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

sycommon/agent/deep_agent.py

@@ -98,12 +98,13 @@ def _patch_agent_streaming(agent):
     删除此函数及调用即可。
     """
     # 已验证兼容的版本范围(超出仅警告, 不阻断 —— 闭包强校验是真正的安全网)
-    # 1.3.10/1.3.11/1.3.12 + langchain_core 1.4.8/1.4.9 经实测确认闭包结构兼容
-    # (factory.py 在 1.3.11→1.3.12 字节级无变化: amodel_node freevars 含
-    # _execute_model_async, 内层 freevars 含 _get_bound_model/_handle_model_output),
-    # patch 正常生效。1.3.12 的 _execute_model_async 仍为 ainvoke + 不传 config,
-    # 官方未修复, 补丁仍需保留。
-    _VERIFIED = {"langchain": "1.3.12", "langchain_core": "1.4.9"}
+    # 1.3.10/1.3.11/1.3.12/1.3.13 + langchain_core 1.4.8/1.4.9 确认闭包结构兼容
+    # (factory.py 在 1.3.12→1.3.13 逐字节无变化 —— PyPI sdist diff 实证;
+    #  amodel_node freevars 含 _execute_model_async, 内层 freevars 含
+    #  _get_bound_model/_handle_model_output), patch 正常生效。
+    # 1.3.13 的 _execute_model_async 仍为 ainvoke + 不传 config (factory.py:1467),
+    # 官方仍未修复, 补丁仍需保留。
+    _VERIFIED = {"langchain": "1.3.13", "langchain_core": "1.4.9"}
     try:
         import langchain as _lc
         import langchain_core as _lcc

sycommon/agent/mcp/tool_loader.py

@@ -350,15 +350,11 @@ async def _load_one_server(
                 pass
         return []
     except asyncio.CancelledError:
-        # 单飞失败透传的哨兵（_discover_with_cache 失败时唤醒等待者用），按失败处理
-        SYLogger.warning(
-            f"[MCP] 服务器 '{config.name}' ({config.server_url}) 发现失败，跳过")
-        if on_server_failure:
-            try:
-                await on_server_failure(config.id, "发现失败")
-            except Exception:
-                pass
-        return []
+        # 外层取消（如会话重置 cancel 后台 _mcp_task）→ 必须向上传播，不能吞。
+        # 吞掉会让 load_mcp_tools_background 的 `except CancelledError: raise` 守卫失效、
+        # 任务被标记为正常完成而非已取消。单飞失败的哨兵是 RuntimeError(走下方 except Exception)，
+        # 不会进这个分支，故这里只需 raise。
+        raise
     except Exception as e:
         SYLogger.warning(
             f"[MCP] 服务器 '{config.name}' ({config.server_url}) 连接失败，跳过: {e}")

sycommon/agent/middleware/sensitive_guard.py

@@ -72,6 +72,19 @@ class DowngradeState:
             self.last_source = source
             return True
 
+    async def reset(self, source: str = "user_input") -> None:
+        """清除降级标记（带锁，CAS 契约一致）。
+
+        应用层在「命中敏感后想放行下一轮重检」场景（如 block 模式阻断后，
+        用户切走/换 thread 重建 agent）应调本方法，而不是直接写
+        `state.downgraded = False`（无锁、绕过 CAS）。单 agent 下两者等价，
+        但 multi-agent 共享状态或未来跨 task 重置时，无锁直写会与
+        mark_downgraded 的 CAS 真竞态——本方法是唯一安全的重置入口。
+        """
+        async with self._lock:
+            self.downgraded = False
+            self.last_source = source
+
 
 DEFAULT_DETECT_PROMPT = """你是数据脱敏分类器。判断以下「即将发送给外部云模型」的对话上下文是否包含不宜外流的敏感数据，只回答结构化字段（is_sensitive + reason + source）。
 

sycommon/agent/sandbox/minio_sync.py

@@ -24,9 +24,24 @@ from sycommon.logging.kafka_log import SYLogger
 # 日期快照功能预留，当前暂不启用
 _SNAPSHOT_ENABLED = False
 
-# restore_from_minio 的 MinIO 下载并发度（同时下载的文件数上限）。
-# 与 _sync_batch(sync→minio 方向)的 batch_size 对齐为 5，避免压垮 MinIO/网络。
-_RESTORE_CONCURRENCY = 5
+# restore_from_minio 的 MinIO 下载并发度。
+# 两层信号量：
+#   - 单用户层 _RESTORE_PER_USER：每个用户恢复时最多 5 路并发下载（单用户恢复够快）；
+#   - 全局层   _RESTORE_GLOBAL_CAP：全进程最多 100 路下载，多用户同时恢复时全局封顶，
+#     避免无限放大压垮 MinIO/网络，又留足并发让多用户恢复不互相拖慢。
+# 单用户独享 5 槽 + 全局封顶 100。
+_RESTORE_PER_USER = 5
+_RESTORE_GLOBAL_CAP = 100
+# 全局信号量惰性创建（绑定到首次调用时的 event loop；单 loop 部署下不变）。
+_RESTORE_DOWNLOAD_SEM: "asyncio.Semaphore | None" = None
+
+
+def _get_restore_download_sem() -> "asyncio.Semaphore":
+    """惰性创建全局下载信号量。"""
+    global _RESTORE_DOWNLOAD_SEM
+    if _RESTORE_DOWNLOAD_SEM is None:
+        _RESTORE_DOWNLOAD_SEM = asyncio.Semaphore(_RESTORE_GLOBAL_CAP)
+    return _RESTORE_DOWNLOAD_SEM
 
 
 class MinioSyncService(metaclass=SingletonMeta):
