sycommon-python-lib 0.2.2a5__py3-none-any.whl → 0.2.2a7__py3-none-any.whl

sycommon/agent/sandbox/http_sandbox_backend.py

@@ -388,7 +388,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         session = await self._get_aiohttp_session()
 
         async def _do_request():
-            async with session.post(url, json=data, headers=headers, timeout=aiohttp.ClientTimeout(total=http_timeout)) as resp:
+            async with session.post(url, json=data, headers=headers) as resp:
                 SYLogger.info(f"[Sandbox] Async POST 响应状态码: {resp.status}")
                 if resp.status >= 400:
                     text = await resp.text()
@@ -486,9 +486,8 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         # 从沙箱服务端 health 接口获取（aiohttp 异步）
         try:
             url = f"{self._base_url}{SANDBOX_API_PREFIX}/health"
-            timeout_obj = aiohttp.ClientTimeout(total=10)
             session = await self._get_aiohttp_session()
-            async with session.get(url, timeout=timeout_obj) as resp:
+            async with session.get(url) as resp:
                 if resp.status == 200:
                     data = await resp.json()
                     workspace = data.get("workspace", "")
@@ -744,13 +743,12 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         actual_timeout = timeout if timeout is not None else self._timeout
         url = f"{self._base_url}{SANDBOX_API_PREFIX}/execute_stream"
         session = await self._get_aiohttp_session()
-        timeout_obj = aiohttp.ClientTimeout(total=actual_timeout + 60)
 
         async with session.post(url, json={
             "command": command.strip(),
             "user_id": self._user_id,
             "timeout": actual_timeout
-        }, timeout=timeout_obj) as resp:
+        }) as resp:
             resp.raise_for_status()
             buffer = ""
             async for chunk in resp.content.iter_any():
@@ -858,7 +856,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 results.append(FileUploadResponse(path=path, error=str(e)))
         return results
 
-    async def aupload_files(self, files: List[tuple[str, bytes]]) -> List[FileUploadResponse]:
+    async def aupload_files(self, files: List[tuple[str, bytes]], *, timeout: int = None) -> List[FileUploadResponse]:
         """异步上传多个文件（真正的异步实现，使用 /batch_upload）"""
         if not files:
             return []
@@ -870,7 +868,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             result = await self._post_async_with_failover(f"{SANDBOX_API_PREFIX}/batch_upload", {
                 "files": batch,
                 "user_id": self._user_id
-            })
+            }, timeout=timeout)
             return [
                 FileUploadResponse(path=r.get("path", ""), error=r.get("error"))
                 for r in result.get("results", [])
@@ -884,7 +882,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                         "path": path,
                         "content": base64.b64encode(content).decode(),
                         "user_id": self._user_id
-                    })
+                    }, timeout=timeout)
                     results.append(FileUploadResponse(path=r["path"], error=r.get("error")))
                 except Exception as ex:
                     results.append(FileUploadResponse(path=path, error=str(ex)))
@@ -911,14 +909,15 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                 results.append(FileDownloadResponse(path=path, error=str(e)))
         return results
 
