sycommon-python-lib 0.2.7a32__py3-none-any.whl → 0.2.7a33__py3-none-any.whl

sycommon/agent/deep_agent.py

@@ -378,7 +378,8 @@ class AgentConfig(BaseModel):
     internal_model_name: Optional[str] = None
     # 敏感检测提示词（应用层可覆盖）；未传(None)用基础库 DEFAULT_DETECT_PROMPT
     sensitive_detect_prompt: Optional[str] = None
-    # 命中敏感后的动作："allow"=不检测放行；"downgrade"=降级内部模型继续；"block"=直接阻断不执行
+    # 命中敏感后的动作："allow"=不检测放行；"downgrade"=降级内部模型继续；
+    # "block"=直接阻断不执行(检测整段上下文)；"block_user_input"=阻断(仅检测最后一条 HumanMessage)。
     sensitive_action: str = "allow"
 
     # 系统提示词

sycommon/agent/middleware/sensitive_guard.py

@@ -250,13 +250,19 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         state: Optional[DowngradeState] = None,
         # 应用层可覆盖检测提示词；未传(None)用 DEFAULT_DETECT_PROMPT
         detect_prompt: Optional[str] = None,
-        # 命中敏感后的动作："allow"=不检测放行；"downgrade"=降级内部模型继续；"block"=直接阻断(不调任何模型)
+        # 命中敏感后的动作："allow"=不检测放行；"downgrade"=降级内部模型继续；
+        # "block"=直接阻断(不调任何模型)，检测整段上下文；
+        # "block_user_input"=直接阻断，但只检测最后一条 HumanMessage(用户本轮输入)。
         action: str = "allow",
         # 阻断模式下的异步提示回调（与 on_downgrade 区分文案）；downgrade 模式不用
         on_block: Optional[Callable[[], Awaitable[None]]] = None,
         # 测试注入：绕过懒加载的真实 get_llm
         _detector: Any = None,
         _internal_raw: Any = None,
+        # 是否执行检测。多 agent 子 agent 传 False：它看到的「最后一条 HumanMessage」
+        # 多是协调者委派指令而非用户原文，重复判易误命中；改由协调者检测、子 agent 只靠
+        # 共享 DowngradeState 短路阻断。单 agent 始终 True（默认）。
+        detect: bool = True,
     ):
         self._model_tier = model_tier
         # None 时检测器/降级目标都用 get_llm() 读 nacos default 模型，不写死模型名
@@ -264,7 +270,13 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         self._on_downgrade = on_downgrade
         self._on_block = on_block
         # 默认 allow（不检测）：应用层未显式指定时按"放行"处理，避免误伤。
-        self._action = action if action in ("downgrade", "block", "allow") else "allow"
+        self._action = action if action in ("downgrade", "block", "block_user_input", "allow") else "allow"
+        self._detect_enabled = detect
+        # 单轮「有附件降 block」标志：仅 block_user_input 模式下，应用层每轮 chat 前按
+        # has_file 刷新。True → 本轮按 block 行为检测（整段上下文，含工具结果/附件正文）；
+        # False → 按 block_user_input（仅最后一条 HumanMessage）。绝不改 _action，避免
+        # 与用户配的真 block 混淆（set_file_turn_degrade 在非 block_user_input 上为 no-op）。
+        self._file_turn_degrade = False
         self._enabled = enabled
         self._state = state or DowngradeState()
         self._detect_prompt = detect_prompt or DEFAULT_DETECT_PROMPT
@@ -276,15 +288,50 @@ class SensitiveGuardMiddleware(AgentMiddleware):
     def is_downgraded(self) -> bool:
         return self._state.is_downgraded
 
+    @property
+    def _is_block_turn(self) -> bool:
+        """本轮是否走阻断路径（命中即返空响应、不调任何模型）。
+
+        block 和 block_user_input 都是阻断型 action；降级标志只改「检测范围」
+        （effective_detect_messages: last_human vs all），不改「是否阻断」。
+        is_blocked 与 awrap_model_call 的 (b)(d) 共用本判定。
+        """
+        return self._action in ("block", "block_user_input")
+
     @property
     def is_blocked(self) -> bool:
-        """本会话是否已阻断（命中过敏感且 action=block）。"""
-        return self._state.is_downgraded and self._action == "block"
+        """本会话是否已阻断（命中过敏感且本轮 action 是阻断型）。
+        action ∈ {block, block_user_input} 时为 True（两者都是阻断型 action）。
+        降级标志只改检测范围（effective_detect_messages），不改是否阻断。"""
+        return self._state.is_downgraded and self._is_block_turn
 
     @property
     def action(self) -> str:
         return self._action
 
+    def set_file_turn_degrade(self, on: bool) -> None:
+        """单轮「有附件降 block」标志开关（仅对 base=block_user_input 生效）。
+
+        应用层每轮 agent.chat 开始前按本轮 has_file 调用：
+          - has_file=True  → on=True  本轮按 block 行为检测（整段上下文）
+          - has_file=False → on=False 本轮按 block_user_input 行为检测（仅用户输入）
+        只在 self._action == "block_user_input" 时生效；其它 base（allow/downgrade/block）
+        调本方法为 no-op（且强制清标志防残留），绝不改 _action。
+        """
+        if self._action == "block_user_input":
+            self._file_turn_degrade = bool(on)
+        else:
+            self._file_turn_degrade = False
+
+    @property
+    def effective_detect_messages(self) -> str:
+        """本轮检测范围标识：'all'（整段上下文）/ 'last_human'（仅最后一条 HumanMessage）。
+        block_user_input + 降级标志 → 'all'；block_user_input 无标志 → 'last_human'；
+        block/downgrade → 'all'；allow 由 (a) 短路不检测。"""
+        if self._action == "block_user_input" and not self._file_turn_degrade:
+            return "last_human"
+        return "all"
+
     @property
     def last_notice_source(self) -> str:
         """首次命中时的敏感来源(user_input/tool_result/history)，供应用层选文案。"""
@@ -294,6 +341,18 @@ class SensitiveGuardMiddleware(AgentMiddleware):
     def state(self) -> DowngradeState:
         return self._state
 
+    @staticmethod
+    def _last_human(messages: List[BaseMessage]) -> Optional[List[BaseMessage]]:
+        """取最后一条 HumanMessage，包装成单元素列表供 _detect 使用。
+
+        block_user_input 模式只检测用户本轮输入（含附件正文），工具结果/历史不进检测。
+        无 HumanMessage 返回 None（调用方放行）。
+        """
+        for m in reversed(messages):
+            if isinstance(m, HumanMessage):
+                return [m]
+        return None
+
     async def _get_detector(self):
         if self._detector is None:
             async with self._init_lock:
@@ -377,27 +436,42 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         if not self._enabled or self._model_tier == "internal" or self._action == "allow":
             return await handler(request)
 
-        # (b) 本会话已命中敏感
+        # (b) 本会话已命中敏感（共享 state 已 downgraded）
         if self._state.is_downgraded:
-            # 阻断模式：直接返回空响应，不再调任何模型；应用层发完提示后会 break stream。
-            # 这里构造一个 content 空的 AIMessage，让 langgraph 把本轮当作模型已回完，
-            # 不进工具循环（无 tool_calls），干净结束。
-            if self._action == "block":
+            # 阻断路径（真 block 或 block_user_input+降级标志）：返回空响应，不再调模型。
+            if self._is_block_turn:
                 return ModelResponse(result=[AIMessage(content="")])
-            # 降级模式：路由内部模型继续；本次输入若非敏感(来自历史记忆)刷新 source=history
+            # 降级模式（downgrade，或 block_user_input 非降级轮——后者理论不会到这因 (c) 只判用户输入）：
+            # 路由内部模型继续；本次输入若非敏感(来自历史记忆)刷新 source=history
             await self._refresh_source_if_history(request.messages)
             return await handler(request.override(model=await self._get_internal_raw()))
 