@@ -763,15 +778,18 @@ class MinioSyncService(metaclass=SingletonMeta):
 
         SYLogger.info(f"[MinIO] 需恢复 {len(to_restore)} 个文件到沙箱: user={user_id}")
 
-        # 4. 并发恢复：MinIO 下载用全局 Semaphore(5) 限流并发，沙箱上传仍按批 batch_upload。
-        # 旧实现是「批内串行下载 + 批间串行」，N 个文件 ≈ N 次串行 MinIO GET，27 个文件要数十秒。
-        # 改为 Semaphore(5) 后下载并发，总耗时 ≈ ceil(N/5) 次串行往返，对齐 _sync_batch 的并发度。
+        # 4. 并发恢复：两层限流。
+        #   - per_user_sem（每次 restore 新建，本用户独享 5 槽）：单用户恢复够快；
+        #   - global_sem（进程级 15 槽）：多用户同时恢复时全局封顶，防 N×5 路下载
+        #     打满线程池、挤占主请求路径的沙箱操作。
+        # 下载协程先抢本用户 5 槽、再抢全局 15 槽，故实际并发 = min(本用户待下载, 全局剩余)。
         restored = 0
-        download_sem = asyncio.Semaphore(_RESTORE_CONCURRENCY)
+        global_sem = _get_restore_download_sem()
+        per_user_sem = asyncio.Semaphore(_RESTORE_PER_USER)
 
         async def _download_one(rel_path: str):
             """下载单个 MinIO 对象到内存，返回 (沙箱绝对路径, 内容) 或 None。"""
-            async with download_sem:
+            async with per_user_sem, global_sem:
                 try:
                     def _download_object(bucket, key):
                         resp = self._client.get_object(bucket, key)
@@ -786,18 +804,18 @@ class MinioSyncService(metaclass=SingletonMeta):
                     )
                     return (f"/{rel_path}", content)
                 except Exception as e:
-                    SYLogger.warning(f"[MinIO] 下载文件失败: {rel_path}, error={e}")
+                    SYLogger.warning(f"[MinIO] 下载文件失败: {rel_path}, error: {e}")
                     return None
 
-        # 全量并发下载(受 Semaphore 限流)，比按批串行快得多
+        # 全量并发下载(受两层 Semaphore 限流)，比按批串行快得多
         download_results = await asyncio.gather(
             *[_download_one(rp) for rp in to_restore]
         )
         downloaded = [r for r in download_results if r is not None]
 
         # 上传仍走 batch_upload(服务端并发)，按 5 个一批发(沙箱端点对超大批量可能限流)
-        for i in range(0, len(downloaded), _RESTORE_CONCURRENCY):
-            batch = downloaded[i:i + _RESTORE_CONCURRENCY]
+        for i in range(0, len(downloaded), _RESTORE_PER_USER):
+            batch = downloaded[i:i + _RESTORE_PER_USER]
             if not batch:
                 continue
             try:

sycommon/agent/summarization_utils.py

@@ -42,6 +42,13 @@ try:
     from langchain_core.exceptions import ContextOverflowError
 
     _orig_handle_bad_request = _lc_oai_base._handle_openai_bad_request
+    _orig_handle_api_error = _lc_oai_base._handle_openai_api_error
+
+    # langchain_openai 原生识别的上下文溢出模式(1.3.5 起 bad_request/api_error 各有):
+    #   bad_request: "context_length_exceeded" / "Input tokens exceed the configured
+    #                limit" / "prompt is too long"
+    #   api_error  : "exceeds the context window"   ← 1.3.5 新增
+    # 这些都不覆盖 MiniMax/vLLM 的 "maximum context length is ..." 句式, 下方扩展补上。
 
     def _patched_handle_openai_bad_request(e: openai.BadRequestError) -> None:
         """扩展版 _handle_openai_bad_request，识别更多上下文溢出错误格式。"""
@@ -58,14 +65,11 @@ try:
                 message=e.message, response=e.response, body=e.body
             ) from e
 
-        # 回退到原始处理逻辑
+        # 回退到原始处理逻辑（含官方的 context_length_exceeded 等识别）
         _orig_handle_bad_request(e)
 
     _lc_oai_base._handle_openai_bad_request = _patched_handle_openai_bad_request
 
-    # 同步 patch _handle_openai_api_error
-    _orig_handle_api_error = _lc_oai_base._handle_openai_api_error
-
     def _patched_handle_openai_api_error(e: openai.APIError) -> None:
         """扩展版 _handle_openai_api_error，识别更多上下文溢出错误格式。"""
         error_str = str(e)
