sycommon-python-lib 0.2.3a0__py3-none-any.whl → 0.2.3a2__py3-none-any.whl

sycommon/agent/deep_agent.py

@@ -231,9 +231,32 @@ class DeepAgent:
                             f"[DeepAgent] AIMessage | content={repr(content_log)} | tools={tc_names}")
                     elif msg_type == "ToolMessage":
                         content_log = (msg.content or "")
-                        preview = content_log[:100]
-                        print(
-                            f"[DeepAgent] ToolResult | {getattr(msg, 'name', '?')} | len={len(content_log)} | preview={repr(preview)}")
+                        if isinstance(content_log, list):
+                            # e.g. [{'type': 'image', 'base64': '...'}]
+                            preview_parts = []
+                            total_len = 0
+                            for item in content_log:
+                                if isinstance(item, dict):
+                                    t = item.get('type', '?')
+                                    if t == 'image' and 'base64' in item:
+                                        b64 = item['base64']
+                                        total_len += len(b64)
+                                        preview_parts.append(
+                                            f"{{'type': 'image', 'base64': '{b64[:100]}...'({len(b64)} chars)}}")
+                                    else:
+                                        s = str(item)
+                                        total_len += len(s)
+                                        preview_parts.append(s[:100])
+                                else:
+                                    s = str(item)
+                                    total_len += len(s)
+                                    preview_parts.append(s[:100])
+                            print(
+                                f"[DeepAgent] ToolResult | {getattr(msg, 'name', '?')} | len={total_len} | preview={preview_parts}")
+                        else:
+                            preview = str(content_log)[:100]
+                            print(
+                                f"[DeepAgent] ToolResult | {getattr(msg, 'name', '?')} | len={len(str(content_log))} | preview={repr(preview)}")
                     elif msg_type == "HumanMessage":
                         content_log = (msg.content or "")[:100]
                         print(
@@ -506,6 +529,11 @@ class DeepAgent:
                     return
                 except (APIConnectionError, APIError, APITimeoutError, ConnectionError, httpx.RemoteProtocolError) as e:
                     last_error = e
+                    # 400 BadRequestError 不重试：请求参数有误，重试无意义
+                    from openai import BadRequestError
+                    if isinstance(e, BadRequestError):
+                        SYLogger.error(f"[DeepAgent] API 参数错误，不重试: {e}")
+                        raise
                     if attempt < max_retries - 1:
                         delay = base_delay * (2 ** attempt)
                         SYLogger.warning(

sycommon/agent/sandbox/file_ops.py

@@ -266,8 +266,12 @@ class FileOperationsMixin:
                 "limit": limit
             }, timeout=timeout)
             if result.get("error"):
-                SYLogger.error(f"[Sandbox] 异步读取文件失败: {result['error']}")
-                return ReadResult(error=result["error"])
+                err_msg = result['error']
+                if 'not found' in err_msg:
+                    SYLogger.warning(f"[Sandbox] 异步读取文件未找到: {err_msg}")
+                else:
+                    SYLogger.error(f"[Sandbox] 异步读取文件失败: {err_msg}")
+                return ReadResult(error=err_msg)
             content = result.get("content", "")
             encoding = result.get("encoding", "utf-8")
             SYLogger.info(
@@ -329,7 +333,11 @@ class FileOperationsMixin:
                 path=result.get("path")
             )
             if write_result.error:
-                SYLogger.error(f"[Sandbox] 异步写入失败: {write_result.error}")
+                err_msg = write_result.error
+                if 'already exists' in err_msg:
+                    SYLogger.warning(f"[Sandbox] 异步写入文件已存在: {err_msg}")
+                else:
+                    SYLogger.error(f"[Sandbox] 异步写入失败: {err_msg}")
             else:
                 SYLogger.info(f"[Sandbox] 异步写入成功: {write_result.path}")
             return write_result

sycommon/llm/sy_langfuse.py

@@ -61,10 +61,10 @@ class LangfuseInitializer(metaclass=SingletonMeta):
                     'baseUrl', '')
                 os.environ["LANGFUSE_TRACING_ENVIRONMENT"] = environment
                 os.environ["OTEL_SERVICE_NAME"] = server_name
-                # 设置 OTLP 追踪导出器超时时间（单位：秒）
-                os.environ["OTEL_EXPORTER_OTLP_TRACES_TIMEOUT"] = "60"
-                # 全局 OTLP 超时（覆盖所有信号：追踪/指标/日志）
-                os.environ["OTEL_EXPORTER_OTLP_TIMEOUT"] = "60"
+                # 控制 Langfuse OTLP 导出：超时 30s、每批最多 32 个 span、每 10s 强制 flush
+                os.environ["LANGFUSE_TIMEOUT"] = "30"
+                os.environ["LANGFUSE_FLUSH_AT"] = "32"
+                os.environ["LANGFUSE_FLUSH_INTERVAL"] = "10"
 
                 self._langfuse_client = get_client()
 

