Squashed 'astrbot-sdk/' changes from 0a9c86345..8186cd3ee

8186cd3ee chore: refresh vendor snapshot [skip ci]
6e6dfd238 Merge pull request #107 from united-pooh/dev
86274a7bc fix: 修正文档注释格式，去除多余空格
1931f606f feat: 增强 StdioTransport 的错误处理，添加对格式错误的处理逻辑和相应的单元测试
566401bc5 feat: Implement mutual TLS support for websocket server and client transports
cfb74da6e fix: 修正文档注释格式，清理多余的内容
de3677be1 refactor: 统一日志入口，引入 sdk_logger 集中管理 loguru patch
9dce3419f Merge pull request #106 from united-pooh:dev
22082ef8b feat: 增强能力描述符和插件导入机制，优化消息处理和错误管理
0789119d6 fix: 修复导入顺序，优化类型注解
REVERT: 0a9c86345 chore: refresh vendor snapshot [skip ci]

git-subtree-dir: astrbot-sdk
git-subtree-split: 8186cd3ee6c8afe876df62382cf3ddfff6063137

Author: whatevertogo

src/astrbot_sdk/_internal/decorator_lifecycle.py

@@ -6,7 +6,6 @@
 from dataclasses import dataclass, field
 from typing import Any
 
-from loguru import logger
 from pydantic import ValidationError
 
 from ..context import Context as RuntimeContext
@@ -23,6 +22,7 @@
     get_validate_config_meta,
 )
 from ..star import Star
+from .sdk_logger import logger
 from .star_runtime import bind_star_runtime
 
 _RUNTIME_STATE_ATTR = "__astrbot_decorator_runtime_state__"

src/astrbot_sdk/_internal/sdk_logger.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+
+import os
+
+from loguru import logger as _raw_loguru_logger
+
+try:
+    from astrbot.core.config.default import VERSION as _ASTRBOT_VERSION
+except Exception:  # noqa: BLE001
+    _ASTRBOT_VERSION = ""
+
+_SHORT_LEVEL_NAMES = {
+    "DEBUG": "DBUG",
+    "INFO": "INFO",
+    "WARNING": "WARN",
+    "ERROR": "ERRO",
+    "CRITICAL": "CRIT",
+}
+
+
+def _get_short_level_name(level_name: str) -> str:
+    return _SHORT_LEVEL_NAMES.get(level_name.upper(), level_name[:4].upper())
+
+
+def _build_source_file(pathname: str | None) -> str:
+    if not pathname:
+        return "unknown"
+    dirname = os.path.dirname(pathname)
+    return (
+        os.path.basename(dirname) + "." + os.path.basename(pathname).replace(".py", "")
+    )
+
+
+def _patch_record(record: dict) -> None:
+    extra = record["extra"]
+    extra.setdefault("plugin_tag", "[Core]")
+    extra.setdefault("short_levelname", _get_short_level_name(record["level"].name))
+    level_no = record["level"].no
+    version_tag = (
+        f" [v{_ASTRBOT_VERSION}]" if _ASTRBOT_VERSION and level_no >= 30 else ""
+    )
+    extra.setdefault("astrbot_version_tag", version_tag)
+    extra.setdefault("source_file", _build_source_file(record["file"].path))
+    extra.setdefault("source_line", record["line"])
+    extra.setdefault("is_trace", False)
+
+
+logger = _raw_loguru_logger.patch(_patch_record)
+
+__all__ = ["logger"]

src/astrbot_sdk/_internal/testing_support.py

@@ -389,7 +389,7 @@ def __init__(self, router: MockCapabilityRouter) -> None:
             role="core",
             version="local",
         )
-        self.remote_capabilities = list(router.descriptors())
+        self.remote_capabilities = list(router.all_descriptors())
         self.remote_capability_map = {
             item.name: item for item in self.remote_capabilities
         }

src/astrbot_sdk/cli.py

@@ -30,8 +30,8 @@
 from typing import Any
 
 import click
-from loguru import logger
 
