From 3edf08c7e482f32bc1db0cc9786b64e17b097000 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 十一月 2024 17:06:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/bisheng.py | 146 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 138 insertions(+), 8 deletions(-)
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index b71a932..d551c61 100644
--- a/app/service/bisheng.py
+++ b/app/service/bisheng.py
@@ -1,3 +1,5 @@
+import json
+from datetime import datetime
import httpx
from app.config.config import settings
@@ -8,6 +10,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 +34,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}")
+ return self._check_response(response)
async def login(self, username: str, password: str) -> str:
public_key = await self.get_public_key_api()
@@ -29,9 +45,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 +54,121 @@
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, page: int = 1, limit: int=100) -> list:
+ url = f"{self.base_url}/api/v1/chat/list?page={page}&limit={limit}"
+ 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),
+ "update_date": item["update_time"]
+ }
+ for item in data
+ if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"]
+ ]
+
+ def process_name(item):
+ message = item.get("latest_message", {}).get("message", "")
+ name = message
+ try:
+ message_json = json.loads(message)
+ if 'question' in message_json:
+ name = message_json['question']
+ elif 'query' in message_json:
+ name = message_json['query']
+ elif 'report_name' in message_json:
+ name = message_json['report_name']
+ except json.JSONDecodeError:
+ pass
+ return name
+
+ result = [
+ {
+ "id": item["chat_id"],
+ "name": process_name(item),
+ "update_date": item["update_time"],
+ "updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000)
+ }
+ for item in data
+ if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"]
+ ]
+
+ return result
+
+ async def get_session_log(self, token: str, agent_id: str, conversation_id: str):
+ url = (
+ f"{self.base_url}/api/v1/chat/history?"
+ f"flow_id={agent_id}&"
+ f"chat_id={conversation_id}&page_size=30&id="
+ )
+ headers = {'cookie': f"access_token_cookie={token};"}
+ async with httpx.AsyncClient() as client:
+ response = await client.get(url, headers=headers)
+ response.raise_for_status()
+ data = self._check_response(response)
+ session_log = [
+ {
+ "message": message.get("message"),
+ "role": message.get("category"),
+ "ts": message.get("create_time")
+ }
+ for message in data
+ ]
+
+ # 鎶妔ession_log 鎸塼s 鍗囧簭鎺掑簭
+ session_log.sort(key=lambda x: x['ts'])
+ return session_log
+
+ 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, filename: str, file: bytes) -> dict:
+ url = f"{self.base_url}/api/v1/knowledge/upload"
+ headers = {'cookie': f"access_token_cookie={token};"}
+
+ # 鍒涘缓琛ㄥ崟鏁版嵁锛屽寘鍚枃浠�
+ files = {"file": (filename, 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
+
+ async def user_list(self, token: str) -> list:
+ url = f"{self.base_url}/api/v1/user/list"
+ 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 change_password_public(self, token: str, username: str, password: str, new_password:str) -> dict:
+ url = f"{self.base_url}/api/v1/user/change_password_public"
+ headers = {'cookie': f"access_token_cookie={token};"}
+ public_key = await self.get_public_key_api()
+ password = BishengCrypto(public_key, settings.PRIVATE_KEY).encrypt(password)
+ new_password = BishengCrypto(public_key, settings.PRIVATE_KEY).encrypt(new_password)
+ json = {"username": username, "password": password, "new_password": new_password}
+ async with httpx.AsyncClient() as client:
+ response = await client.post(url, headers=headers, json=json)
+ data = self._check_response(response)
+
+ return data
--
Gitblit v1.8.0