satori-python 0.17.2__tar.gz → 0.17.4__tar.gz

{satori_python-0.17.2 → satori_python-0.17.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python
-Version: 0.17.2
+Version: 0.17.4
 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>
@@ -84,6 +84,7 @@ pip install satori-python-server
 | 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                                            |
+| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
 
 ### 社区适配器
 

{satori_python-0.17.2 → satori_python-0.17.4}/README.md

@@ -52,6 +52,7 @@ pip install satori-python-server
 | 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                                            |
+| Milky      | `pip install satori-python-adapter-milky`    | satori.adapters.milky.main, satori.adapters.milky.webhook          |
 
 ### 社区适配器
 

{satori_python-0.17.2 → satori_python-0.17.4}/pyproject.toml

@@ -29,7 +29,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.17.2"
+version = "0.17.4"
 
 [project.license]
 text = "MIT"
@@ -75,7 +75,7 @@ excludes = [
 composite = [
     "isort ./src/ ./example/",
     "black ./src/ ./example/",
-    "ruff check ./src/ ./example/",
+    "ruff check",
 ]
 
 [tool.pdm.version]
@@ -99,7 +99,9 @@ extra_standard_library = [
 line-length = 120
 target-version = "py310"
 exclude = [
-    "exam.py",
+    "exam_qps.py",
+    "exam1.py",
+    "exam2.py",
 ]
 
 [tool.ruff.lint]
@@ -117,7 +119,7 @@ ignore = [
     "F403",
     "F405",
     "C901",
-    "UP038",
+    "T201",
 ]
 
 [tool.pyright]

{satori_python-0.17.2 → satori_python-0.17.4}/src/satori/__init__.py

@@ -42,4 +42,4 @@ from .model import Role as Role
 from .model import Upload as Upload
 from .model import User as User
 
-__version__ = "0.17.2"
+__version__ = "0.17.4"

{satori_python-0.17.2 → satori_python-0.17.4}/src/satori/parser.py

@@ -306,7 +306,7 @@ def parse_tokens(tokens: list[str | Token], context: dict | None = None) -> list
             while mat := attr_pat.search(token.extra):
                 key = mat.group(1)
                 groupdict = mat.groupdict()
-                v2 = groupdict.get("value2", groupdict.get("value1"))
+                v2 = groupdict.get("value2") or groupdict.get("value1")
                 curly = groupdict.get("curly")
                 if curly and context is not None:
                     attrs[key] = interpolate(curly, context)

{satori_python-0.17.2 → satori_python-0.17.4}/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):