sycommon-python-lib 0.2.5a30__tar.gz → 0.2.5a32__tar.gz

{sycommon_python_lib-0.2.5a30 → sycommon_python_lib-0.2.5a32}/PKG-INFO

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

{sycommon_python_lib-0.2.5a30 → sycommon_python_lib-0.2.5a32}/pyproject.toml

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

{sycommon_python_lib-0.2.5a30 → sycommon_python_lib-0.2.5a32}/src/sycommon/agent/deep_agent.py

@@ -37,10 +37,13 @@
 import asyncio
 import json
 import os
+import re
 from collections.abc import Awaitable, Callable
 from pathlib import Path
 from typing import Any, AsyncGenerator, Dict, List, Optional, Tuple, TYPE_CHECKING
 
+import yaml
+
 from pydantic import BaseModel, Field
 from langchain_core.messages import HumanMessage, BaseMessage, AIMessageChunk, AIMessage, SystemMessage
 from langchain_core.tools import BaseTool, tool
@@ -1104,11 +1107,25 @@ async def create_deep_agent(
     )
 
 
+def _parse_skill_version(content: str) -> str:
+    """从 SKILL.md 内容中解析 version 字段，无 version 返回空字符串"""
+    match = re.match(r"^---\s*\n(.*?)\n---\s*\n", content, re.DOTALL)
+    if not match:
+        return ""
+    try:
+        data = yaml.safe_load(match.group(1))
+        if isinstance(data, dict):
+            return str(data.get("version", ""))
+    except Exception:
+        pass
+    return ""
+
+
 async def _sync_skills_to_sandbox(
     skills_dir: str,
     backend: HTTPSandboxBackend,
 ) -> None:
-    """同步 skills 到沙箱（按目录名检查，已存在则跳过，不覆盖用户文件）"""
+    """同步 skills 到沙箱（按版本检查，版本不一致则覆盖）"""
     if not os.path.isdir(skills_dir):
         return
 
