From 35f8639455992d24f5d0b962bd6fa79d7fcb8f31 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 19 十一月 2024 10:06:06 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/bisheng.py | 66 +++++++++++++++++++++++++++-----
1 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index d4781da..5fefe90 100644
--- a/app/service/bisheng.py
+++ b/app/service/bisheng.py
@@ -1,3 +1,4 @@
+import json
from datetime import datetime
import httpx
@@ -56,8 +57,8 @@
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"
+ 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)
@@ -70,7 +71,34 @@
"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"]
]
+
+ 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),
+ "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):
@@ -84,15 +112,17 @@
response = await client.get(url, headers=headers)
response.raise_for_status()
data = self._check_response(response)
- session_log = {
- "session_log": [
- {
- "message": message.get("message"),
- "role": message.get("category"),
- }
- for message in data
- ],
- }
+ 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:
@@ -126,3 +156,17 @@
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