@@ -73,6 +77,7 @@ try:
             raise _lc_oai_base.OpenAIAPIContextOverflowError(
                 message=e.message, request=e.request, body=e.body
             ) from e
+        # 回退到原始处理逻辑（含官方 1.3.5 新增的 "exceeds the context window" 识别）
         _orig_handle_api_error(e)
 
     _lc_oai_base._handle_openai_api_error = _patched_handle_openai_api_error

sycommon/tests/test_upgrade_aio_pika.py

@@ -0,0 +1,153 @@
+"""aio-pika 10 升级端到端验证（真实 RabbitMQ）。
+
+验证 aio-pika 9.6.2 → 10.0.1（aiormq 6→7）升级的核心风险点：
+1. 普通连接 connect() 的 connect+channel+publish+consume 全链路
+2. connect_robust() + RobustConnection（robust 模块在 v10 仍保留）
+3. Connection.Close 帧解析能力（用于诊断 vhost 权限等问题）
+
+连接配置取自 shengye-platform-digital-work 的 nacos-data 快照（mq.yml）。
+rabbit 用户对 /uat 无权限（broker ACL），对 / 有权限；本测试用 / 验证连通性，
+/uat 的权限问题与本次升级无关，仅在 e2e 验证时记录为已知差异。
+
+运行方式（pytest 或直接 python）：
+    uv run python -m pytest src/sycommon/tests/test_upgrade_aio_pika.py -v -s
+    python src/sycommon/tests/test_upgrade_aio_pika.py
+"""
+import asyncio
+import os
+import sys
+
+import pytest
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
+
+import aio_pika
+from importlib.metadata import version
+
+# nacos mq.yml 配置
+MQ_HOST = "rabbitmq.test1.svc.k8s.syf.com"
+MQ_PORT = 5672
+MQ_USER = "rabbit"
+MQ_PASS = "SU7BrhDfbGbH"
+# rabbit 用户对 / 有权限；mq.yml 里的 /uat 是另一套授权用户才能访问的 vhost
+MQ_VHOST_OK = "/"
+MQ_VHOST_UAT = "uat"
+
+TEST_QUEUE = "sycommon_upgrade_test"
+TEST_MSG = b"upgrade-test"
+
+
+def _url(vhost: str) -> str:
+    return f"amqp://{MQ_USER}:{MQ_PASS}@{MQ_HOST}:{MQ_PORT}/{vhost}"
+
+
+def test_aio_pika_versions_pinned():
+    """v10 依赖链：aio-pika 10 / aiormq 7 / pamqp 4。"""
+    assert aio_pika.__version__ == "10.0.1", (
+        f"aio-pika 应为 10.0.1, 实际 {aio_pika.__version__}")
+    assert version("aiormq").split(".")[0] == "7", (
+        f"aiormq 主版本应为 7, 实际 {version('aiormq')}")
+    assert version("pamqp").split(".")[0] == "4", (
+        f"pamqp 主版本应为 4, 实际 {version('pamqp')}")
+    print(f"  [OK] aio-pika={aio_pika.__version__} "
+          f"aiormq={version('aiormq')} pamqp={version('pamqp')}")
+
+
+def test_roundtrip_plain_connection():
+    """普通连接：connect + channel + declare_queue + publish + get 全链路。"""
+    async def go():
+        conn = await aio_pika.connect(_url(MQ_VHOST_OK), timeout=10)
+        async with conn:
+            ch = await conn.channel()
+            q = await ch.declare_queue(TEST_QUEUE, auto_delete=True)
+            await ch.default_exchange.publish(
+                aio_pika.Message(body=TEST_MSG), routing_key=TEST_QUEUE)
+            msg = await q.get(timeout=5, no_ack=True)
+            return msg.body
+
+    body = asyncio.run(go())
+    assert body == TEST_MSG, f"收发不一致: {body!r}"
+    print(f"  [OK] 普通连接 roundtrip: body={body!r}")
+
+
+def test_robust_connection_roundtrip():
+    """connect_robust 返回 RobustConnection，robust 模块在 v10 仍存在且工作。"""
+    async def go():
+        conn: aio_pika.RobustConnection = await aio_pika.connect_robust(
+            _url(MQ_VHOST_OK), timeout=10)
+        info = {
+            "type": type(conn).__name__,
+            "is_robust": issubclass(type(conn), aio_pika.RobustConnection),
+            "reconnect_interval": conn.reconnect_interval,
+        }
+        async with conn:
+            ch = await conn.channel()
+            info["channel_type"] = type(ch).__name__
+            q = await ch.declare_queue(TEST_QUEUE, auto_delete=True)
+            got = asyncio.Event()
+            received = []
+
+            async def consumer(message: aio_pika.IncomingMessage):
+                received.append(message.body)
+                got.set()
+
+            await q.consume(consumer, no_ack=True)
+            await ch.default_exchange.publish(
+                aio_pika.Message(body=TEST_MSG), routing_key=TEST_QUEUE)
+            await asyncio.wait_for(got.wait(), timeout=5)
+            info["body"] = received[0]
+        return info
+
+    info = asyncio.run(go())
+    assert info["is_robust"], "connect_robust 未返回 RobustConnection 子类"
+    assert info["type"] == "RobustConnection", f"连接类型异常: {info['type']}"
+    assert info["channel_type"] == "RobustChannel", (
+        f"channel 非鲁棒类型: {info['channel_type']}")
+    assert info["body"] == TEST_MSG, f"robust 收发不一致: {info['body']!r}"
+    print(f"  [OK] RobustConnection roundtrip: "
+          f"type={info['type']} channel={info['channel_type']} "
+          f"reconnect_interval={info['reconnect_interval']} body={info['body']!r}")
+
+
+def test_uat_vhost_permission_known_issue():
+    """记录已知差异：rabbit 用户对 /uat 无权限（broker ACL，与升级无关）。
+
+    断言它确实被 broker 拒绝（reply_text 含 NOT_ALLOWED），以便未来
+    broker 授权变更时本测试会主动失败提醒复核。
+    """
+    async def go():
+        conn = await aio_pika.connect(_url(MQ_VHOST_UAT), timeout=10)
+        async with conn:
+            pass
+
+    try:
+        asyncio.run(go())
+        # 如果将来 /uat 对 rabbit 开放了权限，连接会成功 —— 提示复核
+        pytest.fail(
+            "/uat 现在可连了：broker 可能已给 rabbit 授权，请复核 mq.yml 配置")
+    except Exception as e:  # noqa: BLE001
+        cl = e.args[1] if len(getattr(e, "args", ())) > 1 else None
+        detail = ""
+        if cl is not None and hasattr(cl, "marshal"):
+            detail = cl.marshal().decode("latin1", "replace")
+        assert "NOT_ALLOWED" in detail, (
+            f"/uat 被拒但原因非权限问题，请复核: {detail!r}")
+        print(f"  [OK] /uat 确实因权限被拒（已知差异，与升级无关）: "
+              f"{detail[:60]!r}")
+
+
+if __name__ == "__main__":
+    # 直接运行模式（与 test_consumer_recovery.py 一致的 __main__ 风格）
+    async def main():
+        print("=" * 70)
+        print("  aio-pika 10 升级端到端验证")
+        print("=" * 70)
+        test_aio_pika_versions_pinned()
+        test_roundtrip_plain_connection()
+        test_robust_connection_roundtrip()
+        test_uat_vhost_permission_known_issue()
+        print("=" * 70)
+        print("  全部通过")
+        print("=" * 70)
+
+    asyncio.run(main())

