sycommon-python-lib 0.2.2a1__py3-none-any.whl → 0.2.2a3__py3-none-any.whl

sycommon/agent/sandbox/http_sandbox_backend.py

@@ -408,21 +408,83 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         """用户ID"""
         return self._user_id
 
-    # 沙箱容器内用户数据的实际根目录（与 sandbox server file_ops 路径对齐）
-    # 线上 Linux 沙箱容器固定为 /data/sycommon_sandbox
-    # 本地调试（macOS/Windows）使用环境变量 SANDBOX_WORKSPACE 或系统临时目录
-    _WORKSPACE_ROOT = os.environ.get(
-        "SANDBOX_WORKSPACE",
-        "/data/sycommon_sandbox" if sys.platform != "darwin" and sys.platform != "win32"
-        else os.path.join(tempfile.gettempdir(), "sycommon_sandbox")
-    )
+    # 沙箱容器内用户数据的实际根目录，通过 health 接口从沙箱服务端动态获取。
+    # 初始化为 None，首次执行命令时通过 _resolve_workspace_root() 延迟获取。
+    _workspace_root: Optional[str] = None
+
+    def _resolve_workspace_root(self) -> str:
+        """同步获取沙箱服务端的 WORKSPACE_BASE，并缓存到实例"""
+        if self._workspace_root is not None:
+            return self._workspace_root
+
+        # 优先使用环境变量覆盖
+        env_workspace = os.environ.get("SANDBOX_WORKSPACE")
+        if env_workspace:
+            self._workspace_root = env_workspace
+            SYLogger.info(f"[Sandbox] 使用环境变量 SANDBOX_WORKSPACE={env_workspace}")
+            return self._workspace_root
+
+        # 从沙箱服务端 health 接口获取
+        try:
+            url = f"{self._base_url}{SANDBOX_API_PREFIX}/health"
+            resp = requests.get(url, timeout=10)
+            if resp.status_code == 200:
+                workspace = resp.json().get("workspace", "")
+                if workspace:
+                    self._workspace_root = workspace
+                    SYLogger.info(f"[Sandbox] 从沙箱服务端获取 WORKSPACE_ROOT={workspace}")
+                    return self._workspace_root
+        except Exception as e:
+            SYLogger.warning(f"[Sandbox] 获取沙箱 workspace 失败: {e}")
+
+        # 兜底：根据平台猜测
+        self._workspace_root = "/data/sycommon_sandbox" if sys.platform != "darwin" and sys.platform != "win32" else os.path.join(tempfile.gettempdir(), "sycommon_sandbox")
+        SYLogger.warning(f"[Sandbox] 无法获取沙箱 workspace，使用兜底值: {self._workspace_root}")
+        return self._workspace_root
+
+    async def _aresolve_workspace_root(self) -> str:
+        """异步获取沙箱服务端的 WORKSPACE_BASE，并缓存到实例"""
+        if self._workspace_root is not None:
+            return self._workspace_root
+
+        # 优先使用环境变量覆盖
+        env_workspace = os.environ.get("SANDBOX_WORKSPACE")
+        if env_workspace:
+            self._workspace_root = env_workspace
+            SYLogger.info(f"[Sandbox] 使用环境变量 SANDBOX_WORKSPACE={env_workspace}")
+            return self._workspace_root
+
+        # 从沙箱服务端 health 接口获取（aiohttp 异步）
+        try:
+            url = f"{self._base_url}{SANDBOX_API_PREFIX}/health"
+            timeout_obj = aiohttp.ClientTimeout(total=10)
+            async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(ssl=_SSL_CONTEXT), timeout=timeout_obj) as session:
+                async with session.get(url) as resp:
+                    if resp.status == 200:
+                        data = await resp.json()
+                        workspace = data.get("workspace", "")
+                        if workspace:
+                            self._workspace_root = workspace
+                            SYLogger.info(f"[Sandbox] 从沙箱服务端获取 WORKSPACE_ROOT={workspace}")
+                            return self._workspace_root
+        except Exception as e:
+            SYLogger.warning(f"[Sandbox] 异步获取沙箱 workspace 失败: {e}")
+
+        # 兜底
+        self._workspace_root = "/data/sycommon_sandbox" if sys.platform != "darwin" and sys.platform != "win32" else os.path.join(tempfile.gettempdir(), "sycommon_sandbox")
+        SYLogger.warning(f"[Sandbox] 无法获取沙箱 workspace，使用兜底值: {self._workspace_root}")
+        return self._workspace_root
 
     def _wrap_command_isolation(self, command: str) -> str:
-        """包裹命令，确保在用户工作目录下执行
+        """同步版本：包裹命令，确保在用户工作目录下执行"""
+        workspace_root = self._resolve_workspace_root()
+        user_dir = f"{workspace_root}/{self._user_id}"
+        return f"mkdir -p {user_dir} && cd {user_dir} && {command.strip()}"
 
-        仅负责工作目录定位，文件系统隔离由沙箱服务端保证。
-        """
-        user_dir = f"{self._WORKSPACE_ROOT}/{self._user_id}"
+    async def _awrap_command_isolation(self, command: str) -> str:
+        """异步版本：包裹命令，确保在用户工作目录下执行"""
+        workspace_root = await self._aresolve_workspace_root()
+        user_dir = f"{workspace_root}/{self._user_id}"
         return f"mkdir -p {user_dir} && cd {user_dir} && {command.strip()}"
 
     # ============== 执行命令 ==============
@@ -456,7 +518,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
 
     async def aexecute(self, command: str, *, timeout: int = None) -> ExecuteResponse:
         """异步执行 shell 命令（真正的异步实现，带文件系统隔离）"""
-        isolated_command = self._wrap_command_isolation(command)
+        isolated_command = await self._awrap_command_isolation(command)
         SYLogger.info(f"[Sandbox] aexecute 开始: command={command}")
         await self._ensure_synced_async()
         SYLogger.info(f"[Sandbox] _ensure_synced_async 完成，开始执行命令: {command}")
@@ -715,7 +777,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
     async def aexecute_background(self, command: str, *, timeout: int = 600) -> dict:
         """异步后台执行 shell 命令（真正的异步实现，带文件系统隔离）"""
         await self._ensure_synced_async()
-        isolated_command = self._wrap_command_isolation(command)
+        isolated_command = await self._awrap_command_isolation(command)
         SYLogger.info(f"[Sandbox] 异步后台执行: {command}")
         try:
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/execute_background", {

sycommon/llm/get_llm.py

@@ -7,13 +7,15 @@ from sycommon.llm.usage_token import LLMWithAutoTokenUsage
 from typing import Any, Optional, Union
 from langchain_core.language_models import BaseChatModel
 
