sycommon-python-lib 0.2.5a42__py3-none-any.whl → 0.2.6a0__py3-none-any.whl

sycommon/agent/deep_agent.py

@@ -49,6 +49,7 @@ from langchain_core.messages import HumanMessage, BaseMessage, AIMessageChunk, A
 from langchain_core.tools import BaseTool, tool
 
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.tools.snowflake import Snowflake
 from sycommon.llm.get_llm import get_llm
 from sycommon.agent.sandbox.http_sandbox_backend import HTTPSandboxBackend
 from sycommon.agent.sandbox.sandbox_recovery import SandboxRecoveryManager
@@ -447,6 +448,11 @@ class DeepAgent:
         total_input_tokens = 0
         total_output_tokens = 0
 
+        # ── 设置 chat turn 级 trace_id ──
+        # 如果上层（HTTP 中间件等）已设置 trace_id 则沿用，否则生成新的
+        _chat_trace_id = SYLogger.get_trace_id() or str(Snowflake.id)
+        _trace_token = SYLogger.set_trace_id(_chat_trace_id)
+
         try:
             input_state = {"messages": [HumanMessage(content=message)]}
             if rubric:
@@ -911,6 +917,7 @@ class DeepAgent:
                     SYLogger.warning(f"[DeepAgent] Token 兜底统计失败: {te}")
 
             event = ChatEventBuilder.done()
+            event.data["trace_id"] = _chat_trace_id
             if total_input_tokens > 0 or total_output_tokens > 0:
                 event.data["input_tokens"] = total_input_tokens
                 event.data["output_tokens"] = total_output_tokens
@@ -936,9 +943,12 @@ class DeepAgent:
                 await on_event(event)
             yield event
             event = ChatEventBuilder.done()
+            event.data["trace_id"] = _chat_trace_id
             if on_event:
                 await on_event(event)
             yield event
+        finally:
+            SYLogger.reset_trace_id(_trace_token)
 
     # ============== 内部方法 ==============
 
