Davidliu 3 months ago
parent
commit
0dcf9dfdc3
1 changed files with 34 additions and 31 deletions
  1. 34 31
      src/core/voip/bot.py

+ 34 - 31
src/core/voip/bot.py

@@ -437,41 +437,44 @@ class ToTextBotAgent:
 
 
     def to_quest(self, request: BotChatRequest, try_count = 3):
-        request_data = request.to_json_string()
-        url = f"http://{SERVE_HOST}:40072/botservice"
         start_time = time.time()
-        self.call_agent.logger.info(f"请求数据:{request_data},url:{url}")
+        url = f"http://{SERVE_HOST}:40072/botservice"
+        request_data = request.to_json_string()
+        # self.call_agent.logger.info(f"请求数据:{request_data},url:{url}")
         with requests.Session() as session:
-            session.headers.update({'Content-Type': 'application/json'})
             response = None
-            while try_count > 0:
-                try:
-                    try_count = try_count - 1
-                    response = session.post(url=url, json=json.loads(request_data), timeout=.5)
-                    # response = requests.post(url=url,  json=json.loads(request_data), headers=headers, timeout=10)  # 使用占位URL
-                    self.call_agent.logger.info(f"sessionId={ self.call_agent.session_id}, chat::request:{request_data}, response:{response.text}")
-                    if response.status_code == 200:
-                        response_data = response.json()
-                        if "data" in response_data and response_data["code"]==0:
-                            data = response_data["data"]
-                            parsed_response = ChatMessage.from_json(data)
-                            self.call_agent.message_queue.put(parsed_response)
+            massage = None
+            try:
+                session.headers.update({'Content-Type': 'application/json'})
+                while try_count > 0:
+                    try:
+                        try_count = try_count - 1
+                        response = session.post(url=url, json=json.loads(request_data), timeout=.5)
+                        # response = requests.post(url=url,  json=json.loads(request_data), headers=headers, timeout=10)  # 使用占位URL
+                        if response.status_code == 200:
+                            response_data = response.json()
+                            if "data" in response_data and response_data["code"]==0:
+                                data = response_data["data"]
+                                massage = ChatMessage.from_json(data)
+                                self.call_agent.message_queue.put(massage)
+                            else:
+                                self.call_agent.logger.info("响应中没有 'data' 字段")
                         else:
-                            self.call_agent.logger.info("响应中没有 'data' 字段")
-                    else:
-                        self.call_agent.logger.info(f"请求失败,状态码: {response.status_code}, 响应内容: {response.text}")
-                    break
-                except requests.RequestException as e:
-                    traceback.print_exc()
-                    self.call_agent.logger.error(f"TaskId={request.taskId}, 请求发生异常: {e}, URL: {url}")
-
-            if not response or response.status_code != 200:
-                self.call_agent.message_queue.put(self.get_default_response())
-
-            latency = (time.time() - start_time)
-            registry.BOT_REQUEST_COUNT.inc()
-            registry.BOT_REQUEST_LATENCY.labels(request.taskId).observe(latency)
-            session.close()
+                            self.call_agent.logger.info(f"请求失败,状态码: {response.status_code}, 响应内容: {response.text}")
+                        break
+                    except requests.RequestException as e:
+                        traceback.print_exc()
+                        self.call_agent.logger.error(f"TaskId={request.taskId}, 请求发生异常: {e}, URL: {url}")
+                if not response or response.status_code != 200:
+                    massage = self.get_default_response()
+                    self.call_agent.message_queue.put(massage)
+            finally:
+                session.close()
+
+        latency = (time.time() - start_time)
+        registry.BOT_REQUEST_COUNT.inc()
+        registry.BOT_REQUEST_LATENCY.labels(request.taskId).observe(latency)
+        self.call_agent.logger.info(f"sessionId={ self.call_agent.session_id}, timeCost={latency}, chat::request:{request_data}, response:{response.text}")
 
     def get_default_response(self):
         response = {