From 77d51a55f7241e1eae25d89b4c76865c51565319 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 06 十二月 2024 16:04:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/bisheng.py | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index e8405fd..d4ff068 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
@@ -76,6 +77,9 @@
# ]
def process_name(item):
+ # logger.error("-----------------------process_name-------------------------------------")
+ # logger.error(item)
+
message = item.get("latest_message", {}).get("message", "")
name = message
try:
@@ -86,9 +90,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 +104,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 +122,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