sycommon/tests/test_upgrade_langgraph_stream.py

@@ -0,0 +1,131 @@
+"""langgraph agent 流式升级端到端验证（真实 LLM）。
+
+验证 langchain 1.2.12→1.3.13 + langgraph 1.2.8→1.2.9 + streaming 补丁
+在真实 LLM 网关下，stream_mode="messages" 逐 token 触发 on_llm_new_token。
+
+覆盖升级核心风险点：
+1. 底层 ChatOpenAI.astream() 能逐 token 触发 on_llm_new_token
+2. deepagents 的 model node（_execute_model_async）经补丁替换为 astream+config 后，
+   agent.astream(stream_mode="messages") 正常产出消息片段
+
+连接配置取自 nacos-data llm 配置（10.10.6.132:3000 网关）。
+
+CI/无内网环境默认跳过；连接到内网网关时显式开启：
+    SYCOMMON_E2E_LLM=1 uv run python -m pytest src/sycommon/tests/test_upgrade_langgraph_stream.py -v -s
+    python src/sycommon/tests/test_upgrade_langgraph_stream.py
+"""
+import asyncio
+import os
+import sys
+
+import pytest
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), ".."))
+
+from langchain_openai import ChatOpenAI
+from langchain_core.messages import HumanMessage
+from langchain_core.callbacks import BaseCallbackHandler
+
+# nacos llm 配置
+BASE_URL = "http://10.10.6.132:3000/v1"
+API_KEY = "sk-gbDkgZb3JD6i2Mrwf0RfYJf8YuEiby7nozQmv99E2fxEdUIh"
+MODEL = "glm-5-turbo"
+
+# 无内网网关访问时跳过真实集成（pytest 收集仍可用）
+_E2E_ENABLED = os.environ.get("SYCOMMON_E2E_LLM") == "1"
+_skip_no_intranet = pytest.mark.skipif(
+    not _E2E_ENABLED,
+    reason="需要内网 LLM 网关访问；设置 SYCOMMON_E2E_LLM=1 启用",
+)
+
+
+class _TokenCollector(BaseCallbackHandler):
+    """统计 on_llm_new_token 触发次数。"""
+
+    def __init__(self):
+        self.tokens = 0
+
+    def on_llm_new_token(self, token, **kwargs):  # noqa: D401
+        self.tokens += 1
+
+
+def _make_model(max_tokens: int = 50) -> ChatOpenAI:
+    return ChatOpenAI(
+        model=MODEL, base_url=BASE_URL, api_key=API_KEY,
+        streaming=True, temperature=0.0, max_tokens=max_tokens,
+        extra_body={"stream_options": {"include_usage": True}},
+    )
+
+
+@_skip_no_intranet
+def test_underlying_astream_triggers_token_callbacks():
+    """底层 model.astream() 逐 token 触发 on_llm_new_token。"""
+    async def go():
+        model = _make_model()
+        collector = _TokenCollector()
+        chunks = 0
+        async for _chunk in model.astream(
+            [HumanMessage(content="用一句话介绍你自己")],
+            config={"callbacks": [collector]},
+        ):
+            chunks += 1
+        return chunks, collector.tokens
+
+    chunks, tokens = asyncio.run(go())
+    assert chunks > 0, "astream 无产出"
+    assert tokens > 0, "on_llm_new_token 未触发 —— 流式回调链路断了"
+    print(f"  [OK] astream chunks={chunks}, on_llm_new_token 触发 {tokens} 次")
+
+
+@_skip_no_intranet
+def test_agent_stream_mode_messages(monkeypatch):
+    """端到端：deepagents agent + streaming 补丁 → stream_mode='messages' 产出。
+
+    这是 streaming 补丁（deep_agent.py:_patch_agent_streaming）要修复的核心场景：
+    官方 factory._execute_model_async 用 ainvoke 且不传 config，导致回调不触发；
+    补丁替换为 astream + 从 ContextVar 读 config，使 on_llm_new_token 透传到
+    stream_mode="messages" 消费者。
+    """
+    from deepagents import create_deep_agent
+    from langgraph.checkpoint.memory import MemorySaver
+
+    agent = create_deep_agent(
+        model=_make_model(), tools=[], middleware=(), checkpointer=MemorySaver(),
+    )
+    from sycommon.agent.deep_agent import _patch_agent_streaming
+    _patch_agent_streaming(agent)
+
+    async def go():
+        config = {"configurable": {"thread_id": "upgrade-stream-test"}}
+        message_chunks = 0
+        async for _stream_mode, _chunk in agent.astream(
+            {"messages": [HumanMessage(content="用一个词回答:你好")]},
+            config=config,
+            stream_mode="messages",
+        ):
+            message_chunks += 1
+            if message_chunks > 200:  # 防御性截断
+                break
+        return message_chunks
+
+    message_chunks = asyncio.run(go())
+    assert message_chunks > 0, (
+        "stream_mode='messages' 无产出 —— 补丁未生效或流式链路断了")
+    print(f"  [OK] agent stream_mode='messages' 产出 {message_chunks} 个消息片段")
+
+
+if __name__ == "__main__":
+    async def main():
+        print("=" * 70)
+        print("  langgraph agent 流式升级端到端验证")
+        print("=" * 70)
+        if not _E2E_ENABLED:
+            print("  [SKIP] 未设置 SYCOMMON_E2E_LLM=1，跳过（需内网 LLM 网关）")
+            return
+        test_underlying_astream_triggers_token_callbacks()
+        test_agent_stream_mode_messages(None)
+        print("=" * 70)
+        print("  全部通过")
+        print("=" * 70)
+
+    asyncio.run(main())

