From 0e5f87417a7f775252d14d79a9b85941130e0e2d Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 15 十一月 2024 15:55:45 +0800
Subject: [PATCH] 对话列表过滤name为空的，设置最多1000条返回
---
app/service/ragflow.py | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index 94bd9ac..3c45988 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -1,7 +1,5 @@
import httpx
from typing import Union, Dict, List
-
-from Tools.scripts.objgraph import ignore
from fastapi import HTTPException
from starlette import status
@@ -41,7 +39,7 @@
response = await client.post(
f"{self.base_url}/v1/user/register",
headers={'Content-Type': 'application/json'},
- json={"nickname": username, "email": f"{username}@example.com", "password": password}
+ json={"nickname": username, "email": f"{username}@example.com", "password": password}
)
if response.status_code != 200:
raise Exception(f"Ragflow registration failed: {response.text}")
@@ -101,8 +99,27 @@
"updated_time": item["update_time"]
}
for item in data
+ if "id" in item and "name" in item and item["name"]
]
return result
+
+ async def get_session_log(self, token: str, conversation_id: str) -> dict:
+ url = f"{self.base_url}/v1/conversation/get?conversation_id={conversation_id}"
+ headers = {"Authorization": token}
+ async with httpx.AsyncClient() as client:
+ response = await client.get(url, headers=headers)
+ data = self._handle_response(response)
+ session_log = {
+ "session_log": [
+ {
+ "message": message.get("content"),
+ "role": message.get("role"),
+ }
+ for message in data.get("message", [])
+ ],
+ "reference": data.get("reference"),
+ }
+ return session_log
async def set_session(self, token: str, dialog_id: str, message: dict, chat_id: str, is_new: bool) -> list:
url = f"{self.base_url}/v1/conversation/set?dialog_id={dialog_id}"
@@ -152,10 +169,7 @@
url = f"{self.base_url}/v1/tenant/{tenant_id}/user"
headers = {"Authorization": token}
data = {"email": email, "user_id": user_id}
- print(url)
- print(data)
async with httpx.AsyncClient(timeout=60) as client:
response = await client.post(url, headers=headers, json=data)
- print(response.text)
if response.status_code != 200:
raise Exception(f"Ragflow add user to tenant failed: {response.text}")
--
Gitblit v1.8.0