sycommon-python-lib 0.2.1a48__tar.gz → 0.2.1a50__tar.gz

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/PKG-INFO

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

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/pyproject.toml

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

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/src/sycommon/agent/__init__.py

@@ -45,7 +45,7 @@ Agent 模块
     from sycommon.agent import ChatEventBuilder
 
     event = ChatEventBuilder.ai_chunk("你好")
-    event = ChatEventBuilder.tool_call("execute", {"command": "ls"}, "call_123")
+    event = ChatEventBuilder.tool_call("execute", {"command": "ls"}, tool_call_id="call_123")
 
     # 5. 通过 Services.plugins 接入
     from fastapi import FastAPI

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/src/sycommon/agent/chat_events.py

@@ -16,7 +16,7 @@
     # 构建事件
     event = ChatEventBuilder.ai_chunk("你好世界", agent="助手")  # 单人
     event = ChatEventBuilder.ai_chunk("你好世界", agent="后端工程师")  # 团队
-    event = ChatEventBuilder.tool_call("execute", {"command": "ls"}, "call_123", agent="助手")
+    event = ChatEventBuilder.tool_call("execute", {"command": "ls"}, tool_call_id="call_123", agent="助手")
     event = ChatEventBuilder.progress("agent", 1, agent="助手")
 
     # 转换为字典（用于 JSON 序列化）
@@ -189,7 +189,8 @@ class ChatEventBuilder:
     def tool_call(
         name: str,
         args: Dict[str, Any],
-        id: str = "",
+        tool_call_id: str = "",
+        id: Optional[str] = None,
         agent: Optional[str] = None,
     ) -> ChatEvent:
         """
@@ -198,22 +199,26 @@ class ChatEventBuilder:
         Args:
             name: 工具名称
             args: 工具参数
-            id: 工具调用 ID（用于匹配结果）
+            tool_call_id: 工具调用 ID（LLM 生成的，用于匹配 tool_result）
+            id: AIMessage 自身的消息 ID（来自 BaseMessage.id）
             agent: 调用工具的 Agent 名称（可选，团队模式使用）
 
         Returns:
             ChatEvent: 工具调用事件
         """
