sycommon-python-lib 0.2.1a0__tar.gz → 0.2.1a2__tar.gz

{sycommon_python_lib-0.2.1a0 → sycommon_python_lib-0.2.1a2}/PKG-INFO

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

{sycommon_python_lib-0.2.1a0 → sycommon_python_lib-0.2.1a2}/pyproject.toml

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

{sycommon_python_lib-0.2.1a0 → sycommon_python_lib-0.2.1a2}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -13,14 +13,14 @@ from sycommon.agent.sandbox.session import get_async_session
 from sycommon.agent.sandbox.file_ops import FileOperationsMixin, SANDBOX_API_PREFIX
 
 from deepagents.backends.protocol import (
-    BackendProtocol,
+    SandboxBackendProtocol,
     ExecuteResponse,
     FileDownloadResponse,
     FileUploadResponse,
 )
 
 
-class HTTPSandboxBackend(FileOperationsMixin, BackendProtocol):
+class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
     """
     通过 HTTP API 连接远程沙箱容器（仅异步）
 
@@ -92,11 +92,19 @@ class HTTPSandboxBackend(FileOperationsMixin, BackendProtocol):
             HTTPSandboxBackend 实例
 
         Raises:
-            RuntimeError: 无法发现服务实例
+            RuntimeError: 无法发现服务实例或 NacosService 未初始化
         """
         from sycommon.synacos.nacos_service import NacosService
 
+        # 获取单例实例（参考 feign_client 的方式）
         nacos_manager = NacosService(None)
+
+        # 检查单例是否已正确初始化
+        if not hasattr(nacos_manager, 'discovery'):
+            raise RuntimeError(
+                "NacosService 未初始化，请确保服务启动时已调用 NacosService.setup_nacos(config)"
+            )
+
         instances = nacos_manager.get_service_instances(
             service_name, group=group, target_version=version
         )

{sycommon_python_lib-0.2.1a0 → sycommon_python_lib-0.2.1a2}/src/sycommon/middleware/sandbox.py

@@ -14,6 +14,7 @@ from fastapi import FastAPI, APIRouter, Request, Header
 from typing import Optional
 
 from pydantic import BaseModel
+from sycommon.logging.kafka_log import SYLogger
 
 
 # ============== 常量配置 ==============
@@ -230,6 +231,8 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
                 exit_code=1
             )
 
