From fd734ab75a0856eddf803352367a7c61a1cf406b Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期五, 10 一月 2025 13:33:54 +0800
Subject: [PATCH] 用户组成员管理排除删除掉的用户，修改excel下载文件名
---
app/api/excel.py | 66 +++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 12 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 7b8e792..2c2fedd 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,9 +1,15 @@
+import random
+import string
+
from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks, Depends
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.models import UserModel
+from app.models import UserModel, AgentType
+from app.models.base_model import get_db
+from app.service.session import SessionService
from app.utils.excelmerge.conformity import run_conformity
import shutil
import os
@@ -41,6 +47,23 @@
return os.path.join(path, userid)
+def generate_db_id(prefix: str = "me") -> str:
+ random_part = ''.join(random.choices(string.ascii_letters + string.digits, k=13))
+ return prefix + random_part
+
+
+def db_create_session(db: Session, user_id: str):
+ db_id = generate_db_id()
+ session = SessionService(db).create_session(
+ db_id,
+ "鍚堝苟Excel",
+ "basic_excel_merge",
+ AgentType.BASIC,
+ int(user_id)
+ )
+ return session
+
+
@router.post('/excel/upload')
async def upload_file(files: list[UploadFile] = File(...), current_user: UserModel = Depends(get_current_user)):
user_id = str(current_user.id)
@@ -71,7 +94,9 @@
# ws://localhost:9201/api/document/ws/excel
@router.websocket("/ws/excel")
-async def ws_excel(websocket: WebSocket, current_user: UserModel = Depends(get_current_user_websocket)):
+async def ws_excel(websocket: WebSocket,
+ current_user: UserModel = Depends(get_current_user_websocket),
+ db: Session = Depends(get_db)):
await websocket.accept()
user_id = str(current_user.id)
@@ -97,32 +122,49 @@
"message": "鏂囨。鍚堝苟鎴愬姛锛�",
"type": "close",
})
+ # 鍒涘缓浼氳瘽璁板綍
+ session = db_create_session(db, user_id)
+ # 鏇存柊浼氳瘽璁板綍
+ if session:
+ session_id = session.id
+ new_message = {
+ "role": "user",
+ "download_url": f"./api/document/download/{merge_file}.xlsx"
+ }
+ session_service = SessionService(db)
+ session_service.update_session(session_id, message=new_message)
else:
await websocket.send_json({"error": "鍚堝苟澶辫触", "type": "stream", "files": []})
+ await websocket.close()
else:
print(f"Received data: {data}")
await websocket.send_json({"error": "鏈煡鎸囦护", "data": str(data)})
+ await websocket.close()
except Exception as e:
await websocket.send_json({"error": str(e)})
await websocket.close()
@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)
-
- def delete_file():
- try:
- os.unlink(file_path)
- except OSError as e:
- print(f"Deleting file error")
+ return FileResponse(
+ path=file_path,
+ filename="Excel.xlsx",
+ media_type='application/octet-stream',
+ )
+ # def delete_file():
+ # try:
+ # os.unlink(file_path)
+ # except OSError as e:
+ # print(f"Deleting file error")
# 寰呬笅杞藉畬鎴愬悗鍒犻櫎鐢熸垚鐨勬枃浠�
- background_tasks.add_task(delete_file)
- return FileResponse(path=file_path, filename=file_name,
- media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+ # background_tasks.add_task(delete_file)
+ # return FileResponse(path=file_path, filename=file_name,
+ # media_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
--
Gitblit v1.8.0