From ed7ba0230d7c3e1d25304ae199d8f40e0449c99d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 16 十月 2024 15:26:30 +0800
Subject: [PATCH] 对话兼容报错没data前缀，ragflow会话历史传空时创建会话
---
app/service/ragflow.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 52 insertions(+), 2 deletions(-)
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index 5fbe175..e4d5657 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -51,8 +51,58 @@
# 妫�鏌ュ搷搴旂姸鎬佺爜
if response.status_code == 200:
# 娴佸紡璇诲彇鍝嶅簲
- async for answer in response.aiter_text():
- yield answer
+ try:
+ async for answer in response.aiter_text():
+ yield answer
+ except GeneratorExit as e:
+ print(e)
+ return
else:
yield f"Error: {response.status_code}"
+ 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
+ }
+ 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", [])
+ result = [
+ {
+ "id": item["id"],
+ "name": item["name"],
+ "updated_time": item["update_time"]
+ }
+ for item in data
+ ]
+ return result
+
+ 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
+ }
+
+ data = {"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 []
+ return [{
+ "content": "浣犲ソ锛� 鎴戞槸浣犵殑鍔╃悊锛屾湁浠�涔堝彲浠ュ府鍒颁綘鐨勫悧锛�",
+ "role": "assistant"
+ },
+ {
+ "content": name,
+ "doc_ids": [],
+ "role": "user"
+ }]
--
Gitblit v1.8.0