entari-plugin-server 0.7.4__tar.gz → 0.8.0__tar.gz

{entari_plugin_server-0.7.4 → entari_plugin_server-0.8.0}/PKG-INFO

@@ -1,14 +1,14 @@
 Metadata-Version: 2.1
 Name: entari-plugin-server
-Version: 0.7.4
+Version: 0.8.0
 Summary: Entari plugin for running Satori Server
 Keywords: server,adapters,satori,entari,plugin
 Author-Email: RF-Tar-Railt <rf_tar_railt@qq.com>
 License: MIT
 Project-URL: homepage, https://github.com/ArcletProject/entari-plugin-server
 Project-URL: repository, https://github.com/ArcletProject/entari-plugin-server
-Requires-Python: >=3.10
-Requires-Dist: arclet-entari<0.19.0,>=0.18.0
+Requires-Python: >=3.11
+Requires-Dist: arclet-entari>=0.19.0rc1
 Requires-Dist: satori-python-server<1.4.0,>=1.3.0
 Provides-Extra: fastapi
 Requires-Dist: fastapi>=0.116.1; extra == "fastapi"

{entari_plugin_server-0.7.4 → entari_plugin_server-0.8.0}/pyproject.toml

@@ -1,15 +1,15 @@
 [project]
 name = "entari-plugin-server"
-version = "0.7.4"
+version = "0.8.0"
 description = "Entari plugin for running Satori Server"
 authors = [
     { name = "RF-Tar-Railt", email = "rf_tar_railt@qq.com" },
 ]
 dependencies = [
-    "arclet-entari<0.19.0,>=0.18.0",
+    "arclet-entari>=0.19.0rc1",
     "satori-python-server<1.4.0,>=1.3.0",
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.11"
 readme = "README.md"
 keywords = [
     "server",

{entari_plugin_server-0.7.4 → entari_plugin_server-0.8.0}/src/entari_plugin_server/__init__.py

@@ -8,10 +8,9 @@ from typing import TYPE_CHECKING, Any, Callable, Optional, Union, cast
 from arclet.entari.config.models.default import BasicConfModel
 from typing_extensions import TypeAlias
 
-from arclet.entari import Plugin, plugin
-from arclet.entari.plugin import PluginRole
-from arclet.entari.config import EntariConfig
-from arclet.entari.config import config_model_validate
+from arclet.entari import plugin
+from arclet.entari.plugin import PluginRole, get_plugin
+from arclet.entari.config import EntariConfig, config_model_validate, config_model_schema
 from arclet.entari import logger as log_m
 
 from arclet.letoderea.utils import TCallable
@@ -29,13 +28,12 @@ DISPOSE: TypeAlias = Callable[[], None]
 uvicorn.LoguruHandler = log_m.LoguruHandler
 
 
-plg = Plugin.current()
 plugin.declare_static()
 plugin.metadata(
     "server",
     PluginRole.LIBRARY,
     [{"name": "RF-Tar-Railt", "email": "rf_tar_railt@qq.com"}],
-    "0.7.4",
+    "0.8.0",
     description="为 Entari 提供 Satori 服务器支持，基于此为 Entari 提供 ASGI 服务、适配器连接等功能",
     urls={
         "homepage": "https://github.com/ArcletProject/entari-plugin-server",
@@ -46,6 +44,7 @@ plugin.metadata(
 
 
 conf = plugin.get_config(Config)
+_plg = plugin.get_plugin()
 
 if conf.direct_adapter:
     server = DirectAdapterServer(conf.host, int(conf.port), conf.path, conf.version, conf.token, uvicorn_options=conf.options, stream_threshold=conf.stream_threshold, stream_chunk_size=conf.stream_chunk_size)  # type: ignore
@@ -54,6 +53,8 @@ else:
 
 pattern = re.compile(r"(?P<module>[\w.]+)\s*(:\s*(?P<attr>[\w.]+)\s*)?((?P<extras>\[.*\])\s*)?$")
 
+_adapter_schemas = []
+
 
 def _load_adapter(adapter_config: dict):
     if "$path" not in adapter_config:
@@ -95,6 +96,13 @@ def _load_adapter(adapter_config: dict):
                 [],
                 bases=(config_cls, BasicConfModel),
             )
+            _schema = config_model_schema(
+                dcls,
+                ref_root=f"/properties/plugins/properties/{_plg._config_key}/properties/adapters/items/oneOf/{len(_adapter_schemas)}/"
+            )
+            _schema["properties"]["$path"] = {"const": adapter_config["$path"]}
+            _schema["required"] = ["$path"]
+            _adapter_schemas.append(_schema)
             dcls_instance = config_model_validate(dcls, args)
             return ext(dcls_instance)  # type: ignore
         filtered_args = {k: v for k, v in args.items() if k in sig.parameters}
@@ -107,6 +115,13 @@ def _load_adapter(adapter_config: dict):
             ],
             bases=(BasicConfModel,),
         )
+        _schema = config_model_schema(
+            dcls,
+            ref_root=f"/properties/plugins/properties/{_plg._config_key}/properties/adapters/items/oneOf/{len(_adapter_schemas)}/"
+        )
+        _schema["properties"]["$path"] = {"const": adapter_config["$path"]}
+        _schema["required"] = ["$path"]
+        _adapter_schemas.append(_schema)
         dcls_instance = config_model_validate(dcls, filtered_args)
         return ext(**vars(dcls_instance))
     elif isinstance(ext, Adapter):
@@ -117,6 +132,16 @@ def _load_adapter(adapter_config: dict):
 
 adapters: list[Adapter] = [*filter(None, map(_load_adapter, conf.adapters + EntariConfig.instance.data.get("adapters", [])))]
 
+_plg.register_schema(
+    "properties.adapters",
+    {
+        "type": "array",
+        "items": {"oneOf": _adapter_schemas} if _adapter_schemas else {"type": "object"},
+        "title": "Adapters"
+    },
+    replace=True
+)
+
 for adapter in adapters:
     logger.debug(f"Applying adapter {adapter}")
     server.apply(adapter)
@@ -148,6 +173,8 @@ def replace_asgi(app: Union[ASGIApp, asgitypes.ASGI3Application]):
     Args:
         app (Any): 新的 ASGI 应用
     """
+    plg = get_plugin(1)
+
     if server.status.blocking:
         logger.warning("Server is blocking, cannot replace ASGI app")
         return lambda: None
@@ -186,6 +213,7 @@ def add_route(
         include_in_schema (bool, optional): 是否包含在 OpenAPI 文档中，默认为 True
         kwargs (Any): 其他参数，例如 FastAPI 的路由参数
     """
+    plg = get_plugin(1)
 
     def wrapper(endpoint: TCallable, /) -> TCallable:
         app = cast(Starlette, server.app)
@@ -217,6 +245,7 @@ def add_websocket_route(
         name (str, optional): 路由名称，默认为 None
         kwargs (Any): 其他参数，例如 FastAPI 的路由参数
     """
+    plg = get_plugin(1)
 
     def wrapper(endpoint: TCallable, /) -> TCallable:
         app = cast(Starlette, server.app)