From cfb8a353c72f96494cd46a78bd917f6ed8aaef1d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 20 十一月 2024 17:01:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/basic.py | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/app/service/basic.py b/app/service/basic.py
index 30ac727..733405a 100644
--- a/app/service/basic.py
+++ b/app/service/basic.py
@@ -10,21 +10,27 @@
if response.status_code not in [200, 201]:
raise Exception(f"Failed to fetch data from API: {response.text}")
response_data = response.json()
- status_code = response_data.get("status_code", 0)
- if status_code != 200:
- raise Exception(f"Failed to fetch data from API: {response.text}")
- return response_data.get("data", {})
+ return response_data
- async def download_from_url(self, url: str, params: dict):
+ async def download_from_url(self, url, params=None):
async with httpx.AsyncClient() as client:
- response = await client.get(url, params=params, stream=True)
- if response.status_code == 200:
- content_disposition = response.headers.get('Content-Disposition')
- filename = content_disposition.split('filename=')[-1].strip(
- '"') if content_disposition else 'unknown_filename'
- return response.content, filename, response.headers.get('Content-Type')
- else:
- return None, None, None
+ async with client.stream('GET', url, params=params) as response:
+ if response.status_code == 200:
+ # 鑾峰彇鏂囦欢鍚�
+ content_disposition = response.headers.get('Content-Disposition')
+ if content_disposition:
+ filename = content_disposition.split('filename=')[1].strip('"')
+ else:
+ filename = 'unknown_filename'
+
+ # 鑾峰彇鍐呭绫诲瀷
+ content_type = response.headers.get('Content-Type')
+
+ # 璇诲彇鏂囦欢鍐呭
+ content = await response.aread()
+ return content, filename, content_type
+ else:
+ raise Exception(f"Failed to download: {response.status_code}")
async def excel_talk_image_download(self, file_id: str):
url = f"{self.base_url}/exceltalk/download/image"
@@ -47,7 +53,7 @@
files=files,
params=params
)
- return await self._check_response(response)
+ return self._check_response(response)
async def excel_talk(self, question: str, chat_id: str):
url = f"{self.base_url}/exceltalk/talk"
@@ -59,10 +65,10 @@
if response.status_code == 200:
try:
async for answer in response.aiter_text():
- print(f"response of ragflow chat: {answer}")
+ print(f"response of excel_talk chat: {answer}")
yield answer
except GeneratorExit as e:
print(e)
return
else:
- yield f"Error: {response.status_code}"
+ yield f"Error: {response.status_code}"
\ No newline at end of file
--
Gitblit v1.8.0