refactor(computer): 提取公共配置目录获取逻辑到工具函数#7281 (review)

将重复的配置目录获取逻辑提取到 permissions.py 中的 get_configured_cwd 函数
移除 LocalPythonComponent 中不再需要的 default_cwd 字段

Author: no-teasy

astrbot/core/computer/booters/local.py

@@ -185,8 +185,6 @@ def _run() -> dict[str, Any]:
 
 @dataclass
 class LocalPythonComponent(PythonComponent):
-    default_cwd: str | None = None
-
     async def exec(
         self,
         code: str,
@@ -197,8 +195,7 @@ async def exec(
     ) -> dict[str, Any]:
         def _run() -> dict[str, Any]:
             try:
-                effective_cwd = cwd if cwd else self.default_cwd
-                working_dir, _ = _resolve_working_dir(effective_cwd, get_astrbot_root)
+                working_dir, _ = _resolve_working_dir(cwd, get_astrbot_root)
                 result = subprocess.run(
                     [os.environ.get("PYTHON", sys.executable), "-c", code],
                     timeout=timeout,

astrbot/core/computer/tools/permissions.py

@@ -2,6 +2,15 @@
 from astrbot.core.astr_agent_context import AstrAgentContext
 
 
+def get_configured_cwd(
+    context: ContextWrapper[AstrAgentContext], config_key: str
+) -> str | None:
+    cfg = context.context.context.get_config(
+        umo=context.context.event.unified_msg_origin
+    )
+    return cfg.get("provider_settings", {}).get(config_key, None)
+
+
 def check_admin_permission(
     context: ContextWrapper[AstrAgentContext], operation_name: str
 ) -> str | None:

astrbot/core/computer/tools/python.py

@@ -8,7 +8,7 @@
 from astrbot.core.agent.tool import ToolExecResult
 from astrbot.core.astr_agent_context import AstrAgentContext, AstrMessageEvent
 from astrbot.core.computer.computer_client import get_booter, get_local_booter
-from astrbot.core.computer.tools.permissions import check_admin_permission
+from astrbot.core.computer.tools.permissions import check_admin_permission, get_configured_cwd
 from astrbot.core.message.message_event_result import MessageChain
 
 _OS_NAME = platform.system()
@@ -62,10 +62,7 @@ async def handle_result(result: dict, event: AstrMessageEvent) -> ToolExecResult
 
 
 def _get_configured_python_cwd(context: ContextWrapper[AstrAgentContext]) -> str | None:
-    cfg = context.context.context.get_config(
-        umo=context.context.event.unified_msg_origin
-    )
-    return cfg.get("provider_settings", {}).get("computer_use_local_python_cwd", None)
+    return get_configured_cwd(context, "computer_use_local_python_cwd")
 
 
 @dataclass

astrbot/core/computer/tools/shell.py

@@ -7,7 +7,7 @@
 from astrbot.core.astr_agent_context import AstrAgentContext
 
 from ..computer_client import get_booter, get_local_booter
-from .permissions import check_admin_permission
+from .permissions import check_admin_permission, get_configured_cwd
 
 
 @dataclass
@@ -41,10 +41,7 @@ class ExecuteShellTool(FunctionTool):
     is_local: bool = False
 
     def _get_configured_cwd(self, context: ContextWrapper[AstrAgentContext]) -> str | None:
-        cfg = context.context.context.get_config(
-            umo=context.context.event.unified_msg_origin
-        )
-        return cfg.get("provider_settings", {}).get("computer_use_local_shell_cwd", None)
+        return get_configured_cwd(context, "computer_use_local_shell_cwd")
 
     async def call(
         self,