sycommon-python-lib 0.2.7a13__py3-none-any.whl → 0.2.7a14__py3-none-any.whl

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,18 @@ 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 ""
+                    # 沙箱 /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)
             except Exception:
                 pass
             return ""

sycommon/agent/middleware/sensitive_guard.py

@@ -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)，供应用层选文案。"""
@@ -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/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.dist-info → sycommon_python_lib-0.2.7a14.dist-info}/METADATA

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

{sycommon_python_lib-0.2.7a13.dist-info → sycommon_python_lib-0.2.7a14.dist-info}/RECORD

@@ -136,8 +136,8 @@ sycommon/services.py,sha256=CwC_gESafo05Qn41KLQgtulx6PfX7s2FkxlBI-hXve4,24861
 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=N7XjcIlk-yvvWMy4e1hPKRvZtv2SdwdvYlAOJONbIV4,73315
-sycommon/agent/multi_agent_team.py,sha256=59TbJtS0Fvm4KlZaKdUiaYWg8Y1GomPfZXtA76bNbtM,30131
+sycommon/agent/deep_agent.py,sha256=Y7xQIOmnIda-v_Cf8iEUn61rDD5lfaAPhiXsgUqocy0,74253
+sycommon/agent/multi_agent_team.py,sha256=HFdTmMvJns07rrEsq70GCmILWKDzGxgSh6ZeyhX9Lc4,30260
 sycommon/agent/summarization_utils.py,sha256=bqZRFqSekNGlv2mYQPaT_s2QNA5VDTKddi2Va_SkHWc,18376
 sycommon/agent/acp/__init__.py,sha256=vQGMQYAA5-ZaejYmDZ4r4Fklqs17qH3cDXQ5pZlwj-0,1844
 sycommon/agent/acp/client.py,sha256=s-K626b9ierwyEq61gejrW0xOysvrY2PIpYFsFqSHjc,27108
@@ -147,7 +147,7 @@ sycommon/agent/acp/tool.py,sha256=yt6ohKL2y7wIZMNiLv-m5oCg5u1p5GAbqgjzQVt285Y,10
 sycommon/agent/mcp/__init__.py,sha256=iKrdDhIrFsNIkqG_kgcwNe-nOiM6uVfolKv44LfQ-FQ,636
 sycommon/agent/mcp/models.py,sha256=zda4ho-UTYOJ5oPAZPZ-vxhfDRLghUCsMroHnA2A2QQ,1490
 sycommon/agent/mcp/tool_loader.py,sha256=OQa-lE7RL2s3Lqh-kNOKaUrb130hvorB_HjyFBqZBZs,10960
-sycommon/agent/middleware/sensitive_guard.py,sha256=pn4ImMLkBFMSJ8gxSb_0c1Zg4y9w6pln8ovceA-qHE0,20169
+sycommon/agent/middleware/sensitive_guard.py,sha256=jT-4fNZ5mAvZpoqgVwCuD41iS13zBUdSQvc3up2ziNU,21736
 sycommon/agent/middleware/sitecustomize.py,sha256=Bt7XFnWV_LJo89l858AGp5VUkXwefpLGmjkCtLe-CMw,4800
 sycommon/agent/middleware/skill_api_whitelist.py,sha256=e15aJekXegPp64owSCEdUE5y0SmwCQVQCF4jnhReZNU,10958
 sycommon/agent/middleware/skill_wl_check.py,sha256=rCJ9F6aWPh8tVQBIPmcq2lKDsfwiJQduwSUku_8kXfs,3952
@@ -307,8 +307,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.7a13.dist-info/METADATA,sha256=sthOFqgVTUnIdpJe-da7rVh49-mffEjIe-31TN3ZQoM,7962
-sycommon_python_lib-0.2.7a13.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-sycommon_python_lib-0.2.7a13.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.7a13.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.7a13.dist-info/RECORD,,
+sycommon_python_lib-0.2.7a14.dist-info/METADATA,sha256=JNchBy3XAiVCP_d1u0Nmz-ft-BiFiEIPKlKiV48ySqw,7962
+sycommon_python_lib-0.2.7a14.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+sycommon_python_lib-0.2.7a14.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.7a14.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.7a14.dist-info/RECORD,,