sycommon-python-lib 0.2.1a33__tar.gz → 0.2.1a35__tar.gz

{sycommon_python_lib-0.2.1a33 → sycommon_python_lib-0.2.1a35}/PKG-INFO

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

{sycommon_python_lib-0.2.1a33 → sycommon_python_lib-0.2.1a35}/pyproject.toml

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

{sycommon_python_lib-0.2.1a33 → sycommon_python_lib-0.2.1a35}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -546,6 +546,60 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         """异步手动同步所有配置的目录到沙箱"""
         return await asyncio.to_thread(self.sync)
 
+    def sync_dirs(self, dirs: List[tuple[str, str]]) -> dict:
+        """同步指定的目录列表到沙箱
+
+        Args:
+            dirs: 要同步的目录列表 [(本地路径, 沙箱路径), ...]
+
+        Returns:
+            dict: 每个目录的同步结果 {"local_path": {"success": x, "failed": y, "errors": [...]}}
+        """
+        if not dirs:
+            SYLogger.info("[Sandbox] sync_dirs: 没有指定同步目录")
+            return {}
+
+        SYLogger.info(f"[Sandbox] sync_dirs 开始, 共 {len(dirs)} 个目录")
+        results = {}
+        for idx, (local_path, remote_path) in enumerate(dirs):
+            SYLogger.info(f"[Sandbox] 同步目录 [{idx+1}/{len(dirs)}]: {local_path} -> {remote_path}")
+            local_dir = Path(local_path)
+
+            if not local_dir.exists():
+                SYLogger.warning(f"[Sandbox] 本地目录不存在: {local_path}")
+                results[local_path] = {"success": 0, "failed": 0, "errors": [{"error": "目录不存在"}]}
+                continue
+
+            if local_dir.is_dir():
+                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:
+                    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": []}
+
+        SYLogger.info("[Sandbox] sync_dirs 完成")
+        return results
+
+    async def async_sync_dirs(self, dirs: List[tuple[str, str]]) -> dict:
+        """异步同步指定的目录列表到沙箱
+
+        Args:
+            dirs: 要同步的目录列表 [(本地路径, 沙箱路径), ...]
+
+        Returns:
+            dict: 每个目录的同步结果 {"local_path": {"success": x, "failed": y, "errors": [...]}}
+        """
+        return await asyncio.to_thread(self.sync_dirs, dirs)
+
     def _upload_directory_sync(self, local_dir: str, remote_path: str = "/") -> dict:
         """上传整个目录到沙箱（同步版本）
 

{sycommon_python_lib-0.2.1a33 → sycommon_python_lib-0.2.1a35}/src/sycommon/auth/ldap_service.py

@@ -129,14 +129,19 @@ class LDAPAuthService:
         last_error = None
         for url in self.config.urls:
             try:
-                # 创建连接（移除末尾的斜杠）
+                # 创建连接（移除末尾的斜杠，设置连接超时）
                 clean_url = url.rstrip("/")
-                server = ldap3.Server(clean_url, get_info=ldap3.ALL)
+                server = ldap3.Server(
+                    clean_url,
+                    get_info=ldap3.ALL,
+                    connect_timeout=5,  # 连接超时 5 秒
+                )
                 conn = ldap3.Connection(
                     server,
                     user=user_dn,
                     password=password,
                     auto_bind=True,
+                    receive_timeout=10,  # 接收超时 10 秒
                 )
 
                 # 认证成功，获取用户信息
@@ -263,12 +268,17 @@ class LDAPAuthService:
 
         for url in self.config.urls:
             try:
-                server = ldap3.Server(url.rstrip("/"), get_info=ldap3.ALL)
+                server = ldap3.Server(
+                    url.rstrip("/"),
+                    get_info=ldap3.ALL,
+                    connect_timeout=5,
+                )
                 conn = ldap3.Connection(
                     server,
                     user=bind_user,
                     password=self.config.password,
                     auto_bind=True,
+                    receive_timeout=10,
                 )
 
                 # 搜索用户
@@ -308,12 +318,17 @@ class LDAPAuthService:
 
         for url in self.config.urls:
             try:
-                server = ldap3.Server(url.rstrip("/"), get_info=ldap3.ALL)
+                server = ldap3.Server(
+                    url.rstrip("/"),
+                    get_info=ldap3.ALL,
+                    connect_timeout=5,
+                )
                 conn = ldap3.Connection(
                     server,
                     user=bind_user,
                     password=self.config.password,
                     auto_bind=True,
+                    receive_timeout=10,
                 )
                 conn.unbind()
                 SYLogger.info(f"[LDAP] 连接 {url} 验证成功")

{sycommon_python_lib-0.2.1a33 → sycommon_python_lib-0.2.1a35}/src/sycommon_python_lib.egg-info/PKG-INFO

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