sycommon-python-lib 0.2.1a35__tar.gz → 0.2.1a37__tar.gz

{sycommon_python_lib-0.2.1a35 → sycommon_python_lib-0.2.1a37}/PKG-INFO

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

{sycommon_python_lib-0.2.1a35 → sycommon_python_lib-0.2.1a37}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.1a35"
+version = "0.2.1a37"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"

{sycommon_python_lib-0.2.1a35 → sycommon_python_lib-0.2.1a37}/src/sycommon/agent/sandbox/file_ops.py

@@ -33,7 +33,7 @@ class FileOperationsMixin:
     """文件操作 Mixin
 
     适配 deepagents 0.5.0a2 协议
-    同步方法为主实现，异步方法通过 asyncio.to_thread 调用
+    同步方法为主实现，异步方法使用 aiohttp 实现
     """
 
     _timeout: int  # 类型提示，子类需要提供此属性
@@ -46,6 +46,10 @@ class FileOperationsMixin:
         """发送同步 POST 请求"""
         ...
 
+    async def _post_async_with_failover(self: "HTTPSandboxBackend", endpoint: str, data: dict, timeout: int = None) -> dict:
+        """发送异步 POST 请求（带故障转移）"""
+        ...
+
     def _ensure_synced_sync(self: "HTTPSandboxBackend"):
         """确保目录已同步（同步版本）"""
         if not self._auto_sync:
@@ -72,6 +76,32 @@ class FileOperationsMixin:
             self._workspace_verified = True
             SYLogger.info(f"[Sandbox] 同步完成")
 
+    async def _ensure_synced_async(self: "HTTPSandboxBackend"):
+        """确保目录已同步（异步版本）"""
+        if not self._auto_sync:
+            return
+
+        if self._synced and self._workspace_verified:
+            return
+
+        SYLogger.info(f"[Sandbox] 开始检查工作空间同步状态（异步）...")
+
+        try:
+            workspace_exists = await self._check_workspace_exists_async()
+        except Exception as e:
+            SYLogger.warning(f"[Sandbox] 检查工作空间异常: {e}，跳过检查")
+            workspace_exists = True
+
+        if not workspace_exists:
+            SYLogger.info(f"[Sandbox] 工作空间不存在或已被清空，重新同步...")
+            self._synced = False
+
+        if not self._synced:
+            SYLogger.info(f"[Sandbox] 开始同步目录（异步）...")
+            await self._sync_async()
+            self._workspace_verified = True
+            SYLogger.info(f"[Sandbox] 同步完成")
+
     def _check_workspace_exists_sync(self: "HTTPSandboxBackend") -> bool:
         """检查沙箱工作空间是否存在（同步版本）"""
         try:
@@ -84,10 +114,26 @@ class FileOperationsMixin:
             SYLogger.warning(f"[Sandbox] 检查工作空间失败: {e}")
             return False
 
+    async def _check_workspace_exists_async(self: "HTTPSandboxBackend") -> bool:
+        """检查沙箱工作空间是否存在（异步版本）"""
+        try:
+            await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/ls", {
+                "path": "/",
+                "user_id": self.user_id
+            })
+            return True
+        except Exception as e:
+            SYLogger.warning(f"[Sandbox] 检查工作空间失败: {e}")
+            return False
+
     def _sync_sync(self: "HTTPSandboxBackend"):
         """同步目录（同步版本，由子类实现）"""
         ...
 
+    async def _sync_async(self: "HTTPSandboxBackend") -> dict:
+        """同步目录（异步版本，由子类实现）"""
+        ...
+
     # ============== 目录操作 ==============
 
     def ls(self: "HTTPSandboxBackend", path: str) -> LsResult:
@@ -107,8 +153,20 @@ class FileOperationsMixin:
             return LsResult(error=str(e))
 
     async def als(self: "HTTPSandboxBackend", path: str) -> LsResult:
-        """异步列出目录内容"""
-        return await asyncio.to_thread(self.ls, path)
+        """异步列出目录内容（真正的异步实现）"""
+        try:
+            await self._ensure_synced_async()
+            SYLogger.info(f"[Sandbox] 异步列出目录: {path}")
+            result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/ls", {
+                "path": path,
+                "user_id": self.user_id
+            })
+            entries = [FileInfo(**item) for item in result]
+            SYLogger.info(f"[Sandbox] 目录内容: {len(entries)} 项")
+            return LsResult(entries=entries)
+        except Exception as e:
+            SYLogger.error(f"[Sandbox] 异步列出目录失败: {e}")
+            return LsResult(error=str(e))
 
     # ============== 文件读写 ==============
 
@@ -153,8 +211,33 @@ class FileOperationsMixin:
         offset: int = 0,
         limit: int = 2000,
     ) -> ReadResult:
-        """异步读取文件内容"""
-        return await asyncio.to_thread(self.read, file_path, offset, limit)
+        """异步读取文件内容（真正的异步实现）"""
+        try:
+            await self._ensure_synced_async()
+            SYLogger.info(f"[Sandbox] 异步读取文件: {file_path} (offset={offset}, limit={limit})")
+            result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/read", {
+                "file_path": file_path,
+                "user_id": self.user_id,
+                "offset": offset,
+                "limit": limit
+            })
+            if result.get("error"):
+                SYLogger.error(f"[Sandbox] 异步读取文件失败: {result['error']}")
+                return ReadResult(error=result["error"])
+            content = result.get("content", "")
+            SYLogger.info(f"[Sandbox] 异步读取完成: {len(content)} 字符")
+            from datetime import datetime
+            now = datetime.now().isoformat()
+            file_data = FileData(
+                content=content,
+                encoding="utf-8",
+                created_at=result.get("created_at", now),
+                modified_at=result.get("modified_at", now),
+            )
+            return ReadResult(file_data=file_data)
+        except Exception as e:
+            SYLogger.error(f"[Sandbox] 异步读取文件异常: {e}")
+            return ReadResult(error=str(e))
 
     def write(
         self: "HTTPSandboxBackend",
@@ -188,8 +271,27 @@ class FileOperationsMixin:
         file_path: str,
         content: str,
     ) -> WriteResult:
-        """异步写入文件"""
-        return await asyncio.to_thread(self.write, file_path, content)
+        """异步写入文件（真正的异步实现）"""
+        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
+            })
+            write_result = WriteResult(
+                error=result.get("error"),
+                path=result.get("path")
+            )
+            if write_result.error:
+                SYLogger.error(f"[Sandbox] 异步写入失败: {write_result.error}")
+            else:
+                SYLogger.info(f"[Sandbox] 异步写入成功: {write_result.path}")
+            return write_result
+        except Exception as e:
+            SYLogger.error(f"[Sandbox] 异步写入文件异常: {e}")
+            return WriteResult(error=str(e))
 
     def edit(
         self: "HTTPSandboxBackend",
@@ -224,8 +326,24 @@ class FileOperationsMixin:
         new_string: str,
         replace_all: bool = False,
     ) -> EditResult:
-        """异步编辑文件"""
-        return await asyncio.to_thread(self.edit, file_path, old_string, new_string, replace_all)
+        """异步编辑文件（真正的异步实现）"""
+        try:
+            await self._ensure_synced_async()
+            result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/edit", {
+                "file_path": file_path,
+                "old_string": base64.b64encode(old_string.encode()).decode(),
+                "new_string": base64.b64encode(new_string.encode()).decode(),
+                "user_id": self.user_id,
+                "replace_all": replace_all
+            })
+            return EditResult(
+                error=result.get("error"),
+                path=result.get("path"),
+                occurrences=result.get("occurrences")
+            )
+        except Exception as e:
+            SYLogger.error(f"[Sandbox] 异步编辑文件异常: {e}")
+            return EditResult(error=str(e))
 
     # ============== 搜索 ==============
 
@@ -245,8 +363,19 @@ class FileOperationsMixin:
             return GlobResult(error=str(e))
 
     async def aglob(self: "HTTPSandboxBackend", pattern: str, path: str = "/") -> GlobResult:
-        """异步 glob 搜索文件"""
-        return await asyncio.to_thread(self.glob, pattern, path)
+        """异步 glob 搜索文件（真正的异步实现）"""
+        try:
+            await self._ensure_synced_async()
+            result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/glob", {
+                "pattern": pattern,
+                "path": path,
+                "user_id": self.user_id
+            })
+            matches = [FileInfo(**item) for item in result]
+            return GlobResult(matches=matches)
+        except Exception as e:
+            SYLogger.error(f"[Sandbox] 异步 glob 搜索失败: {e}")
+            return GlobResult(error=str(e))
 
     def grep(
         self: "HTTPSandboxBackend",
@@ -277,8 +406,22 @@ class FileOperationsMixin:
         path: str = None,
         glob: str = None,
     ) -> GrepResult:
-        """异步搜索文件内容"""
-        return await asyncio.to_thread(self.grep, pattern, path, glob)
+        """异步搜索文件内容（真正的异步实现）"""
+        try:
+            await self._ensure_synced_async()
+            result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/grep", {
+                "pattern": pattern,
+                "user_id": self.user_id,
+                "path": path,
+                "glob": glob
+            })
+            if isinstance(result, list):
+                matches = [GrepMatch(**item) for item in result]
+                return GrepResult(matches=matches)
+            return GrepResult(error="Unexpected result format")
+        except Exception as e:
+            SYLogger.error(f"[Sandbox] 异步 grep 搜索失败: {e}")
+            return GrepResult(error=str(e))
 
     # ============== 兼容旧版 API（已废弃）==============