sycommon/middleware/tool_result_truncation.py

@@ -5,6 +5,9 @@
 
 通过 wrap_tool_call / awrap_tool_call 钩子拦截每个工具调用结果，
 在结果进入对话历史之前完成截断。
+
+同时处理 list 类型 content（如 read_file 读取图片返回的 base64 数据），
+将其转换为字符串描述，防止上游 API 拒绝 list content 的 400 错误。
 """
 
 from collections.abc import Awaitable, Callable
@@ -41,6 +44,41 @@ DEFAULT_TRUNCATION_SUFFIX = (
     "2. 将输出重定向到文件后用 read_file 分段读取]"
 )
 
+# list 类型 content 中 base64 图片的最大字符数
+MAX_IMAGE_BASE64_CHARS = 500
+
+
+def _convert_list_content_to_str(content: list, tool_name: str) -> str:
+    """将 list 类型的 ToolMessage.content 转换为字符串。
+
+    对于图片类型（type=image 且含 base64），只保留前 MAX_IMAGE_BASE64_CHARS 个字符的 base64 预览。
+    对于文本类型，保留完整文本。
+    """
+    parts = []
+    for item in content:
+        if isinstance(item, dict):
+            item_type = item.get("type", "text")
+            if item_type == "image" and "base64" in item:
+                b64 = item["base64"]
+                mime = item.get("mime_type", "image/unknown")
+                if len(b64) > MAX_IMAGE_BASE64_CHARS:
+                    parts.append(
+                        f"[图片文件 ({mime}, {len(b64)} 字符 base64 数据), "
+                        f"预览: {b64[:MAX_IMAGE_BASE64_CHARS]}...]"
+                    )
+                else:
+                    parts.append(
+                        f"[图片文件 ({mime}, {len(b64)} 字符 base64 数据), "
+                        f"数据: {b64}]"
+                    )
+            elif "text" in item:
+                parts.append(item["text"])
+            else:
+                parts.append(str(item))
+        else:
+            parts.append(str(item))
+    return "\n".join(parts)
+
 
 class ToolResultTruncationMiddleware(AgentMiddleware):
     """截断过长的工具结果，防止超出模型上下文窗口。
@@ -102,6 +140,27 @@ class ToolResultTruncationMiddleware(AgentMiddleware):
             return result
 
         content = result.content
+
+        # list 类型 content：如 read_file 读取图片返回的 base64 数据
+        # 转换为字符串描述，防止上游 API 拒绝 list content
+        if isinstance(content, list):
+            has_image = any(
+                isinstance(item, dict) and item.get("type") == "image" and "base64" in item
+                for item in content
+            )
+            if has_image:
+                new_content = _convert_list_content_to_str(content, tool_name)
+                SYLogger.info(
+                    f"[ToolResultTruncation] tool='{tool_name}' converted image "
+                    f"list content to string ({len(new_content)} chars)")
+                return ToolMessage(
+                    content=new_content,
+                    tool_call_id=result.tool_call_id,
+                    name=result.name,
+                    status=result.status,
+                    artifact=result.artifact,
+                )
+
         if not isinstance(content, str):
             return result
 

{sycommon_python_lib-0.2.3a0.dist-info → sycommon_python_lib-0.2.3a2.dist-info}/METADATA

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

{sycommon_python_lib-0.2.3a0.dist-info → sycommon_python_lib-0.2.3a2.dist-info}/RECORD

@@ -129,11 +129,11 @@ 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=b09KJbtf-mb33GgKjRkENRv6VN494kA3n4dBqEY_mmA,28651
+sycommon/agent/deep_agent.py,sha256=Ptbz-NKJ1hFhMULxdG7TjQo0hAQ5ULuMQOcjaEg5l8E,30393
 sycommon/agent/multi_agent_team.py,sha256=zsJNjVx0U5qPXlQO-tgAbKotsfL1LMPZvvouxUQGbwY,26466
 sycommon/agent/summarization_utils.py,sha256=Fz6xY6DkLXoUfqQVsz8uZrMvxTtEYEJBcDl6pqFJnRk,2242
 sycommon/agent/sandbox/__init__.py,sha256=jR7LlkD4J4Y6QYyRXQClkwmqDBCCPmycV_hQV9p9YHw,4621
