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

sycommon/agent/middleware/sensitive_guard.py

@@ -277,6 +277,11 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         # False → 按 block_user_input（仅最后一条 HumanMessage）。绝不改 _action，避免
         # 与用户配的真 block 混淆（set_file_turn_degrade 在非 block_user_input 上为 no-op）。
         self._file_turn_degrade = False
+        # 本轮（last_human 范围）「用户输入已判过」标志：block_user_input 无附件时，
+        # 同一轮里用户输入恒定不变，第一次判过即可，工具执行后再进模型节点不再重复判
+        # （重复判定等价于白烧一次内网调用，见 awrap_model_call (c) last_human 分支）。
+        # 每轮 chat 前由 set_file_turn_degrade() 重置；命中敏感走 (b) 短路，本标志无影响。
+        self._last_human_judged = False
         self._enabled = enabled
         self._state = state or DowngradeState()
         self._detect_prompt = detect_prompt or DEFAULT_DETECT_PROMPT
@@ -322,6 +327,9 @@ class SensitiveGuardMiddleware(AgentMiddleware):
             self._file_turn_degrade = bool(on)
         else:
             self._file_turn_degrade = False
+        # 每轮 chat 开始时调用 → 重置「本轮用户输入已判过」标志。
+        # 新一轮用户输入到来，上一轮的判定结论不再复用，需重新判一次。
+        self._last_human_judged = False
 
     @property
     def effective_detect_messages(self) -> str:
@@ -392,6 +400,17 @@ class SensitiveGuardMiddleware(AgentMiddleware):
         识别失败时 fail-open 视为不敏感（默认放行），避免误伤正常请求。
         """
         content = _messages_to_text(messages)
+        # 🔍 sensitive judge 诊断：打印本轮发出去的 content 字符数 + action + 范围
+        # block_user_input 应只发最后一条 HumanMessage（短）；命中场景下若 chars 异常大，
+        # 说明检测范围没按 has_file 切换。仅打印长度与首尾摘要，不泄露正文。
+        try:
+            _action_now = getattr(self, "action", None) or getattr(self, "_action", None)
+            SYLogger.info(
+                f"[SensitiveGuard][Detect] 发起判定: action={_action_now} "
+                f"messages={len(messages)} content_chars={len(content)} "
+                f"head={content[:80]!r} tail={content[-80:]!r}")
+        except Exception:
+            pass
         try:
             detector = await self._get_detector()
             # 🔑 提示词模板里含 {content} 占位符（应用层 SENSITIVE_DETECT_PROMPT）。
@@ -459,11 +478,22 @@ class SensitiveGuardMiddleware(AgentMiddleware):
             if detect_messages is None:
                 # 无用户输入（理论上不会发生）→ 无从检测，放行
                 return await handler(request)
+            # 🔑 block_user_input 无附件：本轮只判一次用户输入。
+            # 工具执行后模型节点会再次进入本方法，但用户输入本轮恒定不变 → 直接放行，
+            # 不重复调 detector（省一次内网判定调用 + 3s 延迟）。命中过则已在 (b) 短路，
+            # 不会走到这。set_file_turn_degrade() 每轮 chat 前会清本标志。
+            if self._last_human_judged:
+                SYLogger.info(
+                    "[SensitiveGuard][Detect] 本轮用户输入已判过，跳过重复判定(last_human)")
+                return await handler(request)
         else:
             # block / downgrade / block_user_input+降级：整段上下文
             detect_messages = request.messages
 
         check = await self._detect(detect_messages)
+        # last_human 范围：无论命中与否，本轮用户输入的判定已完成，置位避免重复判定。
+        if self.effective_detect_messages == "last_human":
+            self._last_human_judged = True
         if not check.is_sensitive:
             return await handler(request)
 

sycommon/llm/llm_logger.py

@@ -29,6 +29,36 @@ class LLMLogger(AsyncCallbackHandler):
         **kwargs: Any
     ) -> None:
         model_name = serialized.get('name', 'unknown')
+        # 🔍 每次模型调用诊断：模型名 + 消息组数 + 各组消息类型/条数 + 每组总字符数
+        # （字符数≈4×token，可粗判 input 是否「固定长度分类器」还是「全文上下文」）。
+        # 跨意图识别/sensitive judge/主对话/rubric 全覆盖。
+        try:
+            groups_summary = []
+            for gi, group in enumerate(messages):
+                chars = 0
+                type_counts: Dict[str, int] = {}
+                for m in group:
+                    c = m.content
+                    if isinstance(c, str):
+                        chars += len(c)
+                    elif isinstance(c, list):
+                        # 多模态：累加每个块的 text 长度
+                        for blk in c:
+                            if isinstance(blk, dict):
+                                chars += len(str(blk.get("text", "")))
+                            else:
+                                chars += len(str(blk))
+                    else:
+                        chars += len(str(c))
+                    t = getattr(m, "type", type(m).__name__)
+                    type_counts[t] = type_counts.get(t, 0) + 1
+                groups_summary.append(
+                    f"#{gi+1} msgs={len(group)} chars={chars} types={type_counts}")
+            SYLogger.info(
+                f"[LLM-DIAG] 调用开始 model={model_name} 组数={len(messages)} | "
+                f"{' || '.join(groups_summary)}")
+        except Exception as _e:
+            SYLogger.warning(f"[LLM-DIAG] 诊断统计失败(非致命): {_e}")
         SYLogger.info(
             f"聊天模型调用开始 | 模型: {model_name} | 消息组数: {len(messages)}")
         self._log_chat_messages(messages)

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

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

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

@@ -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=ChUU8twVVwkxt5c3Ymjf5FCrIqHexVR6kGWG70hhuEQ,27986
+sycommon/agent/middleware/sensitive_guard.py,sha256=B6Dpii3m-IU9qFrIUSUHbtjEwELRrHx2Iez-Ri0fDiM,30276
 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
@@ -203,7 +203,7 @@ sycommon/heartbeat_process/heartbeat_process_worker.py,sha256=duuAEFwda43Y6pZE8t
 sycommon/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/llm/embedding.py,sha256=n2PtKlfJ4E1-V8DIHTilR-y9y1TYB5iaATlWOKjid28,19878
 sycommon/llm/get_llm.py,sha256=Mi4rWB07QQzv0NgAGOCXyB9Yd7jl_MbKd1J5Qml8BMk,8402
-sycommon/llm/llm_logger.py,sha256=8O8UAb76g3Jyk1fTpgqqnpKRz1SWB0-2wc4GBvdnvUk,4526
+sycommon/llm/llm_logger.py,sha256=35R-6BOPKLe2FJA7PKeMPCMaPkFdSEc6_QERnHRhDcs,6114
 sycommon/llm/llm_tokens.py,sha256=yGEessxfk5wRMrPGyWHhiiIIQFDVT23FSaqnwqHGCoY,4712
 sycommon/llm/llm_with_token_tracking.py,sha256=VJYHQSSuqvAbJ7qFs7Zml_thFDZoqL2rXFj8Nrj6rNo,13834
 sycommon/llm/native_with_fallback_runnable.py,sha256=8g2q8cRqJv2miY7GrZz_f-zNmHxdb_5WSujD3frqObQ,8035
@@ -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.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,,
+sycommon_python_lib-0.2.7a34.dist-info/METADATA,sha256=g0qvNe0nB7HSgtEf-n3TBuARcIYTo8qdgkUJMYdge0M,7963
+sycommon_python_lib-0.2.7a34.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+sycommon_python_lib-0.2.7a34.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.7a34.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.7a34.dist-info/RECORD,,