-        # (c) 检测
-        check = await self._detect(request.messages)
+        # (b') detect=False 且尚未命中：放行（多 agent 子 agent 不主动检测，
+        #      等协调者命中后由共享 state 在 (b) 短路阻断）。
+        if not self._detect_enabled:
+            return await handler(request)
+
+        # (c) 检测：按 effective_detect_messages 选喂给 detector 的消息范围
+        #     block_user_input 无降级标志 → 仅最后一条 HumanMessage；其余（block/downgrade/
+        #     block_user_input+降级；allow 已在 (a) 短路不会到这）→ 整段上下文
+        if self.effective_detect_messages == "last_human":
+            detect_messages = self._last_human(request.messages)
+            if detect_messages is None:
+                # 无用户输入（理论上不会发生）→ 无从检测，放行
+                return await handler(request)
+        else:
+            # block / downgrade / block_user_input+降级：整段上下文
+            detect_messages = request.messages
+
+        check = await self._detect(detect_messages)
         if not check.is_sensitive:
             return await handler(request)
 
-        # (d) 命中 → CAS 抢占；按 action 分流
+        # (d) 命中 → CAS 抢占；按本轮是否阻断路径分流
         is_first = await self._state.mark_downgraded(check.source)
-        if self._action == "block":
+        if self._is_block_turn:
             SYLogger.info(
-                f"[SensitiveGuard] 命中敏感信息，阻断执行: {check.reason} (source={check.source})")
+                f"[SensitiveGuard] 命中敏感信息，阻断执行: {check.reason} (source={check.source}, action={self._action})")
             if is_first and self._on_block:
                 try:
                     await self._on_block()

sycommon/agent/multi_agent_team.py

@@ -134,7 +134,7 @@ class TeamConfig(BaseModel):
     sensitive_guard: bool = True        # 是否启用敏感信息检测守卫
     internal_model_name: Optional[str] = None   # 敏感降级目标内部模型名（应用层透传）
     sensitive_detect_prompt: Optional[str] = None  # 敏感检测提示词（应用层覆盖）
-    sensitive_action: str = "allow"  # "allow"=不检测放行；"downgrade"=降级继续；"block"=阻断
+    sensitive_action: str = "allow"  # "allow"=不检测放行；"downgrade"=降级继续；"block"=阻断(整段上下文)；"block_user_input"=阻断(仅检测用户输入)
 
     coordinator_prompt: str = ""
     coordinator_name: str = "项目经理"
@@ -200,6 +200,7 @@ class MultiAgentTeam:
         coordinator_name: str = "项目经理",
         recovery_manager: Optional[SandboxRecoveryManager] = None,
         downgrade_state: Optional[DowngradeState] = None,
+        sensitive_guard: Optional["SensitiveGuardMiddleware"] = None,
     ):
         self.user_id = user_id
         self.agent = agent
@@ -210,6 +211,10 @@ class MultiAgentTeam:
         self.sandbox_backend = sandbox_backend
         self.recovery_manager = recovery_manager
         self.downgrade_state = downgrade_state
+        # 协调者的敏感检测 guard 实例（build 时传入）。暴露给应用层读 guard 状态
+        # （is_downgraded / last_notice_source / set_file_turn_degrade 等），
+        # 让单 agent 与 multi-agent 的应用层代码统一走 `getattr(agent, "sensitive_guard", None)`。
+        self.sensitive_guard = sensitive_guard
 
     @property
     def is_downgraded(self) -> bool:
