sycommon-python-lib 0.2.3a4__py3-none-any.whl → 0.2.3a6__py3-none-any.whl

sycommon/agent/deep_agent.py

@@ -616,9 +616,9 @@ async def create_deep_agent(
     # 创建 agent
     from deepagents import create_deep_agent as _create_deep_agent
 
-    # 根据模型上下文窗口大小配置压缩阈值
-    # 返回 (auto_summarization_mw, tool_mw)，auto 用于自动压缩，tool_mw 提供 compact_conversation 工具
-    auto_summarization_mw, tool_summarization_mw = build_summarization_middleware(
+    # 创建 compact_conversation 工具 middleware
+    # 自动压缩由 deepagents 内置的 SummarizationMiddleware 处理（通过 model.profile 获取阈值）
+    summarization_mw = build_summarization_middleware(
         model, config.model_name, sandbox_backend,
     )
 
@@ -633,8 +633,7 @@ async def create_deep_agent(
             BackgroundExecutionMiddleware(backend=sandbox_backend),
             ToolResultTruncationMiddleware(),
             TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
-            auto_summarization_mw,
-            tool_summarization_mw,
+            summarization_mw,
         ],
     }
     if skills_path:

sycommon/agent/multi_agent_team.py

@@ -584,14 +584,12 @@ async def create_multi_agent_team(
     from deepagents import create_deep_agent
     from deepagents.middleware.subagents import CompiledSubAgent
 
-    # 子 agent 共享同一组压缩 middleware
-    _auto_mw, _tool_mw = build_summarization_middleware(model, config.model_name, sandbox_backend)
+    summarization_mw = build_summarization_middleware(model, config.model_name, sandbox_backend)
     middleware = [
         BackgroundExecutionMiddleware(backend=sandbox_backend),
         ToolResultTruncationMiddleware(),
         TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
-        _auto_mw,
-        _tool_mw,
+        summarization_mw,
     ]
     shared = config.shared_tools or [get_current_date]
 
@@ -632,7 +630,7 @@ async def create_multi_agent_team(
 
     # 创建协调者 Agent
     coord_name = config.coordinator_name
-    _coord_auto_mw, _coord_tool_mw = build_summarization_middleware(model, config.model_name, sandbox_backend)
+    coord_summarization_mw = build_summarization_middleware(model, config.model_name, sandbox_backend)
     coordinator_agent = create_deep_agent(
         model=model,
         tools=config.shared_tools or [get_current_date],
@@ -648,8 +646,7 @@ async def create_multi_agent_team(
             BackgroundExecutionMiddleware(backend=sandbox_backend),
             ToolResultTruncationMiddleware(),
             TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
-            _coord_auto_mw,
-            _coord_tool_mw,
+            coord_summarization_mw,
         ],
     )
 

sycommon/agent/summarization_utils.py

@@ -1,12 +1,13 @@
 """上下文压缩 middleware 构建工具。
 
-根据 nacos 中配置的模型 maxTokens，用绝对 token 数设置压缩阈值，
-避免依赖模型 profile 信息（部分模型不提供 profile）。
+根据 nacos 中配置的模型 maxTokens，用绝对 token 数设置压缩阈值。
+仅创建 SummarizationToolMiddleware（compact_conversation 工具），
+自动压缩由 deepagents 内置的 SummarizationMiddleware 处理（通过 model.profile 获取阈值）。
 """
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Tuple
+from typing import TYPE_CHECKING
 
 from deepagents.middleware.summarization import (
     SummarizationMiddleware,
@@ -26,10 +27,15 @@ def build_summarization_middleware(
     trigger_fraction: float = 0.70,
     keep_fraction: float = 0.10,
     default_max_tokens: int = 200000,
-) -> Tuple[SummarizationMiddleware, SummarizationToolMiddleware]:
-    """根据模型上下文窗口大小构建压缩 middleware。
+) -> SummarizationToolMiddleware:
+    """根据模型上下文窗口大小构建 compact_conversation 工具 middleware。
 
-    使用绝对 token 数而非 fraction 模式，避免要求模型提供 profile 信息。
+    自动压缩由 deepagents 内置的 SummarizationMiddleware 处理，
+    它通过 model.profile.max_input_tokens（由 LLMWithTokenTracking 从 nacos 配置注入）
+    计算压缩阈值。
+
+    此处创建的 SummarizationToolMiddleware 仅提供 compact_conversation 手动压缩工具，
+    使用 nacos 配置的 maxTokens 作为其内部 SummarizationMiddleware 的阈值参数。
 
     Args:
         model: LLM 实例。
@@ -40,8 +46,7 @@ def build_summarization_middleware(
         default_max_tokens: 无法从配置读取时的默认上下文窗口大小。
 
     Returns:
-        (SummarizationMiddleware, SummarizationToolMiddleware) 元组。
-        第一个是自动压缩 middleware，第二个是 compact_conversation 工具 middleware。
+        SummarizationToolMiddleware 实例（提供 compact_conversation 工具）。
     """
     try:
         from sycommon.config.Config import Config
@@ -66,7 +71,7 @@ def build_summarization_middleware(
             "max_length": 2000,
         },
     )
-    print(f"[Summarization] 压缩配置: model={model_name}, max_tokens={max_tokens}, "
+    print(f"[Summarization] compact_conversation 工具配置: model={model_name}, max_tokens={max_tokens}, "
           f"trigger={trigger_tokens} tokens ({trigger_fraction:.0%}), "
           f"keep={keep_tokens} tokens ({keep_fraction:.0%})")
-    return summ, SummarizationToolMiddleware(summ)
+    return SummarizationToolMiddleware(summ)

sycommon/models/mqlistener_config.py

@@ -31,8 +31,7 @@ class RabbitMQListenerConfig(BaseModel):
     durable: bool = Field(True, description="是否持久化")
     auto_delete: bool = Field(False, description="是否自动删除队列")
     auto_parse_json: bool = Field(True, description="是否自动解析JSON消息")
-    prefetch_count: int = Field(2, description="mq同时消费数量")
-    max_concurrent_tasks: int = Field(5, description="handler 最大并发任务数")
+    prefetch_count: int = Field(2, description="同时消费并发数（控制MQ预取与handler并发上限）")
 
     class Config:
         """模型配置"""

sycommon/rabbitmq/rabbitmq_client.py

@@ -42,7 +42,6 @@ class RabbitMQClient:
         auto_delete: bool = False,
         auto_parse_json: bool = True,
         create_if_not_exists: bool = True,
-        max_concurrent_tasks: int = 5,
         **kwargs,
     ):
         self.connection_pool = connection_pool
@@ -75,8 +74,9 @@ class RabbitMQClient:
         self._connect_lock = asyncio.Lock()
         self._reconnect_semaphore = asyncio.Semaphore(1)
 
-        # 异步任务并发控制（方案C：收到即ACK + create_task）
-        self._task_semaphore = asyncio.Semaphore(max_concurrent_tasks)
+        # 异步任务并发控制（方案C：收到即ACK + create_task，复用 prefetch_count）
+        self.prefetch_count = kwargs.get('prefetch_count', 2)
+        self._task_semaphore = asyncio.Semaphore(self.prefetch_count)
         self._running_tasks: set = set()
 
     @property

sycommon/rabbitmq/rabbitmq_service_client_manager.py

@@ -158,7 +158,6 @@ class RabbitMQClientManager(RabbitMQCoreService):
             auto_parse_json=kwargs.get('auto_parse_json', True),
             create_if_not_exists=create_if_not_exists,
             prefetch_count=kwargs.get('prefetch_count', 2),
-            max_concurrent_tasks=kwargs.get('max_concurrent_tasks', 5),
         )
 
         # 4. 连接客户端

sycommon/tests/test_real_summarization.py

@@ -0,0 +1,166 @@
+"""快速验证自动压缩是否触发。
+
+用极小 maxTokens 使 1 轮对话即超过阈值，验证 deepagents 内置的
+SummarizationMiddleware 自动压缩机制。
+"""
+import asyncio
+import sys
+import os
+import time
+import tempfile
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "src"))
+
+from unittest.mock import AsyncMock, MagicMock, patch
+from langgraph.checkpoint.memory import MemorySaver
+from pathlib import Path
+
+from sycommon.agent.deep_agent import AgentConfig
+
+
+def make_mock_sandbox():
+    sandbox = AsyncMock()
+    sandbox.async_sync = AsyncMock(return_value={})
+    sandbox.akill_all_processes = AsyncMock()
+    sandbox.atree = AsyncMock(return_value=None)
+    sandbox.async_sync_dirs = AsyncMock()
+    return sandbox
+
+
+def make_model():
+    from langchain.chat_models import init_chat_model
+    return init_chat_model(
+        model="glm-5.1", model_provider="openai", streaming=False,
+        base_url="http://10.10.6.132:3000/v1",
+        api_key="sk-3hXhO7uCG5CRi7t3THE2cWTKVJqesXJ38cKstHZhDVXHQOIn",
+        temperature=0.7, max_retries=2, timeout=120,
+    )
+
+
+# Monkey-patch 检测自动压缩
+auto_triggered_flags = {}
+
+
+async def run_test(nacos_max_tokens: int):
+    """1 轮对话 + 极小 maxTokens"""
+    trigger_threshold = int(nacos_max_tokens * 0.85)
+    auto_triggered_flags["latest"] = False
+    print(f"\n{'='*60}")
+    print(f"  maxTokens={nacos_max_tokens}, 自动压缩阈值={trigger_threshold} tokens")
+    print(f"{'='*60}")
+
+    mock_llm_cfg = {
+        "model": "glm-5.1",
+        "provider": "openai",
+        "baseUrl": "http://10.10.6.132:3000/v1",
+        "maxTokens": nacos_max_tokens,
+        "vision": False,
+        "callFunction": True,
+        "default": True,
+        "apiKey": "sk-3hXhO7uCG5CRi7t3THE2cWTKVJqesXJ38cKstHZhDVXHQOIn",
+    }
+
+    model = make_model()
+
+    # Monkey-patch awrap_model_call 检测自动压缩
+    from deepagents.middleware import summarization as summ_module
+    _orig_awrap = summ_module._DeepAgentsSummarizationMiddleware.awrap_model_call
+
+    async def _patched_awrap(self_inner, request, handler):
+        result = await _orig_awrap(self_inner, request, handler)
+        from deepagents.middleware.summarization import ExtendedModelResponse
+        if isinstance(result, ExtendedModelResponse):
+            auto_triggered_flags["latest"] = True
+            print(f"  >>> 自动压缩触发! <<<")
+        return result
+
+    summ_module._DeepAgentsSummarizationMiddleware.awrap_model_call = _patched_awrap
+
+    try:
+        with patch("sycommon.config.Config.Config") as mock_config_cls, \
+             patch("sycommon.config.LLMConfig.LLMConfig") as mock_llmconfig_cls, \
+             patch("sycommon.agent.deep_agent.get_llm", return_value=model):
+
+            config_instance = MagicMock()
+            config_instance.get_llm_config = MagicMock(return_value=mock_llm_cfg)
+            config_instance.get_default_llm_model_name = MagicMock(return_value="glm-5.1")
+            mock_config_cls.return_value = config_instance
+
+            from sycommon.config.LLMConfig import LLMConfig
+            mock_llmconfig_cls.from_config = MagicMock(return_value=LLMConfig(**mock_llm_cfg))
+
+            agent_config = AgentConfig(
+                model_name="glm-5.1",
+                system_prompt="你是测试助手。用中文回答，写500字以上。",
+                tools=[],
+                debug=False,
+            )
+
+            sandbox = make_mock_sandbox()
+            checkpointer = MemorySaver()
+
+            with patch("sycommon.agent.summarization_utils.build_summarization_middleware") as mock_build:
+                from deepagents.middleware.summarization import SummarizationMiddleware, SummarizationToolMiddleware
+                from deepagents.backends.filesystem import FilesystemBackend
+
+                fs_backend = FilesystemBackend(
+                    root_dir=f"/tmp/test_summ_{int(time.time())}", virtual_mode=True,
+                )
+                summ = SummarizationMiddleware(
+                    model=model, backend=fs_backend,
+                    trigger=("tokens", int(nacos_max_tokens * 0.70)),
+                    keep=("tokens", int(nacos_max_tokens * 0.10)),
+                )
+                mock_build.return_value = (summ, SummarizationToolMiddleware(summ))
+
+                from sycommon.agent.deep_agent import create_deep_agent
+                deep_agent = await create_deep_agent(
+                    user_id=f"test_{int(time.time())}",
+                    config=agent_config,
+                    sandbox_backend=sandbox,
+                    checkpointer=checkpointer,
+                    project_root=Path(tempfile.mkdtemp()),
+                )
+
+            print(f"  Agent 创建成功")
+
+        question = "请详细介绍中国古代四大发明，每个发明至少写200字。"
+        print(f"  Q: {question}")
+
+        try:
+            async for event in deep_agent.chat(question):
+                if event.type == "tool_call":
+                    tn = event.data.get("name", "") if isinstance(event.data, dict) else str(event.data)
+                    print(f"  [tool_call] {tn}")
+                    if "compact" in tn.lower():
+                        print(f"  >>> compact_conversation 工具调用! <<<")
+        except Exception as e:
+            print(f"  chat 出错: {e}")
+
+    finally:
+        summ_module._DeepAgentsSummarizationMiddleware.awrap_model_call = _orig_awrap
+
+    triggered = auto_triggered_flags.get("latest", False)
+    print(f"  结果: 自动压缩 {'已触发' if triggered else '未触发'}")
+    return triggered
+
+
+async def main():
+    print(f"快速验证自动压缩 - {time.strftime('%H:%M:%S')}")
+
+    r1 = await run_test(nacos_max_tokens=3000)
+    r2 = await run_test(nacos_max_tokens=1000)
+
+    print(f"\n{'='*60}")
+    print(f"  maxTokens=3000 (阈值2550): {'已触发' if r1 else '未触发'}")
+    print(f"  maxTokens=1000 (阈值850):  {'已触发' if r2 else '未触发'}")
+    print(f"{'='*60}")
+
+    if r1 or r2:
+        print(f"\n  结论: 自动压缩机制工作正常!")
+    else:
+        print(f"\n  结论: 未触发，需要排查")
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

{sycommon_python_lib-0.2.3a4.dist-info → sycommon_python_lib-0.2.3a6.dist-info}/METADATA

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

{sycommon_python_lib-0.2.3a4.dist-info → sycommon_python_lib-0.2.3a6.dist-info}/RECORD

@@ -129,9 +129,9 @@ sycommon/services.py,sha256=N6Z4D-qmdyGBZ5z72j2dtSfpXnrnWjEuSyKCgSIY0Cs,21332
 sycommon/agent/__init__.py,sha256=PXxUiDwdzxv3WQfD8R5MKXtV7qZPvbRc0wPxnS-ZsNQ,3752
 sycommon/agent/agent_manager.py,sha256=UhhaekEumT7g4v_Z1UB4jTp13X0n8M8erYaQdkGGWkA,13620
 sycommon/agent/chat_events.py,sha256=bWAMWYIZ2L_yqUcn5jq9ius_lQxLHEv4zQLEqX6UaeM,13190
-sycommon/agent/deep_agent.py,sha256=By7IvmYhOWDglXFoy6ZTovz4QaAOAo5RUFrpbOLdhMQ,30578
-sycommon/agent/multi_agent_team.py,sha256=aZvl-GhC9IS9mWTrtl3XJ9tjCG6dp35qFFPyBv7vr_Q,26647
-sycommon/agent/summarization_utils.py,sha256=aHkA2cGmGw39-yvApvu9qQxvd9nFd6aTIyiehB8oAfE,2584
+sycommon/agent/deep_agent.py,sha256=3RY4ijSxm7-I7NN4wlr-1PcIvdFShjFE39_qNfCVGb4,30500
+sycommon/agent/multi_agent_team.py,sha256=6Ba4MbdEDVuXe6iBE_Q84kzr5zJYLo_djdpkkwJhShg,26558
+sycommon/agent/summarization_utils.py,sha256=7iugXE60wkeJ8AfU2G3S6JePhRRA2uUTau8zJRXTNYk,2909
 sycommon/agent/sandbox/__init__.py,sha256=jR7LlkD4J4Y6QYyRXQClkwmqDBCCPmycV_hQV9p9YHw,4621
 sycommon/agent/sandbox/file_ops.py,sha256=6ymRMM0WchM7G_YmF1ckrLjf5s_JCh1wrAp2g_-sg8k,23162
 sycommon/agent/sandbox/http_sandbox_backend.py,sha256=mjiTZnADvUq_rO05ewllo_eGDS4uTdD2e2GGYvBpF-Q,56150
@@ -206,7 +206,7 @@ sycommon/middleware/traceid.py,sha256=HX4zg7Tp_mPNr2eWDDvK3f7GFJ6eOSeW062Xcc-xsh
 sycommon/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/models/base_http.py,sha256=EICAAibx3xhjBsLqm35Mi3DCqxp0FME4rD_3iQVjT_E,3051
 sycommon/models/log.py,sha256=rZpj6VkDRxK3B6H7XSeWdYZshU8F0Sks8bq1p6pPlDw,500
-sycommon/models/mqlistener_config.py,sha256=MjWrEtm_t-JDHTVkEVgXGSLy72_K_eLb-Ec0kuVBZXc,1747
+sycommon/models/mqlistener_config.py,sha256=japihb4kmP5ZqvqQEs6C7CmcrPlE1UmhAtCimoL61xI,1704
 sycommon/models/mqmsg_model.py,sha256=Zo-LsDMFuF1Vkx9ZmwBC9E7TrCw-7nAQD2TE4v9-6F4,291
 sycommon/models/mqsend_config.py,sha256=NQX9dc8PpuquMG36GCVhJe8omAW1KVXXqr6lSRU6D7I,268
 sycommon/models/sandbox.py,sha256=5QPLqKCDm0UeyC8CHb2G0d7Rb3f7MYaLq12RFRSeOxc,7293
@@ -218,10 +218,10 @@ sycommon/notice/__init__.py,sha256=cVYbKlLLMFHckyDpx21CTZCMTufqZk_uHuEIxUNxwx4,1
 sycommon/notice/uvicorn_monitor.py,sha256=O4R25z032dAlvlbU0WLo0LJqoL1Z52fMFgFdb1e3Cls,11833
 sycommon/notice/wecom_message.py,sha256=PsyoQpPiR0OZaUI9KLXd0-zUwp5okd44q71J60QiRm8,11952
 sycommon/rabbitmq/process_pool_consumer.py,sha256=BFBiK6s5n1wbbj9Mlc_s-z4Gh6JvDN4RyS1qHWfhgCY,29714
-sycommon/rabbitmq/rabbitmq_client.py,sha256=DkA50Cvynh1d0F4pu1Tf-BMhAUVPAECfjyDHvWdFFb8,18628
+sycommon/rabbitmq/rabbitmq_client.py,sha256=IbuXEHa70e4V2KUHDE9MK4WxphDCJDOWy5Z3GGT3KjM,18674
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=mUo1-Nlj0xXKG9MdBA0hvkt1NIvKD4AGsDouzQDY5nQ,13835
 sycommon/rabbitmq/rabbitmq_service.py,sha256=q9c9-9RSvJaY_PE62PQ4mX7ropNsGr0Frcrm5gjaPao,9774
-sycommon/rabbitmq/rabbitmq_service_client_manager.py,sha256=7xgyP9ZLy2nadR1WZjbGdyEerwbluGDKmbCnKjLiSVM,9869
+sycommon/rabbitmq/rabbitmq_service_client_manager.py,sha256=kYhLuUajSY-42vi3HKf3Z3K92WYtp39NU1hPg6GQwe8,9797
 sycommon/rabbitmq/rabbitmq_service_connection_monitor.py,sha256=rdXTG-pZg3-un7y1ObTsNiwRH3Ni6oQaPfRNpAZ2A38,4557
 sycommon/rabbitmq/rabbitmq_service_consumer_manager.py,sha256=S-nU7dGy-yt9SZ3KsMrG_MZMfV7wONLrnEOTIxmeDnc,9962
 sycommon/rabbitmq/rabbitmq_service_core.py,sha256=kr4MaR4txhCRHUPxofa-Zt6-YJbfCw_vFfFVg-LE5cE,5230
@@ -247,6 +247,7 @@ sycommon/tests/deep_agent_server.py,sha256=t7snT2J6KWZrjJsYVi4TU5jpfvXNz4iuzMk4c
 sycommon/tests/test_deep_agent.py,sha256=34gP2KL8SSmtqqhaA9OV97OAl_I0T4TfEutZrR_0srM,5874
 sycommon/tests/test_email.py,sha256=-oPtYVGQzJ3Cv-op3ZNRMeyYOF-UNidGJC35CHRgjGQ,5442
 sycommon/tests/test_mq.py,sha256=Gpr9Eep-osRkcnlwGeshROEf83Ai3qYbAMHwpoML68o,4366
+sycommon/tests/test_real_summarization.py,sha256=7B89es7-UwULk-kq9xUiWH1ylXUO3QDJm4oZWzJNPk0,6193
 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
@@ -257,8 +258,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=JIEJaGXhqrTLcyxlyynSrsHg9bBnDNzX-D4qIWLRPUE,6815
-sycommon_python_lib-0.2.3a4.dist-info/METADATA,sha256=suveAcmu6ymKJX9vHVe6z15ihtgam_fuFjPCTUKJHfk,7741
-sycommon_python_lib-0.2.3a4.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sycommon_python_lib-0.2.3a4.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.3a4.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.3a4.dist-info/RECORD,,
+sycommon_python_lib-0.2.3a6.dist-info/METADATA,sha256=ql7nW3cSs3U-REXMv-nYh1A5eks3i-YkktTX891cZC8,7741
+sycommon_python_lib-0.2.3a6.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sycommon_python_lib-0.2.3a6.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.3a6.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.3a6.dist-info/RECORD,,