sycommon-python-lib 0.2.1b0__tar.gz → 0.2.1b2__tar.gz

{sycommon_python_lib-0.2.1b0 → sycommon_python_lib-0.2.1b2}/PKG-INFO

@@ -1,24 +1,24 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.1b0
+Version: 0.2.1b2
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aio-pika>=9.6.1
+Requires-Dist: aio-pika>=9.6.2
 Requires-Dist: aiohttp>=3.13.3
 Requires-Dist: aiomysql>=0.3.2
 Requires-Dist: anyio>=4.12.1
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: deepagents>=0.4.11
+Requires-Dist: deepagents>=0.5.0a2
 Requires-Dist: elasticsearch>=9.3.0
 Requires-Dist: fastapi>=0.135.1
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: kafka-python>=2.3.0
-Requires-Dist: langchain>=1.2.12
-Requires-Dist: langchain-core>=1.2.19
+Requires-Dist: langchain>=1.2.13
+Requires-Dist: langchain-core>=1.2.20
 Requires-Dist: langchain-openai>=1.1.11
-Requires-Dist: langfuse>=4.0.0
-Requires-Dist: langgraph>=1.1.2
+Requires-Dist: langfuse>=4.0.1
+Requires-Dist: langgraph>=1.1.3
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.6.0
 Requires-Dist: nacos-sdk-python<3.0,>=2.0.9
@@ -28,11 +28,11 @@ Requires-Dist: python-dotenv>=1.2.2
 Requires-Dist: python-multipart>=0.0.22
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: redis>=7.3.0
-Requires-Dist: sentry-sdk[fastapi]>=2.54.0
+Requires-Dist: sentry-sdk[fastapi]>=2.55.0
 Requires-Dist: sqlalchemy[asyncio]>=2.0.48
-Requires-Dist: starlette>=0.52.1
+Requires-Dist: starlette[full]>=1.0.0
 Requires-Dist: tiktoken>=0.12.0
-Requires-Dist: uvicorn>=0.41.0
+Requires-Dist: uvicorn>=0.42.0
 
 # sycommon-python-lib
 

{sycommon_python_lib-0.2.1b0 → sycommon_python_lib-0.2.1b2}/pyproject.toml