@@ -628,7 +633,9 @@ async def create_multi_agent_team(
     # 任一命中 → 全员降级（敏感数据会经委派链流动，独立 state 会漏）。
     shared_downgrade_state = DowngradeState()
 
-    def _make_guard():
+    def _make_guard(detect: bool = True):
+        """协调者 detect=True（检测用户输入）；子 agent detect=False
+        （只靠共享 state 短路阻断，不把委派指令当用户输入重复判）。"""
         return SensitiveGuardMiddleware(
             model_tier=config.model_tier,
             enabled=config.sensitive_guard,
@@ -636,10 +643,11 @@ async def create_multi_agent_team(
             internal_model_name=config.internal_model_name,
             detect_prompt=config.sensitive_detect_prompt,
             action=config.sensitive_action,
+            detect=detect,
         )
 
     middleware = [
-        _make_guard(),
+        _make_guard(detect=False),
         ToolResultTruncationMiddleware(),
         TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
         summarization_mw,
@@ -686,6 +694,10 @@ async def create_multi_agent_team(
     # 创建协调者 Agent
     coord_name = config.coordinator_name
     coord_summarization_mw = build_summarization_middleware(model, config.model_name, sandbox_backend)
+    # 协调者 guard 实例：单独构造，传给 MultiAgentTeam.sensitive_guard 供应用层读取
+    # （与单 agent 的 agent.sensitive_guard 对齐）。
+    coord_guard = _make_guard(detect=True)
+
     coordinator_agent = create_deep_agent(
         model=model,
         tools=config.shared_tools or [get_current_date],
@@ -698,7 +710,7 @@ async def create_multi_agent_team(
         debug=config.debug,
         name=coord_name,
         middleware=[
-            _make_guard(),
+            coord_guard,
             ToolResultTruncationMiddleware(),
             TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
             coord_summarization_mw,
@@ -718,6 +730,7 @@ async def create_multi_agent_team(
         coordinator_name=coord_name,
         recovery_manager=recovery_manager,
         downgrade_state=shared_downgrade_state,
+        sensitive_guard=coord_guard,
     )
 
 

sycommon/config/Config.py

@@ -186,7 +186,8 @@ class Config(metaclass=SingletonMeta):
         # 但消费方按顶层 key 读取（LLMConfig 等）——提升到顶层，免得每个调用方都得知道嵌套路径。
         override_keys = ['LLMConfig', 'EmbeddingConfig', 'RerankerConfig',
                          'ACPAgentConfig',
-                         'SkillApiWhitelist']
+                         'SkillApiWhitelist',
+                         'SensitiveConfig']
         for k in override_keys:
             if k in project_cfg:
                 self.config[k] = project_cfg[k]

{sycommon_python_lib-0.2.7a32.dist-info → sycommon_python_lib-0.2.7a33.dist-info}/METADATA

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

{sycommon_python_lib-0.2.7a32.dist-info → sycommon_python_lib-0.2.7a33.dist-info}/RECORD

@@ -136,8 +136,8 @@ sycommon/services.py,sha256=iC73h5d5bpNqW2qjRUGODZFhUhcwvKVnKUFLKJlBSq0,25322
 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=8-evFtN-FaRXPzj23r2_-VnCTFg5SwOf9cgv3tNsF4M,78766
-sycommon/agent/multi_agent_team.py,sha256=RFXHB9q5j1_2B-MDZVRTcbXHdEpRIXpAhrm1yroUDYI,30460
+sycommon/agent/deep_agent.py,sha256=3HkzT08WKGgdgOB3YuxY6KO7sZF4PW0vxdRSZAjFV2k,78863
+sycommon/agent/multi_agent_team.py,sha256=xY6JMr5TTAumTS7EV3Ye6vQL78Bv7wMEM7lzmP8lkeQ,31425
 sycommon/agent/summarization_utils.py,sha256=yCMeg7vT78vYYRgpzR8paE2Yu27pcPQSY1zvWUbIP_I,18899
 sycommon/agent/acp/__init__.py,sha256=vQGMQYAA5-ZaejYmDZ4r4Fklqs17qH3cDXQ5pZlwj-0,1844
 sycommon/agent/acp/client.py,sha256=s-K626b9ierwyEq61gejrW0xOysvrY2PIpYFsFqSHjc,27108
@@ -148,7 +148,7 @@ sycommon/agent/mcp/__init__.py,sha256=iKrdDhIrFsNIkqG_kgcwNe-nOiM6uVfolKv44LfQ-F
 sycommon/agent/mcp/models.py,sha256=zda4ho-UTYOJ5oPAZPZ-vxhfDRLghUCsMroHnA2A2QQ,1490
 sycommon/agent/mcp/tool_loader.py,sha256=pwhZoSoZuQVYo6BgfdMoRHlGnRPDRxvOvxEgvUM5q7Q,17818
 sycommon/agent/middleware/sandbox_path_guard.py,sha256=K1SnxA8pDxkCSucOkranwUvC9_8rd3l_-TIR8gMMTK8,8102
-sycommon/agent/middleware/sensitive_guard.py,sha256=BYIvObH3QO6hbEYvaKzgxFXTRPIvqVzqL408NbjlR-o,23569
+sycommon/agent/middleware/sensitive_guard.py,sha256=ChUU8twVVwkxt5c3Ymjf5FCrIqHexVR6kGWG70hhuEQ,27986
 sycommon/agent/middleware/sitecustomize.py,sha256=Bt7XFnWV_LJo89l858AGp5VUkXwefpLGmjkCtLe-CMw,4800
 sycommon/agent/middleware/skill_api_whitelist.py,sha256=2qVsrwS6VkkPKHrvjJMNUfBDokdMJkP-mn-V-ZCn7X8,16643
 sycommon/agent/middleware/skill_wl_check.py,sha256=rCJ9F6aWPh8tVQBIPmcq2lKDsfwiJQduwSUku_8kXfs,3952
@@ -168,7 +168,7 @@ sycommon/auth/oa_crypto.py,sha256=xpY1R1Bj3KLENXB0TuThB6Eku1E9PYjcoSpOdgDmCgc,18
 sycommon/auth/oa_service.py,sha256=kLepV9zgqpZoaB73DRPpMA5tJJQjoaDtQPdzBcGXeak,6235
 sycommon/auth/wecom_ldap_service.py,sha256=atVuYs8zL1EfEN5yX9bwHcHpCsB3BdnMnMlR2bbmD6c,33416
 sycommon/config/ACPAgentConfig.py,sha256=paAa0c0gy1RnDDum-Q6m7QLTe7lhz2dsFt4r72QtmWE,3202
-sycommon/config/Config.py,sha256=MP92XxB7hsQiOnyjMkZskbxuMn_OUAZ4RTbC74ZATl4,7885
+sycommon/config/Config.py,sha256=zbddvm2_y_l3k2zMeAZ0BTEST6Or_kUD7y21RnEy2Kc,7929
 sycommon/config/DatabaseConfig.py,sha256=ILiUuYT9_xJZE2W-RYuC3JCt_YLKc1sbH13-MHIOPhg,804
 sycommon/config/ElasticsearchConfig.py,sha256=fO9ZPMgJxSg1-UyDJ90wO6UvYy-jscwPJsSkXgx9qTU,2308
 sycommon/config/EmbeddingConfig.py,sha256=gPKwiDYbeu1GpdIZXMmgqM7JqBIzCXi0yYuGRLZooMI,362
@@ -311,8 +311,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=1yifwIBNGsCIxLnQjHKiBlbsigc_zvPH-dMTZcNxe-Q,7649
-sycommon_python_lib-0.2.7a32.dist-info/METADATA,sha256=QBmyomEqe5Kb4vX1vJBfbN1YmqT6CMipd5ZqsUvTLIw,7963
-sycommon_python_lib-0.2.7a32.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-sycommon_python_lib-0.2.7a32.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.7a32.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.7a32.dist-info/RECORD,,
+sycommon_python_lib-0.2.7a33.dist-info/METADATA,sha256=46OEQuDknEAfGWnldU8AlXjHiXCldxKqj_ZFjbcQ_Ac,7963
+sycommon_python_lib-0.2.7a33.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+sycommon_python_lib-0.2.7a33.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.7a33.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.7a33.dist-info/RECORD,,