-        data = {"name": name, "args": args, "id": id}
+        data = {"name": name, "args": args, "tool_call_id": tool_call_id}
+        if id:
+            data["id"] = id
         if agent:
             data["agent"] = agent
         return ChatEvent(EventType.TOOL_CALL, data)
 
     @staticmethod
     def tool_result(
-        id: str,
+        tool_call_id: str,
         name: str,
         content: str,
+        id: Optional[str] = None,
         args: Optional[Dict[str, Any]] = None,
         success: bool = True,
         agent: Optional[str] = None,
@@ -222,9 +227,10 @@ class ChatEventBuilder:
         构建工具执行结果事件
 
         Args:
-            id: 工具调用 ID（与 tool_call 匹配）
+            tool_call_id: 工具调用 ID（与 tool_call 匹配）
             name: 工具名称
             content: 工具执行输出
+            id: ToolMessage 自身的消息 ID（来自 BaseMessage.id）
             args: 工具参数（可选，方便前端显示）
             success: 执行是否成功
             agent: 执行工具的 Agent 名称（可选，团队模式使用）
@@ -233,11 +239,13 @@ class ChatEventBuilder:
             ChatEvent: 工具结果事件
         """
         data = {
-            "id": id,
+            "tool_call_id": tool_call_id,
             "name": name,
             "content": content,
             "success": success,
         }
+        if id:
+            data["id"] = id
         if args:
             data["args"] = args
         if agent:
@@ -373,14 +381,14 @@ def ai_chunk_event(content: str, **kwargs) -> Dict[str, Any]:
     return ChatEventBuilder.ai_chunk(content, **kwargs).to_dict()
 
 
-def tool_call_event(name: str, args: Dict, id: str = "", **kwargs) -> Dict[str, Any]:
+def tool_call_event(name: str, args: Dict, tool_call_id: str = "", id: Optional[str] = None, **kwargs) -> Dict[str, Any]:
     """创建工具调用事件字典"""
-    return ChatEventBuilder.tool_call(name, args, id, **kwargs).to_dict()
+    return ChatEventBuilder.tool_call(name, args, tool_call_id, id=id, **kwargs).to_dict()
 
 
-def tool_result_event(id: str, name: str, content: str, **kwargs) -> Dict[str, Any]:
+def tool_result_event(tool_call_id: str, name: str, content: str, id: Optional[str] = None, **kwargs) -> Dict[str, Any]:
     """创建工具结果事件字典"""
-    return ChatEventBuilder.tool_result(id, name, content, **kwargs).to_dict()
+    return ChatEventBuilder.tool_result(tool_call_id, name, content, id=id, **kwargs).to_dict()
 
 
 def agent_switch_event(agent: str, **kwargs) -> Dict[str, Any]:

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/src/sycommon/agent/deep_agent.py

@@ -85,6 +85,10 @@ DEFAULT_SYSTEM_PROMPT = """你是智能助手，使用中文和我对话。
 - 沙箱环境具有外网访问权限
 - 所有文件操作（下载、读取、写入、执行）都必须使用相对路径或 ./ 开头的路径
 - 禁止使用 /tmp/、/var/ 等系统目录，始终使用当前工作目录 ./
+- 文件组织规范：
+  - ./output/ — 运行时产生的输出文件（图片、数据文件、日志等）
+  - ./projects/ — 生成的代码文件或完整项目（如新建 Python 脚本、Web 项目等）
+  - 写入前先创建目录，如 mkdir -p output projects
 """
 
 
@@ -300,7 +304,7 @@ class DeepAgent:
                                 except json.JSONDecodeError:
                                     pass  # 还没接收完整，下次继续
 
-                            # 发送 tool_call 事件，前端根据 id 更新
+                            # 发送 tool_call 事件，前端根据 tool_call_id 更新
                             tc_id = existing_tc["id"]
                             if tc_id:
                                 current_args = existing_tc["args"]
@@ -312,7 +316,8 @@ class DeepAgent:
                                     event = ChatEventBuilder.tool_call(
                                         name=existing_tc["name"],
                                         args=current_args,
-                                        id=tc_id,
+                                        tool_call_id=tc_id,
+                                        id=getattr(msg, "id", None),
                                         agent=DEFAULT_AGENT_NAME,
                                     )
                                     existing_tc["_sent"] = True
@@ -355,7 +360,8 @@ class DeepAgent:
                                 event = ChatEventBuilder.tool_call(
                                     name=existing_tc["name"],
                                     args=existing_tc["args"],
-                                    id=tc_id,
+                                    tool_call_id=tc_id,
+                                    id=getattr(msg, "id", None),
                                     agent=DEFAULT_AGENT_NAME,
                                 )
                                 if on_event:
@@ -401,8 +407,9 @@ class DeepAgent:
                         )
 
                     event = ChatEventBuilder.tool_result(
-                        id=tool_call_id, name=tool_name or "unknown",
+                        tool_call_id=tool_call_id, name=tool_name or "unknown",
                         content=content, args=tool_args, success=is_success,
+                        id=getattr(msg, "id", None),
                         agent=DEFAULT_AGENT_NAME,
                     )
                     if on_event:

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/src/sycommon/agent/multi_agent_team.py

@@ -347,7 +347,8 @@ class MultiAgentTeam:
                                     yield event
 
                             event = ChatEventBuilder.tool_call(
-                                name=tc_name, args=tc_args, id=tc_id, agent=tc_agent,
+                                name=tc_name, args=tc_args, tool_call_id=tc_id, agent=tc_agent,
+                                id=getattr(msg, "id", None),
                             )
                             if on_event:
                                 await on_event(event)
@@ -398,9 +399,10 @@ class MultiAgentTeam:
                         )
 
                     event = ChatEventBuilder.tool_result(
-                        id=tool_call_id, name=tool_name or "unknown",
+                        tool_call_id=tool_call_id, name=tool_name or "unknown",
                         content=content, args=tool_args, success=is_success,
                         agent=result_agent,
+                        id=getattr(msg, "id", None),
                     )
                     if on_event:
                         await on_event(event)

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -11,6 +11,8 @@ import base64
 import os
 import shlex
 import ssl
+import sys
+import tempfile
 import requests
 from pathlib import Path
 from typing import Optional, List
@@ -406,41 +408,22 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         """用户ID"""
         return self._user_id
 
-    # ============== 命令隔离 ==============
-
-    # 沙箱容器内用户工作空间的根目录
-    _WORKSPACE_ROOT = "/workspace"
+    # 沙箱容器内用户数据的实际根目录（与 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")
+    )
 
     def _wrap_command_isolation(self, command: str) -> str:
-        """使用 unshare --mount 包裹命令，实现文件系统隔离
-
-        在独立的 mount namespace 中：
-        1. 将用户工作目录 bind mount 到隔离视图
-        2. 隐藏其他用户的工作目录
-        3. 保留系统工具可用
+        """包裹命令，确保在用户工作目录下执行
 
-        原理：
-          unshare --mount 创建新的 mount namespace
-          在其中 mount --make-private / 使挂载对其他用户不可见
-          然后只挂载当前用户的目录，其他用户目录自然不可见
+        仅负责工作目录定位，文件系统隔离由沙箱服务端保证。
         """
         user_dir = f"{self._WORKSPACE_ROOT}/{self._user_id}"
-
-        # 使用 unshare --mount 创建隔离的 mount namespace
-        # 关键步骤：
-        #   1. mount --make-private /  → 本 namespace 的挂载不影响其他进程
-        #   2. 确保 user_dir 存在
-        #   3. 在用户目录下执行命令
-        # 这样 find / 等命令仍然可以遍历系统目录，但看不到其他用户的 workspace
-        wrapped = (
-            f"unshare --mount -- bash -c '"
-            f"mount --make-private / 2>/dev/null; "
-            f"mkdir -p {user_dir}; "
-            f"cd {user_dir}; "
-            f"exec bash -c {shlex.quote(command)}"
-            f"'"
-        )
-        return wrapped
+        return f"mkdir -p {user_dir} && cd {user_dir} && {command.strip()}"
 
     # ============== 执行命令 ==============
 

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/src/sycommon/logging/kafka_log.py

@@ -5,7 +5,6 @@ import socket
 import threading
 import traceback
 import asyncio
-import pprint
 from datetime import datetime
 
 from kafka import KafkaProducer
@@ -305,7 +304,7 @@ class SYLogger:
             logger.info(log_json)
 
         if check_env_flag(['DEV_LOG']):
-            pprint.pprint(log_dict)
+            print(log_dict)
 
     @staticmethod
     def info(msg: any, *args, **kwargs):

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/src/sycommon/middleware/sandbox.py

@@ -38,6 +38,7 @@ from sycommon.models.sandbox import (
     ExecuteRequest, ExecuteResponse,
     UploadRequest, UploadResponse,
     DownloadRequest, DownloadResponse,
+    DeleteRequest, DeleteResponse,
     FileInfo, LsRequest, LsResponse,
     TreeNode, TreeRequest, TreeResponse,
     GlobRequest, GrepRequest, GrepMatch,
@@ -904,6 +905,32 @@ COMMAND_EOF
         except Exception as e:
             return UploadResponse(path=file_path, error=str(e))
 
+    @sandbox_router.post("/delete", response_model=DeleteResponse)
+    async def delete_file(req: DeleteRequest):
+        """删除文件或目录"""
+        workspace = get_user_workspace(req.user_id)
+        try:
+            file_path = resolve_sandbox_path(req.path, workspace)
+        except ValueError as e:
+            return DeleteResponse(path=req.path, error=str(e))
+
+        if not os.path.exists(file_path):
+            return DeleteResponse(path=file_path, error="file_not_found")
+
+        try:
+            if os.path.isdir(file_path):
+                if not req.recursive:
+                    return DeleteResponse(path=file_path, error="is_directory, set recursive=true")
+                import shutil
+                shutil.rmtree(file_path)
+            else:
+                os.remove(file_path)
+
+            return DeleteResponse(path=file_path, error=None)
+
+        except Exception as e:
+            return DeleteResponse(path=file_path, error=str(e))
+
     @sandbox_router.post("/download", response_model=DownloadResponse)
     async def download_file(req: DownloadRequest):
         """下载文件"""

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/src/sycommon/models/sandbox.py

@@ -145,6 +145,19 @@ class WriteResponse(BaseModel):
     path: Optional[str] = None
 
 
+class DeleteRequest(BaseModel):
+    """删除文件/目录请求"""
+    path: str
+    user_id: str
+    recursive: bool = False
+
+
+class DeleteResponse(BaseModel):
+    """删除文件/目录响应"""
+    path: Optional[str] = None
+    error: Optional[str] = None
+
+
 class EditRequest(BaseModel):
     """编辑文件请求"""
     file_path: str

{sycommon_python_lib-0.2.1a48 → sycommon_python_lib-0.2.1a50}/src/sycommon_python_lib.egg-info/PKG-INFO

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