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

sycommon/agent/summarization_utils.py

@@ -1,23 +1,88 @@
 """上下文压缩 middleware 构建工具。
 
 根据 nacos 中配置的模型 maxTokens，用绝对 token 数设置压缩阈值。
-仅创建 SummarizationToolMiddleware（compact_conversation 工具），
-自动压缩由 deepagents 内置的 SummarizationMiddleware 处理（通过 model.profile 获取阈值）。
+中文场景下 count_tokens_approximately 默认 chars_per_token=4.0 会低估约 2.1 倍，
+因此传入自定义 token_counter 修正偏差，并按真实 token 数设定阈值。
 """
 
 from __future__ import annotations
 
+import functools
+import logging
 from typing import TYPE_CHECKING
 
 from deepagents.middleware.summarization import (
     SummarizationMiddleware,
     SummarizationToolMiddleware,
 )
+from langchain_core.messages.utils import count_tokens_approximately
 
 if TYPE_CHECKING:
     from langchain_core.language_models import BaseChatModel
     from deepagents.backends.protocol import BACKEND_TYPES
 
+logger = logging.getLogger(__name__)
+
+# 中文场景修正：chars_per_token 从 4.0 改为 2.0，使近似计数接近真实 token 数
+_chinese_token_counter = functools.partial(count_tokens_approximately, chars_per_token=2.0)
+
+
+def _patched_compute_summarization_defaults(model):
+    """覆盖 deepagents 默认值，返回中文场景修正后的绝对 token 阈值。
+
+    不走 fraction 路径（fraction 依赖 model.profile.max_input_tokens，
+    但内置 middleware 用默认 chars_per_token=4.0 计数，fraction 基于的基数不准）。
+    直接返回修正后的绝对 token 数。
+    """
+    try:
+        from sycommon.config.Config import Config
+        model_name = getattr(model, 'model_name', None) or getattr(model, 'model', None)
+        if model_name:
+            llm_cfg = Config().get_llm_config(model_name)
+            max_tokens = llm_cfg.get("maxTokens", 72000)
+        else:
+            max_tokens = 72000
+    except Exception:
+        max_tokens = 72000
+
+    trigger = int(max_tokens * 0.70)
+    keep = int(max_tokens * 0.10)
+    return {
+        "trigger": ("tokens", trigger),
+        "keep": ("tokens", keep),
+        "truncate_args_settings": {
+            "trigger": ("tokens", trigger),
+            "keep": ("tokens", keep),
+        },
+    }
+
+
+# monkey-patch：替换 deepagents 的默认计算函数
+import deepagents.middleware.summarization as _summ_mod
+_summ_mod.compute_summarization_defaults = _patched_compute_summarization_defaults
+
+# monkey-patch：在内置 middleware 的 awrap_model_call 中注入日志
+_OrigDeepAgentsSumm = _summ_mod._DeepAgentsSummarizationMiddleware
+_orig_awrap_model_call = _OrigDeepAgentsSumm.awrap_model_call
+
+
+async def _patched_awrap_model_call(self, request, handler):
+    effective_messages = self._get_effective_messages(request)
+    truncated_messages, _ = self._truncate_args(
+        effective_messages, request.system_message, request.tools,
+    )
+    counted_messages = [request.system_message, *truncated_messages] if request.system_message is not None else truncated_messages
+    try:
+        total_tokens = self.token_counter(counted_messages, tools=request.tools)
+    except TypeError:
+        total_tokens = self.token_counter(counted_messages)
+    should = self._should_summarize(truncated_messages, total_tokens)
+    print(f"[TokenCount] tokens={total_tokens} msgs={len(counted_messages)} should_summarize={should}")
+    return await _orig_awrap_model_call(self, request, handler)
+
+
+_OrigDeepAgentsSumm.awrap_model_call = _patched_awrap_model_call
+
 
 def build_summarization_middleware(
     model: BaseChatModel,
@@ -64,6 +129,7 @@ def build_summarization_middleware(
         backend=backend,
         trigger=("tokens", trigger_tokens),
         keep=("tokens", keep_tokens),
+        token_counter=_chinese_token_counter,
         trim_tokens_to_summarize=None,
         truncate_args_settings={
             "trigger": ("tokens", trigger_tokens),
@@ -71,6 +137,7 @@ def build_summarization_middleware(
             "max_length": 2000,
         },
     )
+
     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%})")

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.2.3a6
+Version: 0.2.3a8
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -9,16 +9,16 @@ Requires-Dist: aiohttp>=3.13.5
 Requires-Dist: aiomysql>=0.3.2
 Requires-Dist: anyio>=4.12.1
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: deepagents>=0.5.7
+Requires-Dist: deepagents>=0.6.1
 Requires-Dist: elasticsearch>=9.4.0
 Requires-Dist: fastapi>=0.136.1
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: kafka-python>=2.3.1
-Requires-Dist: langchain>=1.2.17
-Requires-Dist: langchain-core>=1.3.3
+Requires-Dist: langchain>=1.3.0
+Requires-Dist: langchain-core>=1.4.0
 Requires-Dist: langchain-openai>=1.2.1
-Requires-Dist: langfuse>=4.5.1
-Requires-Dist: langgraph>=1.1.10
+Requires-Dist: langfuse>=4.6.1
+Requires-Dist: langgraph>=1.2.0
 Requires-Dist: langgraph-checkpoint-redis>=0.4.1
 Requires-Dist: ldap3>=2.9.1
 Requires-Dist: loguru>=0.7.3
@@ -28,10 +28,10 @@ Requires-Dist: psutil>=7.2.2
 Requires-Dist: pyxxl>=0.4.6
 Requires-Dist: pydantic>=2.13.4
 Requires-Dist: python-dotenv>=1.2.2
-Requires-Dist: python-multipart>=0.0.27
+Requires-Dist: python-multipart>=0.0.28
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: redis>=7.3.0
-Requires-Dist: sentry-sdk[fastapi]>=2.59.0
+Requires-Dist: sentry-sdk[fastapi]>=2.60.0
 Requires-Dist: sqlalchemy[asyncio]>=2.0.48
 Requires-Dist: starlette[full]>=1.0.0
 Requires-Dist: tiktoken>=0.12.0

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

@@ -131,7 +131,7 @@ sycommon/agent/agent_manager.py,sha256=UhhaekEumT7g4v_Z1UB4jTp13X0n8M8erYaQdkGGW
 sycommon/agent/chat_events.py,sha256=bWAMWYIZ2L_yqUcn5jq9ius_lQxLHEv4zQLEqX6UaeM,13190
 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/summarization_utils.py,sha256=vOixzpuDBH-g8_xPAjt8-zPz1e4Kf9fyblvXFpkGUfk,5599
 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
@@ -258,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.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,,
+sycommon_python_lib-0.2.3a8.dist-info/METADATA,sha256=WCl4mIVh0pZAMUSmzyyHIryCiIxiMz8oxhDlt9DBnBY,7739
+sycommon_python_lib-0.2.3a8.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sycommon_python_lib-0.2.3a8.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.3a8.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.3a8.dist-info/RECORD,,