sycommon-python-lib 0.2.7a45__tar.gz → 0.2.7a47__tar.gz

{sycommon_python_lib-0.2.7a45 → sycommon_python_lib-0.2.7a47}/PKG-INFO

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

{sycommon_python_lib-0.2.7a45 → sycommon_python_lib-0.2.7a47}/pyproject.toml

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

{sycommon_python_lib-0.2.7a45 → sycommon_python_lib-0.2.7a47}/src/sycommon/agent/deep_agent.py

@@ -63,6 +63,7 @@ from sycommon.agent.middleware.sensitive_guard import SensitiveGuardMiddleware
 from deepagents.middleware.summarization import create_summarization_tool_middleware  # noqa: F401 保留 re-export
 from sycommon.agent.summarization_utils import build_summarization_middleware
 from sycommon.agent.resume_compactor import maybe_compact_before_resume
+import sycommon.agent.reasoning_content_patch  # noqa: F401  提取 reasoning_content/reasoning 字段，避免思考型模型被判空响应
 
 # 流式逐 token 诊断日志开关（默认关）。开启后每个 chunk 都打印
 # chunk_type/content 等（仅供排障）。LLM 最终结果已由 LLMLogger.on_llm_end
@@ -219,6 +220,10 @@ def _patch_agent_streaming(agent):
             """替代 factory._execute_model_async: 用 astream + config 实现流式回调。"""
             from langchain.agents.middleware.types import ModelResponse
 
+            SYLogger.warning(
+                f"[STREAM-DEBUG] _patched_execute_model_async ENTERED | "
+                f"messages={len(request.messages)} 条 | "
+                f"has_system={bool(request.system_message)}")
             model_, effective_response_format = _get_bound_model(request)
             messages = request.messages
 
@@ -558,12 +563,24 @@ class DeepAgent:
             if _STREAM_DEBUG:
                 print(
                     f"[DeepAgent] chat() starting stream, message={repr(message[:80])}", flush=True)
+            SYLogger.warning(
+                f"[STREAM-DEBUG] agent.astream ABOUT TO START | "
+                f"thread={getattr(self, 'thread_id', '?')} | "
+                f"checkpoint_type={type(getattr(self, 'agent', None).__class__).__name__}")
+            _astream_chunk_count = 0
             async for chunk in self._astream_with_retry(
                 input_state,
                 max_retries=3,
                 base_delay=1.0,
             ):
                 # 🔑 逐 token 诊断日志：仅在 DEEP_AGENT_STREAM_DEBUG=true 时打印
+                _astream_chunk_count += 1
+                if _astream_chunk_count == 1:
+                    _first = chunk
+                    _first_type = type(chunk).__name__
+                    SYLogger.warning(
+                        f"[STREAM-DEBUG] agent.astream FIRST CHUNK received | "
+                        f"type={_first_type}")
                 if _STREAM_DEBUG:
                     _chunk_len = len(chunk) if isinstance(
                         chunk, tuple) else '?'
@@ -1011,6 +1028,11 @@ class DeepAgent:
                 print(
                     f"[DeepAgent] FOR LOOP ENDED. stream_step={stream_step}, ai_text_content={repr(ai_text_content[:100])}, tool_calls={len(current_tool_calls)}", flush=True)
 
+            SYLogger.warning(
+                f"[STREAM-DEBUG] FOR LOOP ENDED | _astream_chunk_count={_astream_chunk_count} | "
+                f"stream_step={stream_step} | ai_text_len={len(ai_text_content)} | "
+                f"tool_calls={len(current_tool_calls)}")
+
             # 空响应检测：模型被调用但没有产出任何文本。
             # 🔑 治本修复：纯空响应（无文本且无工具调用，常见于用户派生 key 被网关拒、
             # 网关返回空壳 AIMessage 而非异常）不再静默只打 warning —— 把它翻译成

sycommon_python_lib-0.2.7a47/src/sycommon/agent/reasoning_content_patch.py

