sycommon-python-lib 0.2.2a15__tar.gz → 0.2.2a17__tar.gz

{sycommon_python_lib-0.2.2a15 → sycommon_python_lib-0.2.2a17}/PKG-INFO

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

{sycommon_python_lib-0.2.2a15 → sycommon_python_lib-0.2.2a17}/pyproject.toml

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

{sycommon_python_lib-0.2.2a15 → sycommon_python_lib-0.2.2a17}/src/sycommon/agent/deep_agent.py

@@ -51,7 +51,8 @@ from sycommon.agent.sandbox.sandbox_recovery import SandboxRecoveryManager
 from sycommon.agent.chat_events import ChatEvent, ChatEventBuilder, DEFAULT_AGENT_NAME
 from sycommon.middleware.background_execution import BackgroundExecutionMiddleware
 from sycommon.middleware.token_tracking import TokenTrackingMiddleware
-from deepagents.middleware.summarization import create_summarization_tool_middleware
+from deepagents.middleware.summarization import create_summarization_tool_middleware  # noqa: F401 保留 re-export
+from sycommon.agent.summarization_utils import build_summarization_middleware
 
 if TYPE_CHECKING:
     from deepagents.graph import CompiledStateGraph
@@ -184,6 +185,7 @@ class DeepAgent:
                     if on_event:
                         await on_event(event)
                     yield event
+                    yield ChatEventBuilder.done()
                     return
 
                 # 解析 chunk（subgraphs=True 格式）
