union-app-chat-stream 1.0.5 → 1.0.6

package/app/service/chat_service.py

@@ -156,14 +156,14 @@ class ChatService:
         def tool_result_event(tool_result: str) -> ChatResponse:
             return ChatResponse(conversationId=conversation_id, tool_result=_public_tool_result(tool_result))
 
-        def heartbeat_event(tool_name: str, elapsed_seconds: float) -> ChatResponse:
+        def heartbeat_event(tool_name: str, elapsed_seconds: float, message: str = "") -> ChatResponse:
             return ChatResponse(
                 conversationId=conversation_id,
                 heartbeat={
                     "type": "tool_call_running",
                     "tool": tool_name,
                     "elapsedSeconds": round(elapsed_seconds, 3),
-                    "message": f"工具 {tool_name} 仍在执行，请继续等待。",
+                    "message": message or f"工具 {tool_name} 仍在执行，请继续等待。",
                 },
             )
 
@@ -241,16 +241,23 @@ class ChatService:
                     logger.info(f"执行工具调用。conversation_id={conversation_id} tool={name} args={_preview(args, 200)}")
                     yield tool_call_event(f"\n[调用工具: {name}({args})]\n")
 
+                    retry_notice = {"message": ""}
+
+                    def retry_callback(message: str) -> None:
+                        retry_notice["message"] = message
+
                     tool_context = ToolContext(
                         union_service=self._union_service,
                         rag_service=self._rag,
                         jsessionid=jsessionid,
+                        retry_callback=retry_callback,
                     )
                     result = yield from self._call_function_with_heartbeats(
                         name,
                         args,
                         tool_context,
                         heartbeat_event,
+                        retry_notice,
                     )
                     logger.info(f"工具调用完成。conversation_id={conversation_id} tool={name} result_preview={_preview(result, 300)}")
                     yield tool_result_event(result)
@@ -291,6 +298,7 @@ class ChatService:
         args: str,
         tool_context: ToolContext,
         heartbeat_event,
+        retry_notice,
     ) -> Generator[ChatResponse, None, str]:
         interval = self._tool_heartbeat_interval
         if interval <= 0:
@@ -304,7 +312,7 @@ class ChatService:
                 try:
                     return future.result(timeout=interval)
                 except FutureTimeoutError:
-                    yield heartbeat_event(name, time.monotonic() - started_at)
+                    yield heartbeat_event(name, time.monotonic() - started_at, retry_notice.get("message", ""))
         finally:
             executor.shutdown(wait=False, cancel_futures=True)
 

package/app/service/union_service.py

@@ -12,7 +12,6 @@ class UnionService:
 
     # 常量定义
     API_MAX_RETRIES = 10  # API最大重试次数
-    BIGDATA_API_TIMEOUT = 300
     BIGDATA_INTERFACE_FULL_LINK = "running_cnt.full_link_monthly"
     BIGDATA_INTERFACE_BANK_MONTHLY = "running_cnt.bank_monthly"
 
@@ -72,6 +71,8 @@ class UnionService:
         jsessionid: str,
         description: str = "查询联合运维数据",
         path: str = "",
+        timeout: Optional[int] = None,
+        retry_callback=None,
     ) -> Tuple[Optional[Any], str]:
         """按 tool definition 中配置的 path 和 JSON 参数查询联合运维 API。"""
         url = self._build_union_url(self._union_base_url, path)
@@ -81,13 +82,17 @@ class UnionService:
             return None, f"{description}失败: 登录态ID为空"
 
         try:
-            response = common_utils.call_https_api(
-                url=url,
-                headers=self._get_union_headers(jsessionid),
-                json_data=payload,
-                timeout=self.BIGDATA_API_TIMEOUT,
-                max_retries=self.API_MAX_RETRIES,
-            )
+            kwargs = {
+                "url": url,
+                "headers": self._get_union_headers(jsessionid),
+                "json_data": payload,
+                "max_retries": self.API_MAX_RETRIES,
+            }
+            if timeout is not None:
+                kwargs["timeout"] = timeout
+            if retry_callback:
+                kwargs["retry_callback"] = retry_callback
+            response = common_utils.call_https_api(**kwargs)
             if not response.get("success", True):
                 raise RuntimeError(response.get("error_msg", "请求失败"))
             status_code = response.get("status_code")

