From 5ef590b70cc8e2de16083af2ee2d977daae5587c Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 16:34:29 +0800
Subject: [PATCH] 会话缓存本地数据库
---
app/service/ragflow.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 48 insertions(+), 6 deletions(-)
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index 969f3b0..769631d 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -3,6 +3,7 @@
from fastapi import HTTPException
from starlette import status
+from Log import logger
from app.config.config import settings
from app.utils.rsa_crypto import RagflowCrypto
@@ -99,6 +100,7 @@
"updated_time": item["update_time"]
}
for item in data
+ if "id" in item and "name" in item and item["name"]
]
return result
@@ -109,16 +111,13 @@
response = await client.get(url, headers=headers)
data = self._handle_response(response)
session_log = {
- "dialog_id": data.get("dialog_id"),
- "id": data.get("id"),
- "message": [
+ "session_log": [
{
- "content": message.get("content"),
+ "message": message.get("content"),
"role": message.get("role"),
}
for message in data.get("message", [])
],
- "name": data.get("name"),
"reference": data.get("reference"),
}
return session_log
@@ -147,12 +146,15 @@
}
] if data else []
- async def get_session_history(self, token: str, chat_id: str) -> list:
+ async def get_session_history(self, token: str, chat_id: str, is_all: int=0):
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 = self._handle_response(response)
+ # print("----------------data----------------------:", data)
+ if is_all:
+ return data
return data.get("message", [])
async def upload_and_parse(self, token: str, chat_id: str, filename: str, file: bytes) -> str:
@@ -173,5 +175,45 @@
data = {"email": email, "user_id": user_id}
async with httpx.AsyncClient(timeout=60) as client:
response = await client.post(url, headers=headers, json=data)
+ print(response)
if response.status_code != 200:
raise Exception(f"Ragflow add user to tenant failed: {response.text}")
+
+ async def get_knowledge_list(self, token: str, page_index: int, page_size: int) -> str:
+ url = f"{self.base_url}/v1/kb/list"
+ headers = {"Authorization": token}
+ params = {"page": page_index, "page_size": page_size}
+ async with httpx.AsyncClient(timeout=60) as client:
+ response = await client.get(url, headers=headers, params=params)
+ res = self._handle_response(response)
+ print(res)
+ return res
+
+
+ async def set_user_password(self, token: str, password: str, new_password: str) -> str:
+ # print("password:", password)
+ # print("new_password:", new_password)
+ password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(password)
+ new_password = RagflowCrypto(settings.PUBLIC_KEY, settings.PRIVATE_KEY).encrypt(new_password)
+ url = f"{self.base_url}/v1/user/setting"
+ headers = {"Authorization": token}
+ data = {"password": password, "new_password":new_password}
+
+ async with httpx.AsyncClient(timeout=60) as client:
+ response = await client.post(url, headers=headers, data=data)
+ data = self._handle_response(response)
+ logger.info("set_user_password:{}".format(data))
+ return data
+
+
+if __name__ == "__main__":
+ async def a():
+ a = RagflowService("http://192.168.20.119:11080")
+ b = await a.get_knowledge_list("625e1f24a26811ef8f940242ac130006", 1,
+ 10)
+ print(b)
+
+ import asyncio
+ # 鍦ㄥ悓姝ヤ唬鐮佷腑鍚姩寮傛涓诲嚱鏁�
+ asyncio.run(a())
+
--
Gitblit v1.8.0