From e79d383437d2b7316ee1def8049a13f3eb7c8dfa Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 14 一月 2025 13:38:05 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/excel.py | 11 ++++++++---
app/api/agent.py | 2 --
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/api/agent.py b/app/api/agent.py
index 88cd114..0fb5f10 100644
--- a/app/api/agent.py
+++ b/app/api/agent.py
@@ -192,8 +192,6 @@
for i in session.log_to_json().get("message", []):
if i.get("role") == "user":
tmp_data["question"]=i.get("content")
- if i.get("download_url") is not None:
- tmp_data["download_url"] = i.get("download_url")
elif i.get("role") == "assistant":
if isinstance(i.get("content"), dict):
diff --git a/app/api/excel.py b/app/api/excel.py
index 2c2fedd..7572fa3 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,7 +1,7 @@
import random
import string
-from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks, Depends
+from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks, Depends, Request
from fastapi.responses import JSONResponse, FileResponse
from sqlalchemy.orm import Session
from starlette.websockets import WebSocket
@@ -128,8 +128,13 @@
if session:
session_id = session.id
new_message = {
- "role": "user",
- "download_url": f"./api/document/download/{merge_file}.xlsx"
+ "role": "assistant",
+ "content": {
+ "message": "\u5408\u5e76\u6210\u529f",
+ "type": "message",
+ "file_url": f"/api/document/download/{merge_file}.xlsx",
+ "file_name": f"{merge_file}.xlsx"
+ }
}
session_service = SessionService(db)
session_service.update_session(session_id, message=new_message)
--
Gitblit v1.8.0