+_TIMEOUT_UNSET = object()
+
 
 def get_llm(
     model: Optional[str] = None,
     *,
     streaming: bool = False,
     temperature: Optional[float] = None,
-    timeout: float = 180,
+    timeout: Optional[float] = _TIMEOUT_UNSET,
     max_retries: int = 3,
     wrap_structured: bool = True,
     thinking: bool = False,
@@ -26,7 +28,9 @@ def get_llm(
         model: 模型名称，如果为 None 则使用配置中 default=True 的模型
         streaming: 是否启用流式输出
         temperature: 温度参数，如果为 None 则根据 thinking 模式自动设置
-        timeout: 请求超时时间（秒），默认180秒
+        timeout: 请求超时时间（秒），不传则根据 wrap_structured 自动决定：
+            - wrap_structured=True（结构化输出）：默认 180 秒
+            - wrap_structured=False（普通调用）：默认不设超时
         max_retries: 最大重试次数，默认3次
         wrap_structured: 是否包装为结构化输出实例，默认True
             - True: 返回 LLMWithAutoTokenUsage，支持 with_structured_output()
@@ -147,6 +151,10 @@ def get_llm(
     langfuse_callbacks, langfuse = LangfuseInitializer.get()
     callbacks = [LLMLogger()] + langfuse_callbacks
 
+    # 根据 wrap_structured 决定默认超时
+    if timeout is _TIMEOUT_UNSET:
+        timeout = 180 if wrap_structured else None
+
     init_params = {
         "model_provider": llmConfig.provider,
         "model": llmConfig.model,
@@ -158,7 +166,6 @@ def get_llm(
         "timeout": timeout,
         "max_retries": max_retries,
         "stream_chunk_timeout": None,
-        # "model_kwargs": {"response_format": {"type": "json_object"}},
     }
 
     # 合并其他透传参数（包括 presence_penalty, extra_body, top_p 等）

{sycommon_python_lib-0.2.2a1.dist-info → sycommon_python_lib-0.2.2a3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.2a1
+Version: 0.2.2a3
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.2.2a1.dist-info → sycommon_python_lib-0.2.2a3.dist-info}/RECORD

@@ -126,7 +126,7 @@ sycommon/agent/deep_agent.py,sha256=PUJpvGQNEIgE2TXBvb2i_ux_iDCIl-sQ8iqIS1skXRo,
 sycommon/agent/multi_agent_team.py,sha256=VIV4r_lxXB6ciLOsoFeF-99l8Rv1jWg4G6QpE5J4cBc,26106
 sycommon/agent/sandbox/__init__.py,sha256=qEgMJ2FFw0xJsA53M1Ji8kP6wIi_QkTICQYbWN-1h3M,4514
 sycommon/agent/sandbox/file_ops.py,sha256=eek_hk-hxpLc4cnWzF9cvrtBoSGKhemSsCXKYifMyZY,24622
-sycommon/agent/sandbox/http_sandbox_backend.py,sha256=C9jUM68Uo3XgMndQXyw2KeioduD8MC9p0ikj2epJQ1M,47056
+sycommon/agent/sandbox/http_sandbox_backend.py,sha256=Ve_IdycHaq08UpUO0Eq8ffgynPQOipfmkBGZTq3l1Y0,50426
 sycommon/agent/sandbox/sandbox_pool.py,sha256=eMn8sLakCWf90l6ni2-333QM8oBdX1CflV-WzneFp_k,9133
 sycommon/agent/sandbox/sandbox_recovery.py,sha256=VDhFI1q9DzSs5B3s2gee1mTmXQoxs0UCXzDrqNQ7VBY,7295
 sycommon/agent/sandbox/session.py,sha256=TjzC3yFC-VaJ75UwCyL26QX4PRTGNNfQae1FKFuOsYI,2365
@@ -162,7 +162,7 @@ sycommon/heartbeat_process/heartbeat_process_manager.py,sha256=24qUKs8qegdWHqcox
 sycommon/heartbeat_process/heartbeat_process_worker.py,sha256=duuAEFwda43Y6pZE8tOOspitlyxecaFsg1n1iH9jQDQ,16863
 sycommon/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/llm/embedding.py,sha256=Xwmg1HcgbdW7OcpYyzu8k7U-27rC5lzjIqbg221CcyY,19129
-sycommon/llm/get_llm.py,sha256=zMZCGfyRjFnImMdwWNy9b11VyBsCX3S0hyf7SE1iF1Q,7085
+sycommon/llm/get_llm.py,sha256=472LbzRH6TGCz2p3MH1UH2BE0PJ33knSKSY6s2JNs70,7378
 sycommon/llm/llm_logger.py,sha256=LLXiESwDP5f8dB50nFabShVoLKv8UCf2ll69zo1FOso,3365
 sycommon/llm/llm_tokens.py,sha256=yGEessxfk5wRMrPGyWHhiiIIQFDVT23FSaqnwqHGCoY,4712
 sycommon/llm/llm_with_token_tracking.py,sha256=flGN3dbsjw1enal-p5Wh2Fq14F9Z9_O84aOd6kdq4kc,12377
@@ -246,8 +246,8 @@ sycommon/tools/syemail.py,sha256=BDFhgf7WDOQeTcjxJEQdu0dQhnHFPO_p3eI0-Ni3LhQ,561
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
 sycommon/xxljob/__init__.py,sha256=7eoBlQxv-B39IfRSCY2bkqdGYs1QRe1umAWd88VMEEM,86
 sycommon/xxljob/xxljob_service.py,sha256=JIEJaGXhqrTLcyxlyynSrsHg9bBnDNzX-D4qIWLRPUE,6815
-sycommon_python_lib-0.2.2a1.dist-info/METADATA,sha256=NoQ3Ax44ByOaVYghTZr4cvaPn01OsCtmbBCyFYyLn8I,7683
-sycommon_python_lib-0.2.2a1.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sycommon_python_lib-0.2.2a1.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.2a1.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.2a1.dist-info/RECORD,,
+sycommon_python_lib-0.2.2a3.dist-info/METADATA,sha256=JzdlgU0tqIPnpanKWQWPVrHCKAtpd_gq-8noMxPKdRo,7683
+sycommon_python_lib-0.2.2a3.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sycommon_python_lib-0.2.2a3.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.2a3.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.2a3.dist-info/RECORD,,