From 9c5293052b670ca6bf677b1577707b9f46cd89cd Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期三, 25 十二月 2024 15:57:14 +0800
Subject: [PATCH] create_user修改
---
app/service/bisheng.py | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index e8405fd..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()
@@ -76,6 +80,9 @@
# ]
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"] and item.get("flow_id") == agent_id
+ 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