sycommon-python-lib 0.2.7a13__tar.gz → 0.2.7a15__tar.gz

{sycommon_python_lib-0.2.7a13 → sycommon_python_lib-0.2.7a15}/PKG-INFO

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

{sycommon_python_lib-0.2.7a13 → sycommon_python_lib-0.2.7a15}/pyproject.toml

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

{sycommon_python_lib-0.2.7a13 → sycommon_python_lib-0.2.7a15}/src/sycommon/agent/deep_agent.py

@@ -374,6 +374,8 @@ class AgentConfig(BaseModel):
     internal_model_name: Optional[str] = None
     # 敏感检测提示词（应用层可覆盖）；未传(None)用基础库 DEFAULT_DETECT_PROMPT
     sensitive_detect_prompt: Optional[str] = None
+    # 命中敏感后的动作："downgrade"=降级内部模型继续；"block"=直接阻断不执行
+    sensitive_action: str = "downgrade"
 
     # 系统提示词
     system_prompt: str = DEFAULT_SYSTEM_PROMPT
@@ -1237,11 +1239,13 @@ async def create_deep_agent(
     #    internal_model_name 由应用层透传（避免基础库硬编码应用常量）；
     #    未传(None)时 middleware 内部用 get_llm() 读 nacos default 模型兜底。
     #    sensitive_detect_prompt 由应用层透传覆盖默认检测提示词。
+    #    sensitive_action 决定命中后降级还是阻断。
     guard = SensitiveGuardMiddleware(
         model_tier=config.model_tier,
         enabled=config.sensitive_guard,
         internal_model_name=config.internal_model_name,
         detect_prompt=config.sensitive_detect_prompt,
+        action=config.sensitive_action,
     )
 
     middleware_list = [
@@ -1416,8 +1420,22 @@ async def _sync_skills_to_sandbox(
                     _skip_lazy_sync=True)
                 if remote_content and remote_content.file_data:
                     # FileData 是 TypedDict(dict), 用键访问而非属性
-                    return _parse_skill_version(
-                        remote_content.file_data.get("content", "") or "")
+                    content = remote_content.file_data.get("content", "") or ""
+                    # 优先直接解 version(明文小文件最快);
+                    # 解不出再兜底解码 base64——沙箱 /read 对大文件(如 skill-creator 的
+                    # 34KB SKILL.md)返回 base64, 但 encoding 标志位可能漏标/误标,
+                    # 若依赖该标志位,漏标时会因找不到 "version:" 行误判为"无版本"
+                    # → 每次新建 Agent 都全量重传。改为「先解 → 解不出再 b64 兜底」,
+                    # 不依赖 encoding 字段, 对明文/base64 两种返回都正确。
+                    version = _parse_skill_version(content)
+                    if version:
+                        return version
+                    try:
+                        import base64 as _b64
+                        decoded = _b64.b64decode(content).decode("utf-8", errors="replace")
+                        return _parse_skill_version(decoded)
+                    except Exception:
+                        return ""
             except Exception:
                 pass
             return ""

{sycommon_python_lib-0.2.7a13 → sycommon_python_lib-0.2.7a15}/src/sycommon/agent/middleware/sensitive_guard.py

@@ -10,7 +10,7 @@
 共享同一实例，避免敏感数据通过委派链继续流向外部模型。
 
 agent 本就是内部模型（model_tier="internal"）时短路放行，不检测。
-检测失败 fail-close（视为敏感，降级内部模型）。
+检测失败 fail-open（视为不敏感，放行）。
 """
 import asyncio
 from typing import Any, Awaitable, Callable, List, Optional
@@ -18,7 +18,7 @@ from typing import Any, Awaitable, Callable, List, Optional
 from langchain.agents.middleware.types import (
     AgentMiddleware, ContextT, ModelRequest, ModelResponse, ResponseT,
 )
-from langchain_core.messages import BaseMessage, HumanMessage
+from langchain_core.messages import BaseMessage, HumanMessage, AIMessage
 from pydantic import BaseModel
 
 from sycommon.logging.kafka_log import SYLogger
@@ -228,6 +228,10 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         state: Optional[DowngradeState] = None,
         # 应用层可覆盖检测提示词；未传(None)用 DEFAULT_DETECT_PROMPT
         detect_prompt: Optional[str] = None,
+        # 命中敏感后的动作："downgrade"=降级内部模型继续；"block"=直接阻断(不调任何模型)
+        action: str = "downgrade",
+        # 阻断模式下的异步提示回调（与 on_downgrade 区分文案）；downgrade 模式不用
+        on_block: Optional[Callable[[], Awaitable[None]]] = None,
         # 测试注入：绕过懒加载的真实 get_llm
         _detector: Any = None,
         _internal_raw: Any = None,
@@ -236,6 +240,8 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         # None 时检测器/降级目标都用 get_llm() 读 nacos default 模型，不写死模型名
         self._internal_name = internal_model_name
         self._on_downgrade = on_downgrade
+        self._on_block = on_block
+        self._action = action if action in ("downgrade", "block") else "downgrade"
         self._enabled = enabled
         self._state = state or DowngradeState()
         self._detect_prompt = detect_prompt or DEFAULT_DETECT_PROMPT
@@ -247,6 +253,15 @@ class SensitiveGuardMiddleware(AgentMiddleware):
     def is_downgraded(self) -> bool:
         return self._state.is_downgraded
 
+    @property
+    def is_blocked(self) -> bool:
+        """本会话是否已阻断（命中过敏感且 action=block）。"""
+        return self._state.is_downgraded and self._action == "block"
+
+    @property
+    def action(self) -> str:
+        return self._action
+
     @property
     def last_notice_source(self) -> str:
         """首次命中时的敏感来源(user_input/tool_result/history)，供应用层选文案。"""
@@ -286,16 +301,14 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         return self._internal_raw
 
     async def _detect(self, messages: List[BaseMessage]) -> SensitiveCheck:
-        """一次检测：命中即返回 SensitiveCheck。fail-close（异常→视为敏感）。
+        """一次检测：命中即返回 SensitiveCheck。fail-open（识别不出来→视为不敏感放行）。
 
         稳定性策略：
         - 检测提示词只描述「判什么敏感」，不要求模型自己格式化输出；
         - 直接用 detector.ainvoke 拿原始文本，本方法用正则提 {…} 再 Pydantic 解析；
         - 单轮、零修正重试，避免 with_structured_output 的解析重试烧 token。
-        解析失败时 fail-close 视为敏感（宁可错杀不让敏感外泄）。
+        识别失败时 fail-open 视为不敏感（默认放行），避免误伤正常请求。
         """
-        import json
-        import re
         content = _messages_to_text(messages)
         try:
             detector = await self._get_detector()
@@ -321,13 +334,15 @@ class SensitiveGuardMiddleware(AgentMiddleware):
             text = raw.content if isinstance(raw, BaseMessage) else str(raw)
             check = _parse_detect_json(text)
             if check is None:
+                # fail-open：识别不出来默认放行（不阻断/不降级），仅告警便于排查。
                 SYLogger.warning(
-                    f"[SensitiveGuard] 检测无有效JSON(fail-close→内部模型): {text[:500]!r}")
-                return SensitiveCheck(is_sensitive=True, reason="no_json_in_detect_output")
+                    f"[SensitiveGuard] 检测无有效JSON(fail-open→放行): {text[:300]!r}")
+                return SensitiveCheck(is_sensitive=False, reason="no_json_in_detect_output")
             return check
         except Exception as e:
-            SYLogger.warning(f"[SensitiveGuard] 检测异常(fail-close→内部模型): {e}")
-            return SensitiveCheck(is_sensitive=True, reason=f"detect_error:{e}")
+            # fail-open：检测异常默认放行，避免检测器自身故障拖垮正常对话。
+            SYLogger.warning(f"[SensitiveGuard] 检测异常(fail-open→放行): {e}")
+            return SensitiveCheck(is_sensitive=False, reason=f"detect_error:{e}")
 
     async def awrap_model_call(
         self,
@@ -338,10 +353,14 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         if not self._enabled or self._model_tier == "internal":
             return await handler(request)
 
-        # (b) 本会话已降级 → 直接路由内部模型，不再检测；
-        #     但本次输入若本身不含敏感（敏感来自历史记忆），刷新 last_source=history，
-        #     供应用层在「后续命中」时选「记忆」提示文案（NOTICE_FROM_HISTORY）。
+        # (b) 本会话已命中敏感
         if self._state.is_downgraded:
+            # 阻断模式：直接返回空响应，不再调任何模型；应用层发完提示后会 break stream。
+            # 这里构造一个 content 空的 AIMessage，让 langgraph 把本轮当作模型已回完，
+            # 不进工具循环（无 tool_calls），干净结束。
+            if self._action == "block":
+                return ModelResponse(result=[AIMessage(content="")])
+            # 降级模式：路由内部模型继续；本次输入若非敏感(来自历史记忆)刷新 source=history
             await self._refresh_source_if_history(request.messages)
             return await handler(request.override(model=await self._get_internal_raw()))
 
@@ -350,8 +369,19 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         if not check.is_sensitive:
             return await handler(request)
 
-        # (d) 命中 → CAS 抢占降级；仅首个命中者发提示（带来源）
+        # (d) 命中 → CAS 抢占；按 action 分流
         is_first = await self._state.mark_downgraded(check.source)
+        if self._action == "block":
+            SYLogger.info(
+                f"[SensitiveGuard] 命中敏感信息，阻断执行: {check.reason} (source={check.source})")
+            if is_first and self._on_block:
+                try:
+                    await self._on_block()
+                except Exception as e:
+                    SYLogger.warning(f"[SensitiveGuard] 阻断提示回调失败: {e}")
+            # 不调 handler，返回空响应结束本轮
+            return ModelResponse(result=[AIMessage(content="")])
+        # downgrade 模式：发提示 + 路由内部模型继续执行
         SYLogger.info(
             f"[SensitiveGuard] 命中敏感信息，降级内部模型: {check.reason} (source={check.source})")
         if is_first and self._on_downgrade:

{sycommon_python_lib-0.2.7a13 → sycommon_python_lib-0.2.7a15}/src/sycommon/agent/multi_agent_team.py

@@ -133,6 +133,7 @@ class TeamConfig(BaseModel):
     sensitive_guard: bool = True        # 是否启用敏感信息检测守卫
     internal_model_name: Optional[str] = None   # 敏感降级目标内部模型名（应用层透传）
     sensitive_detect_prompt: Optional[str] = None  # 敏感检测提示词（应用层覆盖）
+    sensitive_action: str = "downgrade"  # "downgrade"=降级继续；"block"=阻断
 
     coordinator_prompt: str = ""
     coordinator_name: str = "项目经理"
@@ -633,6 +634,7 @@ async def create_multi_agent_team(
             state=shared_downgrade_state,
             internal_model_name=config.internal_model_name,
             detect_prompt=config.sensitive_detect_prompt,
+            action=config.sensitive_action,
         )
 
     middleware = [

{sycommon_python_lib-0.2.7a13 → sycommon_python_lib-0.2.7a15}/src/sycommon_python_lib.egg-info/PKG-INFO

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

{sycommon_python_lib-0.2.7a13 → sycommon_python_lib-0.2.7a15}/tests/test_sensitive_guard.py

@@ -131,8 +131,8 @@ async def test_internal_tier_never_detects():
 
 
 @pytest.mark.asyncio
-async def test_detect_error_fail_close():
-    """detector 抛异常 → fail-close：视为敏感，降级内部模型。"""
+async def test_detect_error_fail_open():
+    """detector 抛异常 → fail-open：视为不敏感，放行。"""
     class _BoomDetector:
         async def ainvoke(self, _prompt):
             raise RuntimeError("detector down")
@@ -142,8 +142,8 @@ async def test_detect_error_fail_close():
         _internal_raw=_FakeModel(),
     )
     _, called, _ = await _run(mw, [HumanMessage(content="x")])
-    assert mw.is_downgraded is True
-    assert called["model"] is not None
+    assert mw.is_downgraded is False       # 检测失败不阻断
+    assert called["model"] is None         # 不降级到内部模型
 
 
 @pytest.mark.asyncio
@@ -193,8 +193,8 @@ async def test_detect_parses_think_tag_wrapped_json():
 
 
 @pytest.mark.asyncio
-async def test_detect_no_json_fail_close():
-    """模型输出无 JSON → fail-close 视为敏感。"""
+async def test_detect_no_json_fail_open():
+    """模型输出无 JSON → fail-open 视为不敏感放行。"""
     class _Detector:
         async def ainvoke(self, _prompt):
             return "我没有按要求输出，无法判断"
@@ -202,7 +202,7 @@ async def test_detect_no_json_fail_close():
     mw = SensitiveGuardMiddleware(
         model_tier="external", _detector=_Detector(), _internal_raw=_FakeModel())
     check = await mw._detect([HumanMessage(content="x")])
-    assert check.is_sensitive is True
+    assert check.is_sensitive is False
 
 
 @pytest.mark.asyncio