From b2a5cf3f47b86ec6b69053dfb2a12d02e3980720 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 31 十二月 2024 14:42:14 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/basic.py | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/app/service/basic.py b/app/service/basic.py
index 26c15c1..29bb02a 100644
--- a/app/service/basic.py
+++ b/app/service/basic.py
@@ -13,7 +13,9 @@
def _check_response(self, response: httpx.Response):
"""妫�鏌ュ搷搴斿苟澶勭悊閿欒"""
if response.status_code not in [200, 201]:
- raise Exception(f"Failed to fetch data from API: {response.text}")
+ # raise Exception(f"Failed to fetch data from API: {response.status_code}")
+ logger.error(f"Failed to fetch data from API:")
+ logger.error(response.status_code)
response_data = response.json()
return response_data
@@ -49,7 +51,7 @@
url = f"{self.base_url}/exceltalk/upload/files"
params = {'chat_id': chat_id, 'is_col': '0'}
- async with httpx.AsyncClient() as client:
+ async with httpx.AsyncClient(timeout=300) as client:
response = await client.post(
url,
files=files,
@@ -71,16 +73,23 @@
if decoded_line.startswith("data:"):
decoded_line = decoded_line[5:]
answer = json.loads(decoded_line)
+ answer["type"] = "message"
yield answer
except GeneratorExit as e:
+ logger.error("------------except GeneratorExit as e:---------------------")
+ logger.error(e)
print(e)
yield {"message": "鍐呴儴閿欒", "type": "close"}
- finally:
- # 鍦ㄦ墍鏈夋暟鎹帴鏀跺畬姣曞悗杩斿洖close
- yield {"message": "", "type": "close"}
+ # finally:
+ # # 鍦ㄦ墍鏈夋暟鎹帴鏀跺畬姣曞悗杩斿洖close
+ # yield {"message": "", "type": "close"}
else:
- yield f"Error: {response.status_code}"
+ continue
+ # yield f"Error: {response.status_code}"
+ else:
+ # 鍦ㄦ墍鏈夋暟鎹帴鏀跺畬姣曞悗杩斿洖close
+ yield {"message": "", "type": "close"}
async def questions_talk(self, question, chat_id: str):
logger.error("---------------questions_talk--------------------------")
--
Gitblit v1.8.0