From b9c7727dc6fbb3789f063c0616ef9392311fecb2 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 06 二月 2025 10:58:14 +0800
Subject: [PATCH] merge master
---
app/api/excel.py | 98 ++++++++++++++++++++++++++++++++++++------------
1 files changed, 73 insertions(+), 25 deletions(-)
diff --git a/app/api/excel.py b/app/api/excel.py
index 7b8e792..e8cc6ec 100644
--- a/app/api/excel.py
+++ b/app/api/excel.py
@@ -1,9 +1,15 @@
-from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks, Depends
+import random
+import string
+
+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.models import UserModel
+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
from app.utils.excelmerge.conformity import run_conformity
import shutil
import os
@@ -41,13 +47,30 @@
return os.path.join(path, userid)
-@router.post('/excel/upload')
+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', 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
@@ -57,21 +80,21 @@
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
@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)
@@ -88,41 +111,66 @@
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",
})
+ # 鍒涘缓浼氳瘽璁板綍
+ session = db_create_session(db, user_id)
+ # 鏇存柊浼氳瘽璁板綍
+ if session:
+ session_id = session.id
+ new_message = {
+ "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)
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