+from ._internal.sdk_logger import logger
 from .errors import AstrBotError
 from .runtime.bootstrap import run_plugin_worker, run_supervisor, run_websocket_server
 from .runtime.loader import load_plugin, load_plugin_spec, validate_plugin_spec
@@ -1144,6 +1144,39 @@ def _build_plugin(plugin_dir: Path, output_dir: Path | None) -> None:
     click.echo(f"artifact: {archive_path}")
 
 
+def _run_websocket_worker_entrypoint(
+    *,
+    worker_id: str | None,
+    plugin_dirs: tuple[Path, ...],
+    host: str,
+    port: int,
+    path: str,
+    tls_ca_file: Path,
+    tls_cert_file: Path,
+    tls_key_file: Path,
+) -> None:
+    resolved_plugin_dirs = list(plugin_dirs) if plugin_dirs else [Path.cwd()]
+    _run_async_entrypoint(
+        run_websocket_server(
+            worker_id=worker_id,
+            plugin_dirs=resolved_plugin_dirs,
+            host=host,
+            port=port,
+            path=path,
+            tls_ca_file=tls_ca_file,
+            tls_cert_file=tls_cert_file,
+            tls_key_file=tls_key_file,
+        ),
+        log_message=f"启动 WebSocket Worker，端口：{port}",
+        context={
+            "worker_id": worker_id,
+            "plugin_dirs": resolved_plugin_dirs,
+            "port": port,
+            "path": path,
+        },
+    )
+
+
 @click.group()
 @click.option("-v", "--verbose", is_flag=True, help="Enable verbose output")
 @click.pass_context
@@ -1161,20 +1194,37 @@ def cli(ctx, verbose: bool) -> None:
     type=click.Path(file_okay=False, dir_okay=True, path_type=Path),
     help="Directory containing plugin folders",
 )
+@click.option(
+    "--workers-manifest",
+    default=None,
+    type=click.Path(file_okay=True, dir_okay=False, path_type=Path),
+    help="Supervisor manifest describing remote websocket workers",
+)
 @click.option(
     "--protocol-stdout",
     default=None,
     type=str,
     help="Redirect runtime protocol stdout to console, silent, or a file path",
 )
-def run(plugins_dir: Path, protocol_stdout: str | None) -> None:
+def run(
+    plugins_dir: Path,
+    workers_manifest: Path | None,
+    protocol_stdout: str | None,
+) -> None:
     """Start the plugin supervisor over stdio."""
     transport_stdout, opened_stdout = _resolve_protocol_stdout(protocol_stdout)
     try:
         _run_async_entrypoint(
-            run_supervisor(plugins_dir=plugins_dir, stdout=transport_stdout),
+            run_supervisor(
+                plugins_dir=plugins_dir,
+                stdout=transport_stdout,
+                workers_manifest=workers_manifest,
+            ),
             log_message=f"启动插件主管进程，插件目录：{plugins_dir}",
-            context={"plugins_dir": plugins_dir},
+            context={
+                "plugins_dir": plugins_dir,
+                "workers_manifest": workers_manifest,
+            },
         )
     finally:
         if opened_stdout is not None:
