satori-python-client 0.11.4__tar.gz → 0.13.0__tar.gz

{satori_python_client-0.11.4 → satori_python_client-0.13.0}/.mina/client.toml

@@ -10,6 +10,7 @@ authors = [
 dependencies = [
     "aiohttp",
     "launart",
+    "graia-amnesia",
 ]
 description = "Satori Protocol SDK for python, specify client part"
 license = {text = "MIT"}

{satori_python_client-0.11.4 → satori_python_client-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-client
-Version: 0.11.4
+Version: 0.13.0
 Summary: Satori Protocol SDK for python, specify client part
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -19,6 +19,7 @@ Project-URL: Repository, https://github.com/RF-Tar-Railt/satori-python
 Requires-Python: >=3.8
 Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: launart>=0.8.2
+Requires-Dist: graia-amnesia>=0.9.0
 Requires-Dist: satori-python-core>=0.11.4
 Description-Content-Type: text/markdown
 
@@ -42,6 +43,10 @@ Description-Content-Type: text/markdown
 - [Chronocat](https://chronocat.vercel.app)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
+### 使用该 SDK 的框架
+
+- [`Entari`](https://github.com/ArcletProject/Entari)
+
 ## 安装
 
 安装完整体：
@@ -69,14 +74,15 @@ pip install satori-python-server
 客户端：
 
 ```python
-from satori import Event, WebsocketsInfo
+from satori import EventType, WebsocketsInfo
+from satori.event import MessageEvent
 from satori.client import Account, App
 
 app = App(WebsocketsInfo(port=5140))
 
-@app.register
-async def on_message(account: Account, event: Event):
-    if event.user and event.user.id == "xxxxxxxxxxx":
+@app.register_on(EventType.MESSAGE_CREATED)
+async def on_message(account: Account, event: MessageEvent):
+    if event.user.id == "xxxxxxxxxxx":
         await account.send(event, "Hello, World!")
 
 app.run()

{satori_python_client-0.11.4 → satori_python_client-0.13.0}/README.md

@@ -18,6 +18,10 @@
 - [Chronocat](https://chronocat.vercel.app)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
+### 使用该 SDK 的框架
+
+- [`Entari`](https://github.com/ArcletProject/Entari)
+
 ## 安装
 
 安装完整体：
@@ -45,14 +49,15 @@ pip install satori-python-server
 客户端：
 
 ```python
-from satori import Event, WebsocketsInfo
+from satori import EventType, WebsocketsInfo
+from satori.event import MessageEvent
 from satori.client import Account, App
 
 app = App(WebsocketsInfo(port=5140))
 
-@app.register
-async def on_message(account: Account, event: Event):
-    if event.user and event.user.id == "xxxxxxxxxxx":
+@app.register_on(EventType.MESSAGE_CREATED)
+async def on_message(account: Account, event: MessageEvent):
+    if event.user.id == "xxxxxxxxxxx":
         await account.send(event, "Hello, World!")
 
 app.run()

{satori_python_client-0.11.4 → satori_python_client-0.13.0}/pyproject.toml

@@ -7,6 +7,7 @@ authors = [
 dependencies = [
     "aiohttp>=3.9.3",
     "launart>=0.8.2",
+    "graia-amnesia>=0.9.0",
     "satori-python-core >= 0.11.4",
 ]
 description = "Satori Protocol SDK for python, specify client part"
@@ -23,7 +24,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.11.4"
+version = "0.13.0"
 
 [project.license]
 text = "MIT"
@@ -41,9 +42,9 @@ build-backend = "mina.backend"
 [tool.pdm.dev-dependencies]
 dev = [
     "isort>=5.13.2",
-    "black>=24.2.0",
-    "ruff>=0.3.2",
-    "pre-commit>=3.6.2",
+    "black>=24.4.0",
+    "ruff>=0.4.1",
+    "pre-commit>=3.7.0",
     "fix-future-annotations>=0.5.0",
     "mina-build<0.6,>=0.5.1",
     "pdm-mina>=0.3.2",

{satori_python_client-0.11.4 → satori_python_client-0.13.0}/src/satori/client/__init__.py

@@ -5,13 +5,14 @@ import functools
 import signal
 import threading
 from functools import wraps
-from typing import Any, Awaitable, Callable, Iterable, Literal, TypeVar, overload
+from typing import TYPE_CHECKING, Any, Awaitable, Callable, Iterable, Literal, TypeVar, overload
 
 from creart import it
+from graia.amnesia.builtins.aiohttp import AiohttpClientService
 from launart import Launart, Service, any_completed
 from loguru import logger
 
-from satori import event
+from satori import event as events
 from satori.config import Config, WebhookInfo, WebsocketsInfo
 from satori.const import EventType
 from satori.model import Event, LoginStatus
@@ -33,7 +34,7 @@ MAPPING: dict[type[Config], type[BaseNetwork]] = {
 
 class App(Service):
     id = "satori-python.client"
-    required: set[str] = set()
+    required: set[str] = {"http.client/aiohttp"}
     stages: set[str] = {"preparing", "blocking", "cleanup"}
 
     accounts: dict[str, Account]
@@ -69,8 +70,8 @@ class App(Service):
 
     @overload
     def register_on(self, event_type: Literal[EventType.FRIEND_REQUEST]) -> Callable[
-        [Callable[[Account, event.UserEvent], Awaitable[Any]]],
-        Callable[[Account, event.UserEvent], Awaitable[Any]],
+        [Callable[[Account, events.UserEvent], Awaitable[Any]]],
+        Callable[[Account, events.UserEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -80,8 +81,8 @@ class App(Service):
             EventType.GUILD_ADDED, EventType.GUILD_REMOVED, EventType.GUILD_REQUEST, EventType.GUILD_UPDATED
         ],
     ) -> Callable[
-        [Callable[[Account, event.GuildEvent], Awaitable[Any]]],
-        Callable[[Account, event.GuildEvent], Awaitable[Any]],
+        [Callable[[Account, events.GuildEvent], Awaitable[Any]]],
+        Callable[[Account, events.GuildEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -94,8 +95,8 @@ class App(Service):
             EventType.GUILD_MEMBER_REQUEST,
         ],
     ) -> Callable[
-        [Callable[[Account, event.GuildMemberEvent], Awaitable[Any]]],
-        Callable[[Account, event.GuildMemberEvent], Awaitable[Any]],
+        [Callable[[Account, events.GuildMemberEvent], Awaitable[Any]]],
+        Callable[[Account, events.GuildMemberEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -105,16 +106,16 @@ class App(Service):
             EventType.GUILD_ROLE_CREATED, EventType.GUILD_ROLE_DELETED, EventType.GUILD_ROLE_UPDATED
         ],
     ) -> Callable[
-        [Callable[[Account, event.GuildRoleEvent], Awaitable[Any]]],
-        Callable[[Account, event.GuildRoleEvent], Awaitable[Any]],
+        [Callable[[Account, events.GuildRoleEvent], Awaitable[Any]]],
+        Callable[[Account, events.GuildRoleEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(
         self, event_type: Literal[EventType.LOGIN_ADDED, EventType.LOGIN_REMOVED, EventType.LOGIN_UPDATED]
     ) -> Callable[
-        [Callable[[Account, event.LoginEvent], Awaitable[Any]]],
-        Callable[[Account, event.LoginEvent], Awaitable[Any]],
+        [Callable[[Account, events.LoginEvent], Awaitable[Any]]],
+        Callable[[Account, events.LoginEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -122,34 +123,34 @@ class App(Service):
         self,
         event_type: Literal[EventType.MESSAGE_CREATED, EventType.MESSAGE_DELETED, EventType.MESSAGE_UPDATED],
     ) -> Callable[
-        [Callable[[Account, event.MessageEvent], Awaitable[Any]]],
-        Callable[[Account, event.MessageEvent], Awaitable[Any]],
+        [Callable[[Account, events.MessageEvent], Awaitable[Any]]],
+        Callable[[Account, events.MessageEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(
         self, event_type: Literal[EventType.REACTION_ADDED, EventType.REACTION_REMOVED]
     ) -> Callable[
-        [Callable[[Account, event.ReactionEvent], Awaitable[Any]]],
-        Callable[[Account, event.ReactionEvent], Awaitable[Any]],
+        [Callable[[Account, events.ReactionEvent], Awaitable[Any]]],
+        Callable[[Account, events.ReactionEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(self, event_type: Literal[EventType.INTERACTION_BUTTON]) -> Callable[
-        [Callable[[Account, event.ButtonInteractionEvent], Awaitable[Any]]],
-        Callable[[Account, event.ButtonInteractionEvent], Awaitable[Any]],
+        [Callable[[Account, events.ButtonInteractionEvent], Awaitable[Any]]],
+        Callable[[Account, events.ButtonInteractionEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(self, event_type: Literal[EventType.INTERACTION_COMMAND]) -> Callable[
-        [Callable[[Account, event.ArgvInteractionEvent | event.MessageEvent], Awaitable[Any]]],
-        Callable[[Account, event.ArgvInteractionEvent | event.MessageEvent], Awaitable[Any]],
+        [Callable[[Account, events.ArgvInteractionEvent | events.MessageEvent], Awaitable[Any]]],
+        Callable[[Account, events.ArgvInteractionEvent | events.MessageEvent], Awaitable[Any]],
     ]: ...
 
     @overload
     def register_on(self, event_type: Literal[EventType.INTERNAL]) -> Callable[
-        [Callable[[Account, event.InternalEvent], Awaitable[Any]]],
-        Callable[[Account, event.InternalEvent], Awaitable[Any]],
+        [Callable[[Account, events.InternalEvent], Awaitable[Any]]],
+        Callable[[Account, events.InternalEvent], Awaitable[Any]],
     ]: ...
 
     @overload
@@ -180,16 +181,56 @@ class App(Service):
         if self.lifecycle_callbacks:
             await asyncio.gather(*(callback(account, state) for callback in self.lifecycle_callbacks))
 
-    async def post(self, event: Event):
+    async def post(self, event: Event, conn: BaseNetwork):
         if not self.event_callbacks:
             return
         identity = f"{event.platform}/{event.self_id}"
         if identity not in self.accounts:
-            logger.warning(f"Received event for unknown account: {event}")
-            return
-        account = self.accounts[identity]
+            if event.type == EventType.LOGIN_ADDED:
+                if TYPE_CHECKING:
+                    assert isinstance(event, events.LoginEvent)
+                account = Account(
+                    event.platform,
+                    event.self_id,
+                    event.login,
+                    conn.config,
+                )
+                logger.info(f"account added: {account}")
+                (
+                    account.connected.set()
+                    if event.login.status == LoginStatus.ONLINE
+                    else account.connected.clear()
+                )
+                self.accounts[identity] = account
+                conn.accounts[identity] = account
+                await self.account_update(account, LoginStatus.ONLINE)
+                await self.account_update(account, LoginStatus.CONNECT)
+            else:
+                logger.warning(f"Received event for unknown account: {event}")
+                return
+        else:
+            account = self.accounts[identity]
+        if event.type == EventType.LOGIN_UPDATED:
+            if TYPE_CHECKING:
+                assert isinstance(event, events.LoginEvent)
+            logger.info(f"account updated: {account}")
+            (
+                account.connected.set()
+                if event.login.status in (LoginStatus.ONLINE, LoginStatus.CONNECT)
+                else account.connected.clear()
+            )
+
         await asyncio.gather(*(callback(account, event) for callback in self.event_callbacks))
 
+        if event.type == EventType.LOGIN_REMOVED:
+            if TYPE_CHECKING:
+                assert isinstance(event, events.LoginEvent)
+            logger.info(f"account removed: {account}")
+            account.connected.clear()
+            await self.account_update(account, LoginStatus.DISCONNECT)
+            del self.accounts[identity]
+            del conn.accounts[identity]
+
     async def launch(self, manager: Launart):
         for conn in self.connections:
             manager.add_component(conn)
@@ -217,6 +258,7 @@ class App(Service):
     ):
         if manager is None:
             manager = it(Launart)
+        manager.add_component(AiohttpClientService())
         manager.add_component(self)
         manager.launch_blocking(loop=loop, stop_signal=stop_signal)
 
@@ -227,6 +269,7 @@ class App(Service):
     ):
         if manager is None:
             manager = it(Launart)
+        manager.add_component(AiohttpClientService())
         manager.add_component(self)
         handled_signals: dict[signal.Signals, Any] = {}
         launch_task = asyncio.create_task(manager.launch(), name="amnesia-launch")

{satori_python_client-0.11.4 → satori_python_client-0.13.0}/src/satori/client/account.py

@@ -6,9 +6,11 @@ from typing import TypeVar
 
 from yarl import URL
 
-from .session import Session
+from satori.model import Login
 
-TS = TypeVar("TS", bound="Session")
+from .protocol import ApiProtocol
+
+TP = TypeVar("TP", bound="ApiProtocol")
 
 
 @dataclass
@@ -28,15 +30,29 @@ class ApiInfo:
 
 
 class Account:
-    def __init__(self, platform: str, self_id: str, config: ApiInfo, session_cls: type[Session] = Session):
+    def __init__(
+        self,
+        platform: str,
+        self_id: str,
+        self_info: Login,
+        config: ApiInfo,
+        protocol_cls: type[ApiProtocol] = ApiProtocol,
+    ):
         self.platform = platform
         self.self_id = self_id
+        self.self_info = self_info
         self.config = config
-        self.session = session_cls(self)  # type: ignore
+        self.protocol = protocol_cls(self)  # type: ignore
         self.connected = asyncio.Event()
 
-    def custom(self, config: ApiInfo | None = None, session_cls: type[TS] = Session, **kwargs) -> TS:
-        return Account(self.platform, self.self_id, config or ApiInfo(**kwargs), session_cls).session  # type: ignore
+    def custom(self, config: ApiInfo | None = None, protocol_cls: type[TP] = ApiProtocol, **kwargs) -> TP:
+        return Account(
+            self.platform,
+            self.self_id,
+            self.self_info,
+            config or ApiInfo(**kwargs),
+            protocol_cls,  # type: ignore
+        ).protocol
 
     @property
     def identity(self):
@@ -46,4 +62,4 @@ class Account:
         return f"<Account {self.self_id} ({self.platform})>"
 
     def __getattr__(self, item):
-        return getattr(self.session, item)
+        return getattr(self.protocol, item)