satori-python 0.16.5__tar.gz → 0.16.7__tar.gz

{satori_python-0.16.5 → satori_python-0.16.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.16.5
+Version: 0.16.7
 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>

{satori_python-0.16.5 → satori_python-0.16.7}/pyproject.toml

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

{satori_python-0.16.5 → satori_python-0.16.7}/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.5"
+__version__ = "0.16.7"

{satori_python-0.16.5 → satori_python-0.16.7}/src/satori/client/__init__.py

@@ -38,10 +38,20 @@ MAPPING: dict[type[Config], type[BaseNetwork]] = {
 _app: App | None = None
 
 
-def get_accounts() -> dict[str, Account]:
+@overload
+def get_accounts() -> dict[str, Account]: ...
+
+
+@overload
+def get_accounts(self_id: str) -> list[Account]: ...
+
+
+def get_accounts(self_id: str | None = None):
     if _app is None:
         raise RuntimeError("App instance is not initialized.")
-    return _app.accounts
+    if not self_id:
+        return _app.accounts
+    return [acc for acc in _app.accounts.values() if acc.self_info.user.id == self_id]
 
 
 def get_app() -> App:
@@ -51,13 +61,6 @@ def get_app() -> App:
     return _app
 
 
-def get_account(self_id: str) -> Account:
-    """Get an account by its self_id."""
-    if _app is None:
-        raise RuntimeError("App instance is not initialized.")
-    return _app.get_account(self_id)
-
-
 class App(Service):
     id = "satori-python.client"
     required: set[str] = {"http.client/aiohttp"}
@@ -72,10 +75,12 @@ class App(Service):
     def register_config(cls, tc: type[TConfig], tn: type[BaseNetwork[TConfig]]):
         MAPPING[tc] = tn
 
-    def __init__(self, *configs: Config, default_api_cls: type[ApiProtocol] = ApiProtocol):
+    def __init__(
+        self, *configs: Config, default_api_cls: type[ApiProtocol] = ApiProtocol, main_app: bool = True
+    ):
         global _app
 
-        if _app is not None:
+        if _app is not None and main_app:
             raise RuntimeError("App instance already exists. Only one App instance is allowed.")
         self.accounts = {}
         self.connections = []
@@ -94,9 +99,6 @@ class App(Service):
             raise TypeError(f"Unknown config type: {config}")
         self.connections.append(connection)
 
-    def get_account(self, self_id: str) -> Account:
-        return self.accounts[self_id]
-
     def register(self, callback: Callable[[Account, Event], Awaitable[Any]]):
         self.event_callbacks.append(callback)
 

{satori_python-0.16.5 → satori_python-0.16.7}/src/satori/server/__init__.py

@@ -33,6 +33,7 @@ from starlette.responses import Response as Response
 from starlette.responses import StreamingResponse as StreamingResponse
 from starlette.routing import Route, WebSocketRoute
 from starlette.staticfiles import StaticFiles
+from starlette.types import ASGIApp
 from starlette.websockets import WebSocket, WebSocketDisconnect
 from yarl import URL
 
@@ -139,7 +140,7 @@ class Server(Service, RouterMixin):
         self.app = Starlette()
         super().__init__()
 
-    def replace_app(self, app: asgitypes.ASGI3Application):
+    def replace_app(self, app: ASGIApp | asgitypes.ASGI3Application):
         """替换当前的 Starlette 应用"""
         self.app = app