From 77b983759956322fcd2259de4f1094217535dcdb Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 13 二月 2025 17:59:08 +0800
Subject: [PATCH] 登录问题优化
---
app/api/excel.py | 44 +++++++++++++++++++++++++++-----------------
1 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 490f731..e8cc6ec 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,12 +1,12 @@
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
-from app.api import get_current_user, get_current_user_websocket
+from app.api import get_current_user, get_current_user_websocket, Response
from app.models import UserModel, AgentType
from app.models.base_model import get_db
from app.service.session import SessionService
@@ -64,13 +64,13 @@
return session
-@router.post('/excel/upload')
+@router.post('/excel/upload', response_model=Response)
async def upload_file(files: list[UploadFile] = File(...), current_user: UserModel = Depends(get_current_user)):
user_id = str(current_user.id)
if not any(file.filename for file in files):
- return JSONResponse(content={"error": "娌℃湁鏂囦欢閮ㄥ垎"}, status_code=400)
+ return Response(code=400, msg="娌℃湁鏂囦欢閮ㄥ垎", data={})
if not user_id:
- return JSONResponse(content={"error": "缂哄皯鍙傛暟user_id"}, status_code=400)
+ return Response(code=400, msg="缂哄皯鍙傛暟user_id", data={})
user_source = user_file_path(user_id, SOURCE_FILES_PATH)
user_excel = EXCEL_FILES_PATH
@@ -80,16 +80,14 @@
save_path_list = []
for file in files:
- if file.filename == '':
- return JSONResponse(content={"error": "娌℃湁閫夋嫨鏂囦欢"}, status_code=400)
if file and allowed_file(file.filename):
save_path = os.path.join(user_source, file.filename)
with open(save_path, 'wb') as buffer:
shutil.copyfileobj(file.file, buffer)
save_path_list.append(save_path)
else:
- return JSONResponse(content={"error": "涓嶅厑璁哥殑鏂囦欢绫诲瀷"}, status_code=400)
- return JSONResponse(content={"code": 200, "msg": "", "data": {}}, status_code=200)
+ return Response(code=400, msg="涓嶅厑璁哥殑鏂囦欢绫诲瀷", data={})
+ return Response(code=200, msg="涓婁紶鎴愬姛", data={})
# ws://localhost:9201/api/document/ws/excel
@@ -113,13 +111,16 @@
if merge_file is not None:
await websocket.send_json({
- "message": "鏂囨。鍚堝苟鎴愬姛锛�",
"type": "stream",
- "file_name": f"{merge_file}.xlsx",
- "download_url": f"./api/document/download/{merge_file}.xlsx"
+ "files": [
+ {
+ "file_name": "Excel",
+ "file_url": f"./api/document/download/{merge_file}.xlsx?file_type=excel",
+ }
+ ]
})
await websocket.send_json({
- "message": "鏂囨。鍚堝苟鎴愬姛锛�",
+ "message": "鍚堝苟鎴愬姛",
"type": "close",
})
# 鍒涘缓浼氳瘽璁板綍
@@ -128,8 +129,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_name": "Excel",
+ "file_url": f"/api/document/download/{merge_file}.xlsx?file_type=excel"
+ }
}
session_service = SessionService(db)
session_service.update_session(session_id, message=new_message)
@@ -146,14 +152,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