sycommon/tests/test_upgrade_verification.py

@@ -0,0 +1,229 @@
+"""验证本次依赖升级 + 补丁适配的正确性（纯离线，不依赖 RabbitMQ/真实 LLM）。
+
+覆盖本次三处改动：
+A. deep_agent.py 的 streaming 补丁白名单：_VERIFIED 已更新到 langchain==1.3.13，
+   且在 1.3.13 的真实 langchain.agents.factory 上能定位到 _execute_model_async
+   闭包（验证补丁在新版上仍生效、不跳过）。
+B. summarization_utils.py 的 ContextOverflow 补丁：在 1.3.5 上成功替换
+   _handle_openai_bad_request / _handle_openai_api_error，且：
+   - MiniMax/vLLM 句式 "maximum context length is ..." 仍被正确转成
+     OpenAIContextOverflowError / OpenAIAPIContextOverflowError；
+   - 官方原生句式（context_length_exceeded / exceeds the context window）
+     通过回退 _orig 仍被识别（不被补丁截断）。
+C. 依赖版本落地：langchain 1.3.13 / langchain_openai 1.3.5 / langchain_core 1.4.9。
+"""
+import sys
+import pytest
+
+
+# ============================================================
+# C. 依赖版本落地
+# ============================================================
+def test_installed_versions():
+    import langchain
+    import langchain_openai
+    import langchain_core
+
+    assert langchain.__version__ == "1.3.13", (
+        f"langchain 应为 1.3.13, 实际 {langchain.__version__}")
+    assert langchain_openai.__version__ == "1.3.5", (
+        f"langchain_openai 应为 1.3.5, 实际 {langchain_openai.__version__}")
+    assert langchain_core.__version__ == "1.4.9", (
+        f"langchain_core 应为 1.4.9, 实际 {langchain_core.__version__}")
+    print(f"  [OK] langchain={langchain.__version__} "
+          f"langchain_openai={langchain_openai.__version__} "
+          f"langchain_core={langchain_core.__version__}")
+
+
+# ============================================================
+# A. streaming 补丁白名单 + 闭包定位（不创建真实 agent，直接验 langchain 源码结构）
+# ============================================================
+def test_streaming_patch_whitelist_updated():
+    """_VERIFIED 白名单已更新到 1.3.13。"""
+    import inspect
+    from sycommon.agent import deep_agent
+
+    src = inspect.getsource(deep_agent._patch_agent_streaming)
+    assert '"langchain": "1.3.13"' in src, (
+        "_VERIFIED 白名单未更新到 langchain==1.3.13")
+    assert '"1.3.12"' not in src.split("_VERIFIED")[0].split("#")[-1] or \
+        True  # 仅作存在性提示，真正断言在下一行
+    # 精确：_VERIFIED 字典行内应含 1.3.13
+    ver_line = [l for l in src.splitlines() if "_VERIFIED = " in l][0]
+    assert "1.3.13" in ver_line, f"_VERIFIED 行未指向 1.3.13: {ver_line.strip()}"
+    print(f"  [OK] 白名单已更新: {ver_line.strip()}")
+
+
+def test_factory_closure_locatable_on_1_3_13():
+    """直接验证 langchain 1.3.13 的 factory.py 闭包结构，
+    确认 _patch_agent_streaming 的 cell 定位逻辑能成功命中。
+
+    复刻补丁里的 _cell_by_name 定位逻辑，对真实源码运行。
+    """
+    # deepagents 的 create_deep_agent 在构建 agent 时才创建闭包，
+    # 这里直接 import factory 模块确认关键符号存在且未被官方改动。
+    from langchain.agents import factory as fac
+
+    src = inspect_getsource(fac)
+    # 1.3.13 官方仍是 ainvoke + 不传 config（子代理已用 sdiff 实证）
+    assert "output = await model_.ainvoke(messages)" in src, (
+        "1.3.13 的 _execute_model_async 未改用 astream —— 与补丁白名单注释一致, "
+        "补丁仍需保留")
+    assert "_execute_model_async" in src, "_execute_model_async 符号仍在"
+    assert "async def amodel_node" in src, "amodel_node 闭包仍在"
+    print("  [OK] langchain 1.3.13 factory.py 闭包结构确认: "
+          "_execute_model_async 仍存在、仍为 ainvoke+无config, 补丁替换点有效")
+
+
+def inspect_getsource(mod):
+    import inspect
+    return inspect.getsource(mod)
+
+
+def test_cell_by_name_logic_on_real_amodel_node(monkeypatch):
+    """实际构建一个 deep agent,触发 _patch_agent_streaming,断言它成功命中
+    闭包（而非打印 skip 警告）。这是补丁在 1.3.13 上是否真正生效的端到端验证。
+    """
+    from sycommon.logging.kafka_log import SYLogger
+
+    # 收集补丁内部发出的日志（SYLogger 是自定义类, 静态方法 warning/info, monkeypatch 拦截）
+    captured: list[str] = []
+    monkeypatch.setattr(SYLogger, "warning",
+                        staticmethod(lambda *a, **k: captured.append(" ".join(str(x) for x in a))))
+    monkeypatch.setattr(SYLogger, "info",
+                        staticmethod(lambda *a, **k: captured.append(" ".join(str(x) for x in a))))
+
+    from langchain.chat_models import init_chat_model
+    from langchain_core.tools import tool as lc_tool
+
+    from deepagents import create_deep_agent
+
+    model = init_chat_model(
+        model="test", model_provider="openai",
+        base_url="http://localhost:1/v1",
+        api_key="sk-test", temperature=0.0)
+
+    @lc_tool
+    def dummy_tool() -> str:
+        """dummy"""
+        return "ok"
+
+    agent = create_deep_agent(
+        model=model, tools=[dummy_tool],
+        middleware=(), checkpointer=None,
+    )
+
+    from sycommon.agent.deep_agent import _patch_agent_streaming
+    _patch_agent_streaming(agent)
+
+    # 断言没有打出 "skip streaming patch"（即命中失败）警告
+    skip_warnings = [m for m in captured if "skip streaming patch" in m]
+    assert not skip_warnings, (
+        f"补丁在 1.3.13 上未命中闭包, 发出 skip 警告: {skip_warnings}")
+    # 应打出 patched 成功日志
+    patched_logs = [m for m in captured if "patched (astream + config)" in m]
+    assert patched_logs, (
+        "补丁未打印 patched 成功日志, 可能未替换 _execute_model_async")
+    print(f"  [OK] 补丁在 langchain 1.3.13 上成功替换 _execute_model_async")
+    print(f"       成功日志: {patched_logs[0][:120]}")
+
+
+# ============================================================
+# B. ContextOverflow 补丁
+# ============================================================
+def _make_bad_request(msg: str):
+    """构造一个真实的 openai.BadRequestError（带 httpx.Response）。"""
+    import openai
+    import httpx
+    resp = httpx.Response(400, request=httpx.Request("POST", "http://localhost/v1"))
+    return openai.BadRequestError(msg, response=resp, body={})
+
+
+def _make_api_error(msg: str):
+    """构造一个真实的 openai.APIError（带 request）。"""
+    import openai
+    import httpx
+    req = httpx.Request("POST", "http://localhost/v1")
+    # APIError 签名: (message, *, request, body=None)
+    return openai.APIError(msg, request=req, body={})
+
+
+def test_overflow_patch_replaces_handlers():
+    """import summarization_utils 后, 两个 handler 已被替换为 patched 版本。"""
+    import sycommon.agent.summarization_utils  # noqa: F401  触发补丁
+    import langchain_openai.chat_models.base as base
+
+    assert base._handle_openai_bad_request.__name__ == \
+        "_patched_handle_openai_bad_request", "bad_request handler 未被替换"
+    assert base._handle_openai_api_error.__name__ == \
+        "_patched_handle_openai_api_error", "api_error handler 未被替换"
+    print("  [OK] 两个 handler 均已被 patched 版本替换")
+
+
+def test_overflow_minimax_bad_request_recognized():
+    """MiniMax/vLLM 句式 → OpenAIContextOverflowError。"""
+    import sycommon.agent.summarization_utils  # noqa: F401  确保补丁已应用
+    import langchain_openai.chat_models.base as base
+
+    for msg in [
+        "This model's maximum context length is 8192 tokens. "
+        "However, your messages resulted in 9000 tokens.",
+        "Please reduce the length of the input prompt.",
+    ]:
+        e = _make_bad_request(msg)
+        with pytest.raises(base.OpenAIContextOverflowError):
+            base._handle_openai_bad_request(e)
+    print("  [OK] MiniMax/vLLM bad_request 句式被正确识别")
+
+
+def test_overflow_minimax_api_error_recognized():
+    """MiniMax/vLLM 句式经 APIError 路径 → OpenAIAPIContextOverflowError。"""
+    import sycommon.agent.summarization_utils  # noqa: F401  确保补丁已应用
+    import langchain_openai.chat_models.base as base
+
+    e = _make_api_error(
+        "This model's maximum context length is 8192 tokens.")
+    with pytest.raises(base.OpenAIAPIContextOverflowError):
+        base._handle_openai_api_error(e)
+    print("  [OK] MiniMax/vLLM api_error 句式被正确识别")
+
+
+def test_overflow_native_unchanged_via_fallback():
+    """官方原生句式通过 _orig 回退仍被识别（补丁没有截断官方逻辑）。
+
+    1.3.5 新增的 _handle_openai_api_error 识别 'exceeds the context window';
+    补丁对该句式应回退到官方 _orig 从而抛出 OpenAIAPIContextOverflowError。
+    """
+    import sycommon.agent.summarization_utils  # noqa: F401  确保补丁已应用
+    import langchain_openai.chat_models.base as base
+
+    # bad_request 原生: context_length_exceeded
+    e1 = _make_bad_request(
+        "This model's context_length_exceeded, too long")
+    with pytest.raises(base.OpenAIContextOverflowError):
+        base._handle_openai_bad_request(e1)
+
+    # api_error 1.3.5 原生: exceeds the context window
+    e2 = _make_api_error("input exceeds the context window")
+    with pytest.raises(base.OpenAIAPIContextOverflowError):
+        base._handle_openai_api_error(e2)
+    print("  [OK] 官方原生句式(context_length_exceeded / exceeds the context window)"
+          " 通过回退仍被识别")
+
+
+def test_overflow_unrelated_error_reraised():
+    """非上下文溢出的错误应原样 re-raise,不被误转。"""
+    import sycommon.agent.summarization_utils  # noqa: F401  确保补丁已应用
+    import openai
+    import langchain_openai.chat_models.base as base
+
+    # 一个与上下文无关的 BadRequestError（会落入官方源码末尾的 raise, re-raise）
+    # 官方 _handle_openai_bad_request 末尾是裸 `raise`, 需在 except 块内才有 active
+    # exception。这里用 try/except 包一层模拟 langchain 的真实调用上下文。
+    e = _make_bad_request("invalid api key format")
+    try:
+        raise e
+    except openai.BadRequestError:
+        with pytest.raises(openai.BadRequestError):
+            base._handle_openai_bad_request(e)
+    print("  [OK] 无关错误原样 re-raise, 未被误转")

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

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.7a30
+Version: 0.2.7a32
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: aio-pika==9.6.2
+Requires-Dist: aio-pika==10.0.1
 Requires-Dist: aiohttp==3.14.1
 Requires-Dist: aiomysql==0.3.2
 Requires-Dist: anyio==4.14.1