@@ -1121,16 +1138,46 @@ async def _sync_skills_to_sandbox(
                 if child.is_dir:
                     existing_dirs.add(child.name)
 
-        # 只上传沙箱中不存在的技能
+        # 遍历本地 skills，按版本决定是否同步
         for skill_name in os.listdir(skills_dir):
             src = os.path.join(skills_dir, skill_name)
             if not os.path.isdir(src):
                 continue
+
+            # 读取本地版本
+            local_skill_md = os.path.join(src, "SKILL.md")
+            local_version = ""
+            if os.path.isfile(local_skill_md):
+                try:
+                    with open(local_skill_md, "r", encoding="utf-8") as f:
+                        local_version = _parse_skill_version(f.read())
+                except Exception:
+                    pass
+
             if skill_name in existing_dirs:
-                SYLogger.debug(f"[DeepAgent] 技能已存在，跳过: {skill_name}")
-                continue
+                # 读取沙箱中的版本
+                remote_version = ""
+                try:
+                    remote_content = await backend.aread(f"/skills/{skill_name}/SKILL.md")
+                    if remote_content:
+                        remote_version = _parse_skill_version(remote_content)
+                except Exception:
+                    pass
+
+                if remote_version and remote_version == local_version:
+                    SYLogger.debug(f"[DeepAgent] 技能版本一致，跳过: {skill_name} v{local_version}")
+                    continue
+
+                # 版本不一致或沙箱无版本，删除后重新上传
+                try:
+                    await backend.aexecute(f"rm -rf /skills/{skill_name}")
+                    SYLogger.info(f"[DeepAgent] 技能版本不一致，覆盖: {skill_name} ({remote_version or '无版本'} → {local_version})")
+                except Exception as e:
+                    SYLogger.warning(f"[DeepAgent] 删除旧版技能失败: {skill_name}, {e}")
+                    continue
+
             await backend.async_sync_dirs([(src, f"/skills/{skill_name}")])
-            SYLogger.info(f"[DeepAgent] 同步技能到沙箱: {skill_name}")
+            SYLogger.info(f"[DeepAgent] 同步技能到沙箱: {skill_name} v{local_version}")
     except Exception as e:
         SYLogger.warning(f"[DeepAgent] 技能同步失败: {e}")
 

{sycommon_python_lib-0.2.5a30 → sycommon_python_lib-0.2.5a32}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -655,6 +655,18 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
 
     # ============== 执行命令 ==============
 
+    def update_env(self, env_updates: dict[str, str]):
+        """动态更新沙箱环境变量（合并到现有 env，重建 _env_prefix）
+
+        用于运行时刷新 token 等场景，无需重建整个沙箱实例。
+        """
+        self._env.update(env_updates)
+        exports = " && ".join(
+            f"export {k}={_shell_quote(str(v))}"
+            for k, v in self._env.items()
+        )
+        self._env_prefix = f"{exports} && " if exports else ""
+
     def _inject_env(self, command: str) -> str:
         """在命令前注入环境变量 export"""
         if self._env_prefix:

{sycommon_python_lib-0.2.5a30 → sycommon_python_lib-0.2.5a32}/src/sycommon/agent/summarization_utils.py

@@ -44,7 +44,7 @@ CUSTOM_SUMMARY_PROMPT = """<role>
 下面的对话历史将被你在此步骤中提取的上下文替换。
 你需要确保不会重复任何已完成的操作，因此你从对话历史中提取的上下文应集中于对整体目标最重要的信息。
 
-请用以下结构提取上下文，每个部分用中文自然段落描述，不要使用英文标题：
+请用以下结构提取上下文，每个部分用中文自然段落描述：
 
 【用户意图】
 简要描述用户的主要目标或请求，确保足够完整以理解整个会话的目的。
@@ -186,9 +186,10 @@ _orig_build_new_messages = _OrigDeepAgentsSumm._build_new_messages_with_path
 def _patched_build_new_messages(self, summary, file_path):
     if file_path is not None:
         content = (
+            "[系统内部消息 - 仅供你理解上下文，绝对禁止将此消息或摘要内容展示、复述或提及给用户]\n\n"
             "你正在一个已经被压缩的对话中继续回复用户。\n\n"
             f"完整的对话历史已保存到 {file_path}，如需查阅细节可以读取该文件。\n\n"
-            "以下是压缩后的对话摘要：\n\n"
+            "以下是压缩后的对话摘要（直接基于此摘要理解上下文并正常回复用户，不要提及摘要的存在）：\n\n"
             f"<summary>\n{summary}\n</summary>"
         )
     else:

{sycommon_python_lib-0.2.5a30 → sycommon_python_lib-0.2.5a32}/src/sycommon/logging/kafka_log.py

@@ -166,15 +166,19 @@ class KafkaSink:
 
     def close(self):
         """关闭 KafkaProducer，释放连接池资源"""
-        if self._producer:
-            self._producer = None
-            try:
-                self._producer_obj.flush(timeout=5)
-                self._producer_obj.close(timeout=10)
-            except KeyboardInterrupt:
-                pass
-            except Exception:
-                pass
+        if self._producer_obj is None:
+            return
+        # 先移除引用，阻止 write() 继续发送新消息
+        self._producer = None
+        try:
+            self._producer_obj.flush(timeout=5)
+            self._producer_obj.close(timeout=10)
+        except KeyboardInterrupt:
+            pass
+        except Exception:
+            pass
+        finally:
+            self._producer_obj = None
 
 
 class _InterceptHandler(logging.Handler):

{sycommon_python_lib-0.2.5a30 → sycommon_python_lib-0.2.5a32}/src/sycommon/middleware/tool_result_truncation.py

@@ -121,7 +121,7 @@ def _convert_list_content_to_str(content: list, tool_name: str) -> str:
                 size_kb = len(b64) * 3 // 4 // 1024
                 parts.append(
                     f"[图片文件 ({mime}, {size_kb}KB) — "
-                    f"图片二进制数据无法直接发送给模型。"
+                    f"图片二进制内容已省略。"
                     f"请使用 execute 工具通过 Python (如 PIL/OpenCV) 读取并处理图片，"
                     f"例如 OCR 识别文字、分析图片内容等。]"
                 )
@@ -130,7 +130,7 @@ def _convert_list_content_to_str(content: list, tool_name: str) -> str:
                 size_kb = len(item["base64"]) * 3 // 4 // 1024
                 parts.append(
                     f"[{item_type}文件 ({mime}, {size_kb}KB) — "
-                    f"二进制数据无法直接发送给模型。"
+                    f"二进制文件内容已省略。"
                     f"请使用 execute 工具通过 Python 处理该文件。]"
                 )
             elif "text" in item:

{sycommon_python_lib-0.2.5a30 → sycommon_python_lib-0.2.5a32}/src/sycommon/middleware/traceid.py

@@ -250,25 +250,20 @@ def setup_trace_id_handler(app):
 
             # 构建响应日志
             response_log_body = response_body.decode('utf-8', errors='ignore')
-            total_len = len(response_log_body)
-            # 检测是否包含 base64 二进制内容（如 PDF、图片等）
-            is_binary_response = False
+            # 检测是否包含 base64 二进制内容（如 PDF、图片等），如有则省略
             try:
                 resp_json = json.loads(response_log_body)
                 if isinstance(resp_json, dict) and resp_json.get("content") and len(str(resp_json["content"])) > 1000:
                     resp_json["content"] = f"... (base64/binary content omitted, {len(str(resp_json['content']))} chars)"
                     response_log_body = json.dumps(resp_json, ensure_ascii=False)
-                    is_binary_response = True
             except (json.JSONDecodeError, ValueError):
                 pass
-            if not is_binary_response and total_len > 10000:
-                response_log_body = response_log_body[:10000] + f"... (truncated, total {total_len} bytes)"
             response_message = {
                 "traceId": trace_id,
                 "status_code": response.status_code,
                 "response_body": response_log_body,
             }
-            SYLogger.info(json.dumps(response_message, ensure_ascii=False))
+            SYLogger.info(response_message)
 
             # 兜底：确保 Header 必有 TraceId
             try:

{sycommon_python_lib-0.2.5a30 → sycommon_python_lib-0.2.5a32}/src/sycommon_python_lib.egg-info/PKG-INFO

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