fix(test): fix nodeinfo tests

Author: AmaseCocoa

src/apmodel/nodeinfo/__init__.py

@@ -1 +1,4 @@
-from .nodeinfo import Nodeinfo
+from .nodeinfo import Nodeinfo
+
+def load(data: dict) -> Nodeinfo:
+    return Nodeinfo.model_validate(data)

src/apmodel/nodeinfo/nodeinfo.py

@@ -1,8 +1,13 @@
 from __future__ import annotations
 
-from enum import Enum
+import sys
 from typing import List, Literal, Optional
 
+if sys.version_info >= (3, 11):
+    from enum import StrEnum
+else:
+    from backports.strenum import StrEnum
+
 from pydantic import (
     BaseModel,
     ConfigDict,
@@ -12,7 +17,7 @@
 from pydantic_core import PydanticCustomError
 
 
-class NodeinfoProtocol(Enum):
+class NodeinfoProtocol(StrEnum):
     ACTIVITYPUB = "activitypub"
     BUDDYCLOUD = "buddycloud"
     DFRN = "dfrn"
@@ -25,7 +30,7 @@ class NodeinfoProtocol(Enum):
     ZOT = "zot"
 
 
-class NodeinfoInbound(Enum):
+class NodeinfoInbound(StrEnum):
     ATOM1_0 = "atom1.0"
     GNUSOCIAL = "gnusocial"
     IMAP = "imap"
@@ -36,7 +41,7 @@ class NodeinfoInbound(Enum):
     TWITTER = "twitter"
 
 
-class NodeinfoOutbound(Enum):
+class NodeinfoOutbound(StrEnum):
     ATOM1_0 = "atom1.0"
     GNUSOCIAL = "gnusocial"
     BLOGGER = "blogger"

tests/data/nodeinfo_sample_2.0.json

@@ -2,8 +2,7 @@
     "version": "2.0",
     "software": {
         "name": "foofedi",
-        "version": "2025.8.27",
-        "homepage": "https://foofedi.example.com/"
+        "version": "2025.8.27"
     },
     "protocols": [
         "activitypub"

tests/test_nodeinfo.py

@@ -1,39 +1,57 @@
 import json
 from pathlib import Path
-from apmodel.nodeinfo.nodeinfo import Nodeinfo, NodeinfoProtocol, NodeinfoOutbound
-from apmodel.types import Undefined
+
+from pydantic import ValidationError
+from pydantic_core import PydanticCustomError
+
+from apmodel import nodeinfo as ni
+from apmodel.nodeinfo.nodeinfo import NodeinfoOutbound, NodeinfoProtocol
+
+import pytest
 
 def test_nodeinfo_2_0():
     path = Path(__file__).parent / "data" / "nodeinfo_sample_2.0.json"
     with open(path) as f:
         data = json.load(f)
-    
-    nodeinfo = Nodeinfo.from_json(data)
+
+    nodeinfo = ni.load(data)
 
     assert nodeinfo.version == "2.0"
     assert nodeinfo.software.name == "foofedi"
     assert nodeinfo.software.version == "2025.8.27"
-    assert isinstance(nodeinfo.software.homepage, Undefined)
+    assert not nodeinfo.software.homepage
     assert nodeinfo.protocols[0] == NodeinfoProtocol.ACTIVITYPUB
     assert NodeinfoOutbound.ATOM1_0 in nodeinfo.services.outbound
     assert nodeinfo.openRegistrations is False
     assert nodeinfo.usage.users.total == 4
     assert nodeinfo.metadata["nodeName"] == "FooFedi TEST"
 
+def test_nodeinfo_2_0_incorrect():
+    path = Path(__file__).parent / "data" / "nodeinfo_sample_2.0_incorrect.json"
+    with open(path) as f:
+        data = json.load(f)
+
+    with pytest.raises(ValidationError) as e:
+        ni.load(data)
+
+
 def test_nodeinfo_2_1():
     path = Path(__file__).parent / "data" / "nodeinfo_sample_2.1.json"
     with open(path) as f:
         data = json.load(f)
-    
-    nodeinfo = Nodeinfo.from_json(data)
+
+    nodeinfo = ni.load(data)
 
     assert nodeinfo.version == "2.1"
     assert nodeinfo.software.name == "foofedi"
     assert nodeinfo.software.version == "2025.8.27"
     assert nodeinfo.software.homepage == "https://foofedi.example.com/"
-    assert nodeinfo.software.repository == "https://git.example.com/foofedi/foofedi"
+    assert (
+        nodeinfo.software.repository
+        == "https://git.example.com/foofedi/foofedi"
+    )
     assert nodeinfo.protocols[0] == NodeinfoProtocol.ACTIVITYPUB
     assert NodeinfoOutbound.ATOM1_0 in nodeinfo.services.outbound
     assert nodeinfo.openRegistrations is False
     assert nodeinfo.usage.users.total == 4
-    assert nodeinfo.metadata["nodeName"] == "FooFedi TEST"
+    assert nodeinfo.metadata["nodeName"] == "FooFedi TEST"