From fb4beedd7ee92777711a854c1c264db460a38d49 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 11 四月 2025 09:56:29 +0800
Subject: [PATCH] 首页模型
---
app/service/bisheng.py | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index ecf2892..51db4f8 100644
--- a/app/service/bisheng.py
+++ b/app/service/bisheng.py
@@ -2,6 +2,7 @@
from datetime import datetime
import httpx
+from Log import logger
from app.config.config import settings
from app.utils.rsa_crypto import BishengCrypto
@@ -25,7 +26,7 @@
else:
return {}
- async def register(self, username: str, password: str):
+ async def register(self, username: str, password: str, token:str=""):
public_key = await self.get_public_key_api()
password = BishengCrypto(public_key, settings.PRIVATE_KEY).encrypt(password)
async with httpx.AsyncClient() as client:
@@ -34,7 +35,10 @@
json={"user_name": username, "password": password},
headers={'Content-Type': 'application/json'}
)
- return self._check_response(response)
+ res = self._check_response(response)
+ if isinstance(res, dict):
+ res["id"] = res.get("user_id")
+ return res
async def login(self, username: str, password: str) -> str:
public_key = await self.get_public_key_api()
@@ -57,25 +61,28 @@
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:
+ async def get_chat_sessions(self, token: str, agent_id,page: int = 1, limit: int=1000) -> 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"]
- ]
+ # print(data)
+ # 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):
+ # logger.error("-----------------------process_name-------------------------------------")
+ # logger.error(item)
+
message = item.get("latest_message", {}).get("message", "")
name = message
try:
@@ -86,9 +93,11 @@
name = message_json['query']
elif 'report_name' in message_json:
name = message_json['report_name']
- except json.JSONDecodeError:
+ except Exception as e:
pass
- return name
+ if not name:
+ name = item.get("flow_name")
+ return name[:50]
result = [
{
@@ -98,7 +107,7 @@
"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"]
+ if item.get("flow_id") == agent_id #if "latest_message" in item and "message" in item["latest_message"] and item["latest_message"]["message"] and
]
return result
@@ -116,11 +125,12 @@
data = self._check_response(response)
session_log = [
{
- "message": message.get("message"),
- "role": message.get("category"),
+ "message":message.get("message", "") if message.get("message", "") else message.get("intermediate_steps", ""),
+ "files": message.get("files", ""),
+ "role": "question" if message.get("category") == "question" and message.get("message", "") else "answer",
"ts": message.get("create_time")
}
- for message in data
+ for message in data if message.get("category") != "system"
]
# 鎶妔ession_log 鎸塼s 鍗囧簭鎺掑簭
--
Gitblit v1.8.0