@@ -13,12 +13,12 @@ Requires-Dist: deepagents==0.6.12
 Requires-Dist: elasticsearch==9.4.1
 Requires-Dist: fastapi==0.139.0
 Requires-Dist: jinja2==3.1.6
-Requires-Dist: kafka-python==3.0.7
-Requires-Dist: langchain==1.3.12
+Requires-Dist: kafka-python==3.0.8
+Requires-Dist: langchain==1.3.13
 Requires-Dist: langchain-core==1.4.9
-Requires-Dist: langchain-openai==1.3.4
-Requires-Dist: langfuse==4.13.2
-Requires-Dist: langgraph==1.2.8
+Requires-Dist: langchain-openai==1.3.5
+Requires-Dist: langfuse==4.14.0
+Requires-Dist: langgraph==1.2.9
 Requires-Dist: langgraph-checkpoint-postgres==3.1.0
 Requires-Dist: langgraph-checkpoint-redis==0.5.0
 Requires-Dist: ldap3==2.9.1

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

@@ -136,9 +136,9 @@ 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=uLqhiBLcNQlmaYcg0L6dreJGKHDJ4XFU7GWjuVioIkY,78708
+sycommon/agent/deep_agent.py,sha256=8-evFtN-FaRXPzj23r2_-VnCTFg5SwOf9cgv3tNsF4M,78766
 sycommon/agent/multi_agent_team.py,sha256=RFXHB9q5j1_2B-MDZVRTcbXHdEpRIXpAhrm1yroUDYI,30460
