S106 AstrBot运行时注册
这个提交存在于:
父节点
12b2a379ea
当前提交
c7937c099a
共有 5 个文件被更改,包括 195 次插入 和 4 次删除
|
|
@ -1,6 +1,13 @@
|
||||||
"""Runtime adapters for AstrBot, chat platforms, and Web UI integration."""
|
"""Runtime adapters for AstrBot, chat platforms, and Web UI integration."""
|
||||||
|
|
||||||
from adapters.astrbot_adapter import dispatch_extension_request, resolve_route, runtime_route_table
|
from adapters.astrbot_adapter import (
|
||||||
|
dispatch_extension_request,
|
||||||
|
register_astrbot_runtime,
|
||||||
|
resolve_route,
|
||||||
|
runtime_health,
|
||||||
|
runtime_registration_manifest,
|
||||||
|
runtime_route_table,
|
||||||
|
)
|
||||||
from adapters.onebot11_adapter import handle_message_event as handle_onebot11_message_event
|
from adapters.onebot11_adapter import handle_message_event as handle_onebot11_message_event
|
||||||
from adapters.webui_adapter import get_web_mount_manifest, resolve_web_asset
|
from adapters.webui_adapter import get_web_mount_manifest, resolve_web_asset
|
||||||
from adapters.wechat_adapter import handle_message_event as handle_wechat_message_event
|
from adapters.wechat_adapter import handle_message_event as handle_wechat_message_event
|
||||||
|
|
@ -10,7 +17,10 @@ __all__ = [
|
||||||
"get_web_mount_manifest",
|
"get_web_mount_manifest",
|
||||||
"handle_onebot11_message_event",
|
"handle_onebot11_message_event",
|
||||||
"handle_wechat_message_event",
|
"handle_wechat_message_event",
|
||||||
|
"register_astrbot_runtime",
|
||||||
"resolve_route",
|
"resolve_route",
|
||||||
"resolve_web_asset",
|
"resolve_web_asset",
|
||||||
|
"runtime_health",
|
||||||
|
"runtime_registration_manifest",
|
||||||
"runtime_route_table",
|
"runtime_route_table",
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ from dataclasses import dataclass
|
||||||
from typing import Any, Callable
|
from typing import Any, Callable
|
||||||
|
|
||||||
from backend.dto.common import ErrorCode, error_response
|
from backend.dto.common import ErrorCode, error_response
|
||||||
from backend.route_registry import ROUTES, RouteSpec
|
from backend.route_registry import ROUTES, RouteSpec, assert_unique_routes
|
||||||
from backend.services.ui_service import API_BASE
|
from backend.services.ui_service import API_BASE
|
||||||
from core.identity import RequestContext
|
from core.identity import RequestContext
|
||||||
|
|
||||||
|
|
@ -74,6 +74,78 @@ def runtime_route_table() -> list[dict[str, Any]]:
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def runtime_registration_manifest() -> dict[str, Any]:
|
||||||
|
return {
|
||||||
|
"plugin_name": "astrbot_plugin_imagestudio",
|
||||||
|
"api_base": API_BASE,
|
||||||
|
"dispatch_handler": "adapters.astrbot_adapter.dispatch_extension_request",
|
||||||
|
"web_asset_handler": "adapters.webui_adapter.resolve_web_asset",
|
||||||
|
"extension_routes": runtime_route_table(),
|
||||||
|
"web_mounts": [
|
||||||
|
{
|
||||||
|
"name": "standalone_web",
|
||||||
|
"path": f"{API_BASE}/web",
|
||||||
|
"handler": "adapters.webui_adapter.resolve_web_asset",
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"health": runtime_health(),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def runtime_health() -> dict[str, Any]:
|
||||||
|
errors: list[dict[str, Any]] = []
|
||||||
|
try:
|
||||||
|
assert_unique_routes()
|
||||||
|
except RuntimeError as exc:
|
||||||
|
errors.append({"code": "DUPLICATE_ROUTE", "message": str(exc)})
|
||||||
|
importable = 0
|
||||||
|
for route in ROUTES:
|
||||||
|
try:
|
||||||
|
_load_handler(route.handler)
|
||||||
|
importable += 1
|
||||||
|
except Exception as exc:
|
||||||
|
errors.append(
|
||||||
|
{
|
||||||
|
"code": "HANDLER_IMPORT_FAILED",
|
||||||
|
"route": route.endpoint,
|
||||||
|
"handler": route.handler,
|
||||||
|
"message": str(exc),
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
"ok": not errors,
|
||||||
|
"route_count": len(ROUTES),
|
||||||
|
"importable_handlers": importable,
|
||||||
|
"errors": errors,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def register_astrbot_runtime(runtime: Any, registration: dict[str, Any] | None = None) -> dict[str, Any]:
|
||||||
|
manifest = registration or runtime_registration_manifest()
|
||||||
|
route_count = 0
|
||||||
|
web_mount_count = 0
|
||||||
|
missing: list[str] = []
|
||||||
|
for route in manifest["extension_routes"]:
|
||||||
|
if _register_route(runtime, route):
|
||||||
|
route_count += 1
|
||||||
|
else:
|
||||||
|
missing.append("register_extension_route")
|
||||||
|
break
|
||||||
|
for mount in manifest["web_mounts"]:
|
||||||
|
if _register_web_mount(runtime, mount):
|
||||||
|
web_mount_count += 1
|
||||||
|
else:
|
||||||
|
missing.append("register_web_mount")
|
||||||
|
break
|
||||||
|
return {
|
||||||
|
"registered": not missing,
|
||||||
|
"routes_registered": route_count,
|
||||||
|
"web_mounts_registered": web_mount_count,
|
||||||
|
"missing_capabilities": sorted(set(missing)),
|
||||||
|
"health": manifest["health"],
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def dispatch_extension_request(
|
def dispatch_extension_request(
|
||||||
ctx: RequestContext,
|
ctx: RequestContext,
|
||||||
method: str,
|
method: str,
|
||||||
|
|
@ -93,6 +165,40 @@ def dispatch_extension_request(
|
||||||
return match.handler(*_handler_args(match, ctx, query or {}, payload or {}))
|
return match.handler(*_handler_args(match, ctx, query or {}, payload or {}))
|
||||||
|
|
||||||
|
|
||||||
|
def _register_route(runtime: Any, route: dict[str, Any]) -> bool:
|
||||||
|
handler = _load_handler(str(route["handler"]))
|
||||||
|
for method_name in ("register_extension_route", "register_route", "add_route"):
|
||||||
|
callback = getattr(runtime, method_name, None)
|
||||||
|
if not callable(callback):
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
callback(
|
||||||
|
method=route["method"],
|
||||||
|
path=route["path"],
|
||||||
|
handler=handler,
|
||||||
|
permission=route["permission"],
|
||||||
|
endpoint=route["endpoint"],
|
||||||
|
)
|
||||||
|
except TypeError:
|
||||||
|
callback(route["method"], route["path"], handler)
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def _register_web_mount(runtime: Any, mount: dict[str, Any]) -> bool:
|
||||||
|
handler = _load_handler(str(mount["handler"]))
|
||||||
|
for method_name in ("register_web_mount", "mount_web", "add_web_mount"):
|
||||||
|
callback = getattr(runtime, method_name, None)
|
||||||
|
if not callable(callback):
|
||||||
|
continue
|
||||||
|
try:
|
||||||
|
callback(name=mount["name"], path=mount["path"], handler=handler)
|
||||||
|
except TypeError:
|
||||||
|
callback(mount["path"], handler)
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
def _match_endpoint(pattern: str, endpoint: str) -> dict[str, str] | None:
|
def _match_endpoint(pattern: str, endpoint: str) -> dict[str, str] | None:
|
||||||
param_names = re.findall(r"\{([^{}]+)\}", pattern)
|
param_names = re.findall(r"\{([^{}]+)\}", pattern)
|
||||||
regex = "^" + re.sub(r"\{([^{}]+)\}", r"([^/]+)", pattern) + "$"
|
regex = "^" + re.sub(r"\{([^{}]+)\}", r"([^/]+)", pattern) + "$"
|
||||||
|
|
|
||||||
19
main.py
19
main.py
|
|
@ -8,7 +8,13 @@ from __future__ import annotations
|
||||||
|
|
||||||
from typing import Any
|
from typing import Any
|
||||||
|
|
||||||
from adapters.astrbot_adapter import dispatch_extension_request, runtime_route_table
|
from adapters.astrbot_adapter import (
|
||||||
|
dispatch_extension_request,
|
||||||
|
register_astrbot_runtime,
|
||||||
|
runtime_health,
|
||||||
|
runtime_registration_manifest,
|
||||||
|
runtime_route_table,
|
||||||
|
)
|
||||||
from adapters.webui_adapter import get_web_mount_manifest
|
from adapters.webui_adapter import get_web_mount_manifest
|
||||||
from backend.services.ui_service import API_BASE
|
from backend.services.ui_service import API_BASE
|
||||||
from core.identity import RequestContext
|
from core.identity import RequestContext
|
||||||
|
|
@ -19,14 +25,25 @@ PLUGIN_NAME = "astrbot_plugin_imagestudio"
|
||||||
|
|
||||||
def get_plugin_manifest() -> dict[str, Any]:
|
def get_plugin_manifest() -> dict[str, Any]:
|
||||||
web_manifest = get_web_mount_manifest()
|
web_manifest = get_web_mount_manifest()
|
||||||
|
runtime = runtime_registration_manifest()
|
||||||
return {
|
return {
|
||||||
"plugin_name": PLUGIN_NAME,
|
"plugin_name": PLUGIN_NAME,
|
||||||
"api_base": API_BASE,
|
"api_base": API_BASE,
|
||||||
"web": web_manifest,
|
"web": web_manifest,
|
||||||
"routes": runtime_route_table(),
|
"routes": runtime_route_table(),
|
||||||
|
"runtime": runtime,
|
||||||
|
"health": runtime["health"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def register_plugin(runtime: Any) -> dict[str, Any]:
|
||||||
|
return register_astrbot_runtime(runtime, runtime_registration_manifest())
|
||||||
|
|
||||||
|
|
||||||
|
def get_runtime_health() -> dict[str, Any]:
|
||||||
|
return runtime_health()
|
||||||
|
|
||||||
|
|
||||||
def dispatch_web_request(
|
def dispatch_web_request(
|
||||||
ctx: RequestContext,
|
ctx: RequestContext,
|
||||||
method: str,
|
method: str,
|
||||||
|
|
|
||||||
|
|
@ -2,8 +2,9 @@ from __future__ import annotations
|
||||||
|
|
||||||
import unittest
|
import unittest
|
||||||
|
|
||||||
|
from backend.route_registry import ROUTES
|
||||||
from core.identity import RequestContext
|
from core.identity import RequestContext
|
||||||
from main import PLUGIN_NAME, dispatch_web_request, get_plugin_manifest
|
from main import PLUGIN_NAME, dispatch_web_request, get_plugin_manifest, get_runtime_health, register_plugin
|
||||||
|
|
||||||
|
|
||||||
class PluginEntrypointTests(unittest.TestCase):
|
class PluginEntrypointTests(unittest.TestCase):
|
||||||
|
|
@ -14,6 +15,8 @@ class PluginEntrypointTests(unittest.TestCase):
|
||||||
self.assertTrue(manifest["api_base"].endswith("astrbot_plugin_imagestudio"))
|
self.assertTrue(manifest["api_base"].endswith("astrbot_plugin_imagestudio"))
|
||||||
self.assertIn("web", manifest)
|
self.assertIn("web", manifest)
|
||||||
self.assertTrue(any(route["endpoint"] == "dashboard/summary" for route in manifest["routes"]))
|
self.assertTrue(any(route["endpoint"] == "dashboard/summary" for route in manifest["routes"]))
|
||||||
|
self.assertTrue(manifest["runtime"]["health"]["ok"])
|
||||||
|
self.assertEqual(manifest["health"]["route_count"], len(ROUTES))
|
||||||
|
|
||||||
def test_dispatch_web_request_delegates_to_adapter(self):
|
def test_dispatch_web_request_delegates_to_adapter(self):
|
||||||
ctx = RequestContext.from_astrbot(username="admin", user_id="user_001")
|
ctx = RequestContext.from_astrbot(username="admin", user_id="user_001")
|
||||||
|
|
@ -27,6 +30,26 @@ class PluginEntrypointTests(unittest.TestCase):
|
||||||
self.assertTrue(response["ok"])
|
self.assertTrue(response["ok"])
|
||||||
self.assertEqual(response["data"]["plugin_name"], PLUGIN_NAME)
|
self.assertEqual(response["data"]["plugin_name"], PLUGIN_NAME)
|
||||||
|
|
||||||
|
def test_register_plugin_delegates_to_runtime_registration(self):
|
||||||
|
class FakeRuntime:
|
||||||
|
def __init__(self):
|
||||||
|
self.routes = []
|
||||||
|
self.mounts = []
|
||||||
|
|
||||||
|
def register_extension_route(self, **kwargs):
|
||||||
|
self.routes.append(kwargs)
|
||||||
|
|
||||||
|
def register_web_mount(self, **kwargs):
|
||||||
|
self.mounts.append(kwargs)
|
||||||
|
|
||||||
|
runtime = FakeRuntime()
|
||||||
|
result = register_plugin(runtime)
|
||||||
|
|
||||||
|
self.assertTrue(result["registered"])
|
||||||
|
self.assertEqual(len(runtime.routes), len(ROUTES))
|
||||||
|
self.assertEqual(len(runtime.mounts), 1)
|
||||||
|
self.assertTrue(get_runtime_health()["ok"])
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,10 @@ from pathlib import Path
|
||||||
from adapters.astrbot_adapter import (
|
from adapters.astrbot_adapter import (
|
||||||
dispatch_extension_request,
|
dispatch_extension_request,
|
||||||
normalize_extension_path,
|
normalize_extension_path,
|
||||||
|
register_astrbot_runtime,
|
||||||
resolve_route,
|
resolve_route,
|
||||||
|
runtime_health,
|
||||||
|
runtime_registration_manifest,
|
||||||
runtime_route_table,
|
runtime_route_table,
|
||||||
)
|
)
|
||||||
from adapters.webui_adapter import get_web_mount_manifest, resolve_web_asset
|
from adapters.webui_adapter import get_web_mount_manifest, resolve_web_asset
|
||||||
|
|
@ -131,6 +134,38 @@ class RouteRegistryTests(unittest.TestCase):
|
||||||
table = runtime_route_table()
|
table = runtime_route_table()
|
||||||
self.assertTrue(any(route["path"].endswith("/dashboard/summary") for route in table))
|
self.assertTrue(any(route["path"].endswith("/dashboard/summary") for route in table))
|
||||||
|
|
||||||
|
def test_runtime_registration_manifest_and_health_are_stable(self):
|
||||||
|
registration = runtime_registration_manifest()
|
||||||
|
health = runtime_health()
|
||||||
|
|
||||||
|
self.assertEqual(registration["plugin_name"], "astrbot_plugin_imagestudio")
|
||||||
|
self.assertTrue(registration["api_base"].endswith("astrbot_plugin_imagestudio"))
|
||||||
|
self.assertTrue(registration["web_mounts"][0]["path"].endswith("/web"))
|
||||||
|
self.assertTrue(health["ok"])
|
||||||
|
self.assertEqual(health["route_count"], len(ROUTES))
|
||||||
|
self.assertEqual(health["importable_handlers"], len(ROUTES))
|
||||||
|
|
||||||
|
def test_register_astrbot_runtime_calls_host_registration_methods(self):
|
||||||
|
class FakeRuntime:
|
||||||
|
def __init__(self):
|
||||||
|
self.routes = []
|
||||||
|
self.mounts = []
|
||||||
|
|
||||||
|
def register_extension_route(self, **kwargs):
|
||||||
|
self.routes.append(kwargs)
|
||||||
|
|
||||||
|
def register_web_mount(self, **kwargs):
|
||||||
|
self.mounts.append(kwargs)
|
||||||
|
|
||||||
|
runtime = FakeRuntime()
|
||||||
|
result = register_astrbot_runtime(runtime)
|
||||||
|
|
||||||
|
self.assertTrue(result["registered"])
|
||||||
|
self.assertEqual(result["routes_registered"], len(ROUTES))
|
||||||
|
self.assertEqual(result["web_mounts_registered"], 1)
|
||||||
|
self.assertTrue(callable(runtime.routes[0]["handler"]))
|
||||||
|
self.assertTrue(callable(runtime.mounts[0]["handler"]))
|
||||||
|
|
||||||
def test_astrbot_adapter_dispatches_pure_route_handlers(self):
|
def test_astrbot_adapter_dispatches_pure_route_handlers(self):
|
||||||
ctx = RequestContext.from_astrbot(username="admin", user_id="user_001", permissions={"can_manage_config"})
|
ctx = RequestContext.from_astrbot(username="admin", user_id="user_001", permissions={"can_manage_config"})
|
||||||
|
|
||||||
|
|
|
||||||
正在加载…
添加表格
在新工单中引用