sycommon-python-lib 0.2.7a14__tar.gz → 0.2.7a16__tar.gz

{sycommon_python_lib-0.2.7a14 → sycommon_python_lib-0.2.7a16}/PKG-INFO

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

{sycommon_python_lib-0.2.7a14 → sycommon_python_lib-0.2.7a16}/pyproject.toml

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

{sycommon_python_lib-0.2.7a14 → sycommon_python_lib-0.2.7a16}/src/sycommon/agent/deep_agent.py

@@ -374,8 +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"
+    # 命中敏感后的动作："allow"=不检测放行；"downgrade"=降级内部模型继续；"block"=直接阻断不执行
+    sensitive_action: str = "allow"
 
     # 系统提示词
     system_prompt: str = DEFAULT_SYSTEM_PROMPT
@@ -1421,17 +1421,21 @@ async def _sync_skills_to_sandbox(
                 if remote_content and remote_content.file_data:
                     # FileData 是 TypedDict(dict), 用键访问而非属性
                     content = remote_content.file_data.get("content", "") or ""
-                    # 沙箱 /read 对大文件(如 skill-creator 的 34KB SKILL.md)返回
-                    # encoding=base64，直接解析会因找不到 "version:" 行而误判为"无版本"
-                    # → 每次新建 Agent 都全量重传。base64 时先解码再解析。
-                    encoding = remote_content.file_data.get("encoding", "utf-8")
-                    if encoding == "base64" and content:
-                        try:
-                            import base64 as _b64
-                            content = _b64.b64decode(content).decode("utf-8", errors="replace")
-                        except Exception:
-                            pass
-                    return _parse_skill_version(content)
+                    # 优先直接解 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.7a14 → sycommon_python_lib-0.2.7a16}/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
@@ -228,8 +228,8 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         state: Optional[DowngradeState] = None,
         # 应用层可覆盖检测提示词；未传(None)用 DEFAULT_DETECT_PROMPT
         detect_prompt: Optional[str] = None,
-        # 命中敏感后的动作："downgrade"=降级内部模型继续；"block"=直接阻断(不调任何模型)
-        action: str = "downgrade",
+        # 命中敏感后的动作："allow"=不检测放行；"downgrade"=降级内部模型继续；"block"=直接阻断(不调任何模型)
+        action: str = "allow",
         # 阻断模式下的异步提示回调（与 on_downgrade 区分文案）；downgrade 模式不用
         on_block: Optional[Callable[[], Awaitable[None]]] = None,
         # 测试注入：绕过懒加载的真实 get_llm
@@ -241,7 +241,8 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         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"
+        # 默认 allow（不检测）：应用层未显式指定时按"放行"处理，避免误伤。
+        self._action = action if action in ("downgrade", "block", "allow") else "allow"
         self._enabled = enabled
         self._state = state or DowngradeState()
         self._detect_prompt = detect_prompt or DEFAULT_DETECT_PROMPT
@@ -301,16 +302,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()
@@ -336,21 +335,24 @@ 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,
         request: ModelRequest[ContextT],
         handler: Callable[[ModelRequest[ContextT]], Awaitable[ModelResponse[ResponseT]]],
     ) -> ModelResponse[ResponseT]:
-        # (a) 关闭 / 内部 tier：纯放行，不检测（避免内部模型检内部模型 + 省 token）
-        if not self._enabled or self._model_tier == "internal":
+        # (a) 关闭 / 内部 tier / allow 模式：纯放行，不检测。
+        #     allow = 应用层完全关闭敏感检测（不调用 detector、不阻断、不降级），零开销。
+        if not self._enabled or self._model_tier == "internal" or self._action == "allow":
             return await handler(request)
 
         # (b) 本会话已命中敏感

{sycommon_python_lib-0.2.7a14 → sycommon_python_lib-0.2.7a16}/src/sycommon/agent/multi_agent_team.py

@@ -133,7 +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"=阻断
+    sensitive_action: str = "allow"  # "allow"=不检测放行；"downgrade"=降级继续；"block"=阻断
 
     coordinator_prompt: str = ""
     coordinator_name: str = "项目经理"

{sycommon_python_lib-0.2.7a14 → sycommon_python_lib-0.2.7a16}/src/sycommon_python_lib.egg-info/PKG-INFO

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

{sycommon_python_lib-0.2.7a14 → sycommon_python_lib-0.2.7a16}/tests/test_sensitive_guard.py

@@ -35,8 +35,9 @@ class _FakeRequest:
 
 
 def _mk_mw(detector_response: SensitiveCheck, model_tier="external",
-           on_downgrade=None, state=None):
-    """构造 middleware，detector 直接返回原始文本（_detect 自行解析 {…}）。"""
+           on_downgrade=None, state=None, action="downgrade"):
+    """构造 middleware，detector 直接返回原始文本（_detect 自行解析 {…}）。
+    默认 action=downgrade（命中降级）以匹配多数测试断言。"""
     import json as _json
 
     def _to_text(resp):
@@ -55,6 +56,7 @@ def _mk_mw(detector_response: SensitiveCheck, model_tier="external",
         model_tier=model_tier,
         on_downgrade=on_downgrade,
         state=state,
+        action=action,
         _detector=_FakeDetector(),
         _internal_raw=_FakeModel(),
     )
@@ -131,8 +133,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 +144,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 +195,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 +204,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