satori-python-server 0.17.6__tar.gz → 0.18.0__tar.gz

{satori_python_server-0.17.6 → satori_python_server-0.18.0}/.mina/server.toml

@@ -1,5 +1,5 @@
 includes = ["src/satori/server"]
-raw-dependencies = ["satori-python-core >= 0.17.0"]
+raw-dependencies = ["satori-python-core >=0.18.0"]
 
 [project]
 name = "satori-python-server"

{satori_python_server-0.17.6 → satori_python_server-0.18.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: satori-python-server
-Version: 0.17.6
+Version: 0.18.0
 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>
@@ -23,7 +23,7 @@ Requires-Dist: graia-amnesia[uvicorn]<0.12.0,>=0.11.0
 Requires-Dist: starlette>=0.40.0
 Requires-Dist: websockets>=15.0.1
 Requires-Dist: python-multipart>=0.0.9
-Requires-Dist: satori-python-core>=0.17.0
+Requires-Dist: satori-python-core>=0.18.0
 Description-Content-Type: text/markdown
 
 # satori-python
@@ -33,17 +33,18 @@ Description-Content-Type: text/markdown
 [![PyPI](https://img.shields.io/pypi/v/satori-python)](https://pypi.org/project/satori-python)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satori-python)](https://www.python.org/)
 
-基于 [Satori](https://satori.js.org/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.js.org/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/)
 
 ### 协议端
 
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [LLBot](https://www.llonebot.com/guide/introduction)
 - [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
@@ -81,6 +82,7 @@ pip install satori-python-server
 | 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          |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
 
 ### 社区适配器
 

{satori_python_server-0.17.6 → satori_python_server-0.18.0}/README.md

@@ -5,17 +5,18 @@
 [![PyPI](https://img.shields.io/pypi/v/satori-python)](https://pypi.org/project/satori-python)
 [![PyPI - Python Version](https://img.shields.io/pypi/pyversions/satori-python)](https://www.python.org/)
 
-基于 [Satori](https://satori.js.org/zh-CN/) 协议的 Python 开发工具包
+基于 [Satori](https://satori.chat/zh-CN/) 协议的 Python 开发工具包
 
 ## 协议介绍
 
-[Satori Protocol](https://satori.js.org/zh-CN/)
+[Satori Protocol](https://satori.chat/zh-CN/)
 
 ### 协议端
 
 目前提供了 `satori` 协议实现的有：
 
 - [Chronocat](https://chronocat.vercel.app)
+- [LLBot](https://www.llonebot.com/guide/introduction)
 - [nekobox](https://github.com/wyapx/nekobox)
 - Koishi （搭配 `@koishijs/plugin-server`）
 
@@ -53,6 +54,7 @@ pip install satori-python-server
 | 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          |
+| QQ         | `pip install satori-python-adapter-qq`       | satori.adapters.milky.main, satori.adapters.milky.websocket        |
 
 ### 社区适配器
 

{satori_python_server-0.17.6 → satori_python_server-0.18.0}/pyproject.toml

@@ -11,7 +11,7 @@ dependencies = [
     "starlette>=0.40.0",
     "websockets>=15.0.1",
     "python-multipart>=0.0.9",
-    "satori-python-core >= 0.17.0",
+    "satori-python-core >=0.18.0",
 ]
 description = "Satori Protocol SDK for python, specify server part"
 readme = "README.md"
@@ -27,7 +27,7 @@ classifiers = [
     "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
 ]
-version = "0.17.6"
+version = "0.18.0"
 
 [project.license]
 text = "MIT"

{satori_python_server-0.17.6 → satori_python_server-0.18.0}/src/satori/server/__init__.py

@@ -40,6 +40,7 @@ from starlette.websockets import WebSocket, WebSocketDisconnect
 from yarl import URL
 
 from satori.const import Api, EventType
+from satori.exception import ActionFailed
 from satori.model import Event, Meta, ModelBase, Opcode
 from satori.utils import decode
 
@@ -96,6 +97,9 @@ async def _request_handler(action: str, request: StarletteRequest, func: RouteCa
                 self_id=self_id,
             )
         )
+    except ActionFailed as ae:
+        logger.warning(ae)
+        return Response(status_code=ae.CODE, content=str(ae))
     except Exception as e:
         logger.error(e)
         return Response(status_code=500, content=str(e))
@@ -139,7 +143,6 @@ class Server(Service, RouterMixin):
         self.port = port
         self.version = version
         self.path = path
-        self.uvicorn_options = uvicorn_options
         if self.path and not self.path.startswith("/"):
             self.path = f"/{self.path}"
         if (self.host == "0.0.0.0" or self.host == "::") and not token:
@@ -157,9 +160,13 @@ class Server(Service, RouterMixin):
         self.stream_chunk_size = stream_chunk_size
         self.resources: dict[str, Path] = {}
         self.app = Starlette()
-        self.asgi_service = UvicornASGIService(self.host, self.port, options=self.uvicorn_options)
+        self.asgi_service = UvicornASGIService(self.host, self.port, options=uvicorn_options)
         super().__init__()
 
+    @property
+    def uvicorn_options(self) -> UvicornOptions:
+        return self.asgi_service.options
+
     def replace_app(self, app: ASGIApp | asgitypes.ASGI3Application):
         """替换当前的 Starlette 应用"""
         self.app = app
@@ -332,7 +339,9 @@ class Server(Service, RouterMixin):
             else:
                 continue
             return await _request_handler(action, request, func, platform, self_id)
-        return Response(status_code=404, content=action)
+        return Response(
+            status_code=404, content=f"Action {action!r} is not supported in current platform {platform!r}."
+        )
 
     async def proxy_url_handler(self, request: StarletteRequest):
         url = request.path_params["internal_url"]

{satori_python_server-0.17.6 → satori_python_server-0.18.0}/src/satori/server/route.py

@@ -36,6 +36,7 @@ INTERAL: TypeAlias = RouteCall[Any, ModelBase | list[ModelBase] | dict[str, Any]
 class MessageParam(TypedDict):
     channel_id: str
     content: str
+    referrer: NotRequired[dict[str, Any]]
 
 
 MESSAGE_CREATE: TypeAlias = RouteCall[MessageParam, list[MessageObject] | list[dict[str, Any]]]
@@ -179,7 +180,7 @@ GUILD_ROLE_LIST: TypeAlias = RouteCall[GuildXXXListParam, PageResult[Role] | dic
 
 
 class GuildRoleCreateParam(TypedDict):
-    guild: str
+    guild_id: str
     role: dict
 
 
@@ -187,7 +188,7 @@ GUILD_ROLE_CREATE: TypeAlias = RouteCall[GuildRoleCreateParam, Role | dict[str,
 
 
 class GuildRoleUpdateParam(TypedDict):
-    guild: str
+    guild_id: str
     role_id: str
     role: dict
 
@@ -196,7 +197,7 @@ GUILD_ROLE_UPDATE: TypeAlias = RouteCall[GuildRoleUpdateParam, None]
 
 
 class GuildRoleDeleteParam(TypedDict):
-    guild: str
+    guild_id: str
     role_id: str