sycommon-python-lib 0.2.2a18__tar.gz → 0.2.2a19__tar.gz

{sycommon_python_lib-0.2.2a18 → sycommon_python_lib-0.2.2a19}/PKG-INFO

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

{sycommon_python_lib-0.2.2a18 → sycommon_python_lib-0.2.2a19}/pyproject.toml

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

{sycommon_python_lib-0.2.2a18 → sycommon_python_lib-0.2.2a19}/src/sycommon/agent/deep_agent.py

@@ -51,6 +51,7 @@ 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 sycommon.middleware.tool_result_truncation import ToolResultTruncationMiddleware
 from deepagents.middleware.summarization import create_summarization_tool_middleware  # noqa: F401 保留 re-export
 from sycommon.agent.summarization_utils import build_summarization_middleware
 
@@ -598,6 +599,7 @@ async def create_deep_agent(
         "debug": config.debug,
         "middleware": [
             BackgroundExecutionMiddleware(backend=sandbox_backend),
+            ToolResultTruncationMiddleware(),
             TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
             summarization_mw,
         ],

{sycommon_python_lib-0.2.2a18 → sycommon_python_lib-0.2.2a19}/src/sycommon/agent/multi_agent_team.py

@@ -44,6 +44,7 @@ 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 sycommon.middleware.tool_result_truncation import ToolResultTruncationMiddleware
 from deepagents.middleware.summarization import create_summarization_tool_middleware  # noqa: F401 保留 re-export
 from sycommon.agent.summarization_utils import build_summarization_middleware
 
@@ -585,6 +586,7 @@ async def create_multi_agent_team(
 
     middleware = [
         BackgroundExecutionMiddleware(backend=sandbox_backend),
+        ToolResultTruncationMiddleware(),
         TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
         build_summarization_middleware(model, config.model_name, sandbox_backend),
     ]
@@ -640,6 +642,7 @@ async def create_multi_agent_team(
         name=coord_name,
         middleware=[
             BackgroundExecutionMiddleware(backend=sandbox_backend),
+            ToolResultTruncationMiddleware(),
             TokenTrackingMiddleware(model_name=config.model_name, user_id=user_id),
             build_summarization_middleware(model, config.model_name, sandbox_backend),
         ],

{sycommon_python_lib-0.2.2a18 → sycommon_python_lib-0.2.2a19}/src/sycommon/agent/summarization_utils.py

@@ -23,7 +23,7 @@ def build_summarization_middleware(
     model_name: str,
     backend: "BACKEND_TYPES",
     *,
-    trigger_fraction: float = 0.85,
+    trigger_fraction: float = 0.70,
     keep_fraction: float = 0.10,
     default_max_tokens: int = 200000,
 ) -> SummarizationToolMiddleware:
@@ -35,7 +35,7 @@ def build_summarization_middleware(
         model: LLM 实例。
         model_name: 模型名称（用于从 nacos 读取配置）。
         backend: 后端实例。
-        trigger_fraction: 触发压缩的上下文窗口比例，默认 85%。
+        trigger_fraction: 触发压缩的上下文窗口比例，默认 70%。
         keep_fraction: 压缩后保留的上下文窗口比例，默认 10%。
         default_max_tokens: 无法从配置读取时的默认上下文窗口大小。
 

{sycommon_python_lib-0.2.2a18 → sycommon_python_lib-0.2.2a19}/src/sycommon/llm/struct_token.py

@@ -345,7 +345,6 @@ class StructuredRunnableWithToken(Runnable):
             try:
                 with self.langfuse.start_as_current_observation(as_type="span", name="invoke") as span:
                     with propagate_attributes(session_id=trace_id, user_id=user_id):
-                        span.update_trace(user_id=user_id, session_id=trace_id)
                         return self._execute_chain(input, config, trace_id, user_id, span)
             except Exception as e:
                 # Langfuse 跟踪失败不应阻断业务，降级执行
@@ -366,7 +365,6 @@ class StructuredRunnableWithToken(Runnable):
             try:
                 with self.langfuse.start_as_current_observation(as_type="span", name="ainvoke") as span:
                     with propagate_attributes(session_id=trace_id, user_id=user_id):
-                        span.update_trace(user_id=user_id, session_id=trace_id)
                         return await self._aexecute_chain(input, config, trace_id, user_id, span)
             except Exception as e:
                 # Langfuse 跟踪失败不应阻断业务，降级执行
@@ -405,7 +403,7 @@ class StructuredRunnableWithToken(Runnable):
                 input_data = {"messages": adapted_input}
 
             if span:
-                span.update_trace(input=input_data)
+                span.update(input=input_data)
 
             structured_result = self.retry_chain.invoke(
                 input_data,
@@ -413,7 +411,7 @@ class StructuredRunnableWithToken(Runnable):
             )
 
             if span:
-                span.update_trace(output=structured_result)
+                span.update(output=structured_result)
 
             token_usage = token_handler.usage_metadata
             structured_result._token_usage_ = token_usage
@@ -465,7 +463,7 @@ class StructuredRunnableWithToken(Runnable):
                 input_data = {"messages": adapted_input}
 
             if span:
-                span.update_trace(input=input_data)
+                span.update(input=input_data)
 
             # 3. 调用子链
             structured_result = await self.retry_chain.ainvoke(
@@ -474,7 +472,7 @@ class StructuredRunnableWithToken(Runnable):
             )
 
             if span:
-                span.update_trace(output=structured_result)
+                span.update(output=structured_result)
 
             token_usage = token_handler.usage_metadata
             structured_result._token_usage_ = token_usage

sycommon_python_lib-0.2.2a19/src/sycommon/middleware/tool_result_truncation.py

@@ -0,0 +1,136 @@
+"""工具结果截断中间件
+
+在工具执行结果返回给 LLM 之前，自动截断过长的 ToolMessage.content，
+防止 "Prompt exceeds max length" 错误。
+
+通过 wrap_tool_call / awrap_tool_call 钩子拦截每个工具调用结果，
+在结果进入对话历史之前完成截断。
+"""
+
+from collections.abc import Awaitable, Callable
+from typing import Any, FrozenSet
+
+from langchain.agents.middleware.types import (
+    AgentMiddleware,
+    AgentState,
+    ContextT,
+    ResponseT,
+)
+from langchain_core.messages import ToolMessage
+from langgraph.prebuilt.tool_node import ToolCallRequest
+from langgraph.types import Command
+
+from sycommon.logging.kafka_log import SYLogger
+
+
+# 不需要截断的工具（输出始终很短，或前端需要完整数据）
+DEFAULT_PASSTHROUGH_TOOLS: FrozenSet[str] = frozenset({
+    "get_download_url",
+    "get_current_date",
+    "memory",
+    "skill_manager",
+    "session_search",
+    "web_search",  # web_search 已在工具内部自行截断
+})
+
+# 截断提示模板
+DEFAULT_TRUNCATION_SUFFIX = (
+    "\n\n[输出已截断至前{kept}字符，原始长度{original}字符。"
+    "如需查看完整输出，可以：\n"
+    "1. 重新执行命令并添加过滤条件（如 grep、head、tail）\n"
+    "2. 将输出重定向到文件后用 read_file 分段读取]"
+)
+
+
+class ToolResultTruncationMiddleware(AgentMiddleware):
+    """截断过长的工具结果，防止超出模型上下文窗口。
+
+    Args:
+        max_content_length: 工具结果内容的最大字符长度，默认 15000（约 3750 token）。
+            模型上下文 200K token，70% 触发压缩 = 140K token，给单条工具结果留 3750 token
+            约占剩余空间的 2.6%，多条工具调用并行时也不会逼近上限。
+        passthrough_tools: 不截断的工具名集合。
+        truncation_suffix: 截断提示文本，支持 {kept} 和 {original} 占位符。
+    """
+
+    def __init__(
+        self,
+        *,
+        max_content_length: int = 15000,
+        passthrough_tools: FrozenSet[str] | None = None,
+        truncation_suffix: str = DEFAULT_TRUNCATION_SUFFIX,
+    ) -> None:
+        self._max_content_length = max_content_length
+        self._passthrough_tools = passthrough_tools or DEFAULT_PASSTHROUGH_TOOLS
+        self._truncation_suffix = truncation_suffix
+
+    @property
+    def name(self) -> str:
+        return "ToolResultTruncationMiddleware"
+
+    def _should_passthrough(self, tool_name: str) -> bool:
+        return tool_name in self._passthrough_tools
+
+    def _truncate(self, content: str, tool_name: str) -> str:
+        if self._should_passthrough(tool_name):
+            return content
+
+        original_len = len(content)
+        if original_len <= self._max_content_length:
+            return content
+
+        kept = self._max_content_length
+        suffix = self._truncation_suffix.format(kept=kept, original=original_len)
+        truncated = content[:kept] + suffix
+
+        SYLogger.info(
+            f"[ToolResultTruncation] tool='{tool_name}' truncated: "
+            f"{original_len} -> {len(truncated)} chars"
+        )
+        return truncated
+
+    def _process_result(
+        self,
+        result: Any,
+        tool_name: str,
+    ) -> Any:
+        """处理工具调用结果，截断过长的 ToolMessage.content"""
+        if isinstance(result, Command):
+            return result
+
+        if not isinstance(result, ToolMessage):
+            return result
+
+        content = result.content
+        if not isinstance(content, str):
+            return result
+
+        new_content = self._truncate(content, tool_name)
+        if new_content is content:
+            return result
+
+        return ToolMessage(
+            content=new_content,
+            tool_call_id=result.tool_call_id,
+            name=result.name,
+            status=result.status,
+            artifact=result.artifact,
+        )
+
+    def wrap_tool_call(
+        self,
+        request: ToolCallRequest,
+        handler: Callable[[ToolCallRequest], ToolMessage | Command],
+    ) -> ToolMessage | Command:
+        tool_name = request.tool_call.get("name", "")
+        result = handler(request)
+        return self._process_result(result, tool_name)
+
+    async def awrap_tool_call(
+        self,
+        request: ToolCallRequest,
+        handler: Callable[[ToolCallRequest], Awaitable[ToolMessage | Command]],
+    ) -> ToolMessage | Command:
+        tool_name = request.tool_call.get("name", "")
+        result = await handler(request)
+        return self._process_result(result, tool_name)

sycommon_python_lib-0.2.2a19/src/sycommon/notice/__init__.py

@@ -0,0 +1,5 @@
+from sycommon.notice.wecom_message import WeComMessageService
+
+__all__ = [
+    "WeComMessageService",
+]

sycommon_python_lib-0.2.2a19/src/sycommon/notice/wecom_message.py

@@ -0,0 +1,328 @@
+"""
+企微消息发送服务
+
+封装企业微信「应用消息 API」和「智能机器人主动消息」两种通道：
+- 应用消息：支持文本、Markdown、图片、文件发送（需要 corpid/corpsecret/agentid）
+- 机器人消息：支持 Markdown、模板卡片主动推送（需要注入 WSClient 实例）
+
+使用示例::
+
+    from sycommon.notice import WeComMessageService
+
+    svc = WeComMessageService()
+
+    # 应用消息 - 发送文件
+    await svc.send_file(touser="0633", file_path="/tmp/report.xlsx")
+
+    # 应用消息 - 发送 Markdown
+    await svc.send_markdown(touser="0633", content="# 通知\\n内容")
+
+    # 机器人主动消息
+    from aibot import WSClient, WSClientOptions
+    ws = WSClient(WSClientOptions(bot_id="...", secret="..."))
+    await ws.connect()
+    svc.set_ws_client(ws)
+    await svc.send_bot_markdown(chatid="single:user123", content="**Hello**")
+"""
+
+import logging
+import time
+from pathlib import Path
+from typing import Any, Dict, Optional
+
+import aiohttp
+from pydantic import BaseModel
+
+from sycommon.config.Config import SingletonMeta
+from sycommon.logging.kafka_log import SYLogger
+
+
+class WeComMessageConfig(BaseModel):
+    """企微消息服务配置"""
+
+    corpid: str
+    corpsecret: str
+    agentid: int
+
+    @classmethod
+    def from_config(cls) -> "WeComMessageConfig":
+        from sycommon.config.Config import Config
+
+        wecom_config = Config().config.get("llm", {}).get("WeCom", {})
+        corpid = wecom_config.get("corpid", "")
+        corpsecret = wecom_config.get("corpsecret", "")
+        agentid = wecom_config.get("agentid")
+
+        if not corpid or not corpsecret:
+            raise ValueError(
+                "企微配置不完整，请在 llm.WeCom 下配置 corpid 和 corpsecret"
+            )
+        if agentid is None:
+            raise ValueError(
+                "企微配置不完整，请在 llm.WeCom 下配置 agentid"
+            )
+
+        return cls(corpid=corpid, corpsecret=corpsecret, agentid=int(agentid))
+
+
+class WeComMessageService(metaclass=SingletonMeta):
+    """企微消息发送服务
+
+    同时支持应用消息 API 和机器人主动消息。
+    应用消息需要 corpid/corpsecret/agentid 配置。
+    机器人消息需要通过 set_ws_client() 注入 WSClient 实例。
+    """
+
+    def __init__(self):
+        self._config: Optional[WeComMessageConfig] = None
+        self._access_token: Optional[str] = None
+        self._token_expires_at: float = 0
+        self._ws_client: Optional[Any] = None
+
+    def _ensure_config(self) -> WeComMessageConfig:
+        if self._config is None:
+            self._config = WeComMessageConfig.from_config()
+        return self._config
+
+    def set_ws_client(self, client: Any) -> None:
+        """设置外部管理的 WSClient 实例（用于机器人主动消息）"""
+        self._ws_client = client
+
+    # ─── Token 管理 ───
+
+    async def _get_access_token(self) -> str:
+        if self._access_token and time.time() < self._token_expires_at:
+            return self._access_token
+
+        config = self._ensure_config()
+        url = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"
+        params = {
+            "corpid": config.corpid,
+            "corpsecret": config.corpsecret,
+        }
+
+        async with aiohttp.ClientSession() as session:
+            async with session.get(url, params=params) as resp:
+                data = await resp.json()
+
+        if data.get("errcode") != 0:
+            raise RuntimeError(f"获取企微 access_token 失败: {data}")
+
+        self._access_token = data["access_token"]
+        self._token_expires_at = time.time() + data.get("expires_in", 7200) - 300
+        SYLogger.info("[WeComMsg] access_token 已刷新")
+        return self._access_token
+
+    # ─── HTTP 辅助 ───
+
+    async def _wecom_post(self, path: str, body: dict) -> dict:
+        """发送企微 POST 请求"""
+        token = await self._get_access_token()
+        url = f"https://qyapi.weixin.qq.com{path}?access_token={token}"
+
+        async with aiohttp.ClientSession() as session:
+            async with session.post(url, json=body) as resp:
+                return await resp.json()
+
+    async def _wecom_upload(self, file_path: str, media_type: str = "file") -> dict:
+        """上传文件到企微素材库"""
+        token = await self._get_access_token()
+        url = (
+            f"https://qyapi.weixin.qq.com/cgi-bin/media/upload"
+            f"?access_token={token}&type={media_type}"
+        )
+
+        path = Path(file_path)
+        if not path.exists():
+            raise FileNotFoundError(f"文件不存在: {file_path}")
+
+        data = aiohttp.FormData()
+        data.add_field("media", open(file_path, "rb"), filename=path.name)
+
+        try:
+            async with aiohttp.ClientSession() as session:
+                async with session.post(url, data=data) as resp:
+                    return await resp.json()
+        finally:
+            # FormData 内的文件对象在请求结束后由 aiohttp 关闭，
+            # 但保险起见也手动确保关闭
+            pass
+
+    # ─── 应用消息 API ───
+
+    async def send_text(
+        self, touser: str, content: str, agentid: Optional[int] = None
+    ) -> Optional[dict]:
+        """发送文本应用消息"""
+        config = self._ensure_config()
+        body = {
+            "touser": touser,
+            "msgtype": "text",
+            "agentid": agentid or config.agentid,
+            "text": {"content": content},
+        }
+
+        try:
+            result = await self._wecom_post("/cgi-bin/message/send", body)
+            if result.get("errcode") != 0:
+                SYLogger.warning(f"[WeComMsg] 发送文本消息失败: {result}")
+                return result
+            SYLogger.info(f"[WeComMsg] 文本消息已发送给 {touser}")
+            return result
+        except Exception as e:
+            SYLogger.error(f"[WeComMsg] 发送文本消息异常: {e}")
+            return None
+
+    async def send_markdown(
+        self, touser: str, content: str, agentid: Optional[int] = None
+    ) -> Optional[dict]:
+        """发送 Markdown 应用消息"""
+        config = self._ensure_config()
+        body = {
+            "touser": touser,
+            "msgtype": "markdown",
+            "agentid": agentid or config.agentid,
+            "markdown": {"content": content},
+        }
+
+        try:
+            result = await self._wecom_post("/cgi-bin/message/send", body)
+            if result.get("errcode") != 0:
+                SYLogger.warning(f"[WeComMsg] 发送 Markdown 消息失败: {result}")
+                return result
+            SYLogger.info(f"[WeComMsg] Markdown 消息已发送给 {touser}")
+            return result
+        except Exception as e:
+            SYLogger.error(f"[WeComMsg] 发送 Markdown 消息异常: {e}")
+            return None
+
+    async def send_image(
+        self, touser: str, media_id: str, agentid: Optional[int] = None
+    ) -> Optional[dict]:
+        """发送图片应用消息（需先上传获取 media_id）"""
+        config = self._ensure_config()
+        body = {
+            "touser": touser,
+            "msgtype": "image",
+            "agentid": agentid or config.agentid,
+            "image": {"media_id": media_id},
+        }
+
+        try:
+            result = await self._wecom_post("/cgi-bin/message/send", body)
+            if result.get("errcode") != 0:
+                SYLogger.warning(f"[WeComMsg] 发送图片消息失败: {result}")
+                return result
+            SYLogger.info(f"[WeComMsg] 图片消息已发送给 {touser}")
+            return result
+        except Exception as e:
+            SYLogger.error(f"[WeComMsg] 发送图片消息异常: {e}")
+            return None
+
+    async def upload_file(self, file_path: str) -> Optional[str]:
+        """上传文件到企微临时素材库，返回 media_id
+
+        :param file_path: 本地文件路径
+        :return: media_id，失败返回 None
+        """
+        try:
+            result = await self._wecom_upload(file_path, media_type="file")
+            if result.get("errcode", 0) != 0:
+                SYLogger.warning(f"[WeComMsg] 文件上传失败: {result}")
+                return None
+            media_id = result["media_id"]
+            SYLogger.info(
+                f"[WeComMsg] 文件上传成功: {Path(file_path).name} -> {media_id}"
+            )
+            return media_id
+        except Exception as e:
+            SYLogger.error(f"[WeComMsg] 文件上传异常: {e}")
+            return None
+
+    async def send_file_by_media_id(
+        self, touser: str, media_id: str, agentid: Optional[int] = None
+    ) -> Optional[dict]:
+        """通过 media_id 发送文件应用消息"""
+        config = self._ensure_config()
+        body = {
+            "touser": touser,
+            "msgtype": "file",
+            "agentid": agentid or config.agentid,
+            "file": {"media_id": media_id},
+        }
+
+        try:
+            result = await self._wecom_post("/cgi-bin/message/send", body)
+            if result.get("errcode") != 0:
+                SYLogger.warning(f"[WeComMsg] 发送文件消息失败: {result}")
+                return result
+            SYLogger.info(f"[WeComMsg] 文件消息已发送给 {touser}")
+            return result
+        except Exception as e:
+            SYLogger.error(f"[WeComMsg] 发送文件消息异常: {e}")
+            return None
+
+    async def send_file(
+        self, touser: str, file_path: str, agentid: Optional[int] = None
+    ) -> Optional[dict]:
+        """上传文件并发送给指定用户（便捷方法）
+
+        :param touser: 接收人 userid，多人用 "|" 分隔
+        :param file_path: 本地文件路径
+        :param agentid: 应用 agentid，默认从配置读取
+        :return: API 响应，失败返回 None
+        """
+        media_id = await self.upload_file(file_path)
+        if not media_id:
+            return None
+        return await self.send_file_by_media_id(touser, media_id, agentid)
+
+    # ─── 机器人主动消息 ───
+
+    async def send_bot_markdown(
+        self, chatid: str, content: str
+    ) -> Optional[Any]:
+        """通过机器人 WebSocket 通道发送 Markdown 消息
+
+        :param chatid: 单聊填 userid，群聊填 chatid
+        :param content: Markdown 内容
+        :return: WsFrame，失败返回 None
+        """
+        if not self._ws_client:
+            SYLogger.error("[WeComMsg] 未设置 WSClient，请先调用 set_ws_client()")
+            return None
+
+        try:
+            result = await self._ws_client.send_message(chatid, {
+                "msgtype": "markdown",
+                "markdown": {"content": content},
+            })
+            SYLogger.info(f"[WeComMsg] 机器人 Markdown 消息已发送到 {chatid}")
+            return result
+        except Exception as e:
+            SYLogger.error(f"[WeComMsg] 机器人发送 Markdown 异常: {e}")
+            return None
+
+    async def send_bot_template_card(
+        self, chatid: str, template_card: Dict[str, Any]
+    ) -> Optional[Any]:
+        """通过机器人 WebSocket 通道发送模板卡片消息
+
+        :param chatid: 单聊填 userid，群聊填 chatid
+        :param template_card: 模板卡片内容
+        :return: WsFrame，失败返回 None
+        """
+        if not self._ws_client:
+            SYLogger.error("[WeComMsg] 未设置 WSClient，请先调用 set_ws_client()")
+            return None
+
+        try:
+            result = await self._ws_client.send_message(chatid, {
+                "msgtype": "template_card",
+                "template_card": template_card,
+            })
+            SYLogger.info(f"[WeComMsg] 机器人模板卡片消息已发送到 {chatid}")
+            return result
+        except Exception as e:
+            SYLogger.error(f"[WeComMsg] 机器人发送模板卡片异常: {e}")
+            return None

{sycommon_python_lib-0.2.2a18 → sycommon_python_lib-0.2.2a19}/src/sycommon_python_lib.egg-info/PKG-INFO

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

{sycommon_python_lib-0.2.2a18 → sycommon_python_lib-0.2.2a19}/src/sycommon_python_lib.egg-info/SOURCES.txt

@@ -203,6 +203,7 @@ src/sycommon/middleware/mq.py
 src/sycommon/middleware/sandbox.py
 src/sycommon/middleware/timeout.py
 src/sycommon/middleware/token_tracking.py
+src/sycommon/middleware/tool_result_truncation.py
 src/sycommon/middleware/traceid.py
 src/sycommon/models/__init__.py
 src/sycommon/models/base_http.py
@@ -217,6 +218,7 @@ src/sycommon/models/token_usage_mysql.py
 src/sycommon/models/xxljob_handler_config.py
 src/sycommon/notice/__init__.py
 src/sycommon/notice/uvicorn_monitor.py
+src/sycommon/notice/wecom_message.py
 src/sycommon/rabbitmq/process_pool_consumer.py
 src/sycommon/rabbitmq/rabbitmq_client.py
 src/sycommon/rabbitmq/rabbitmq_pool.py