@@ -1267,16 +1277,31 @@ async def _sync_skill_to_minio(
     return count
 
 
+async def _get_minio_skill_version(minio_service, skill_name: str) -> str:
+    """从 MinIO 全局 skills/ 路径下读取技能版本"""
+    try:
+        content = await asyncio.to_thread(
+            minio_service._client.get_object,
+            minio_service._bucket,
+            f"skills/{skill_name}/SKILL.md",
+        )
+        data = content.read()
+        content.close()
+        return _parse_skill_version(data.decode("utf-8"))
+    except Exception:
+        return ""
+
+
 async def _sync_skills_to_sandbox(
     skills_dir: str,
     backend: HTTPSandboxBackend,
 ) -> None:
     """同步技能目录到沙箱和 MinIO（按版本检查，版本不一致则全量覆盖）
 
-    遍历本地 skills_dir 下所有技能子目录，比较本地与沙箱的 SKILL.md version：
-    - 版本一致：跳过
-    - 版本不一致或沙箱无版本：删除旧目录，全量上传到沙箱和 MinIO
-    同步完成后将技能名加入 backend._synced_skills，跳过后续懒同步。
+    版本检查优先级：
+    1. 沙箱 /skills/{name}/SKILL.md — 最快，无需额外 IO
+    2. MinIO skills/{name}/SKILL.md — 沙箱为空时（新 Pod / 新沙箱）的兜底
+    版本一致则跳过，不一致或无版本则全量上传到沙箱和 MinIO。
     """
     if not os.path.isdir(skills_dir):
         return
@@ -1315,9 +1340,9 @@ async def _sync_skills_to_sandbox(
                 except Exception:
                     pass
 
-            # 比较版本：一致则跳过
+            # 比较版本：优先从沙箱读，沙箱无则从 MinIO 读
+            remote_version = ""
             if skill_name in existing_dirs:
-                remote_version = ""
                 try:
                     remote_content = await backend.aread(
                         f"/skills/{skill_name}/SKILL.md")
@@ -1326,14 +1351,26 @@ async def _sync_skills_to_sandbox(
                 except Exception:
                     pass
 
-                if remote_version and remote_version == local_version:
-                    SYLogger.debug(
-                        f"[DeepAgent] 技能版本一致，跳过: {skill_name} v{local_version}")
-                    backend._synced_skills.add(skill_name)
-                    skip_count += 1
-                    continue
+            # 沙箱无版本，尝试从 MinIO 全局 skills/ 读取
+            if not remote_version and minio_service:
+                remote_version = await _get_minio_skill_version(
+                    minio_service, skill_name)
+
+            if remote_version and remote_version == local_version:
+                SYLogger.debug(
+                    f"[DeepAgent] 技能版本一致，跳过: {skill_name} v{local_version}")
+                backend._synced_skills.add(skill_name)
+                skip_count += 1
+                # 沙箱为空但 MinIO 有（版本一致）：只恢复到沙箱，不再上传 MinIO
+                if skill_name not in existing_dirs:
+                    await backend.async_sync_dirs(
+                        [(src, f"/skills/{skill_name}")])
+                    SYLogger.info(
+                        f"[DeepAgent] 从本地恢复技能到沙箱: {skill_name} v{local_version}")
+                continue
 
-                # 版本不一致或沙箱无版本，删除旧目录后全量覆盖
+            # 版本不一致或无版本，删除旧目录后全量覆盖
+            if skill_name in existing_dirs:
                 try:
                     await backend.aexecute(f"rm -rf /skills/{skill_name}")
                     SYLogger.info(

sycommon/agent/multi_agent_team.py

@@ -37,6 +37,7 @@ from langchain_core.messages import HumanMessage, BaseMessage
 from langchain_core.tools import BaseTool, tool
 
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.tools.snowflake import Snowflake
 from sycommon.llm.get_llm import get_llm
 from sycommon.agent.sandbox.http_sandbox_backend import HTTPSandboxBackend
 from sycommon.tools.env import get_env_var
@@ -221,6 +222,10 @@ class MultiAgentTeam:
         current_agent = self.coordinator_name
         seen_tool_call_ids = set()  # 去重：流式分片中同一 tool_call 多次到达
 
+        # ── 设置 chat turn 级 trace_id ──
+        _chat_trace_id = SYLogger.get_trace_id() or str(Snowflake.id)
+        _trace_token = SYLogger.set_trace_id(_chat_trace_id)
+
         try:
             async for chunk in self._astream_with_retry(
                 {"messages": [HumanMessage(content=message)]},
@@ -420,6 +425,7 @@ class MultiAgentTeam:
                 SYLogger.debug(f"[ai_message] {repr(ai_chunk_buffer[:100])}...")
 
             event = ChatEventBuilder.done()
+            event.data["trace_id"] = _chat_trace_id
             if on_event:
                 await on_event(event)
             yield event
@@ -437,9 +443,12 @@ class MultiAgentTeam:
                 await on_event(event)
             yield event
             event = ChatEventBuilder.done()
+            event.data["trace_id"] = _chat_trace_id
             if on_event:
                 await on_event(event)
             yield event
+        finally:
+            SYLogger.reset_trace_id(_trace_token)
 
     # ============== 内部方法 ==============
 

{sycommon_python_lib-0.2.5a42.dist-info → sycommon_python_lib-0.2.6a0.dist-info}/METADATA

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

{sycommon_python_lib-0.2.5a42.dist-info → sycommon_python_lib-0.2.6a0.dist-info}/RECORD

@@ -129,8 +129,8 @@ sycommon/services.py,sha256=pUcV0xFrn1hrArD9YwE8m6CMrrWPwNBAqUIWhgsVkzY,24943
 sycommon/agent/__init__.py,sha256=mxceAeUifQ-DKvWp7ZEJIFlmOCb5wpYHPGQw3rwEN8I,4378
 sycommon/agent/agent_manager.py,sha256=UhhaekEumT7g4v_Z1UB4jTp13X0n8M8erYaQdkGGWkA,13620
 sycommon/agent/chat_events.py,sha256=t7qWa6OrIWLfqtd1AnqaVP67QWkn1JxpCBTZYQpoLuM,14226
-sycommon/agent/deep_agent.py,sha256=KaFYhb6yDcjKPqOS-hUpqzFmmAiuOuCUKMQzkr0W7DU,65273
-sycommon/agent/multi_agent_team.py,sha256=SRCZHswfflU1w38_YaF0pqh20qa5N5xqcGAVCBoZzmM,26675
+sycommon/agent/deep_agent.py,sha256=TY2C4AnF609ZFjjz2OrpcAqjRZ2v2fPFtG7LzpWVpgQ,66892
+sycommon/agent/multi_agent_team.py,sha256=mskS-FJbAB_n5kghjHhiWxpA3L9cD1lObeW_wjrLI6s,27079
 sycommon/agent/summarization_utils.py,sha256=fiwvKYE_eQc1EtBiPT4UyOZoqQdd4JwEsLRDsJNioLQ,14928
 sycommon/agent/mcp/__init__.py,sha256=iKrdDhIrFsNIkqG_kgcwNe-nOiM6uVfolKv44LfQ-FQ,636
 sycommon/agent/mcp/models.py,sha256=zda4ho-UTYOJ5oPAZPZ-vxhfDRLghUCsMroHnA2A2QQ,1490
@@ -282,8 +282,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.5a42.dist-info/METADATA,sha256=1W1XtiQJptn_RJ5dRXRg8br_cDUEl9FK4lCRxu1PCiA,7914
-sycommon_python_lib-0.2.5a42.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sycommon_python_lib-0.2.5a42.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.5a42.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.5a42.dist-info/RECORD,,
+sycommon_python_lib-0.2.6a0.dist-info/METADATA,sha256=SZCYl4eAehrnZBS5MnF5Rr-VMP3XbDcKv5XbHQ8GPhI,7913
+sycommon_python_lib-0.2.6a0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sycommon_python_lib-0.2.6a0.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.6a0.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.6a0.dist-info/RECORD,,