satori-python 0.12.0__tar.gz → 0.13.0__tar.gz

{satori_python-0.12.0 → satori_python-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.12.0
+Version: 0.13.0
 Summary: Satori Protocol SDK for python
 Home-page: https://github.com/RF-Tar-Railt/satori-python
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
@@ -22,9 +22,10 @@ Requires-Dist: loguru>=0.7.2
 Requires-Dist: launart>=0.8.2
 Requires-Dist: typing-extensions>=4.7.0
 Requires-Dist: graia-amnesia>=0.9.0
-Requires-Dist: starlette>=0.37.2
+Requires-Dist: starlette[python-multipart]>=0.37.2
 Requires-Dist: uvicorn[standard]>=0.28.0
 Requires-Dist: yarl>=1.9.4
+Requires-Dist: python-multipart>=0.0.9
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -47,6 +48,10 @@ Description-Content-Type: text/markdown
 - [Chronocat](https://chronocat.vercel.app)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
+### 使用该 SDK 的框架
+
+- [`Entari`](https://github.com/ArcletProject/Entari)
+
 ## 安装
 
 安装完整体：
@@ -74,14 +79,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-0.12.0 → satori_python-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-0.12.0 → satori_python-0.13.0}/pyproject.toml

@@ -11,9 +11,10 @@ dependencies = [
     "launart>=0.8.2",
     "typing-extensions>=4.7.0",
     "graia-amnesia>=0.9.0",
-    "starlette>=0.37.2",
+    "starlette[python-multipart]>=0.37.2",
     "uvicorn[standard]>=0.28.0",
     "yarl>=1.9.4",
+    "python-multipart>=0.0.9",
 ]
 requires-python = ">=3.9"
 readme = "README.md"
@@ -28,7 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.12.0"
+version = "0.13.0"
 
 [project.license]
 text = "MIT"

{satori_python-0.12.0 → satori_python-0.13.0}/src/satori/__init__.py

@@ -36,7 +36,10 @@ from .model import Login as Login
 from .model import LoginStatus as LoginStatus
 from .model import Member as Member
 from .model import MessageObject as MessageObject
+from .model import PageDequeResult as PageDequeResult
+from .model import PageResult as PageResult
 from .model import Role as Role
+from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.12.0"
+__version__ = "0.13.0"

{satori_python-0.12.0 → satori_python-0.13.0}/src/satori/client/account.py

@@ -8,9 +8,9 @@ from yarl import URL
 
 from satori.model import Login
 
-from .session import Session
+from .protocol import ApiProtocol
 
-TS = TypeVar("TS", bound="Session")
+TP = TypeVar("TP", bound="ApiProtocol")
 
 
 @dataclass
@@ -36,17 +36,23 @@ class Account:
         self_id: str,
         self_info: Login,
         config: ApiInfo,
-        session_cls: type[Session] = Session,
+        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):
@@ -56,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)