@@ -0,0 +1,88 @@
+"""langchain_openai reasoning_content / reasoning 字段提取补丁。
+
+根因：
+  langchain_openai 1.3.5 的 ChatOpenAI 只针对官方 OpenAI 规范，源码
+  (base.py:7) 明确声明：第三方 provider 的非标准字段（reasoning_content /
+  reasoning_details）**不解析**。思考型模型（Qwen3.5 的 reasoning、
+  LongCat-2.0 的 reasoning_content、DeepSeek-R1 等）把推理过程放在这些字段，
+  被 _convert_delta_to_message_chunk（流式 chunk）/ _convert_dict_to_message
+  （非流式整包）直接丢弃。
+
+  deep_agent 的空响应判定（deep_agent.py:806-813, 1022）依赖
+  reasoning_content：模型把内容全放进 reasoning 字段时，content 为空，
+  langchain 又把 reasoning 字段丢了 → deep_agent 拿到既无 content 又无
+  reasoning_content 的空 AIMessage → 误判「空响应」触发三级降级，
+  最终给用户空气泡。
+
+修复：
+  wrap 上述两个转换函数，把 delta/message 里的 reasoning_content / reasoning
+  捞进 message.additional_kwargs["reasoning_content"]（按字符串累加）。
+  AIMessageChunk 累加（+）时会自动拼接同名字符串，deep_agent 既有逻辑
+  (additional_kwargs.get("reasoning_content")) 即可正常读取，无需改 deep_agent。
+
+  填 additional_kwargs 而非 content：reasoning 是推理过程，不应混进正文
+  content（否则会直接展示给用户 / 喂给工具解析）。deep_agent 已有专门分支
+  把它作为 reasoning 事件单独 yield（带 data["reasoning"]=True）。
+
+等 langchain 官方支持 reasoning_content（>1.3.5）后删除本模块即可。
+"""
+from __future__ import annotations
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+# 不同 provider 的思考字段名：
+#   reasoning_content —— LongCat / DeepSeek-R1 / 智谱 GLM 等
+#   reasoning         —— 部分 vLLM 部署的 Qwen
+_REASONING_KEYS = ("reasoning_content", "reasoning")
+
+
+def _extract_reasoning(d) -> str:
+    """从 delta/message dict 里提取思考内容（字符串拼接，兼容 str/dict 两种值形态）。"""
+    if not isinstance(d, dict):
+        return ""
+    for k in _REASONING_KEYS:
+        v = d.get(k)
+        if isinstance(v, str) and v:
+            return v
+        if isinstance(v, dict):  # 个别 provider 包成 {"content": "..."}
+            inner = v.get("content") or v.get("text")
+            if isinstance(inner, str) and inner:
+                return inner
+    return ""
+
+
+try:
+    import langchain_openai.chat_models.base as _lc_oai_base
+
+    _orig_delta = _lc_oai_base._convert_delta_to_message_chunk
+    _orig_dict = _lc_oai_base._convert_dict_to_message
+
+    def _with_reasoning(msg, rc: str):
+        """把 reasoning 追加到 message.additional_kwargs（不改原 dict，新构造）。"""
+        ak = dict(getattr(msg, "additional_kwargs", None) or {})
+        existing = ak.get("reasoning_content", "")
+        ak["reasoning_content"] = (existing + rc) if existing else rc
+        msg.additional_kwargs = ak
+        return msg
+
+    def _patched_convert_delta(_dict, default_class):
+        msg = _orig_delta(_dict, default_class)
+        rc = _extract_reasoning(_dict)
+        return _with_reasoning(msg, rc) if rc else msg
+
+    def _patched_convert_dict(_dict):
+        msg = _orig_dict(_dict)
+        rc = _extract_reasoning(_dict)
+        return _with_reasoning(msg, rc) if rc else msg
+
+    _lc_oai_base._convert_delta_to_message_chunk = _patched_convert_delta
+    _lc_oai_base._convert_dict_to_message = _patched_convert_dict
+    logger.info(
+        "[ReasoningContentPatch] 已 wrap _convert_delta_to_message_chunk / "
+        "_convert_dict_to_message，提取 reasoning_content/reasoning 字段")
+except ImportError:
+    logger.debug("[ReasoningContentPatch] langchain_openai 不可用，跳过补丁")
+except Exception as _patch_err:  # pragma: no cover
+    logger.warning(f"[ReasoningContentPatch] 补丁应用失败: {_patch_err}")

{sycommon_python_lib-0.2.7a45 → sycommon_python_lib-0.2.7a47}/src/sycommon/agent/sandbox/http_sandbox_backend.py

@@ -84,6 +84,28 @@ _SKILL_PATH_RE = re.compile(
 )
 
 
+def _extract_sandbox_error_code(body: str) -> Optional[str]:
+    """从沙箱错误响应体里提取规范 error 码（如 "file_not_found"）。
+
+    沙箱 4xx 错误体形如 {"error": "file_not_found", ...}。deepagents 的
+    MemoryMiddleware/SkillsMiddleware 约定 response.error == "file_not_found"
+    时视为「缺失文件正常跳过」；其它值才 raise。故本函数把 body 里的 error
+    字段原码提取出来，透传给上层；解析失败返回 None（调用方回退到整串）。
+    """
+    if not body:
+        return None
+    try:
+        import json as _json
+        obj = _json.loads(body)
+        if isinstance(obj, dict):
+            err = obj.get("error")
+            if isinstance(err, str) and err:
+                return err
+    except Exception:
+        pass
+    return None
+
+
 def _read_file_safe(path: str) -> bytes:
     with open(path, "rb") as f:
         return f.read()
