sycommon-python-lib 0.2.1a39__tar.gz → 0.2.1a41__tar.gz

{sycommon_python_lib-0.2.1a39 → sycommon_python_lib-0.2.1a41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.1a39
+Version: 0.2.1a41
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -19,6 +19,7 @@ Requires-Dist: langchain-core>=1.2.20
 Requires-Dist: langchain-openai>=1.1.11
 Requires-Dist: langfuse>=4.0.1
 Requires-Dist: langgraph>=1.1.3
+Requires-Dist: langgraph-checkpoint-redis>=0.4.0
 Requires-Dist: ldap3>=2.9.1
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.6.0

{sycommon_python_lib-0.2.1a39 → sycommon_python_lib-0.2.1a41}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.2.1a39"
+version = "0.2.1a41"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -20,6 +20,7 @@ dependencies = [
     "langchain-openai>=1.1.11",
     "langfuse>=4.0.1",
     "langgraph>=1.1.3",
+    "langgraph-checkpoint-redis>=0.4.0",
     "ldap3>=2.9.1",
     "loguru>=0.7.3",
     "mysql-connector-python>=9.6.0",

{sycommon_python_lib-0.2.1a39 → sycommon_python_lib-0.2.1a41}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -485,15 +485,22 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
             return False
 
     async def _sync_async(self) -> dict:
-        """同步目录（异步版本）"""
+        """同步目录（异步版本）
+
+        sync_dirs 条目支持两种格式:
+            (local_path, remote_path)               -> 全量覆盖
+            (local_path, remote_path, mode)          -> mode="full" 全量覆盖, mode="partial" 跳过已有子目录
+        """
         if not self._sync_dirs:
             SYLogger.info("[Sandbox] 没有配置同步目录")
             return {}
 
         SYLogger.info(f"[Sandbox] _sync_async 开始, 共 {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}")
+        for idx, entry in enumerate(self._sync_dirs):
+            local_path, remote_path = entry[0], entry[1]
+            mode = entry[2] if len(entry) > 2 else "full"
+            SYLogger.info(f"[Sandbox] 同步目录 [{idx+1}/{len(self._sync_dirs)}]: {local_path} -> {remote_path} (mode={mode})")
             local_dir = Path(local_path)
 
             if not local_dir.exists():
@@ -503,7 +510,7 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
 
             if local_dir.is_dir():
                 SYLogger.info(f"[Sandbox] 开始上传目录: {local_path}")
-                result = await self._upload_directory_async(str(local_dir), remote_path)
+                result = await self._upload_directory_async(str(local_dir), remote_path, mode=mode)
                 results[local_path] = result
                 SYLogger.info(f"[Sandbox] 目录上传完成: {local_path}, 成功={result['success']}, 失败={result['failed']}")
             else:
@@ -520,8 +527,16 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         SYLogger.info("[Sandbox] _sync_async 完成")
         return results
 
-    async def _upload_directory_async(self, local_dir: str, remote_path: str = "/") -> dict:
-        """上传整个目录到沙箱（异步版本）"""
+    async def _upload_directory_async(self, local_dir: str, remote_path: str = "/", *, mode: str = "full") -> dict:
+        """上传整个目录到沙箱（异步版本）
+
+        Args:
+            local_dir: 本地目录路径
+            remote_path: 沙箱目标路径
+            mode: 同步模式
+                - "full": 全量覆盖（默认），上传所有文件
+                - "partial": 部分覆盖，查询沙箱已有子目录并跳过同名目录
+        """
         local_path = Path(local_dir)
         if not local_path.exists():
             raise FileNotFoundError(f"本地目录不存在: {local_dir}")
@@ -529,7 +544,24 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         if not local_path.is_dir():
             raise NotADirectoryError(f"路径不是目录: {local_dir}")
 
-        SYLogger.info(f"[Sandbox] _upload_directory_async 开始: {local_dir} -> {remote_path}")
+        SYLogger.info(f"[Sandbox] _upload_directory_async 开始: {local_dir} -> {remote_path} (mode={mode})")
+
+        # partial 模式：查询沙箱已有子目录并跳过
+        existing_subdirs = set()
+        if mode == "partial":
+            try:
+                ls_result = await self._post_async(f"{SANDBOX_API_PREFIX}/ls", {
+                    "path": remote_path,
+                    "user_id": self._user_id
+                })
+                if ls_result and not ls_result.get("error"):
+                    for item in ls_result.get("files", ls_result.get("children", [])):
+                        if item.get("is_dir", False):
+                            existing_subdirs.add(item.get("name", ""))
+                    if existing_subdirs:
+                        SYLogger.info(f"[Sandbox] partial 模式，跳过已有子目录: {existing_subdirs}")
+            except Exception as e:
+                SYLogger.warning(f"[Sandbox] 查询沙箱目录失败，将全量同步: {e}")
 
         exclude_patterns = [".git", "__pycache__", ".pyc", ".DS_Store", "node_modules"]
 
@@ -547,6 +579,19 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
         for root, dirs, files in os.walk(local_path):
             dirs[:] = [d for d in dirs if not should_exclude(d)]
 
+            # 对于 /skills 目录，跳过沙箱中已存在的子目录（只检查最外层）
+            if existing_subdirs:
+                try:
+                    rel = Path(root).relative_to(local_path)
+                    if str(rel) == ".":
+                        before = len(dirs)
+                        skipped_names = [d for d in dirs if d in existing_subdirs]
+                        dirs[:] = [d for d in dirs if d not in existing_subdirs]
+                        if skipped_names:
+                            SYLogger.info(f"[Sandbox] 跳过已有技能目录: {skipped_names}")
+                except ValueError:
+                    pass
+
             for file in files:
                 if should_exclude(file):
                     continue
@@ -558,32 +603,34 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
 
         SYLogger.info(f"[Sandbox] 准备上传 {len(files_to_upload)} 个文件到沙箱")
 
-        success_count = 0
-        failed_count = 0
-        errors = []
+        semaphore = asyncio.Semaphore(10)
 
-        for idx, (sandbox_path, local_file) in enumerate(files_to_upload):
-            try:
+        async def _upload_one(idx, sandbox_path, local_file):
+            async with semaphore:
                 if idx % 10 == 0:
                     SYLogger.info(f"[Sandbox] 上传进度: {idx}/{len(files_to_upload)}")
+                try:
+                    content = await asyncio.to_thread(lambda f=local_file: open(f, "rb").read())
+                    result = await self._post_async(f"{SANDBOX_API_PREFIX}/upload", {
+                        "path": sandbox_path,
+                        "content": base64.b64encode(content).decode(),
+                        "user_id": self._user_id
+                    })
+                    if result.get("error"):
+                        return {"ok": False, "path": sandbox_path, "error": result["error"]}
+                    return {"ok": True}
+                except Exception as e:
+                    return {"ok": False, "path": sandbox_path, "error": str(e)}
 
-                content = await asyncio.to_thread(lambda f=local_file: open(f, "rb").read())
+        upload_tasks = [
+            _upload_one(idx, sandbox_path, local_file)
+            for idx, (sandbox_path, local_file) in enumerate(files_to_upload)
+        ]
+        upload_results = await asyncio.gather(*upload_tasks)
 
-                result = await self._post_async(f"{SANDBOX_API_PREFIX}/upload", {
-                    "path": sandbox_path,
-                    "content": base64.b64encode(content).decode(),
-                    "user_id": self._user_id
-                })
-
-                if result.get("error"):
-                    failed_count += 1
-                    errors.append({"path": sandbox_path, "error": result["error"]})
-                else:
-                    success_count += 1
-
-            except Exception as e:
-                failed_count += 1
-                errors.append({"path": sandbox_path, "error": str(e)})
+        success_count = sum(1 for r in upload_results if r["ok"])
+        failed_count = sum(1 for r in upload_results if not r["ok"])
+        errors = [{"path": r["path"], "error": r["error"]} for r in upload_results if not r["ok"]]
 
         SYLogger.info(f"[Sandbox] _upload_directory_async 完成: 成功={success_count}, 失败={failed_count}")
         return {"success": success_count, "failed": failed_count, "errors": errors}

{sycommon_python_lib-0.2.1a39 → sycommon_python_lib-0.2.1a41}/src/sycommon/models/sso_user.py

@@ -1,11 +1,16 @@
 from pydantic import BaseModel, ConfigDict
+from pydantic.alias_generators import to_camel
 from typing import List, Optional
 from datetime import datetime
 
 
 class SsoUser(BaseModel):
     """SSO用户模型，对应Java的SsoUser类"""
-    model_config = ConfigDict(protected_namespaces=())
+    model_config = ConfigDict(
+        protected_namespaces=(),
+        alias_generator=to_camel,
+        populate_by_name=True,
+    )
     tenant_id: Optional[str] = None
     customer_id: Optional[str] = None
     customer_name: Optional[str] = None

{sycommon_python_lib-0.2.1a39 → sycommon_python_lib-0.2.1a41}/src/sycommon/rabbitmq/rabbitmq_service_producer_manager.py

@@ -209,7 +209,7 @@ class RabbitMQProducerManager(RabbitMQClientManager):
                     request_path="/",
                     req_type="SYSTEM",
                     trace_id=logger.get_trace_id(),
-                ).model_dump_json(),
+                ).model_dump_json(by_alias=True),
                 "trace-id": logger.get_trace_id(),
                 "createTime": str(int(time.time() * 1000)),
             }

{sycommon_python_lib-0.2.1a39 → sycommon_python_lib-0.2.1a41}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.1a39
+Version: 0.2.1a41
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -19,6 +19,7 @@ Requires-Dist: langchain-core>=1.2.20
 Requires-Dist: langchain-openai>=1.1.11
 Requires-Dist: langfuse>=4.0.1
 Requires-Dist: langgraph>=1.1.3
+Requires-Dist: langgraph-checkpoint-redis>=0.4.0
 Requires-Dist: ldap3>=2.9.1
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.6.0

{sycommon_python_lib-0.2.1a39 → sycommon_python_lib-0.2.1a41}/src/sycommon_python_lib.egg-info/requires.txt

@@ -13,6 +13,7 @@ langchain-core>=1.2.20
 langchain-openai>=1.1.11
 langfuse>=4.0.1
 langgraph>=1.1.3
+langgraph-checkpoint-redis>=0.4.0
 ldap3>=2.9.1
 loguru>=0.7.3
 mysql-connector-python>=9.6.0