From f249dda1376dd5a525e74617900351c5bbc61705 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期一, 02 十二月 2024 09:26:18 +0800
Subject: [PATCH] 报告生成
---
app/service/bisheng.py | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index ecf2892..9be6692 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
@@ -57,25 +58,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:
@@ -88,6 +92,15 @@
name = message_json['report_name']
except json.JSONDecodeError:
pass
+ if not name:
+ name = item.get("flow_name")
+ return name
+
+ def process_name_report(item):
+ # logger.error("-----------------------process_name-------------------------------------")
+ # logger.error(item)
+ name = item.get("flow_name", "鎶ュ憡鐢熸垚")
+
return name
result = [
@@ -98,7 +111,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
@@ -113,10 +126,12 @@
async with httpx.AsyncClient() as client:
response = await client.get(url, headers=headers)
response.raise_for_status()
+ # print(response.text)
data = self._check_response(response)
session_log = [
{
- "message": message.get("message"),
+ "message": message.get("intermediate_steps", ""),
+ "intermediate_steps": message.get("message", ""),
"role": message.get("category"),
"ts": message.get("create_time")
}
--
Gitblit v1.8.0