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 | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 490f731..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)
@@ -146,14 +151,18 @@
@router.get("/download/{file_full_name}")
-async def download_file(background_tasks: BackgroundTasks, file_full_name: str):
+async def download_file(file_full_name: str):
file_name = os.path.basename(file_full_name)
user_excel = EXCEL_FILES_PATH
file_path = os.path.join(user_excel, file_full_name)
if not os.path.exists(file_path):
return JSONResponse(content={"error": "鏂囦欢涓嶅瓨鍦�"}, status_code=404)
-
+ return FileResponse(
+ path=file_path,
+ filename="Excel.xlsx",
+ media_type='application/octet-stream',
+ )
# def delete_file():
# try:
# os.unlink(file_path)
--
Gitblit v1.8.0