Merge pull request #77 from fedi-libs/chore/pyrefly-to-ty

feat: migrate pyrefly to ty

Author: AmaseCocoa

.gitignore

@@ -209,4 +209,10 @@ __marimo__/
 private_key*.pem
 
 devel/
-data/
+_version.py
+
+/*.py
+data/
+
+# auto-generated file
+src/apkit/_version.py

.zed/settings.json

@@ -1,27 +1,10 @@
 {
     "languages": {
         "Python": {
-            "language_servers": ["ruff", "pyrefly"]
+            "language_servers": ["ruff", "ty"]
         }
     },
     "lsp": {
-        "pyrefly": {
-            "binary": {
-                "path": ".venv/bin/pyrefly",
-                "arguments": ["lsp"]
-            },
-            "settings": {
-                "python": {
-                    "pythonPath": ".venv/bin/python"
-                },
-                "pyrefly": {
-                    "project_includes": ["src/**/*.py", "tests/**/*.py"],
-                    "project_excludes": ["**/.[!/.]*", "**/*venv/**"],
-                    "search_path": ["src"],
-                    "ignore_errors_in_generated_code": true
-                }
-            }
-        },
         "ruff": {
             "initialization_options": {
                 "settings": {

examples/delete.py

@@ -8,7 +8,7 @@
 from cryptography.hazmat.primitives import serialization as crypto_serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 
-from apkit.client.asyncio import ActivityPubClient
+from apkit.client import ActivityPubClient
 from apkit.models import CryptographicKey, Delete, Person
 
 if len(sys.argv) < 3:
@@ -104,9 +104,12 @@ async def delete_note(recepient: str, object_id: str) -> None:
         # Deliver the activity
         logger.info("Delivering activity...")
 
+        if not actor.public_key or not actor.public_key.id:
+            raise ValueError("public_key.id not found")
+
         resp = await client.post(
             inbox_url,
-            key_id=actor.publicKey.id,
+            key_id=actor.public_key.id,
             signature=private_key,
             json=delete,
         )

examples/follow.py

@@ -7,8 +7,8 @@
 from cryptography.hazmat.primitives import serialization as crypto_serialization
 from cryptography.hazmat.primitives.asymmetric import rsa
 
-from apkit.client.asyncio import ActivityPubClient
-from apkit.client.models import Resource as WebfingerResource
+from apkit.client import ActivityPubClient
+from apmodel.webfinger import Resource as WebfingerResource
 from apkit.models import CryptographicKey, Follow, Person
 
 if len(sys.argv) < 2:
@@ -70,10 +70,10 @@
     summary="This is a demo actor powered by apkit!",
     inbox=f"https://{HOST}/users/{USER_ID}/inbox",
     outbox=f"https://{HOST}/users/{USER_ID}/outbox",
-    public_key_pem=CryptographicKey(
+    public_key=CryptographicKey(
         id=f"https://{HOST}/users/{USER_ID}#main-key",
         owner=f"https://{HOST}/users/{USER_ID}",
-        public_key=public_key_pem,
+        public_key_pem=public_key_pem,
     ),
 )
 
@@ -113,6 +113,9 @@ async def follow(actor_id: str) -> None:
         # Deliver the activity
         logger.info("Delivering activity...")
 
+        if not actor.public_key or not actor.public_key.id:
+            raise ValueError("public_key.id not found")
+
         resp = await client.post(
             inbox_url,
             key_id=actor.public_key.id,

examples/like.py

@@ -5,11 +5,13 @@
 import uuid
 from datetime import UTC, datetime
 
+from apmodel.objects import Actor
 from cryptography.hazmat.primitives import serialization as crypto_serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives.asymmetric import ed25519, rsa
 
-from apkit.client.asyncio import ActivityPubClient
+from apkit.client import ActivityPubClient
 from apkit.models import CryptographicKey, Like, Person
+from apkit.types import ActorKey
 
 if len(sys.argv) < 2:
     print("USAGE: python like.py <OBJECT_ID>", file=sys.stderr)
@@ -89,6 +91,9 @@ async def like(object_id: str) -> None:
         logger.info(f"Author of the object is: {sender_id}")
 
         target_actor = await client.actor.fetch(sender_id)
+        if not isinstance(target_actor, Actor):
+            raise ValueError("Actor not found.")
+
         # Get the inbox URL from the actor's profile
         inbox_url = target_actor.inbox
         if not inbox_url:
@@ -109,10 +114,17 @@ async def like(object_id: str) -> None:
         # Deliver the activity
         logger.info("Delivering activity...")
 
+        if not actor.public_key or not actor.public_key.id:
+            raise ValueError("Actor's publickey is missing")
+
+        if not isinstance(private_key, rsa.RSAPrivateKey) and not isinstance(
+            private_key, ed25519.Ed25519PrivateKey
+        ):
+            raise ValueError("Invalid Key")
+
         resp = await client.post(
             inbox_url,
-            key_id=actor.publicKey.id,
-            signature=private_key,
+            signatures=[ActorKey(key_id=actor.public_key.id, private_key=private_key)],
             json=activity,
         )
         logger.info(f"Delivery result: {resp.status}")

examples/minimal_server.py

@@ -2,14 +2,19 @@
 import logging
 import os
 import sys
+import uuid
 
 from cryptography.hazmat.primitives import serialization as crypto_serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives.asymmetric import ed25519, rsa
 from fastapi import Request, Response
 from fastapi.responses import JSONResponse
 
-from apkit.client import WebfingerLink, WebfingerResource, WebfingerResult
-from apkit.client.asyncio.client import ActivityPubClient
+from apkit.client import (
+    ActivityPubClient,
+    WebfingerLink,
+    WebfingerResource,
+    WebfingerResult,
+)
 from apkit.models import (
     Actor as APKitActor,
 )
@@ -83,26 +88,33 @@
 actor = Person(
     id=f"https://{HOST}/users/{USER_ID}",
     name="apkit Demo",
-    preferredUsername="demo",
+    preferred_username="demo",
     summary="This is a demo actor powered by apkit!",
     inbox=f"https://{HOST}/users/{USER_ID}/inbox",
     outbox=f"https://{HOST}/users/{USER_ID}/outbox",
-    publicKey=CryptographicKey(
+    public_key=CryptographicKey(
         id=f"https://{HOST}/users/{USER_ID}#main-key",
         owner=f"https://{HOST}/users/{USER_ID}",
-        publicKeyPem=public_key_pem,
+        public_key_pem=public_key_pem,
     ),
 )
 
+
 # --- Server Initialization ---
 app = ActivityPubServer()
 
 
 # --- Key Retrieval Function ---
 # This function provides the private key for signing outgoing activities.
 def get_keys_for_actor(identifier: str) -> list[ActorKey]:
-    if identifier == USER_ID:
-        return [ActorKey(key_id=actor.publicKey.id, private_key=private_key)]
+    if not actor.public_key:
+        raise ValueError("PublicKey not found.")
+    if not isinstance(private_key, rsa.RSAPrivateKey) and not isinstance(
+        private_key, ed25519.Ed25519PrivateKey
+    ):
+        raise ValueError("Invalid Key")
+    if identifier == USER_ID and actor.public_key.id:
+        return [ActorKey(key_id=actor.public_key.id, private_key=private_key)]
     return []
 
 
@@ -177,7 +189,7 @@ async def outbox(ctx: Context):
 
     if not ctx.request.query_params.get("page"):
         outbox = OrderedCollection()
-        outbox.totalItems = 0  # No letter in the mail today.
+        outbox.total_items = 0  # No letter in the mail today.
         outbox.id = f"https://{HOST}/users/{identifier}/outbox"
         outbox.first = f"{outbox.id}?page=true"
         outbox.last = f"{outbox.id}?min_id=0&page=true"
@@ -202,15 +214,15 @@ async def on_follow_activity(ctx: Context) -> Response:
     elif isinstance(activity.actor, APKitActor):
         follower_actor = activity.actor
 
-    if not follower_actor:
+    if not follower_actor or not isinstance(follower_actor, APKitActor):
         return JSONResponse(
             {"error": "Could not resolve follower actor"}, status_code=400
         )
 
     logger.info(f"🫂 {follower_actor.name} follows me.")
 
     # Automatically accept the follow request
-    id_ = "https://{HOST}/activity/{uuid.uuid4()}"
+    id_ = f"https://{HOST}/activity/{uuid.uuid4()}"
     accept_activity = activity.accept(id_, actor)
 
     # Send the signed Accept activity back to the follower's inbox

examples/send_message.py

@@ -5,13 +5,16 @@
 import uuid
 from datetime import UTC, datetime
 
-from apmodel.vocab.mention import Mention
+import apmodel
+from apmodel.core import Link
+from apmodel.objects import Actor, Mention
+from apmodel.webfinger import Resource as WebfingerResource
 from cryptography.hazmat.primitives import serialization as crypto_serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
+from cryptography.hazmat.primitives.asymmetric import ed25519, rsa
 
-from apkit.client.asyncio import ActivityPubClient
-from apkit.client.models import Resource as WebfingerResource
+from apkit.client import ActivityPubClient
 from apkit.models import Create, CryptographicKey, Note, Person
+from apkit.types import ActorKey
 
 if len(sys.argv) < 2:
     print("USAGE: python send_message.py <RECEPIENT_URI>", file=sys.stderr)
@@ -93,10 +96,16 @@ async def send_note(recepient: str) -> None:
             webfinger_result = await client.actor.resolve(res.username, res.host)
 
             # read the ActivityPub link from the result
-            recepient = webfinger_result.get("application/activity+json").href
+            res = webfinger_result.get("application/activity+json")[0].href
+            if not res:
+                raise ValueError("")
+            else:
+                recepient = res
 
         # Fetch a remote Actor
         target_actor = await client.actor.fetch(recepient)
+        if not isinstance(target_actor, Actor):
+            raise ValueError("Actor not found.")
         logger.info(f"Fetched actor: {target_actor.name}")
 
         # Get the inbox URL from the actor's profile
@@ -106,6 +115,14 @@ async def send_note(recepient: str) -> None:
 
         logger.info(f"Found actor's inbox: {inbox_url}")
 
+        if (
+            actor.id is None
+            or target_actor.id is None
+            or target_actor.url is None
+            or isinstance(target_actor.url, Link)
+        ):
+            raise ValueError("Actor ID or URL is missing")
+
         # Create note
         t = f'<p><span class="h-card" translate="no"><a href="{target_actor.url}" class="u-url mention">@<span>{target_actor.preferred_username}</span></a></span></p>'
         note = Note(
@@ -117,7 +134,8 @@ async def send_note(recepient: str) -> None:
             cc=["https://www.w3.org/ns/activitystreams#Public"],
             tag=[
                 Mention(
-                    href=target_actor.url, name=f"@{target_actor.preferred_username}"
+                    href=target_actor.url,
+                    name=f"@{target_actor.preferred_username}",
                 )
             ],
         )
@@ -138,11 +156,21 @@ async def send_note(recepient: str) -> None:
         # Uncomment the following line if you want to see the code of the activity.
         # print(create.to_json())
 
+        if not actor.public_key:
+            raise ValueError("Actor's publickey is missing")
+
+        if not isinstance(private_key, rsa.RSAPrivateKey) and not isinstance(
+            private_key, ed25519.Ed25519PrivateKey
+        ):
+            raise ValueError("Invalid Key")
+
+        if not actor.public_key.id:
+            raise ValueError("public_key.key_id is required")
+
         resp = await client.post(
             inbox_url,
-            key_id=actor.publicKey.id,
-            signature=private_key,
-            json=create.to_json(keep_object=True),
+            signatures=[ActorKey(key_id=actor.public_key.id, private_key=private_key)],
+            json=apmodel.to_dict(create),
         )
         logger.info(f"Delivery result: {resp.status}")