satori-python-client 0.16.4__tar.gz → 0.16.6__tar.gz

{satori_python_client-0.16.4 → satori_python_client-0.16.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-client
-Version: 0.16.4
+Version: 0.16.6
 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>
@@ -72,10 +72,17 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           |
-|------------|----------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   |
-| OneBot V11 | `pip install satori-python-adapter-onebot11` |
+| 适配器        | 安装                                           | 路径                                                                 |
+|------------|----------------------------------------------|--------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
+| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
+
+### 社区适配器
+
+| 适配器               | 安装                    | 路径           |
+|-------------------|-----------------------|--------------|
+| nekobox(Lagrange) | `pip install nekobox` | nekobox.main |
 
 ## 使用
 

{satori_python_client-0.16.4 → satori_python_client-0.16.6}/README.md

@@ -47,10 +47,17 @@ pip install satori-python-server
 
 ### 官方适配器
 
-| 适配器        | 安装                                           |
-|------------|----------------------------------------------|
-| Satori     | `pip install satori-python-adapter-satori`   |
-| OneBot V11 | `pip install satori-python-adapter-onebot11` |
+| 适配器        | 安装                                           | 路径                                                                 |
+|------------|----------------------------------------------|--------------------------------------------------------------------|
+| Satori     | `pip install satori-python-adapter-satori`   | satori.adapters.satori                                             |
+| OneBot V11 | `pip install satori-python-adapter-onebot11` | satori.adapters.onebot11.forward, satori.adapters.onebot11.reverse |
+| Console    | `pip install satori-python-adapter-console`  | satori.adapters.console                                            |
+
+### 社区适配器
+
+| 适配器               | 安装                    | 路径           |
+|-------------------|-----------------------|--------------|
+| nekobox(Lagrange) | `pip install nekobox` | nekobox.main |
 
 ## 使用
 

{satori_python_client-0.16.4 → satori_python_client-0.16.6}/pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.16.4"
+version = "0.16.6"
 
 [project.license]
 text = "MIT"
@@ -49,6 +49,7 @@ dev = [
     "fix-future-annotations>=0.5.0",
     "mina-build<0.6,>=0.5.1",
     "pdm-mina>=0.3.2",
+    "nonechat<0.7.0,>=0.6.0",
 ]
 
 [tool.pdm.build]

{satori_python_client-0.16.4 → satori_python_client-0.16.6}/src/satori/client/__init__.py

@@ -35,6 +35,31 @@ MAPPING: dict[type[Config], type[BaseNetwork]] = {
     WebsocketsInfo: WsNetwork,
 }
 
+_app: App | None = None
+
+
+@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.")
+    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:
+    """Get the current App instance."""
+    if _app is None:
+        raise RuntimeError("App instance is not initialized.")
+    return _app
+
 
 class App(Service):
     id = "satori-python.client"
@@ -51,6 +76,10 @@ class App(Service):
         MAPPING[tc] = tn
 
     def __init__(self, *configs: Config, default_api_cls: type[ApiProtocol] = ApiProtocol):
+        global _app
+
+        if _app is not None:
+            raise RuntimeError("App instance already exists. Only one App instance is allowed.")
         self.accounts = {}
         self.connections = []
         self.event_callbacks = []
@@ -59,6 +88,7 @@ class App(Service):
         for config in configs:
             self.apply(config)
         self.default_api_cls = default_api_cls
+        _app = self
 
     def apply(self, config: Config):
         try:
@@ -67,9 +97,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_client-0.16.4 → satori_python_client-0.16.6}/src/satori/client/network/base.py

@@ -8,7 +8,7 @@ from launart import Service
 from ..config import Config as Config
 
 if TYPE_CHECKING:
-    from .. import Account, App
+    from satori.client import Account, App
 
 TConfig = TypeVar("TConfig", bound=Config)