From 2ab8a0e98c782a55c69a22d4b49bf294b8cfc2d9 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期一, 10 二月 2025 13:53:09 +0800
Subject: [PATCH] 报告生成代码同步完善
---
app/service/basic.py | 98 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 70 insertions(+), 28 deletions(-)
diff --git a/app/service/basic.py b/app/service/basic.py
index 30ac727..29bb02a 100644
--- a/app/service/basic.py
+++ b/app/service/basic.py
@@ -1,4 +1,9 @@
+import json
+
import httpx
+import requests
+
+from Log import logger
class BasicService:
@@ -8,23 +13,31 @@
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()
- 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"
@@ -34,35 +47,64 @@
url = f"{self.base_url}/exceltalk/download/excel"
return await self.download_from_url(url, params={'excel_name': file_id})
- async def excel_talk_upload(self, chat_id: str, filename: str, file_content: bytes):
+ async def excel_talk_upload(self, chat_id: str, files):
url = f"{self.base_url}/exceltalk/upload/files"
params = {'chat_id': chat_id, 'is_col': '0'}
- # 鍒涘缓 FormData 瀵硅薄
- files = [('files', (filename, file_content, 'application/octet-stream'))]
-
- async with httpx.AsyncClient() as client:
+ async with httpx.AsyncClient(timeout=300) as client:
response = await client.post(
url,
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"
params = {'chat_id': chat_id}
data = {"query": question}
headers = {'Content-Type': 'application/json'}
- async with httpx.AsyncClient(timeout=300.0) as client:
- async with client.stream("POST", url, params=params, json=data, headers=headers) as response:
- if response.status_code == 200:
+ with requests.post(url, headers=headers, json=data, params=params, timeout=60,
+ stream=True) as response:
+ for line in response.iter_lines():
+ if line:
+ decoded_line = line.decode("utf-8")
try:
- async for answer in response.aiter_text():
- print(f"response of ragflow chat: {answer}")
- yield answer
+ 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)
- return
+ 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--------------------------")
+ url = f"{self.base_url}/questions/talk"
+ params = {'chat_id': chat_id}
+ headers = {'Content-Type': 'text/plain'}
+ async with httpx.AsyncClient(timeout=1800) as client:
+ response = await client.post(
+ url,
+ data=question,
+ headers=headers,
+ params=params
+ )
+ return self._check_response(response)
+
+ async def questions_talk_word_download(self, file_id: str):
+ url = f"{self.base_url}/questions/download/word"
+ return await self.download_from_url(url, params={'word_name': file_id})
\ No newline at end of file
--
Gitblit v1.8.0