-sycommon/agent/summarization_utils.py,sha256=bqZRFqSekNGlv2mYQPaT_s2QNA5VDTKddi2Va_SkHWc,18376
+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
 sycommon/agent/acp/fetch.py,sha256=a6tL13eeGT1KgExgNbdYpzQ54xBqLeTGNTIQmxr3eQ4,6796
@@ -146,9 +146,9 @@ sycommon/agent/acp/ssh_init.py,sha256=5y1kIyNHpsh9ayx9RWO5gS0GOOn2GfZpU4fNrGuhOY
 sycommon/agent/acp/tool.py,sha256=yt6ohKL2y7wIZMNiLv-m5oCg5u1p5GAbqgjzQVt285Y,10975
 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=B0dCaRKm2WGGsK6d9TIp4zmuun6QxPwXCVFY7drKEkA,17824
+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=8e7qSAoak0MNB5fRLscQF0PVGZ07SKdwmGk590GubOI,22870
+sycommon/agent/middleware/sensitive_guard.py,sha256=BYIvObH3QO6hbEYvaKzgxFXTRPIvqVzqL408NbjlR-o,23569
 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
@@ -157,7 +157,7 @@ sycommon/agent/sandbox/__init__.py,sha256=jR7LlkD4J4Y6QYyRXQClkwmqDBCCPmycV_hQV9
 sycommon/agent/sandbox/consistent_hash.py,sha256=8Jgk-W4NAD2-u5_vKRVlPmql_e0Vy4aNORiXOuzvIrs,7277
 sycommon/agent/sandbox/file_ops.py,sha256=VTK7xduMMWLVTr9JViMnmPeh7s8Ojr8YwYA4ovMZZg0,37138
 sycommon/agent/sandbox/http_sandbox_backend.py,sha256=1Cj_JYdvwP3PFPa_4xFPnrGdt67Wp5iQdoziSzjeqoE,70481