-sycommon/agent/sandbox/file_ops.py,sha256=2LJNm0bQZj_l1FtpcDUtOBSQUK-Sd2vVZyc1JbNBhXk,22779
+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
 sycommon/agent/sandbox/minio_sync.py,sha256=r6tjoQA8AHNVG_hcHS3enfFnw-eTkW4r7jA7bwatsWc,19241
 sycommon/agent/sandbox/sandbox_pool.py,sha256=eMn8sLakCWf90l6ni2-333QM8oBdX1CflV-WzneFp_k,9133
@@ -178,7 +178,7 @@ sycommon/llm/llm_with_token_tracking.py,sha256=flGN3dbsjw1enal-p5Wh2Fq14F9Z9_O84
 sycommon/llm/native_with_fallback_runnable.py,sha256=8g2q8cRqJv2miY7GrZz_f-zNmHxdb_5WSujD3frqObQ,8035
 sycommon/llm/output_fixing_runnable.py,sha256=wGHBKRpUjDz4ONJulTvG5UzJxZr1iK3ULkosaKqjF0w,8113
 sycommon/llm/struct_token.py,sha256=nXNcncRu3HfXxPXaJoG6AFAdFSNb3oJ4t0mz_TLL6Ow,19809
-sycommon/llm/sy_langfuse.py,sha256=fkfPxXhz65GcCRPNm202xxCNzgCODNh-QNmlDdTU4kM,4459
+sycommon/llm/sy_langfuse.py,sha256=27RyPUkScqJYHrupOEyUs23fDszoaA66FFgv5Qc7-B4,4443
 sycommon/llm/token_usage_es_service.py,sha256=-RBCwZ8jS436n8DBUBm3Lf5O6TsQMaQgIj5oYBLO4Ss,19909
 sycommon/llm/token_usage_mysql_service.py,sha256=1WhdpZ8M4v4UNP5W0ui3A-Cx5yfZiX73l77FTJvL_d8,32644
 sycommon/llm/usage_token.py,sha256=E_umP6qjN5AZU_2XLXGpWdLxQ8VVKSf74B5RmqBQk2A,7780
@@ -201,7 +201,7 @@ sycommon/middleware/mq.py,sha256=9X6KKtadFjBXKS5L3kEKujYio9wwGfWgXwWOAHO-HDg,254
 sycommon/middleware/sandbox.py,sha256=SQnUvVE0gvBo_YrP4fdA-6ZmJxAG9Po1zUynNFrgTI4,61109
 sycommon/middleware/timeout.py,sha256=KlxOPa8xl2dg6yuRi_EzkVJG8bX4stb5ueYxctzzGM8,1433
 sycommon/middleware/token_tracking.py,sha256=rEbgV1bgWMdzAERx4aq5XAvOIT6jTY_tK1P0xHJnL3o,6609
-sycommon/middleware/tool_result_truncation.py,sha256=KR7obBZJhpunhpQaATBE22H2SeXNZlsVH3zL3efEt5o,4557
+sycommon/middleware/tool_result_truncation.py,sha256=p_v3XGYxO7UIrTaxmmFbDYadIHUfXk8HbZ_WVcxJrrQ,7041
 sycommon/middleware/traceid.py,sha256=HX4zg7Tp_mPNr2eWDDvK3f7GFJ6eOSeW062Xcc-xshc,14340
 sycommon/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/models/base_http.py,sha256=EICAAibx3xhjBsLqm35Mi3DCqxp0FME4rD_3iQVjT_E,3051
@@ -257,8 +257,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.3a0.dist-info/METADATA,sha256=VusXz0MfTQ622eAN2iRy9I16ZjZTrxQN3cPO5rcDe7M,7740
-sycommon_python_lib-0.2.3a0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-sycommon_python_lib-0.2.3a0.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
-sycommon_python_lib-0.2.3a0.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
-sycommon_python_lib-0.2.3a0.dist-info/RECORD,,
+sycommon_python_lib-0.2.3a2.dist-info/METADATA,sha256=_JyFaU2brTdZJKEKeceWFhgTP1ee62Hr7PurpTSy5rE,7740
+sycommon_python_lib-0.2.3a2.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+sycommon_python_lib-0.2.3a2.dist-info/entry_points.txt,sha256=gsR4SssKxDWjRU8ggidzNcdMXDPRSKRS7UaGyNP84Qg,92
+sycommon_python_lib-0.2.3a2.dist-info/top_level.txt,sha256=RgphKrg7nJyZ7irJqbxFr-5H2LUYTvI7ivoWZH2hcD0,29
+sycommon_python_lib-0.2.3a2.dist-info/RECORD,,