package/app/utils/common_utils.py

@@ -1,5 +1,5 @@
 import requests
-from typing import Optional, Dict, Any
+from typing import Optional, Dict, Any, Callable
 from requests.exceptions import RequestException, Timeout, ConnectionError
 import json
 import time
@@ -30,12 +30,13 @@ def call_https_api(
         data: Optional[Dict[str, Any]] = None,
         json_data: Optional[Dict[str, Any]] = None,
         headers: Optional[Dict[str, str]] = None,
-    timeout: int = 10,
+        timeout: int = 10,
         verify_ssl: bool = False,
         auth: Optional[tuple] = None,
         proxies: Optional[Dict[str, Any]] = None,
         max_retries: int = 0,
-        retry_delay: float = 1.0
+        retry_delay: float = 1.0,
+        retry_callback: Optional[Callable[[str], None]] = None,
 
 ) -> Dict[str, Any]:
     default_headers = {
@@ -81,14 +82,20 @@ def call_https_api(
             logger.info(f"请求成功：{response.status_code},返回值:{response.text}")
             return result
         except ConnectionError as e:
-            logger.error(f"连接失败：{e}")
+            error_msg = f"连接失败：{e}"
+            logger.error(error_msg)
         except Timeout as e:
-            logger.error(f"请求超时：{e}")
+            error_msg = f"请求超时：{e}"
+            logger.error(error_msg)
         except RequestException as e:
-            logger.error(f"请求异常：{e}")
+            error_msg = f"请求异常：{e}"
+            logger.error(error_msg)
         except Exception as e:
-            logger.error(f"未知错误：{e}")
+            error_msg = f"未知错误：{e}"
+            logger.error(error_msg)
         if attempt < max_retries:
+            if retry_callback:
+                retry_callback(f"{error_msg}，正在重试（第{attempt + 2}次）")
             time.sleep(retry_delay)
         else:
             break

package/app/utils/function_utils.py

@@ -21,6 +21,7 @@ class ToolContext:
     union_service: Optional[Any] = None
     rag_service: Optional[Any] = None
     jsessionid: str = ""
+    retry_callback: Optional[Callable[[str], None]] = None
 
 
 ToolFunction = Callable[[Dict[str, Any], ToolContext], Dict[str, Any]]
@@ -213,7 +214,12 @@ def _run_backend_tool(
         if context.union_service is None:
             raise ValueError("Union服务未初始化")
         method = getattr(context.union_service, method_name)
-        data, message = method(payload, context.jsessionid, description=description, path=path)
+        kwargs = {"description": description, "path": path}
+        if isinstance(backend.get("timeout"), int):
+            kwargs["timeout"] = backend["timeout"]
+        if context.retry_callback:
+            kwargs["retry_callback"] = context.retry_callback
+        data, message = method(payload, context.jsessionid, **kwargs)
     elif service_name == "rag_service":
         if context.rag_service is None:
             raise ValueError("知识库检索服务未初始化")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "union-app-chat-stream",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Union operations chat stream Flask application package.",
   "license": "UNLICENSED",
   "files": [

package/tools/tool_definitions.yaml

@@ -123,6 +123,7 @@ tools:
       method: "query_union"
       description: "查询成员机构运行指标"
       path: "/api/queryBigData"
+      timeout: 300
       params:
         interfaceName: "runing_cnt.bank"
         params:
@@ -173,6 +174,7 @@ tools:
       method: "query_union"
       description: "查询全链路运行指标"
       path: "/api/queryBigData"
+      timeout: 300
       params:
         interfaceName: "runing_cnt.full_link"
         params: