From 4e8cecd4ca733ba9356ba0e8df4b8da31eee286c Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 17 十月 2024 15:51:55 +0800
Subject: [PATCH] fix
---
app/service/ragflow.py | 77 +++++++++++++++++++++-----------------
1 files changed, 43 insertions(+), 34 deletions(-)
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index 0fe0c39..4021866 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -1,5 +1,5 @@
import httpx
-
+from typing import Union, Dict, List
from app.config.config import settings
from app.utils.rsa_crypto import RagflowCrypto
@@ -8,13 +8,30 @@
def __init__(self, base_url: str):
self.base_url = base_url
+ async def _handle_response(self, response: httpx.Response) -> Union[Dict, List]:
+ if response.status_code != 200:
+ return {}
+
+ data = response.json()
+ ret_code = data.get("retcode")
+ if ret_code != 0:
+ return {}
+
+ # 妫�鏌ヨ繑鍥炵殑鏁版嵁绫诲瀷
+ if isinstance(data.get("data"), dict):
+ return data.get("data", {})
+ elif isinstance(data.get("data"), list):
+ return data.get("data", [])
+ else:
+ return {}
+
async def register(self, username: str, password: str):
password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
async with httpx.AsyncClient() as client:
response = await client.post(
f"{self.base_url}/v1/user/register",
- json={"nickname": username, "email": f"{username}@example.com", "password": password},
- headers={'Content-Type': 'application/json'}
+ headers={'Content-Type': 'application/json'},
+ json={"nickname": username, "email": f"{username}@example.com", "password": password}
)
if response.status_code != 200:
raise Exception(f"Ragflow registration failed: {response.text}")
@@ -24,12 +41,11 @@
async with httpx.AsyncClient() as client:
response = await client.post(
f"{self.base_url}/v1/user/login",
- json={"email": f"{username}@example.com", "password": password},
- headers={'Content-Type': 'application/json'}
+ headers={'Content-Type': 'application/json'},
+ json={"email": f"{username}@example.com", "password": password}
)
if response.status_code != 200:
raise Exception(f"Ragflow login failed: {response.text}")
- # 浠庡搷搴斿ご涓彁鍙� Authorization 瀛楁
authorization = response.headers.get('Authorization')
if not authorization:
raise Exception("Authorization header not found in response")
@@ -40,17 +56,16 @@
"conversation_id": chat_id,
"messages": chat_history
}
+
+ print(data)
target_url = f"{self.base_url}/v1/conversation/completion"
- async with httpx.AsyncClient() as client:
+ async with httpx.AsyncClient(timeout=300.0) as client:
headers = {
'Content-Type': 'application/json',
'Authorization': token
}
- # 鍒涘缓娴佸紡璇锋眰
async with client.stream("POST", target_url, json=data, headers=headers) as response:
- # 妫�鏌ュ搷搴旂姸鎬佺爜
if response.status_code == 200:
- # 娴佸紡璇诲彇鍝嶅簲
try:
async for answer in response.aiter_text():
yield answer
@@ -62,15 +77,10 @@
async def get_chat_sessions(self, token: str, dialog_id: str) -> list:
url = f"{self.base_url}/v1/conversation/list?dialog_id={dialog_id}"
- headers = {
- "Authorization": token
- }
+ headers = {"Authorization": token}
async with httpx.AsyncClient() as client:
response = await client.get(url, headers=headers)
- if response.status_code != 200:
- raise Exception(f"Failed to fetch data from Ragflow API: {response.text}")
-
- data = response.json().get("data", [])
+ data = await self._handle_response(response)
result = [
{
"id": item["id"],
@@ -83,25 +93,16 @@
async def set_session(self, token: str, dialog_id: str, name: str, chat_id: str, is_new: bool) -> list:
url = f"{self.base_url}/v1/conversation/set?dialog_id={dialog_id}"
- headers = {
- "Authorization": token
- }
-
+ headers = {"Authorization": token}
data = {
- "dialog_id": dialog_id,
- "name": name,
- "is_new": is_new,
- "conversation_id": chat_id,
- }
-
+ "dialog_id": dialog_id,
+ "name": name,
+ "is_new": is_new,
+ "conversation_id": chat_id,
+ }
async with httpx.AsyncClient() as client:
response = await client.post(url, headers=headers, json=data)
- if response.status_code != 200:
- return []
- ret_code = response.json().get("retcode")
- if ret_code != 0:
- return []
-
+ data = await self._handle_response(response)
return [
{
"content": "浣犲ソ锛� 鎴戞槸浣犵殑鍔╃悊锛屾湁浠�涔堝彲浠ュ府鍒颁綘鐨勫悧锛�",
@@ -112,4 +113,12 @@
"doc_ids": [],
"role": "user"
}
- ]
+ ] if data else []
+
+ async def get_session_history(self, token: str, chat_id: str) -> list:
+ url = f"{self.base_url}/v1/conversation/get?conversation_id={chat_id}"
+ headers = {"Authorization": token}
+ async with httpx.AsyncClient() as client:
+ response = await client.get(url, headers=headers)
+ data = await self._handle_response(response)
+ return data.get("message", [])
\ No newline at end of file
--
Gitblit v1.8.0