-sycommon/agent/sandbox/minio_sync.py,sha256=c2TQmnawlpfTyEalSmcIRSK4DNkrZluq-9SjoySrf-M,34515
+sycommon/agent/sandbox/minio_sync.py,sha256=z1WNv4CZHn5U0akCnpjnBKCqlq5LhPq4zppDbzJ7YRk,35380
 sycommon/agent/sandbox/sandbox_pool.py,sha256=eMn8sLakCWf90l6ni2-333QM8oBdX1CflV-WzneFp_k,9133
 sycommon/agent/sandbox/sandbox_recovery.py,sha256=X-eDODx1tmGMh_iTngV6e1ppfDBHpTdkPreJusN5MHY,7358
 sycommon/agent/sandbox/session.py,sha256=TjzC3yFC-VaJ75UwCyL26QX4PRTGNNfQae1FKFuOsYI,2365
@@ -298,6 +298,9 @@ sycommon/tests/test_real_summarization.py,sha256=7B89es7-UwULk-kq9xUiWH1ylXUO3QD
 sycommon/tests/test_summarization_config.py,sha256=Ztb-eJXt2NrpBXNp7xST4Cwq4x8DK9pFuC7-bXUUOaE,16860
 sycommon/tests/test_summarization_real.py,sha256=iTwwA_xQd5Zgkn849lu2M0zIHPnMp-3szsIGrg6G9J4,12406
 sycommon/tests/test_summary_leak_e2e.py,sha256=vE5r9QCcZRmUy3YQASwdwCBsVrRcl8vU95sLUyB6u9s,34739
+sycommon/tests/test_upgrade_aio_pika.py,sha256=HIvy0Gs-aNNGX6Q3Y2fwSq2nDODbsWt7kl7-bk3gTk0,6115
+sycommon/tests/test_upgrade_langgraph_stream.py,sha256=alKdaYXDiS2HAhNrkIB5yHKZ6_C79E-T-GBUUo-Lyrk,4785
+sycommon/tests/test_upgrade_verification.py,sha256=EdGkeoFvXGpagpArweMv8Q4IhH3TjYsg-novU8dGh8w,10387
 sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/async_utils.py,sha256=e2Bp8v0LDrnViBIZ3zcCWtm_01w67vG34VhnAyGu9ZM,1015
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
@@ -308,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.7a30.dist-info/METADATA,sha256=A_VXT1ygWDo4Hkvwonq65az8FeY0k_8ik6hkReVPKWY,7962
-sycommon_python_lib-0.2.7a30.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-sycommon_python_lib-0.2.7a30.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.7a30.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.7a30.dist-info/RECORD,,
+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,,