@@ -1,25 +1,25 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.1b0"
+version = "0.2.1b2"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
 dependencies = [
-    "aio-pika>=9.6.1",
+    "aio-pika>=9.6.2",
     "aiohttp>=3.13.3",
     "aiomysql>=0.3.2",
     "anyio>=4.12.1",
     "decorator>=5.2.1",
-    "deepagents>=0.4.11",
+    "deepagents>=0.5.0a2",
     "elasticsearch>=9.3.0",
     "fastapi>=0.135.1",
     "jinja2>=3.1.6",
     "kafka-python>=2.3.0",
-    "langchain>=1.2.12",
-    "langchain-core>=1.2.19",
+    "langchain>=1.2.13",
+    "langchain-core>=1.2.20",
     "langchain-openai>=1.1.11",
-    "langfuse>=4.0.0",
-    "langgraph>=1.1.2",
+    "langfuse>=4.0.1",
+    "langgraph>=1.1.3",
     "loguru>=0.7.3",
     "mysql-connector-python>=9.6.0",
     "nacos-sdk-python>=2.0.9,<3.0",
@@ -29,11 +29,11 @@ dependencies = [
     "python-multipart>=0.0.22",
     "pyyaml>=6.0.3",
     "redis>=7.3.0",
-    "sentry-sdk[fastapi]>=2.54.0",
+    "sentry-sdk[fastapi]>=2.55.0",
     "sqlalchemy[asyncio]>=2.0.48",
-    "starlette>=0.52.1",
+    "starlette[full]>=1.0.0",
     "tiktoken>=0.12.0",
-    "uvicorn>=0.41.0",
+    "uvicorn>=0.42.0",
 ]
 
 [tool.setuptools]

{sycommon_python_lib-0.2.1b0 → sycommon_python_lib-0.2.1b2}/src/sycommon/agent/__init__.py

@@ -6,6 +6,15 @@ sycommon.agent - DeepAgents 便捷封装
 
 from sycommon.agent.exports import *
 
+# 沙箱模块
+from sycommon.agent.sandbox import (
+    HTTPSandboxBackend,
+    SandboxPool,
+    SandboxInstance,
+    areset_all_sandboxes,
+    aget_sandbox_status,
+)
+
 __all__ = [
     # 主要接口
     "get_agent",
@@ -35,4 +44,10 @@ __all__ = [
     # 技能系统中间件
     "SkillsMiddleware",
     "SkillMetadata",
+    # 沙箱模块
+    "HTTPSandboxBackend",
+    "SandboxPool",
+    "SandboxInstance",
+    "areset_all_sandboxes",
+    "aget_sandbox_status",
 ]

sycommon_python_lib-0.2.1b2/src/sycommon/agent/sandbox/__init__.py

@@ -0,0 +1,95 @@
+"""
+沙箱模块
+
+提供远程沙箱容器的连接和管理能力，支持通过 Nacos 服务发现。
+
+架构说明:
+┌─────────────────────────────────────────────────────────────┐
+│                      调用服务                                │
+│                                                             │
+│  HTTPSandboxBackend.from_nacos("sandbox-service")          │
+│                           │                                 │
+│                           ▼                                 │
+│  ┌─────────────────────────────────────────────────────┐   │
+│  │                    Nacos                             │   │
+│  │  负责服务发现 + 负载均衡                              │   │
+│  │                                                     │   │
+│  │  sandbox-service:                                   │   │
+│  │    - 192.168.1.100:8080 (实例1)                     │   │
+│  │    - 192.168.1.101:8080 (实例2)                     │   │
+│  │    - 192.168.1.102:8080 (实例3)                     │   │
+│  └─────────────────────────────────────────────────────┘   │
+│                           │                                 │
+│              Nacos 轮询返回一个实例                          │
+│                           ▼                                 │
+│  ┌─────────────────────────────────────────────────────┐   │
+│  │              沙箱容器 (多副本)                        │   │
+│  │                                                     │   │
+│  │  每个容器运行 sandbox_server.py                     │   │
+│  │  提供命令执行、文件操作 API                          │   │
+│  └─────────────────────────────────────────────────────┘   │
+└─────────────────────────────────────────────────────────────┘
+
+使用示例:
+
+    # 方式 1: 获取单个沙箱（推荐，Nacos 负责负载均衡）
+    from sycommon.agent.sandbox import HTTPSandboxBackend
+
+    sandbox = HTTPSandboxBackend.from_nacos("sandbox-service", user_id="user123")
+    result = await sandbox.aexecute("python --version")
+
+    # 方式 2: 普通用户重置自己的工作目录
+    await sandbox.areset()  # 仅重置 /workspace/user123/
+
+    # 方式 3: 管理员批量管理所有沙箱
+    from sycommon.agent.sandbox import SandboxPool
+
+    pool = await SandboxPool.from_nacos("sandbox-service", is_admin=True)
+    print(await pool.astatus())  # 查看所有实例状态
+    await pool.areset_all()  # 重置所有沙箱（需要管理员权限）
+
+    # 方式 4: 配合 Agent 使用
+    from deepagents import create_deep_agent
+    from sycommon.agent.sandbox import HTTPSandboxBackend
+
+    sandbox = HTTPSandboxBackend.from_nacos("sandbox-service", user_id="user123")
+    agent = create_deep_agent(
+        model="openai:gpt-4o",
+        backend=sandbox,
+    )
+
+    # 方式 5: 启用沙箱服务（在其他项目中）
+    from fastapi import FastAPI
+    from sycommon.services import Services
+
+    app = Services.plugins(
+        app=FastAPI(),
+        sandbox_service=True,  # 启用沙箱服务
+        ...
+    )
+"""
+
+from sycommon.agent.sandbox.http_sandbox_backend import HTTPSandboxBackend
+from sycommon.agent.sandbox.sandbox_pool import (
+    SandboxPool,
+    SandboxInstance,
+    areset_all_sandboxes,
+    aget_sandbox_status,
+)
+from sycommon.agent.sandbox.sandbox_recovery import SandboxRecoveryManager
+
+__all__ = [
+    # 后端
+    "HTTPSandboxBackend",
+
+    # 池管理
+    "SandboxPool",
+    "SandboxInstance",
+
+    # 恢复管理
+    "SandboxRecoveryManager",
+
+    # 便捷函数
+    "areset_all_sandboxes",
+    "aget_sandbox_status",
+]

sycommon_python_lib-0.2.1b2/src/sycommon/agent/sandbox/file_ops.py

@@ -0,0 +1,316 @@
+"""
+沙箱文件操作 Mixin
+
+提供文件相关的同步/异步操作方法
+适配 deepagents 0.5.0a2 协议
+"""
+
+import asyncio
+import base64
+from typing import List, TYPE_CHECKING
+
+from sycommon.logging.kafka_log import SYLogger
+from deepagents.backends.protocol import (
+    FileInfo,
+    FileData,
+    LsResult,
+    GrepResult,
+    GlobResult,
+    ReadResult,
+    WriteResult,
+    EditResult,
+    GrepMatch,
+)
+
+if TYPE_CHECKING:
+    from sycommon.agent.sandbox.http_sandbox_backend import HTTPSandboxBackend
+
+# 沙箱 API 路径前缀
+SANDBOX_API_PREFIX = "/v1/sandbox"
+
+
+class FileOperationsMixin:
+    """文件操作 Mixin
+
+    适配 deepagents 0.5.0a2 协议
+    同步方法为主实现，异步方法通过 asyncio.to_thread 调用
+    """
+
+    _timeout: int  # 类型提示，子类需要提供此属性
+    user_id: str  # 类型提示，子类需要提供此属性
+    _auto_sync: bool = False  # 是否自动同步
+    _synced: bool = False  # 是否已同步
+    _workspace_verified: bool = False  # 工作空间是否已验证存在
+
+    def _post_sync(self: "HTTPSandboxBackend", endpoint: str, data: dict, timeout: int = None) -> dict:
+        """发送同步 POST 请求"""
+        ...
+
+    def _ensure_synced_sync(self: "HTTPSandboxBackend"):
+        """确保目录已同步（同步版本）"""
+        if not self._auto_sync:
+            return
+
+        if self._synced and self._workspace_verified:
+            return
+
+        SYLogger.info(f"[Sandbox] 开始检查工作空间同步状态...")
+
+        try:
+            workspace_exists = self._check_workspace_exists_sync()
+        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] 开始同步目录...")
+            self._sync_sync()
+            self._workspace_verified = True
+            SYLogger.info(f"[Sandbox] 同步完成")
+
+    def _check_workspace_exists_sync(self: "HTTPSandboxBackend") -> bool:
+        """检查沙箱工作空间是否存在（同步版本）"""
+        try:
+            self._post_sync(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"):
+        """同步目录（同步版本，由子类实现）"""
+        ...
+
+    # ============== 目录操作 ==============
+
+    def ls(self: "HTTPSandboxBackend", path: str) -> LsResult:
+        """列出目录内容"""
+        try:
+            self._ensure_synced_sync()
+            SYLogger.info(f"[Sandbox] 列出目录: {path}")
+            result = self._post_sync(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))
+
+    async def als(self: "HTTPSandboxBackend", path: str) -> LsResult:
+        """异步列出目录内容"""
+        return await asyncio.to_thread(self.ls, path)
+
+    # ============== 文件读写 ==============
+
+    def read(
+        self: "HTTPSandboxBackend",
+        file_path: str,
+        offset: int = 0,
+        limit: int = 2000,
+    ) -> ReadResult:
+        """读取文件内容"""
+        try:
+            self._ensure_synced_sync()
+            SYLogger.info(f"[Sandbox] 读取文件: {file_path} (offset={offset}, limit={limit})")
+            result = self._post_sync(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)} 字符")
+            # 构建 FileData 格式
+            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))
+
+    async def aread(
+        self: "HTTPSandboxBackend",
+        file_path: str,
+        offset: int = 0,
+        limit: int = 2000,
+    ) -> ReadResult:
+        """异步读取文件内容"""
+        return await asyncio.to_thread(self.read, file_path, offset, limit)
+
+    def write(
+        self: "HTTPSandboxBackend",
+        file_path: str,
+        content: str,
+    ) -> WriteResult:
+        """写入文件"""
+        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
+            })
+            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))
+
+    async def awrite(
+        self: "HTTPSandboxBackend",
+        file_path: str,
+        content: str,
+    ) -> WriteResult:
+        """异步写入文件"""
+        return await asyncio.to_thread(self.write, file_path, content)
+
+    def edit(
+        self: "HTTPSandboxBackend",
+        file_path: str,
+        old_string: str,
+        new_string: str,
+        replace_all: bool = False,
+    ) -> EditResult:
+        """编辑文件"""
+        try:
+            self._ensure_synced_sync()
+            result = self._post_sync(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))
+
+    async def aedit(
+        self: "HTTPSandboxBackend",
+        file_path: str,
+        old_string: str,
+        new_string: str,
+        replace_all: bool = False,
+    ) -> EditResult:
+        """异步编辑文件"""
+        return await asyncio.to_thread(self.edit, file_path, old_string, new_string, replace_all)
+
+    # ============== 搜索 ==============
+
+    def glob(self: "HTTPSandboxBackend", pattern: str, path: str = "/") -> GlobResult:
+        """glob 搜索文件"""
+        try:
+            self._ensure_synced_sync()
+            result = self._post_sync(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))
+
+    async def aglob(self: "HTTPSandboxBackend", pattern: str, path: str = "/") -> GlobResult:
+        """异步 glob 搜索文件"""
+        return await asyncio.to_thread(self.glob, pattern, path)
+
+    def grep(
+        self: "HTTPSandboxBackend",
+        pattern: str,
+        path: str = None,
+        glob: str = None,
+    ) -> GrepResult:
+        """搜索文件内容"""
+        try:
+            self._ensure_synced_sync()
+            result = self._post_sync(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))
+
+    async def agrep(
+        self: "HTTPSandboxBackend",
+        pattern: str,
+        path: str = None,
+        glob: str = None,
+    ) -> GrepResult:
+        """异步搜索文件内容"""
+        return await asyncio.to_thread(self.grep, pattern, path, glob)
+
+    # ============== 兼容旧版 API（已废弃）==============
+
+    def ls_info(self: "HTTPSandboxBackend", path: str) -> List[FileInfo]:
+        """列出目录内容（已废弃，请使用 ls）"""
+        result = self.ls(path)
+        if result.error:
+            return []
+        return result.entries or []
+
+    async def als_info(self: "HTTPSandboxBackend", path: str) -> List[FileInfo]:
+        """异步列出目录内容（已废弃，请使用 als）"""
+        result = await self.als(path)
+        if result.error:
+            return []
+        return result.entries or []
+
+    async def aglob_info(self: "HTTPSandboxBackend", pattern: str, path: str = "/") -> List[FileInfo]:
+        """异步 glob 搜索文件（已废弃，请使用 aglob）"""
+        result = await self.aglob(pattern, path)
+        if result.error:
+            return []
+        return result.matches or []
+
+    async def agrep_raw(
+        self: "HTTPSandboxBackend",
+        pattern: str,
+        path: str = None,
+        glob: str = None,
+    ):
+        """异步搜索文件内容（已废弃，请使用 agrep）"""
+        result = await self.agrep(pattern, path, glob)
+        if result.error:
+            return f"Error: {result.error}"
+        return result.matches or []