From 3edf08c7e482f32bc1db0cc9786b64e17b097000 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 十一月 2024 17:06:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/service/bisheng.py | 4 +++-
app/service/ragflow.py | 5 ++++-
app/models/dialog_model.py | 1 +
app/api/agent.py | 21 ++++++++++++++++++++-
4 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index e2982c7..5842350 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -140,8 +140,27 @@
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
elif agent.agent_type == AgentType.BASIC:
+ data = []
session = db.query(SessionModel).filter(SessionModel.id == conversation_id).first()
- return JSONResponse(status_code=200, content={"code": 200, "data": session.log_to_json() if session else {}})
+ if session:
+ tmp_data = {}
+ for i in session.log_to_json().get("message", []):
+ if i.get("role") == "user":
+ tmp_data["question"]=i.get("content")
+ elif i.get("role") == "assistant":
+ if isinstance(i.get("content"), dict):
+ tmp_data["answer"] = i.get("content", {}).get("message")
+ if "file_name" in i.get("content", {}):
+ tmp_data["files"] = [{"file_name":i.get("content", {}).get("file_name"), "file_url":i.get("content", {}).get("file_url")}]
+ else:
+ tmp_data["answer"] = i.get("content")
+ data.append(tmp_data)
+ tmp_data = {}
+
+ if tmp_data:
+ data.append(tmp_data)
+
+ return JSONResponse(status_code=200, content={"code": 200, "data": data})
else:
return JSONResponse(status_code=200, content={"code": 200, "log": "Unsupported agent type"})
diff --git a/app/models/dialog_model.py b/app/models/dialog_model.py
index 7a1848a..a9e1cc8 100644
--- a/app/models/dialog_model.py
+++ b/app/models/dialog_model.py
@@ -57,5 +57,6 @@
return {
'id': self.id,
'updated_time': self.update_time,
+ 'update_date': self.update_time.strftime('%Y-%m-%d %H:%M:%S'),
'name': self.name,
}
\ No newline at end of file
diff --git a/app/service/bisheng.py b/app/service/bisheng.py
index 5fefe90..d551c61 100644
--- a/app/service/bisheng.py
+++ b/app/service/bisheng.py
@@ -68,7 +68,8 @@
{
"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)
+ "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"]
@@ -93,6 +94,7 @@
{
"id": item["chat_id"],
"name": process_name(item),
+ "update_date": item["update_time"],
"updated_time": int(datetime.strptime(item["update_time"], "%Y-%m-%dT%H:%M:%S").timestamp() * 1000)
}
for item in data
diff --git a/app/service/ragflow.py b/app/service/ragflow.py
index 34e8307..7517591 100644
--- a/app/service/ragflow.py
+++ b/app/service/ragflow.py
@@ -1,3 +1,5 @@
+from datetime import datetime
+
import httpx
from typing import Union, Dict, List
from fastapi import HTTPException
@@ -97,7 +99,8 @@
{
"id": item["id"],
"name": item["name"],
- "updated_time": item["update_time"]
+ "updated_time": item["update_time"],
+ "update_date": datetime.utcfromtimestamp(item["update_time"] / 1000.0).strftime('%Y-%m-%d %H:%M:%S')
}
for item in data
if "id" in item and "name" in item and item["name"]
--
Gitblit v1.8.0