-    async def adownload_files(self, paths: List[str]) -> List[FileDownloadResponse]:
+    async def adownload_files(self, paths: List[str], *, timeout: int = None) -> List[FileDownloadResponse]:
         """异步下载多个文件（真正的异步实现）"""
         results = []
         for path in paths:
             try:
                 result = await self._post_async_with_failover(
                     f"{SANDBOX_API_PREFIX}/download",
-                    {"path": path, "user_id": self._user_id}
+                    {"path": path, "user_id": self._user_id},
+                    timeout=timeout
                 )
                 if result.get("error"):
                     results.append(FileDownloadResponse(
@@ -1303,8 +1302,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         try:
             url = f"{self._base_url}{SANDBOX_API_PREFIX}/health"
             session = await self._get_aiohttp_session()
-            timeout_obj = aiohttp.ClientTimeout(total=10)
-            async with session.get(url, timeout=timeout_obj) as resp:
+            async with session.get(url) as resp:
                 resp.raise_for_status()
                 result = await resp.json()
                 SYLogger.info(f"[Sandbox] 异步健康检查成功: {result}")

sycommon/middleware/traceid.py

@@ -77,7 +77,7 @@ def setup_trace_id_handler(app):
             "method": request.method,
             "url": str(request.url),
             "query_params": query_params,
-            "request_body": request_body,
+            "request_body": request_body if not files_info else f"[文件上传] {list(files_info.values())}",
             "uploaded_files": files_info if files_info else None
         }
         SYLogger.info(json.dumps(request_message, ensure_ascii=False))
@@ -245,10 +245,13 @@ def setup_trace_id_handler(app):
                 pass
 
             # 构建响应日志
+            response_log_body = response_body.decode('utf-8', errors='ignore')
+            if len(response_log_body) > 10000:
+                response_log_body = response_log_body[:10000] + f"... (truncated, total {len(response_body)} bytes)"
             response_message = {
                 "traceId": trace_id,
                 "status_code": response.status_code,
-                "response_body": response_body.decode('utf-8', errors='ignore'),
+                "response_body": response_log_body,
             }
             SYLogger.info(json.dumps(response_message, ensure_ascii=False))
 

{sycommon_python_lib-0.2.2a5.dist-info → sycommon_python_lib-0.2.2a7.dist-info}/METADATA

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

{sycommon_python_lib-0.2.2a5.dist-info → sycommon_python_lib-0.2.2a7.dist-info}/RECORD

@@ -133,7 +133,7 @@ sycommon/agent/deep_agent.py,sha256=PUJpvGQNEIgE2TXBvb2i_ux_iDCIl-sQ8iqIS1skXRo,
 sycommon/agent/multi_agent_team.py,sha256=VIV4r_lxXB6ciLOsoFeF-99l8Rv1jWg4G6QpE5J4cBc,26106
 sycommon/agent/sandbox/__init__.py,sha256=qEgMJ2FFw0xJsA53M1Ji8kP6wIi_QkTICQYbWN-1h3M,4514
 sycommon/agent/sandbox/file_ops.py,sha256=AY9vi0285iYYpT8-Dzr9zu1uWgr3RNcdTk2KPXY0cfI,22888
-sycommon/agent/sandbox/http_sandbox_backend.py,sha256=tq7ktX8O-psQVFgfHdvLHbCiJFXacaCgd5rBgTLlatA,56347
+sycommon/agent/sandbox/http_sandbox_backend.py,sha256=0rOsbUv5UJYxwwBujTrJ-32sYelTtnjbn1OTk1lqPpY,56165
 sycommon/agent/sandbox/sandbox_pool.py,sha256=eMn8sLakCWf90l6ni2-333QM8oBdX1CflV-WzneFp_k,9133
 sycommon/agent/sandbox/sandbox_recovery.py,sha256=VDhFI1q9DzSs5B3s2gee1mTmXQoxs0UCXzDrqNQ7VBY,7295
 sycommon/agent/sandbox/session.py,sha256=TjzC3yFC-VaJ75UwCyL26QX4PRTGNNfQae1FKFuOsYI,2365
@@ -199,7 +199,7 @@ sycommon/middleware/mq.py,sha256=9X6KKtadFjBXKS5L3kEKujYio9wwGfWgXwWOAHO-HDg,254
 sycommon/middleware/sandbox.py,sha256=1PA1E3WPP1_GLHyg0hxcQ47Cxo9ib_bhFg4F5yFjn9c,60802
 sycommon/middleware/timeout.py,sha256=KlxOPa8xl2dg6yuRi_EzkVJG8bX4stb5ueYxctzzGM8,1433
 sycommon/middleware/token_tracking.py,sha256=rEbgV1bgWMdzAERx4aq5XAvOIT6jTY_tK1P0xHJnL3o,6609
-sycommon/middleware/traceid.py,sha256=rJ6yLkYJi-x_Vq41xzkfAAc4xDts2IpPmDcKN8hYuv8,13065
+sycommon/middleware/traceid.py,sha256=mUvx0TQUD6X3Qo0sOAaLXoC7KcCHz2BLWkKGZ3POves,13348
 sycommon/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/models/base_http.py,sha256=EICAAibx3xhjBsLqm35Mi3DCqxp0FME4rD_3iQVjT_E,3051
 sycommon/models/log.py,sha256=rZpj6VkDRxK3B6H7XSeWdYZshU8F0Sks8bq1p6pPlDw,500
@@ -253,8 +253,8 @@ sycommon/tools/syemail.py,sha256=BDFhgf7WDOQeTcjxJEQdu0dQhnHFPO_p3eI0-Ni3LhQ,561
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
 sycommon/xxljob/__init__.py,sha256=7eoBlQxv-B39IfRSCY2bkqdGYs1QRe1umAWd88VMEEM,86
 sycommon/xxljob/xxljob_service.py,sha256=JIEJaGXhqrTLcyxlyynSrsHg9bBnDNzX-D4qIWLRPUE,6815
-sycommon_python_lib-0.2.2a5.dist-info/METADATA,sha256=oI-21bOsIGa6w5YvL46xxrvrnj2EOQLk5dH6EXaTwC0,7683
-sycommon_python_lib-0.2.2a5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sycommon_python_lib-0.2.2a5.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.2a5.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.2a5.dist-info/RECORD,,
+sycommon_python_lib-0.2.2a7.dist-info/METADATA,sha256=Gf5CzRWkW4TvNxB4FdO9g6x5tUwVTM9Hv8RcPk_7ckg,7683
+sycommon_python_lib-0.2.2a7.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sycommon_python_lib-0.2.2a7.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.2a7.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.2a7.dist-info/RECORD,,