@@ -582,6 +584,11 @@ async def create_deep_agent(
     # 创建 agent
     from deepagents import create_deep_agent as _create_deep_agent
 
+    # 根据模型上下文窗口大小配置压缩阈值
+    summarization_mw = build_summarization_middleware(
+        model, config.model_name, sandbox_backend,
+    )
+
     agent_kwargs = {
         "model": model,
         "tools": config.tools or [get_current_date],
@@ -592,7 +599,7 @@ async def create_deep_agent(
         "middleware": [
             BackgroundExecutionMiddleware(backend=sandbox_backend),
             TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
-            create_summarization_tool_middleware(model, sandbox_backend),
+            summarization_mw,
         ],
     }
     if skills_path:

{sycommon_python_lib-0.2.2a15 → sycommon_python_lib-0.2.2a17}/src/sycommon/agent/multi_agent_team.py

@@ -44,7 +44,8 @@ from sycommon.agent.sandbox.sandbox_recovery import SandboxRecoveryManager
 from sycommon.agent.chat_events import ChatEvent, ChatEventBuilder, DEFAULT_AGENT_NAME
 from sycommon.middleware.background_execution import BackgroundExecutionMiddleware
 from sycommon.middleware.token_tracking import TokenTrackingMiddleware
-from deepagents.middleware.summarization import create_summarization_tool_middleware
+from deepagents.middleware.summarization import create_summarization_tool_middleware  # noqa: F401 保留 re-export
+from sycommon.agent.summarization_utils import build_summarization_middleware
 
 if TYPE_CHECKING:
     from deepagents.graph import CompiledStateGraph
@@ -268,6 +269,7 @@ class MultiAgentTeam:
                     if on_event:
                         await on_event(event)
                     yield event
+                    yield ChatEventBuilder.done()
                     return
 
                 # 解析 chunk（带 namespace）
@@ -584,7 +586,7 @@ async def create_multi_agent_team(
     middleware = [
         BackgroundExecutionMiddleware(backend=sandbox_backend),
         TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
-        create_summarization_tool_middleware(model, sandbox_backend),
+        build_summarization_middleware(model, config.model_name, sandbox_backend),
     ]
     shared = config.shared_tools or [get_current_date]
 
@@ -639,7 +641,7 @@ async def create_multi_agent_team(
         middleware=[
             BackgroundExecutionMiddleware(backend=sandbox_backend),
             TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
-            create_summarization_tool_middleware(model, sandbox_backend),
+            build_summarization_middleware(model, config.model_name, sandbox_backend),
         ],
     )
 

sycommon_python_lib-0.2.2a17/src/sycommon/agent/summarization_utils.py

@@ -0,0 +1,63 @@
+"""上下文压缩 middleware 构建工具。
+
+根据 nacos 中配置的模型 maxTokens，用 fraction 模式计算压缩阈值，
+确保压缩行为与实际模型上下文窗口大小匹配。
+"""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from deepagents.middleware.summarization import (
+    SummarizationMiddleware,
+    SummarizationToolMiddleware,
+)
+
+if TYPE_CHECKING:
+    from langchain_core.language_models import BaseChatModel
+    from deepagents.backends.protocol import BACKEND_TYPES
+
+
+def build_summarization_middleware(
+    model: BaseChatModel,
+    model_name: str,
+    backend: "BACKEND_TYPES",
+    *,
+    trigger_fraction: float = 0.85,
+    keep_fraction: float = 0.10,
+    default_max_tokens: int = 200000,
+) -> SummarizationToolMiddleware:
+    """根据模型上下文窗口大小构建压缩 middleware。
+
+    Args:
+        model: LLM 实例。
+        model_name: 模型名称（用于从 nacos 读取配置）。
+        backend: 后端实例。
+        trigger_fraction: 触发压缩的上下文窗口比例，默认 85%。
+        keep_fraction: 压缩后保留的上下文窗口比例，默认 10%。
+        default_max_tokens: 无法从配置读取时的默认上下文窗口大小。
+
+    Returns:
+        SummarizationToolMiddleware 实例（包含自动压缩 + compact_conversation 工具）。
+    """
+    try:
+        from sycommon.config.Config import Config
+
+        llm_cfg = Config().get_llm_config(model_name)
+        max_tokens = llm_cfg.get("maxTokens", default_max_tokens)
+    except Exception:
+        max_tokens = default_max_tokens
+
+    summ = SummarizationMiddleware(
+        model=model,
+        backend=backend,
+        trigger=("fraction", trigger_fraction),
+        keep=("fraction", keep_fraction),
+        trim_tokens_to_summarize=None,
+        truncate_args_settings={
+            "trigger": ("fraction", trigger_fraction),
+            "keep": ("fraction", keep_fraction),
+            "max_length": 2000,
+        },
+    )
+    return SummarizationToolMiddleware(summ)

{sycommon_python_lib-0.2.2a15 → sycommon_python_lib-0.2.2a17}/src/sycommon/middleware/sandbox.py

@@ -1047,7 +1047,17 @@ COMMAND_EOF
             if os.path.isdir(file_path):
                 if not req.recursive:
                     return DeleteResponse(path=file_path, error="is_directory, set recursive=true")
-                shutil.rmtree(file_path)
+                # 重试机制：并发同步写入文件时 rmtree 可能报 Directory not empty
+                import time
+                for attempt in range(3):
+                    try:
+                        shutil.rmtree(file_path)
+                        break
+                    except OSError:
+                        if attempt < 2:
+                            time.sleep(0.3)
+                        else:
+                            shutil.rmtree(file_path, ignore_errors=True)
             else:
                 os.remove(file_path)
             return DeleteResponse(path=file_path, error=None)
@@ -1121,8 +1131,8 @@ COMMAND_EOF
             SYLogger.error(f"[Sandbox Server] tree 失败: {e}")
             return TreeResponse(error=str(e))
 
-        max_depth = req.max_depth if req.max_depth is not None else 5
-        max_files = req.max_files if req.max_files is not None else 500
+        max_depth = req.max_depth if req.max_depth is not None else 0
+        max_files = req.max_files if req.max_files is not None else 0
         if max_depth == 0:
             max_depth = 100
 

{sycommon_python_lib-0.2.2a15 → sycommon_python_lib-0.2.2a17}/src/sycommon/models/sandbox.py

@@ -86,8 +86,8 @@ class TreeRequest(BaseModel):
     """树形目录请求"""
     path: str = "/"
     user_id: str
-    max_depth: Optional[int] = 10
-    max_files: Optional[int] = 500
+    max_depth: Optional[int] = 0
+    max_files: Optional[int] = 0
 
 
 class TreeResponse(BaseModel):

{sycommon_python_lib-0.2.2a15 → sycommon_python_lib-0.2.2a17}/src/sycommon_python_lib.egg-info/PKG-INFO

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

{sycommon_python_lib-0.2.2a15 → sycommon_python_lib-0.2.2a17}/src/sycommon_python_lib.egg-info/SOURCES.txt

@@ -133,6 +133,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/summarization_utils.py
 src/sycommon/agent/sandbox/__init__.py
 src/sycommon/agent/sandbox/file_ops.py
 src/sycommon/agent/sandbox/http_sandbox_backend.py