From f5f6ab74044362e44262c39b1b6e2a88a36e0f91 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期四, 17 十月 2024 11:11:10 +0800
Subject: [PATCH] ragflow发送消息前查找消息历史并放到消息里
---
app/service/bisheng.py | 71 +++++++++++++++++++++++++++++++----
1 files changed, 63 insertions(+), 8 deletions(-)
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index b71a932..d56a00d 100644
--- a/app/service/bisheng.py
+++ b/app/service/bisheng.py
@@ -1,3 +1,4 @@
+from datetime import datetime
import httpx
from app.config.config import settings
@@ -8,6 +9,21 @@
def __init__(self, base_url: str):
self.base_url = base_url
+ def _check_response(self, response: httpx.Response):
+ if response.status_code not in [200, 201]:
+ raise Exception(f"Failed to fetch data from Bisheng API: {response.text}")
+ response_data = response.json()
+ status_code = response_data.get("status_code", 0)
+ if status_code != 200:
+ raise Exception(f"Failed to fetch data from Bisheng API: {response.text}")
+ # 妫�鏌ヨ繑鍥炵殑鏁版嵁绫诲瀷
+ if isinstance(response_data.get("data"), dict):
+ return response_data.get("data", {})
+ elif isinstance(response_data.get("data"), list):
+ return response_data.get("data", [])
+ else:
+ return {}
+
async def register(self, username: str, password: str):
public_key = await self.get_public_key_api()
password = BishengCrypto(public_key, settings.PRIVATE_KEY).encrypt(password)
@@ -17,8 +33,7 @@
json={"user_name": username, "password": password},
headers={'Content-Type': 'application/json'}
)
- if response.status_code != 200 and response.status_code != 201:
- raise Exception(f"Bisheng registration failed: {response.text}")
+ self._check_response(response)
async def login(self, username: str, password: str) -> str:
public_key = await self.get_public_key_api()
@@ -29,9 +44,8 @@
json={"user_name": username, "password": password},
headers={'Content-Type': 'application/json'}
)
- if response.status_code != 200 and response.status_code != 201:
- raise Exception(f"Bisheng login failed: {response.text}")
- return response.json().get('data', {}).get('access_token')
+ data = self._check_response(response)
+ return data.get('access_token')
async def get_public_key_api(self) -> dict:
async with httpx.AsyncClient() as client:
@@ -39,6 +53,47 @@
f"{self.base_url}/api/v1/user/public_key",
headers={'Content-Type': 'application/json'}
)
- if response.status_code != 200:
- raise Exception(f"Failed to get public key: {response.text}")
- return response.json().get('data', {}).get('public_key')
+ data = self._check_response(response)
+ return data.get('public_key')
+
+ async def get_chat_sessions(self, token: str) -> list:
+ url = f"{self.base_url}/api/v1/chat/list?page=1&limit=40"
+ headers = {'cookie': f"access_token_cookie={token};"}
+ async with httpx.AsyncClient() as client:
+ response = await client.get(url, headers=headers)
+ data = self._check_response(response)
+
+ result = [
+ {
+ "id": item["chat_id"],
+ "name": item["latest_message"]["message"],
+ "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000)
+ }
+ for item in data
+ ]
+ return result
+
+ async def variable_list(self, token: str, agent_id: str) -> list:
+ url = f"{self.base_url}/api/v1/variable/list?flow_id={agent_id}"
+ headers = {'cookie': f"access_token_cookie={token};"}
+ async with httpx.AsyncClient() as client:
+ response = await client.get(url, headers=headers)
+ data = self._check_response(response)
+ return data
+
+ async def upload(self, token: str, file: bytes) -> dict:
+ url = f"{self.base_url}/api/v1/knowledge/upload"
+ headers = {'cookie': f"access_token_cookie={token};"}
+
+ # 鍒涘缓琛ㄥ崟鏁版嵁锛屽寘鍚枃浠�
+ files = {"file": ("file", file)} # 浣跨敤榛樿鏂囦欢鍚� "file"
+
+ async with httpx.AsyncClient() as client:
+ response = await client.post(url, headers=headers, files=files)
+ data = self._check_response(response)
+ file_path = data.get("file_path", "")
+ result = {
+ "file_path": file_path
+ }
+
+ return result
--
Gitblit v1.8.0