fix(type): fix types

Author: AmaseCocoa

.zed/settings.json

@@ -1,7 +1,7 @@
 {
     "languages": {
         "Python": {
-            "language_servers": ["pyrefly", "ruff", "!pyright", "!pylsp"]
+            "language_servers": ["ruff", "pyrefly"]
         }
     },
     "lsp": {

pyproject.toml

@@ -102,6 +102,12 @@ unfixable = []
 
 dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 
+[tool.pyrefly]
+project-includes = [
+    "**/*.py*",
+    "**/*.ipynb",
+]
+
 [tool.ruff.format]
 quote-style = "double"
 indent-style = "space"

src/apmodel/_core/_initial/_rebuild.py

@@ -1,4 +1,4 @@
-from typing import List
+from typing import List, Type
 
 from pyld.jsonld import warnings
 from typing_extensions import Literal, Dict, Any
@@ -76,7 +76,7 @@
 from ...vocab.profile import Profile  # noqa: F401
 from ...vocab.tombstone import Tombstone  # noqa: F401
 
-models_to_rebuild: List[ActivityPubModel] = [
+models_to_rebuild: List[Type[ActivityPubModel]] = [
     # Core
     Object,
     Activity,
@@ -141,23 +141,14 @@
     CryptographicKey,
     DataIntegrityProof,
     Multikey,
-    # Nodeinfo
-    Nodeinfo,
-    NodeinfoInbound,
-    NodeinfoOutbound,
-    NodeinfoProtocol,
-    NodeinfoServices,
-    NodeinfoSoftware,
-    NodeinfoUsage,
-    NodeinfoUsageUsers,
 ]
 
 
-for model in models_to_rebuild:
-    if isinstance(model, type) and issubclass(model, BaseModel):
+for model_cls in models_to_rebuild:
+    if issubclass(model_cls, BaseModel):
         try:
-            model.model_rebuild()
+            model_cls.model_rebuild()
         except Exception as e:
-            warnings.warn(f"Failed to rebuild {model.__name__}: {e}")
+            warnings.warn(f"Failed to rebuild {model_cls.__name__}: {e}")
     else:
         continue

src/apmodel/_core/key.py

@@ -70,6 +70,8 @@ def _encode_public_key_as_multibase(
                 format=serialization.PublicFormat.Raw,
             ),
         )
+    else:
+        raise ValueError(f"Unsupported public key type: {type(k)}")
     return multibase.encode(wrapped, "base58btc")
 
 
@@ -94,6 +96,8 @@ def _encode_private_key_as_multibase(
                 encryption_algorithm=serialization.NoEncryption(),
             ),
         )
+    else:
+        raise ValueError(f"Unsupported private key type: {type(k)}")
     return multibase.encode(wrapped, "base58btc")
 
 

src/apmodel/context.py

@@ -85,9 +85,6 @@ def __repr__(self) -> str:
     def __len__(self) -> int:
         return len(self.full_context)
 
-    def __iter__(self) -> Iterator[str | Dict[str, Any]]:
-        return iter(self.full_context)
-
     def __getitem__(self, key: Any) -> Any:
         return self.full_context[key]
 

src/apmodel/core/object.py

@@ -22,9 +22,7 @@
 
 class Object(ActivityPubModel):
     context: LDContext = Field(
-        default_factory=lambda: LDContext(
-            ["https://www.w3.org/ns/activitystreams"]
-        ),
+        default_factory=lambda: LDContext(["https://www.w3.org/ns/activitystreams"]),
         kw_only=True,
         alias="@context",
     )
@@ -36,12 +34,10 @@ class Object(ActivityPubModel):
     url: Optional["str | Link"] = Field(default=None)
     published: Optional[str] = Field(default=None)
     updated: Optional[str] = Field(default=None)
-    attributed_to: Optional["str | Actor | List[str | Actor]"] = Field(
+    attributed_to: Optional["str | Actor | List[str | Actor]"] = Field(default=None)
+    audience: Optional["str | Object | Dict[str, Any] | List[str | Object]"] = Field(
         default=None
     )
-    audience: Optional["str | Object | Dict[str, Any] | List[str | Object]"] = (
-        Field(default=None)
-    )
     to: Optional[
         "str | Object | Dict[str, Any] | List[str | Object | Dict[str, Any]]"
     ] = Field(default=None)
@@ -64,9 +60,7 @@ class Object(ActivityPubModel):
     likes: Optional["Collection"] = Field(default=None)
     shares: Optional["Collection"] = Field(default=None)
     scope: "Optional[Object | Dict[str, Any]]" = Field(default=None)
-    tag: "List[Object | Hashtag | Emoji | Dict[str, Any]]" = Field(
-        default_factory=list
-    )
+    tag: "List[Object | Hashtag | Emoji | Dict[str, Any]]" = Field(default_factory=list)
     attachment: "List[PropertyValue | Dict[str, Any] | Object | Link]" = Field(
         default_factory=list
     )
@@ -77,9 +71,7 @@ def _convert_field_to_model(cls, v: Any, info: ValidationInfo) -> Any:
 
         if v is None:
             return None
-        parent_context = (
-            info.context.get("ld_context") if info.context else None
-        )
+        parent_context = info.context.get("ld_context") if info.context else None
         return load(v, "raw", parent_context=parent_context)
 
     @field_validator(

src/apmodel/loader.py

@@ -7,7 +7,6 @@
 from apmodel.context import LDContext
 
 from ._core._jsonjd.loader import create_document_loader
-from .nodeinfo import Nodeinfo
 from .registry import registry
 from .types import ActivityPubModel
 
@@ -66,9 +65,6 @@ def load(
                     f"with data {data_to_validate}: {e}"
                 )
 
-    if Nodeinfo.is_nodeinfo_data(data_to_validate):
-        return Nodeinfo.from_json(data_to_validate)
-
     if default == "raw":
         return data
     return default

tests/test_real_data.py

@@ -35,9 +35,11 @@ def test_misskey_person(test_data_path: Path):
         assert isinstance(actor.attachment[0], PropertyValue)
 
         # check extra value
-        assert actor._misskey_summary == "Hello"
+        assert actor.model_extra is not None
+        assert actor.model_extra.get("_misskey_summary") == "Hello"
 
         # check apmodel methods
+        assert actor.public_key is not None
         assert isinstance(actor.public_key.public_key, RSAPublicKey)
 
 
@@ -84,14 +86,17 @@ def test_fedibird_person(test_data_path: Path):
         assert isinstance(actor.attachment[0], PropertyValue)
 
         # check extra value
+        assert actor.model_extra is not None
         assert actor.model_extra.get("vcard:Address") == "Earth"
-        assert isinstance(actor.otherSetting, list)
+        assert isinstance(actor.model_extra.get("otherSetting"), list)
+        searchable_by = actor.model_extra.get("searchableBy")
         assert (
-            isinstance(actor.searchableBy, list)
-            and actor.searchableBy[0] == "https://fedibird.example.com/users/user"
+            isinstance(searchable_by, list)
+            and searchable_by[0] == "https://fedibird.example.com/users/user"
         )
 
         # check apmodel methods
+        assert actor.public_key is not None
         assert isinstance(actor.public_key.public_key, RSAPublicKey)
 
 
@@ -107,8 +112,9 @@ def test_akkoma_actor(test_data_path: Path):
         assert actor.name == "User"
         assert actor.summary == "Hello"
         assert isinstance(actor.endpoints, ActorEndpoints)
+        assert actor.endpoints.model_extra is not None
         assert (
-            actor.endpoints.oauthAuthorizationEndpoint
+            actor.endpoints.model_extra.get("oauthAuthorizationEndpoint")
             == "https://akkoma.example.com/oauth/authorize"
         )
 
@@ -124,7 +130,8 @@ def test_akkoma_note(test_data_path: Path):
             note.id
             == "https://akkoma.example.com/objects/bcd39b5c-004f-4897-81b1-2b7a4caa398b"
         )
-        assert note.sensitive is True
+        assert note.model_extra is not None
+        assert note.model_extra.get("sensitive") is True
         assert note.summary == "test"
         assert note.content == "<p>:blobthumbsup: 👀</p>"
 
@@ -149,6 +156,7 @@ def test_mastodon_actor(test_data_path: Path):
         assert actor.endpoints.shared_inbox == "https://mastodon.example.com/inbox"
         assert actor.discoverable is True
         assert actor.indexable is True
+        assert actor.public_key is not None
         assert isinstance(actor.public_key.public_key, RSAPublicKey)
         assert actor.public_key.id == "https://mastodon.example.com/users/user#main-key"
         assert actor.public_key.owner == "https://mastodon.example.com/users/user"
@@ -168,15 +176,16 @@ def test_mastodon_note(test_data_path: Path):
             == "https://mastodon.example.com/users/user/statuses/2002577998669970637"
         )
         assert note.content == "<p>Hello!</p>"
-        assert note.sensitive is False
+        assert note.model_extra is not None
+        assert note.model_extra.get("sensitive") is False
         assert note.attributed_to == "https://mastodon.example.com/users/user"
         assert isinstance(note.replies, Collection)
         assert isinstance(note.likes, Collection)
         assert isinstance(note.shares, Collection)
 
 
 def test_akkoma_replies(test_data_path: Path):
-    from apmodel.core.collection import OrderedCollection
+    from apmodel.core.collection import OrderedCollection, OrderedCollectionPage
 
     data_loc = test_data_path / "akkoma_replies.json"
     with open(data_loc, "r") as f:
@@ -186,4 +195,5 @@ def test_akkoma_replies(test_data_path: Path):
         assert isinstance(replies, OrderedCollection)
         assert replies.total_items == 1
         assert replies.first is not None
+        assert isinstance(replies.first, OrderedCollectionPage)
         assert replies.first.type == "OrderedCollectionPage"

tests/test_registry.py

@@ -1,4 +1,5 @@
 import sys
+from typing import Dict, Optional, Type, Union
 
 import pytest
 from pydantic import Field
@@ -7,7 +8,7 @@
 from apmodel.registry import ModelRegistry, _load_model_cls
 from apmodel.types import ActivityPubModel
 
-MINIMAL_PRELOADS = {
+MINIMAL_PRELOADS: Dict[str, Union[str, Type[ActivityPubModel]]] = {
     "https://www.w3.org/ns/activitystreams#Object": "apmodel.core.object.Object",
     "https://www.w3.org/ns/activitystreams#Person": "apmodel.vocab.actor.Person",
 }
@@ -54,7 +55,7 @@ def test_register_custom_model(test_registry: ModelRegistry):
     """Tests registration of a new custom model."""
 
     class CustomObject(Object):
-        type: str = Field("https://example.com/ns#CustomObject", frozen=True)
+        type: Optional[str] = Field("https://example.com/ns#CustomObject", frozen=True)
 
     test_registry.register(CustomObject, "https://example.com/ns#CustomObject")
     retrieved_class = test_registry.get("https://example.com/ns#CustomObject")