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

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

@@ -1,13 +1,14 @@
 Metadata-Version: 2.1
 Name: entari-plugin-server
-Version: 0.7.2
+Version: 0.7.4
 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.0rc4
+Requires-Dist: arclet-entari<0.19.0,>=0.18.0
 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.2 → entari_plugin_server-0.7.4}/pyproject.toml

@@ -1,16 +1,23 @@
 [project]
 name = "entari-plugin-server"
-version = "0.7.2"
+version = "0.7.4"
 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.0rc4",
+    "arclet-entari<0.19.0,>=0.18.0",
     "satori-python-server<1.4.0,>=1.3.0",
 ]
 requires-python = ">=3.10"
 readme = "README.md"
+keywords = [
+    "server",
+    "adapters",
+    "satori",
+    "entari",
+    "plugin",
+]
 
 [project.license]
 text = "MIT"

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

@@ -35,7 +35,7 @@ plugin.metadata(
     "server",
     PluginRole.LIBRARY,
     [{"name": "RF-Tar-Railt", "email": "rf_tar_railt@qq.com"}],
-    "0.7.2",
+    "0.7.4",
     description="为 Entari 提供 Satori 服务器支持，基于此为 Entari 提供 ASGI 服务、适配器连接等功能",
     urls={
         "homepage": "https://github.com/ArcletProject/entari-plugin-server",
@@ -48,9 +48,9 @@ plugin.metadata(
 conf = plugin.get_config(Config)
 
 if conf.direct_adapter:
-    server = DirectAdapterServer(conf.host, 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
+    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
 else:
-    server = Server(conf.host, 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
+    server = Server(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
 
 pattern = re.compile(r"(?P<module>[\w.]+)\s*(:\s*(?P<attr>[\w.]+)\s*)?((?P<extras>\[.*\])\s*)?$")
 
@@ -87,8 +87,17 @@ def _load_adapter(adapter_config: dict):
     if isinstance(ext, type) and issubclass(ext, Adapter) and ext is not Adapter:
         args: dict = {k: (log_m.logger_id if v == "$logger_id" else v) for k, v in adapter_config.items()}
         sig = inspect.signature(ext.__init__)
-        filtered_args = {k: v for k, v in args.items() if k in sig.parameters}
         annos = inspect.get_annotations(ext.__init__, globals=module.__dict__, locals=globals(), eval_str=True)
+        if len(annos) == 1 and "config" in annos:
+            config_cls = annos["config"]
+            dcls = make_dataclass(
+                "AdapterConfig",
+                [],
+                bases=(config_cls, BasicConfModel),
+            )
+            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}
         dcls = make_dataclass(
             "AdapterConfig",
             [

{entari_plugin_server-0.7.2 → entari_plugin_server-0.7.4}/src/entari_plugin_server/config.py

@@ -104,7 +104,7 @@ class Config(BasicConfModel):
     """适配器配置列表"""
     host: str = "127.0.0.1"
     """服务器主机地址"""
-    port: int = 5140
+    port: int | str = 5140
     """服务器端口"""
     path: str = ""
     """服务器部署路径"""