sycommon-python-lib 0.2.4a6__tar.gz → 0.2.5a0__tar.gz

{sycommon_python_lib-0.2.4a6 → sycommon_python_lib-0.2.5a0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.4a6
+Version: 0.2.5a0
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -8,8 +8,8 @@ Requires-Dist: aio-pika>=9.6.2
 Requires-Dist: aiohttp>=3.13.5
 Requires-Dist: aiomysql>=0.3.2
 Requires-Dist: anyio>=4.12.1
-Requires-Dist: decorator>=5.3.0
-Requires-Dist: deepagents>=0.6.1
+Requires-Dist: decorator>=5.3.1
+Requires-Dist: deepagents>=0.6.3
 Requires-Dist: elasticsearch>=9.4.0
 Requires-Dist: fastapi>=0.136.1
 Requires-Dist: jinja2>=3.1.6

{sycommon_python_lib-0.2.4a6 → sycommon_python_lib-0.2.5a0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.4a6"
+version = "0.2.5a0"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -9,8 +9,8 @@ dependencies = [
     "aiohttp>=3.13.5",
     "aiomysql>=0.3.2",
     "anyio>=4.12.1",
-    "decorator>=5.3.0",
-    "deepagents>=0.6.1",
+    "decorator>=5.3.1",
+    "deepagents>=0.6.3",
     "elasticsearch>=9.4.0",
     "fastapi>=0.136.1",
     "jinja2>=3.1.6",

{sycommon_python_lib-0.2.4a6 → sycommon_python_lib-0.2.5a0}/src/sycommon/agent/sandbox/file_ops.py

@@ -289,15 +289,26 @@ class FileOperationsMixin:
         self: "HTTPSandboxBackend",
         file_path: str,
         content: str,
+        *,
+        overwrite: bool = True,  # 默认允许覆盖，兼容 deepagents offload 场景
     ) -> WriteResult:
-        """写入文件"""
+        """写入文件
+
+        Args:
+            file_path: 文件路径。
+            content: 文件内容。
+            overwrite: 是否允许覆盖已有文件，默认 True（兼容 deepagents 0.6.3
+                SummarizationMiddleware offload 场景，如 /large_tool_results/ 和
+                /conversation_history/ 路径）。设为 False 时，文件已存在返回错误。
+        """
         try:
             self._ensure_synced_sync()
             SYLogger.info(f"[Sandbox] 写入文件: {file_path} ({len(content)} 字符)")
             result = self._post_sync(f"{SANDBOX_API_PREFIX}/write", {
                 "file_path": file_path,
                 "content": base64.b64encode(content.encode()).decode(),
-                "user_id": self.user_id
+                "user_id": self.user_id,
+                "overwrite": overwrite,
             })
             write_result = WriteResult(
                 error=result.get("error"),
@@ -317,16 +328,25 @@ class FileOperationsMixin:
         file_path: str,
         content: str,
         *,
+        overwrite: bool = True,  # 默认允许覆盖，兼容 deepagents offload 场景
         timeout: int = None,
     ) -> WriteResult:
-        """异步写入文件"""
+        """异步写入文件
+
+        Args:
+            file_path: 文件路径。
+            content: 文件内容。
+            overwrite: 是否允许覆盖已有文件，默认 True。
+            timeout: 请求超时时间。
+        """
         try:
             await self._ensure_synced_async()
             SYLogger.info(f"[Sandbox] 异步写入文件: {file_path} ({len(content)} 字符)")
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/write", {
                 "file_path": file_path,
                 "content": base64.b64encode(content.encode()).decode(),
-                "user_id": self.user_id
+                "user_id": self.user_id,
+                "overwrite": overwrite,
             }, timeout=timeout)
             write_result = WriteResult(
                 error=result.get("error"),

{sycommon_python_lib-0.2.4a6 → sycommon_python_lib-0.2.5a0}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -37,6 +37,11 @@ except ImportError:
     _SSL_CONTEXT = ssl.create_default_context()
 
 
+def _read_file_safe(path: str) -> bytes:
+    with open(path, "rb") as f:
+        return f.read()
+
+
 class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
     """
     通过 HTTP API 连接远程沙箱容器
@@ -210,6 +215,24 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             nacos_group=group,
         )
 
+    @classmethod
+    async def afrom_nacos(
+        cls,
+        service_name: str,
+        user_id: str,
+        group: str = "DEFAULT_GROUP",
+        version: str = None,
+        timeout: int = 180,
+        sync_dirs: List[tuple[str, str]] = None,
+        auto_sync: bool = False,
+        load_balance: bool = True,
+    ) -> "HTTPSandboxBackend":
+        """异步从 Nacos 服务发现创建后端实例"""
+        return await asyncio.to_thread(
+            cls.from_nacos,
+            service_name, user_id, group, version, timeout, sync_dirs, auto_sync, load_balance,
+        )
+
     # ============== 内部方法 - 同步版本 ==============
 
     def _refresh_from_nacos_and_switch_sync(self) -> bool:
@@ -565,7 +588,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             else:
                 # 单文件
                 SYLogger.info(f"[Sandbox] 上传单文件: {local_path}")
-                content = await asyncio.to_thread(lambda: open(local_dir, "rb").read())
+                content = await asyncio.to_thread(lambda p: _read_file_safe(p), local_dir)
                 upload_results = await self.aupload_files([(remote_path, content)], timeout=timeout)
                 if upload_results[0].error:
                     results[local_path] = {"success": 0, "failed": 1, "errors": [{"path": remote_path, "error": upload_results[0].error}]}
@@ -669,7 +692,8 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             def _read_batch():
                 items = []
                 for sandbox_path, local_file in batch_files:
-                    content = open(local_file, "rb").read()
+                    with open(local_file, "rb") as f:
+                        content = f.read()
                     items.append((sandbox_path, content))
                 return items
             batch_items = await asyncio.to_thread(_read_batch)
@@ -1037,7 +1061,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 SYLogger.info(f"[Sandbox] 异步目录上传完成: {local_path}, 成功={result['success']}, 失败={result['failed']}")
             else:
                 SYLogger.info(f"[Sandbox] 异步上传单文件: {local_path}")
-                content = await asyncio.to_thread(lambda: open(local_dir, "rb").read())
+                content = await asyncio.to_thread(lambda p: _read_file_safe(p), local_dir)
                 upload_results = await self.aupload_files([(remote_path, content)], timeout=timeout)
                 if upload_results[0].error:
                     results[local_path] = {"success": 0, "failed": 1, "errors": [{"path": remote_path, "error": upload_results[0].error}]}

{sycommon_python_lib-0.2.4a6 → sycommon_python_lib-0.2.5a0}/src/sycommon/agent/sandbox/minio_sync.py

@@ -162,7 +162,7 @@ class MinioSyncService(metaclass=SingletonMeta):
             return None
 
     def get_presigned_url(self, object_key: str, expires_days: int = 7) -> Optional[str]:
-        """生成预签名下载 URL"""
+        """生成预签名下载 URL（同步）"""
         if not self._client:
             return None
         try:
@@ -177,8 +177,12 @@ class MinioSyncService(metaclass=SingletonMeta):
                 f"[MinIO] Presigned URL failed: {object_key}, error={e}")
             return None
 
+    async def aget_presigned_url(self, object_key: str, expires_days: int = 7) -> Optional[str]:
+        """异步生成预签名下载 URL"""
+        return await asyncio.to_thread(self.get_presigned_url, object_key, expires_days)
+
     def remove_object(self, object_key: str) -> bool:
-        """从 MinIO 删除文件"""
+        """从 MinIO 删除文件（同步）"""
         if not self._client:
             return False
         try:
@@ -189,12 +193,12 @@ class MinioSyncService(metaclass=SingletonMeta):
             SYLogger.warning(f"[MinIO] Delete failed: {object_key}, error={e}")
             return False
 
-    def remove_prefix(self, prefix: str) -> int:
-        """删除 MinIO 中指定前缀下的所有对象（用于目录删除）
+    async def aremove_object(self, object_key: str) -> bool:
+        """异步从 MinIO 删除文件"""
+        return await asyncio.to_thread(self.remove_object, object_key)
 
-        Returns:
-            删除的对象数量
-        """
+    def remove_prefix(self, prefix: str) -> int:
+        """删除 MinIO 中指定前缀下的所有对象（同步，用于目录删除）"""
         if not self._client:
             return 0
         try:
@@ -210,6 +214,10 @@ class MinioSyncService(metaclass=SingletonMeta):
             SYLogger.warning(f"[MinIO] Delete prefix failed: {prefix}, error={e}")
             return 0
 
+    async def aremove_prefix(self, prefix: str) -> int:
+        """异步删除 MinIO 中指定前缀下的所有对象"""
+        return await asyncio.to_thread(self.remove_prefix, prefix)
+
     # ============== 查找最近副本 ==============
 
     def find_latest_object_key(self, user_id: str, file_path: str) -> Optional[str]:
@@ -252,7 +260,7 @@ class MinioSyncService(metaclass=SingletonMeta):
             SYLogger.warning(f"[MinIO] find_latest failed: {e}")
         return None
 
-    async def afinf_latest_object_key(self, user_id: str, file_path: str) -> Optional[str]:
+    async def afind_latest_object_key(self, user_id: str, file_path: str) -> Optional[str]:
         """异步查找某个文件最近一天的 object key"""
         return await asyncio.to_thread(self.find_latest_object_key, user_id, file_path)
 
@@ -473,12 +481,17 @@ class MinioSyncService(metaclass=SingletonMeta):
             files_to_upload = []
             for rel_path in batch:
                 try:
-                    response = await asyncio.to_thread(
-                        self._client.get_object, self._bucket, f"{prefix}{rel_path}"
+                    def _download_object(bucket, key):
+                        resp = self._client.get_object(bucket, key)
+                        try:
+                            return resp.read()
+                        finally:
+                            resp.close()
+                            resp.release_conn()
+
+                    content = await asyncio.to_thread(
+                        _download_object, self._bucket, f"{prefix}{rel_path}"
                     )
-                    content = response.read()
-                    response.close()
-                    response.release_conn()
                     files_to_upload.append((f"/{rel_path}", content))
                 except Exception as e:
                     SYLogger.warning(f"[MinIO] 下载文件失败: {rel_path}, error={e}")

{sycommon_python_lib-0.2.4a6 → sycommon_python_lib-0.2.5a0}/src/sycommon/agent/sandbox/sandbox_recovery.py

@@ -123,7 +123,7 @@ class SandboxRecoveryManager:
             bool: 切换成功返回 True，否则返回 False
         """
         # 优先使用底层已有的切换逻辑（会尝试迁移工作空间文件）
-        switched = await self.backend._refresh_from_nacos_and_switch()
+        switched = await asyncio.to_thread(self.backend._refresh_from_nacos_and_switch_sync)
 
         if switched:
             self._consecutive_failures = 0
@@ -149,7 +149,8 @@ class SandboxRecoveryManager:
                 SYLogger.error("[Sandbox] NacosService 未初始化")
                 return False
 
-            instances = nacos_manager.get_service_instances(
+            instances = await asyncio.to_thread(
+                nacos_manager.get_service_instances,
                 self.backend._nacos_service_name,
                 group=self.backend._nacos_group
             )