@@ -1362,12 +1412,101 @@ def worker(
             opened_stdout.close()
 
 
+@cli.command("serve-worker")
+@click.option("--worker-id", default=None, type=str, help="Stable websocket worker id")
+@click.option(
+    "--plugin-dir",
+    "plugin_dirs",
+    multiple=True,
+    type=click.Path(file_okay=False, dir_okay=True, path_type=Path),
+    help="Plugin directory to serve; repeat to host multiple plugins in one worker",
+)
+@click.option("--host", default="127.0.0.1", show_default=True)
+@click.option("--port", default=8765, type=int, show_default=True)
+@click.option("--path", default="/", show_default=True)
+@click.option(
+    "--tls-ca-file",
+    required=True,
+    type=click.Path(file_okay=True, dir_okay=False, exists=True, path_type=Path),
+)
+@click.option(
+    "--tls-cert-file",
+    required=True,
+    type=click.Path(file_okay=True, dir_okay=False, exists=True, path_type=Path),
+)
+@click.option(
+    "--tls-key-file",
+    required=True,
+    type=click.Path(file_okay=True, dir_okay=False, exists=True, path_type=Path),
+)
+def serve_worker(
+    worker_id: str | None,
+    plugin_dirs: tuple[Path, ...],
+    host: str,
+    port: int,
+    path: str,
+    tls_ca_file: Path,
+    tls_cert_file: Path,
+    tls_key_file: Path,
+) -> None:
+    """Serve one or more plugins as a standalone websocket worker."""
+    _run_websocket_worker_entrypoint(
+        worker_id=worker_id,
+        plugin_dirs=plugin_dirs,
+        host=host,
+        port=port,
+        path=path,
+        tls_ca_file=tls_ca_file,
+        tls_cert_file=tls_cert_file,
+        tls_key_file=tls_key_file,
+    )
+
+
 @cli.command(hidden=True)
-@click.option("--port", default=8765, type=int, help="WebSocket server port")
-def websocket(port: int) -> None:
-    """WebSocket runtime entrypoint kept for standalone bridge scenarios."""
-    _run_async_entrypoint(
-        run_websocket_server(port=port),
-        log_message=f"启动 WebSocket 服务器，端口：{port}",
-        context={"port": port},
+@click.option("--worker-id", default=None, type=str)
+@click.option(
+    "--plugin-dir",
+    "plugin_dirs",
+    multiple=True,
+    type=click.Path(file_okay=False, dir_okay=True, path_type=Path),
+)
+@click.option("--host", default="127.0.0.1", show_default=True)
+@click.option("--port", default=8765, type=int, show_default=True)
+@click.option("--path", default="/", show_default=True)
+@click.option(
+    "--tls-ca-file",
+    required=True,
+    type=click.Path(file_okay=True, dir_okay=False, exists=True, path_type=Path),
+)
+@click.option(
+    "--tls-cert-file",
+    required=True,
+    type=click.Path(file_okay=True, dir_okay=False, exists=True, path_type=Path),
+)
+@click.option(
+    "--tls-key-file",
+    required=True,
+    type=click.Path(file_okay=True, dir_okay=False, exists=True, path_type=Path),
+)
+def websocket(
+    worker_id: str | None,
+    plugin_dirs: tuple[Path, ...],
+    host: str,
+    port: int,
+    path: str,
+    tls_ca_file: Path,
+    tls_cert_file: Path,
+    tls_key_file: Path,
+) -> None:
+    """Deprecated websocket runtime wrapper for standalone worker scenarios."""
+    logger.warning("'astr websocket' is deprecated; use 'astr serve-worker' instead")
+    _run_websocket_worker_entrypoint(
+        worker_id=worker_id,
+        plugin_dirs=plugin_dirs,
+        host=host,
+        port=port,
+        path=path,
+        tls_ca_file=tls_ca_file,
+        tls_cert_file=tls_cert_file,
+        tls_key_file=tls_key_file,
     )

src/astrbot_sdk/context.py

@@ -37,9 +37,8 @@
 from pathlib import Path
 from typing import Any
 
-from loguru import logger as base_logger
-
 from ._internal.plugin_logger import PluginLogger
+from ._internal.sdk_logger import logger as base_logger
 from ._internal.star_runtime import current_star_instance
 from ._message_types import normalize_message_type
 from .clients import (

src/astrbot_sdk/conversation.py

@@ -41,8 +41,11 @@ class ConversationSession:
     _owner_task: asyncio.Task[Any] | None = None
 
     def __post_init__(self) -> None:
-        if self.state != ConversationState.ACTIVE:
+        if self.state is None:
             self.state = ConversationState.ACTIVE
+            return
+        if not isinstance(self.state, ConversationState):
+            self.state = ConversationState(str(self.state))
 
     def bind_owner_task(self, task: asyncio.Task[Any]) -> None:
         self._owner_task = task