@@ -1235,8 +1257,14 @@ class HTTPSandboxBackend(FileOperationsMixin, SandboxBackendProtocol):
                                     headers=headers, timeout=timeout_obj) as resp:
                 if resp.status >= 400:
                     text = await resp.text()
+                    # 🔑 对齐 deepagents 约定：沙箱错误体里的 error 码必须原样透传
+                    # （如 "file_not_found"）。MemoryMiddleware/SkillsMiddleware 据此
+                    # 判断「缺失文件 → 正常跳过 continue」；若包成 "HTTP 404: {...}"
+                    # 整串，框架匹配不上就会 raise ValueError，被上层当沙箱故障恢复 3 次，
+                    # 耗尽后 graph 产 0 chunk → 最终给用户「模型返回空响应」。
+                    _code = _extract_sandbox_error_code(text)
                     return FileDownloadResult(
-                        path=path, error=f"HTTP {resp.status}: {text[:200]}")
+                        path=path, error=_code or f"HTTP {resp.status}: {text[:200]}")
                 with open(dest, "wb") as f:
                     async for chunk in resp.content.iter_chunked(self._STREAM_CHUNK):
                         f.write(chunk)

{sycommon_python_lib-0.2.7a45 → sycommon_python_lib-0.2.7a47}/src/sycommon/auth/ldap_service.py

@@ -126,7 +126,9 @@ class LDAPAuthService:
         user_dn = self._build_user_dn(username)
 
         # 尝试连接各个 LDAP 服务器
-        last_error = None
+        # 优先返回认证类错误（invalidCredentials 等），而非连接类错误（timeout）。
+        # 避免备用服务器连接超时覆盖了主服务器的真实认证错误（密码错误），误导用户。
+        errors = []
         for url in self.config.urls:
             try:
                 # 创建连接（移除末尾的斜杠，设置连接超时）
@@ -155,15 +157,32 @@ class LDAPAuthService:
                 )
 
             except LDAPException as e:
-                last_error = e
+                errors.append((url, str(e)))
                 SYLogger.warning(f"[LDAP] 连接 {url} 失败: {e}")
                 continue
 
-        SYLogger.error(f"[LDAP] 用户 {username} 认证失败: {last_error}")
-        return LDAPAuthResult(
-            success=False,
-            error=f"认证失败: {last_error}" if last_error else "认证失败",
-        )
+        # 优先返回认证类错误（密码错误等），而不是连接超时
+        # 按优先级排序：invalidCredentials / invalidAttribute / insufficientAccess 优先
+        auth_keywords = ["invalidcredentials", "invalidattribute", "insufficientaccess", "密码", "credential"]
+        for url, err in errors:
+            if any(kw in err.lower() for kw in auth_keywords):
+                SYLogger.error(f"[LDAP] 用户 {username} 认证失败: {err}")
+                return LDAPAuthResult(
+                    success=False,
+                    error=f"认证失败: {err}",
+                )
+
+        # 全是连接类错误，返回第一个（通常是主服务器）
+        if errors:
+            first_err = errors[0][1]
+            SYLogger.error(f"[LDAP] 用户 {username} 认证失败: {first_err}")
+            return LDAPAuthResult(
+                success=False,
+                error=f"认证失败: {first_err}",
+            )
+
+        SYLogger.error(f"[LDAP] 用户 {username} 认证失败: 未知错误")
+        return LDAPAuthResult(success=False, error="认证失败: 未知错误")
 
     def _build_user_dn(self, username: str) -> str:
         """构建用户 DN

{sycommon_python_lib-0.2.7a45 → sycommon_python_lib-0.2.7a47}/src/sycommon_python_lib.egg-info/PKG-INFO

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

{sycommon_python_lib-0.2.7a45 → sycommon_python_lib-0.2.7a47}/src/sycommon_python_lib.egg-info/SOURCES.txt

@@ -140,6 +140,7 @@ src/sycommon/agent/agent_manager.py
 src/sycommon/agent/chat_events.py
 src/sycommon/agent/deep_agent.py
 src/sycommon/agent/multi_agent_team.py
+src/sycommon/agent/reasoning_content_patch.py
 src/sycommon/agent/resume_compactor.py
 src/sycommon/agent/summarization_utils.py
 src/sycommon/agent/acp/__init__.py