+        SYLogger.info(f"[Sandbox Server] 执行命令: {req.command} (user={req.user_id}, timeout={req.timeout}s)")
+
         try:
             result = subprocess.run(
                 req.command,
@@ -258,6 +261,8 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
             if result.returncode != 0:
                 output = f"{output.rstrip()}\n\nExit code: {result.returncode}"
 
+            SYLogger.info(f"[Sandbox Server] 执行完成: exit_code={result.returncode}, output_len={len(output)}")
+
             return ExecuteResponse(
                 output=output,
                 exit_code=result.returncode,
@@ -265,12 +270,14 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
             )
 
         except subprocess.TimeoutExpired:
+            SYLogger.error(f"[Sandbox Server] 执行超时: {req.timeout}s")
             return ExecuteResponse(
                 output=f"Error: Command timed out after {req.timeout} seconds.",
                 exit_code=124,
                 truncated=False
             )
         except Exception as e:
+            SYLogger.error(f"[Sandbox Server] 执行异常: {e}")
             return ExecuteResponse(
                 output=f"Error: {type(e).__name__}: {e}",
                 exit_code=1,
@@ -287,8 +294,10 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
             target_path = os.path.join(workspace, target_path)
 
         if not os.path.isdir(target_path):
+            SYLogger.error(f"[Sandbox Server] 列目录失败: 目录不存在 {target_path}")
             return []
 
+        SYLogger.info(f"[Sandbox Server] 列出目录: {target_path}")
         results = []
         try:
             with os.scandir(target_path) as it:
@@ -302,9 +311,10 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
                     except Exception:
                         pass
                     results.append(info)
-        except Exception:
-            pass
+        except Exception as e:
+            SYLogger.error(f"[Sandbox Server] 列目录异常: {e}")
 
+        SYLogger.info(f"[Sandbox Server] 目录内容: {len(results)} 项")
         return results
 
     @sandbox_router.post("/read", response_model=ReadResponse)
@@ -317,8 +327,11 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
             file_path = os.path.join(workspace, file_path)
 
         if not os.path.isfile(file_path):
+            SYLogger.error(f"[Sandbox Server] 读取失败: 文件不存在 {file_path}")
             return ReadResponse(error=f"File '{file_path}' not found", content=None)
 
+        SYLogger.info(f"[Sandbox Server] 读取文件: {file_path} (offset={req.offset}, limit={req.limit})")
+
         try:
             with open(file_path, 'r') as f:
                 lines = f.readlines()
@@ -335,9 +348,12 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
                 line_num = req.offset + i + 1
                 output.append(f"{line_num:6d}\t{line.rstrip()}")
 
-            return ReadResponse(content="\n".join(output), error=None)
+            content = "\n".join(output)
+            SYLogger.info(f"[Sandbox Server] 读取完成: {len(selected)} 行")
+            return ReadResponse(content=content, error=None)
 
         except Exception as e:
+            SYLogger.error(f"[Sandbox Server] 读取异常: {e}")
             return ReadResponse(error=str(e), content=None)
 
     @sandbox_router.post("/write", response_model=WriteResponse)
@@ -349,10 +365,13 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
         if not os.path.isabs(file_path):
             file_path = os.path.join(workspace, file_path)
 
+        SYLogger.info(f"[Sandbox Server] 写入文件: {file_path}")
+
         try:
             content = base64.b64decode(req.content).decode('utf-8')
 
             if os.path.exists(file_path):
+                SYLogger.error(f"[Sandbox Server] 写入失败: 文件已存在 {file_path}")
                 return WriteResponse(error=f"File '{file_path}' already exists", path=None)
 
             parent = os.path.dirname(file_path)
@@ -362,9 +381,11 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
             with open(file_path, 'w') as f:
                 f.write(content)
 
+            SYLogger.info(f"[Sandbox Server] 写入成功: {file_path} ({len(content)} 字符)")
             return WriteResponse(error=None, path=file_path)
 
         except Exception as e:
+            SYLogger.error(f"[Sandbox Server] 写入异常: {e}")
             return WriteResponse(error=str(e), path=None)
 
     @sandbox_router.post("/edit", response_model=EditResponse)
@@ -376,11 +397,14 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
         if not os.path.isabs(file_path):
             file_path = os.path.join(workspace, file_path)
 
+        SYLogger.info(f"[Sandbox Server] 编辑文件: {file_path}")
+
         try:
             old_string = base64.b64decode(req.old_string).decode('utf-8')
             new_string = base64.b64decode(req.new_string).decode('utf-8')
 
             if not os.path.isfile(file_path):
+                SYLogger.error(f"[Sandbox Server] 编辑失败: 文件不存在 {file_path}")
                 return EditResponse(error=f"File '{file_path}' not found")
 
             with open(file_path, 'r') as f:
@@ -389,8 +413,10 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
             count = content.count(old_string)
 
             if count == 0:
+                SYLogger.error(f"[Sandbox Server] 编辑失败: 未找到匹配字符串")
                 return EditResponse(error=f"String not found: '{old_string[:50]}...'")
             if count > 1 and not req.replace_all:
+                SYLogger.error(f"[Sandbox Server] 编辑失败: 多处匹配 ({count}次)")
                 return EditResponse(
                     error=f"String appears {count} times. Use replace_all=True to replace all."
                 )
@@ -403,9 +429,11 @@ def setup_sandbox_handler(app: FastAPI, config: dict = None):
             with open(file_path, 'w') as f:
                 f.write(new_content)
 
+            SYLogger.info(f"[Sandbox Server] 编辑成功: {file_path} (替换 {count} 处)")
             return EditResponse(error=None, path=file_path, occurrences=count)
 
         except Exception as e:
+            SYLogger.error(f"[Sandbox Server] 编辑异常: {e}")
             return EditResponse(error=str(e))
 
     @sandbox_router.post("/upload", response_model=UploadResponse)

{sycommon_python_lib-0.2.1a0 → sycommon_python_lib-0.2.1a2}/src/sycommon_python_lib.egg-info/PKG-INFO

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