satori-python-core 0.16.2__tar.gz → 0.16.3__tar.gz

{satori_python_core-0.16.2 → satori_python_core-0.16.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-core
-Version: 0.16.2
+Version: 0.16.3
 Summary: Satori Protocol SDK for python, specify common part
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>

{satori_python_core-0.16.2 → satori_python_core-0.16.3}/pyproject.toml

@@ -23,7 +23,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.16.2"
+version = "0.16.3"
 
 [project.license]
 text = "MIT"

{satori_python_core-0.16.2 → satori_python_core-0.16.3}/src/satori/__init__.py

@@ -41,4 +41,4 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.16.2"
+__version__ = "0.16.3"

{satori_python_core-0.16.2 → satori_python_core-0.16.3}/src/satori/event.py

@@ -4,7 +4,7 @@ from satori.model import (
     Channel,
     Event,
     Guild,
-    Login,
+    LoginPartial,
     Member,
     MessageObject,
     Role,
@@ -37,7 +37,7 @@ class GuildRoleEvent(GuildEvent):
 
 
 class LoginEvent(Event):
-    login: Login
+    login: LoginPartial
 
 
 class ReactionEvent(Event):

{satori_python_core-0.16.2 → satori_python_core-0.16.3}/src/satori/model.py

@@ -1,4 +1,5 @@
 import mimetypes
+from collections.abc import AsyncIterable, Awaitable
 from dataclasses import asdict, dataclass, field, fields
 from datetime import datetime
 from enum import IntEnum
@@ -145,11 +146,11 @@ class LoginStatus(IntEnum):
 
 @dataclass
 class Login(ModelBase):
-    sn: str
+    sn: int
     status: LoginStatus
     adapter: str
-    platform: Optional[str] = None
-    user: Optional[User] = None
+    platform: str
+    user: User
     features: list[str] = field(default_factory=list)
 
     __converter__ = {"user": User.parse, "status": LoginStatus}
@@ -173,7 +174,7 @@ class Login(ModelBase):
         if "self_id" in raw and "user" not in raw:
             raw["user"] = {"id": raw["self_id"]}
         if "sn" not in raw:
-            raw["sn"] = raw["user"]["id"]
+            raw["sn"] = 0
         if "adapter" not in raw:
             raw["adapter"] = "satori"
         if "status" not in raw:
@@ -182,11 +183,15 @@ class Login(ModelBase):
 
     @property
     def id(self) -> str:
-        if not self.user:
-            raise ValueError(f"Login {self.sn} has not complete yet")
         return self.user.id
 
 
+@dataclass
+class LoginPartial(Login):
+    platform: Optional[str] = None
+    user: Optional[User] = None
+
+
 @dataclass
 class ArgvInteraction(ModelBase):
     name: str
@@ -241,10 +246,10 @@ class Identify(ModelBase):
 
 @dataclass
 class Ready(ModelBase):
-    logins: list[Login]
+    logins: list[LoginPartial]
     proxy_urls: list[str] = field(default_factory=list)
 
-    __converter__ = {"logins": lambda raw: [Login.parse(login) for login in raw]}
+    __converter__ = {"logins": lambda raw: [LoginPartial.parse(login) for login in raw]}
 
     def dump(self):
         return asdict(self)
@@ -264,10 +269,10 @@ class MetaPayload(ModelBase):
 class Meta(ModelBase):
     """Meta 数据"""
 
-    logins: list[Login]
+    logins: list[LoginPartial]
     proxy_urls: list[str] = field(default_factory=list)
 
-    __converter__ = {"logins": lambda raw: [Login.parse(login) for login in raw]}
+    __converter__ = {"logins": lambda raw: [LoginPartial.parse(login) for login in raw]}
 
     def dump(self):
         return asdict(self)
@@ -414,7 +419,7 @@ class Event(ModelBase):
             raw["sn"] = raw["id"]
         if "platform" in raw and "self_id" in raw and "login" not in raw:
             raw["login"] = {
-                "sn": raw["self_id"],
+                "sn": 0,
                 "platform": raw["platform"],
                 "user": {"id": raw["self_id"]},
                 "status": LoginStatus.ONLINE,
@@ -501,6 +506,29 @@ class PageDequeResult(PageResult[T]):
         return res
 
 
+class IterablePageResult(Generic[T], AsyncIterable[T], Awaitable[PageResult[T]]):
+    def __init__(
+        self, func: Callable[[Optional[str]], Awaitable[PageResult[T]]], initial_page: Optional[str] = None
+    ):
+        self.func = func
+        self.next_page = initial_page
+
+    def __await__(self):
+        return self.func(self.next_page).__await__()
+
+    def __aiter__(self):
+        async def _gen():
+            while True:
+                result = await self.func(self.next_page)
+                for item in result.data:
+                    yield item
+                self.next_page = result.next
+                if not self.next_page:
+                    break
+
+        return _gen()
+
+
 Direction: TypeAlias = Literal["before", "after", "around"]
 Order: TypeAlias = Literal["asc", "desc"]