sycommon-python-lib 0.2.1a24__tar.gz → 0.2.1a26__tar.gz

{sycommon_python_lib-0.2.1a24 → sycommon_python_lib-0.2.1a26}/PKG-INFO

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

{sycommon_python_lib-0.2.1a24 → sycommon_python_lib-0.2.1a26}/pyproject.toml

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

{sycommon_python_lib-0.2.1a24 → sycommon_python_lib-0.2.1a26}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -136,6 +136,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         Raises:
             RuntimeError: 无法发现服务实例或 NacosService 未初始化
         """
+        SYLogger.info(f"[Sandbox] from_nacos 开始: service_name={service_name}, user_id={user_id}")
         from sycommon.synacos.nacos_service import NacosService
 
         # 获取单例实例
@@ -147,6 +148,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 "NacosService 未初始化，请确保服务启动时已调用 NacosService.setup_nacos(config)"
             )
 
+        SYLogger.info(f"[Sandbox] 正在查询 Nacos 服务实例...")
         instances = nacos_manager.get_service_instances(
             service_name, group=group, target_version=version
         )
@@ -158,7 +160,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         instance = instances[0]
         base_url = f"http://{instance['ip']}:{instance['port']}"
 
-        SYLogger.info(f"Nacos 发现沙箱服务: {service_name} -> {base_url}")
+        SYLogger.info(f"[Sandbox] Nacos 发现沙箱服务: {service_name} -> {base_url}")
 
         return cls(
             base_url=base_url,
@@ -249,18 +251,25 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         if trace_id:
             headers["x-traceid-header"] = str(trace_id)
 
+        url = f"{self._base_url}{endpoint}"
+        SYLogger.info(f"[Sandbox] POST 请求开始: {url}, timeout={http_timeout}s")
+
         for attempt in range(max_retries):
             try:
+                SYLogger.info(f"[Sandbox] POST 尝试 {attempt + 1}/{max_retries}: {url}")
                 resp = requests.post(
-                    f"{self._base_url}{endpoint}",
+                    url,
                     json=data,
                     headers=headers if headers else None,
                     timeout=http_timeout
                 )
+                SYLogger.info(f"[Sandbox] POST 响应状态码: {resp.status_code}")
                 if resp.status_code >= 400:
                     SYLogger.error(f"[Sandbox] HTTP 错误 {resp.status_code}: {resp.text}")
                     resp.raise_for_status()
-                return resp.json()
+                result = resp.json()
+                SYLogger.info(f"[Sandbox] POST 成功: {url}")
+                return result
 
             except (requests.exceptions.RequestException, requests.exceptions.HTTPError) as e:
                 SYLogger.warning(f"[Sandbox] 请求失败 (尝试 {attempt + 1}/{max_retries}): {self._base_url} - {e}")
@@ -300,8 +309,9 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
 
     def execute(self, command: str, *, timeout: int = None) -> ExecuteResponse:
         """执行 shell 命令"""
+        SYLogger.info(f"[Sandbox] execute 开始: command={command}")
         self._ensure_synced_sync()
-        SYLogger.info(f"[Sandbox] 执行命令: {command}")
+        SYLogger.info(f"[Sandbox] _ensure_synced_sync 完成，开始执行命令: {command}")
         try:
             result = self._post_sync(f"{SANDBOX_API_PREFIX}/execute", {
                 "command": command,
@@ -378,44 +388,61 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
 
     # ============== 目录同步 ==============
 
-    def _sync_sync(self):
+    def _sync_sync(self) -> dict:
         """同步目录（同步版本）"""
         if not self._sync_dirs:
             SYLogger.info("[Sandbox] 没有配置同步目录")
-            return
+            return {}
 
-        for local_path, remote_path in self._sync_dirs:
-            SYLogger.info(f"[Sandbox] 同步目录: {local_path} -> {remote_path}")
+        SYLogger.info(f"[Sandbox] _sync_sync 开始, 共 {len(self._sync_dirs)} 个目录")
+        results = {}
+        for idx, (local_path, remote_path) in enumerate(self._sync_dirs):
+            SYLogger.info(f"[Sandbox] 同步目录 [{idx+1}/{len(self._sync_dirs)}]: {local_path} -> {remote_path}")
             local_dir = Path(local_path)
 
             if not local_dir.exists():
                 SYLogger.error(f"[Sandbox] 本地目录不存在: {local_path}")
+                results[local_path] = {"success": 0, "failed": 0, "errors": [{"error": "目录不存在"}]}
                 continue
 
             if local_dir.is_dir():
-                self._upload_directory_sync(str(local_dir), remote_path)
+                SYLogger.info(f"[Sandbox] 开始上传目录: {local_path}")
+                result = self._upload_directory_sync(str(local_dir), remote_path)
+                results[local_path] = result
+                SYLogger.info(f"[Sandbox] 目录上传完成: {local_path}, 成功={result['success']}, 失败={result['failed']}")
             else:
                 # 单文件
+                SYLogger.info(f"[Sandbox] 上传单文件: {local_path}")
                 with open(local_dir, "rb") as f:
                     content = f.read()
                 upload_results = self.upload_files([(remote_path, content)])
                 if upload_results[0].error:
-                    SYLogger.error(f"[Sandbox] 上传文件失败: {upload_results[0].error}")
+                    results[local_path] = {"success": 0, "failed": 1, "errors": [{"path": remote_path, "error": upload_results[0].error}]}
+                else:
+                    results[local_path] = {"success": 1, "failed": 0, "errors": []}
 
         self._synced = True
-        SYLogger.info("[Sandbox] 目录同步完成")
+        SYLogger.info("[Sandbox] _sync_sync 完成")
+        return results
 
     def sync(self) -> dict:
-        """手动同步所有配置的目录到沙箱"""
-        self._sync_sync()
-        return {"status": "completed"}
+        """手动同步所有配置的目录到沙箱
+
+        Returns:
+            dict: 每个目录的同步结果 {"local_path": {"success": x, "failed": y, "errors": [...]}}
+        """
+        return self._sync_sync()
 
     async def async_sync(self) -> dict:
         """异步手动同步所有配置的目录到沙箱"""
         return await asyncio.to_thread(self.sync)
 
-    def _upload_directory_sync(self, local_dir: str, remote_path: str = "/"):
-        """上传整个目录到沙箱（同步版本）"""
+    def _upload_directory_sync(self, local_dir: str, remote_path: str = "/") -> dict:
+        """上传整个目录到沙箱（同步版本）
+
+        Returns:
+            dict: {"success": int, "failed": int, "errors": list}
+        """
         local_path = Path(local_dir)
         if not local_path.exists():
             raise FileNotFoundError(f"本地目录不存在: {local_dir}")
@@ -423,6 +450,8 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         if not local_path.is_dir():
             raise NotADirectoryError(f"路径不是目录: {local_dir}")
 
+        SYLogger.info(f"[Sandbox] _upload_directory_sync 开始: {local_dir} -> {remote_path}")
+
         exclude_patterns = [".git", "__pycache__", ".pyc", ".DS_Store", "node_modules"]
 
         def should_exclude(name: str) -> bool:
@@ -450,8 +479,15 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
 
         SYLogger.info(f"[Sandbox] 准备上传 {len(files_to_upload)} 个文件到沙箱")
 
-        for sandbox_path, local_file in files_to_upload:
+        success_count = 0
+        failed_count = 0
+        errors = []
+
+        for idx, (sandbox_path, local_file) in enumerate(files_to_upload):
             try:
+                if idx % 10 == 0:
+                    SYLogger.info(f"[Sandbox] 上传进度: {idx}/{len(files_to_upload)}")
+
                 with open(local_file, "rb") as f:
                     content = f.read()
 
@@ -462,10 +498,17 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 })
 
                 if result.get("error"):
-                    SYLogger.warning(f"[Sandbox] 上传失败: {sandbox_path} - {result['error']}")
+                    failed_count += 1
+                    errors.append({"path": sandbox_path, "error": result["error"]})
+                else:
+                    success_count += 1
 
             except Exception as e:
-                SYLogger.warning(f"[Sandbox] 上传异常: {sandbox_path} - {e}")
+                failed_count += 1
+                errors.append({"path": sandbox_path, "error": str(e)})
+
+        SYLogger.info(f"[Sandbox] _upload_directory_sync 完成: 成功={success_count}, 失败={failed_count}")
+        return {"success": success_count, "failed": failed_count, "errors": errors}
 
     def _sync_workspace_sync(self) -> dict:
         """同步用户工作空间的所有文件（同步版本）"""

{sycommon_python_lib-0.2.1a24 → sycommon_python_lib-0.2.1a26}/src/sycommon_python_lib.egg-info/PKG-INFO

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