sycommon-python-lib 0.2.5a20__tar.gz → 0.2.5a21__tar.gz

{sycommon_python_lib-0.2.5a20 → sycommon_python_lib-0.2.5a21}/PKG-INFO

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

{sycommon_python_lib-0.2.5a20 → sycommon_python_lib-0.2.5a21}/pyproject.toml

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

{sycommon_python_lib-0.2.5a20 → sycommon_python_lib-0.2.5a21}/src/sycommon/agent/sandbox/file_ops.py

@@ -508,10 +508,12 @@ class FileOperationsMixin:
                 "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")
+            # GrepResponse: {"matches": [...], "partial_error": "...", "error": "..."}
+            matches = [GrepMatch(**item) for item in result.get("matches", [])]
+            return GrepResult(
+                matches=matches,
+                error=result.get("error"),
+            )
         except Exception as e:
             SYLogger.error(f"[Sandbox] grep 搜索失败: {e}")
             return GrepResult(error=str(e))
@@ -533,10 +535,12 @@ class FileOperationsMixin:
                 "path": path,
                 "glob": glob
             }, timeout=timeout)
-            if isinstance(result, list):
-                matches = [GrepMatch(**item) for item in result]
-                return GrepResult(matches=matches)
-            return GrepResult(error="Unexpected result format")
+            # GrepResponse: {"matches": [...], "partial_error": "...", "error": "..."}
+            matches = [GrepMatch(**item) for item in result.get("matches", [])]
+            return GrepResult(
+                matches=matches,
+                error=result.get("error"),
+            )
         except Exception as e:
             SYLogger.error(f"[Sandbox] 异步 grep 搜索失败: {e}")
             return GrepResult(error=str(e))

{sycommon_python_lib-0.2.5a20 → sycommon_python_lib-0.2.5a21}/src/sycommon/middleware/sandbox.py

@@ -44,7 +44,7 @@ from sycommon.models.sandbox import (
     DeleteRequest, DeleteResponse,
     FileInfo, LsRequest, LsResponse,
     TreeNode, TreeRequest, TreeResponse,
-    GlobRequest, GrepRequest, GrepMatch,
+    GlobRequest, GrepRequest, GrepMatch, GrepResponse,
     ReadRequest, ReadResponse,
     WriteRequest, WriteResponse,
     EditRequest, EditResponse,
@@ -1012,21 +1012,23 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
 
         return await asyncio.to_thread(_glob)
 
-    @sandbox_router.post("/grep", response_model=list[GrepMatch])
+    @sandbox_router.post("/grep", response_model=GrepResponse)
     async def grep_search(req: GrepRequest):
         """grep 搜索内容
 
-        安全增强（对齐 deepagents 0.6.3 backends/filesystem.py）：
+        安全增强（对齐 deepagents 0.6.4 backends/filesystem.py）：
         - symlink 逃逸防护：结果路径必须 resolve 到 workspace 内
         - 路径规范化：统一转换为虚拟路径，防止泄露宿主绝对路径
         - 结果解析全量异步：os.path.realpath/relpath 通过 asyncio.to_thread 执行
+        - partial_error: grep 命令非零退出码时返回部分结果 + 警告
+        - 不再静默 stderr，用于诊断错误
         """
         workspace = await aget_user_workspace(req.user_id)
         try:
             search_path = resolve_sandbox_path(req.path or "/", workspace)
         except ValueError as e:
             SYLogger.error(f"[Sandbox Server] grep 失败: {e}")
-            return []
+            return GrepResponse(error=str(e))
 
         quoted_path = shlex.quote(search_path)
         grep_opts = "-rHnF"
@@ -1035,7 +1037,8 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
         glob_pattern = f"--include={shlex.quote(req.glob)}" if req.glob else ""
         pattern_escaped = shlex.quote(req.pattern)
 
-        cmd = f"grep {grep_opts} {glob_pattern} -e {pattern_escaped} {quoted_path} 2>/dev/null || true"
+        # 注意：不再用 2>/dev/null || true，以便捕获 stderr 用于错误诊断
+        cmd = f"grep {grep_opts} {glob_pattern} -e {pattern_escaped} {quoted_path}"
 
         # 使用 asyncio.create_subprocess_shell 异步执行
         proc = await asyncio.create_subprocess_shell(
@@ -1044,8 +1047,17 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
             stderr=asyncio.subprocess.PIPE,
             start_new_session=_SUBPROCESS_NEW_SESSION,
         )
-        stdout, _ = await proc.communicate()
+        stdout, stderr = await proc.communicate()
         result_text = stdout.decode('utf-8') if stdout else ''
+        stderr_text = stderr.decode('utf-8', errors='replace') if stderr else ''
+
+        # 检查退出码：1 = no match (不是错误), 2+ = 真正的错误
+        partial_error = None
+        if proc.returncode is not None and proc.returncode >= 2:
+            partial_error = f"grep exited with code {proc.returncode}"
+            if stderr_text.strip():
+                partial_error += f": {stderr_text.strip()[:500]}"
+            SYLogger.warning(f"[Sandbox Server] grep partial failure: {partial_error}")
 
         # 结果解析（含 os.path.realpath / relpath 同步 IO）放入线程池
         def _parse_grep_results():
@@ -1063,7 +1075,7 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
 
                 path_part = line[:first_colon]
 
-                # 路径安全检查（对齐 deepagents 0.6.3）：
+                # 路径安全检查（对齐 deepagents 0.6.4）：
                 # resolve 后必须在 workspace 内，跳过 symlink 逃逸的结果
                 try:
                     resolved = os.path.realpath(path_part)
@@ -1091,7 +1103,8 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
                 ))
             return matches
 
-        return await asyncio.to_thread(_parse_grep_results)
+        matches = await asyncio.to_thread(_parse_grep_results)
+        return GrepResponse(matches=matches, partial_error=partial_error)
 
     @sandbox_router.post("/stat", response_model=StatResponse)
     async def stat_file(req: StatRequest):

{sycommon_python_lib-0.2.5a20 → sycommon_python_lib-0.2.5a21}/src/sycommon/models/sandbox.py

@@ -118,6 +118,13 @@ class GrepMatch(BaseModel):
     text: str
 
 
+class GrepResponse(BaseModel):
+    """grep 搜索响应（对齐 deepagents 0.6.4 partial_error 语义）"""
+    matches: list[GrepMatch] = []
+    partial_error: Optional[str] = None
+    error: Optional[str] = None
+
+
 class ReadRequest(BaseModel):
     """读取文件请求"""
     file_path: str

{sycommon_python_lib-0.2.5a20 → sycommon_python_lib-0.2.5a21}/src/sycommon_python_lib.egg-info/PKG-INFO

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