sycommon-python-lib 0.2.1a34__tar.gz → 0.2.1a36__tar.gz

{sycommon_python_lib-0.2.1a34 → sycommon_python_lib-0.2.1a36}/PKG-INFO

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

{sycommon_python_lib-0.2.1a34 → sycommon_python_lib-0.2.1a36}/pyproject.toml

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

{sycommon_python_lib-0.2.1a34 → sycommon_python_lib-0.2.1a36}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -117,18 +117,20 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         timeout: int = 120,
         sync_dirs: List[tuple[str, str]] = None,
         auto_sync: bool = False,
+        load_balance: bool = True,
     ) -> "HTTPSandboxBackend":
         """
         从 Nacos 服务发现创建后端实例
 
         Args:
             service_name: Nacos 服务名
-            user_id: 用户ID，用于隔离工作目录
+            user_id: 用户ID，用于隔离工作目录和负载均衡
             group: 服务分组
             version: 服务版本
             timeout: 超时时间
             sync_dirs: 要同步的目录列表 [(本地路径, 沙箱路径), ...]
             auto_sync: 是否在首次文件操作时自动同步
+            load_balance: 是否基于 user_id 进行负载均衡（默认 True）
 
         Returns:
             HTTPSandboxBackend 实例
@@ -138,6 +140,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         """
         SYLogger.info(f"[Sandbox] from_nacos 开始: service_name={service_name}, user_id={user_id}")
         from sycommon.synacos.nacos_service import NacosService
+        import hashlib
 
         # 获取单例实例
         nacos_manager = NacosService(None)
@@ -156,8 +159,17 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         if not instances:
             raise RuntimeError(f"服务 [{service_name}] 无可用实例")
 
-        # 使用第一个实例
-        instance = instances[0]
+        # 基于用户ID的负载均衡：使用哈希选择实例
+        if load_balance and len(instances) > 1:
+            # 使用 user_id 的哈希值来选择实例，确保同一用户始终路由到同一实例
+            hash_value = int(hashlib.md5(user_id.encode()).hexdigest(), 16)
+            instance_index = hash_value % len(instances)
+            instance = instances[instance_index]
+            SYLogger.info(f"[Sandbox] 负载均衡: user_id={user_id} -> instance[{instance_index}/{len(instances)}]")
+        else:
+            # 使用第一个实例
+            instance = instances[0]
+
         base_url = f"http://{instance['ip']}:{instance['port']}"
 
         SYLogger.info(f"[Sandbox] Nacos 发现沙箱服务: {service_name} -> {base_url}")
@@ -546,6 +558,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.1a34 → sycommon_python_lib-0.2.1a36}/src/sycommon_python_lib.egg-info/PKG-INFO

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