satori-python-server 0.17.3__tar.gz → 0.17.5__tar.gz

{satori_python_server-0.17.3 → satori_python_server-0.17.5}/PKG-INFO

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

{satori_python_server-0.17.3 → satori_python_server-0.17.5}/pyproject.toml

@@ -27,7 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.17.3"
+version = "0.17.5"
 
 [project.license]
 text = "MIT"
@@ -96,6 +96,7 @@ exclude = [
     "exam_qps.py",
     "exam1.py",
     "exam2.py",
+    "src/satori/_vendor/*",
 ]
 
 [tool.ruff.lint]

{satori_python_server-0.17.3 → satori_python_server-0.17.5}/src/satori/server/__init__.py

@@ -308,17 +308,27 @@ class Server(Service, RouterMixin):
         self_id: str = request.headers.get("X-Self-ID") or request.headers.get("Satori-User-ID")  # type: ignore
 
         for _router in self._adapters:
-            if action not in _router.routes:
+            if action in _router.routes:
+                func = _router.routes[action]
+            elif action.startswith("internal") and "internal/*" in _router.routes:
+                func = _router.routes["internal/*"]
+            else:
                 continue
             if not _router.ensure(platform, self_id):
                 continue
-            return await _request_handler(action, request, _router.routes[action], platform, self_id)
+            return await _request_handler(action, request, func, platform, self_id)
         if action in self.routes:
             return await _request_handler(action, request, self.routes[action], platform, self_id)
+        if action.startswith("internal") and "internal/*" in self.routes:
+            return await _request_handler(action, request, self.routes["internal/*"], platform, self_id)
         for _router in self.routers:
-            if action not in _router.routes:
+            if action in _router.routes:
+                func = _router.routes[action]
+            elif action.startswith("internal") and "internal/*" in _router.routes:
+                func = _router.routes["internal/*"]
+            else:
                 continue
-            return await _request_handler(action, request, _router.routes[action], platform, self_id)
+            return await _request_handler(action, request, func, platform, self_id)
         return Response(status_code=404, content=action)
 
     async def proxy_url_handler(self, request: StarletteRequest):

{satori_python_server-0.17.3 → satori_python_server-0.17.5}/src/satori/server/adapter.py

@@ -22,7 +22,11 @@ class Adapter(Service, RouterMixin):
     server: "Server"
 
     @abstractmethod
-    def get_platform(self) -> str: ...
+    def get_platform(self) -> str:
+        """该方法仅用于自动标识适配器类型
+
+        若你继承该类并且重写了 `id`, 该方法可以返回任意字符串
+        """
 
     @abstractmethod
     def ensure(self, platform: str, self_id: str) -> bool: ...