From 0aa8144e2c09b39caf29f77b5447bea67d146526 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期五, 22 十一月 2024 11:26:32 +0800
Subject: [PATCH] 文档上传接口支持前端传多个文件
---
app/service/basic.py | 5 +-
app/api/files.py | 92 +++++++++++++++++++++++++++------------------
2 files changed, 57 insertions(+), 40 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index 863f174..8faa011 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -1,5 +1,5 @@
import io
-from typing import Optional
+from typing import Optional, List
import requests
from fastapi import Depends, APIRouter, HTTPException, UploadFile, File, Query, Form
@@ -23,48 +23,69 @@
@router.post("/upload/{agent_id}", response_model=Response)
-async def upload_file(agent_id: str,
- file: UploadFile = File(...),
- chat_id: str = Query(None, description="The ID of the chat"),
- db: Session = Depends(get_db),
- current_user: UserModel = Depends(get_current_user)
- ):
+async def upload_files(
+ agent_id: str,
+ file: List[UploadFile] = File(...), # 淇敼杩欓噷锛屾帴鍙楁枃浠跺垪琛�
+ chat_id: str = Query(None, description="The ID of the chat"),
+ db: Session = Depends(get_db),
+ current_user: UserModel = Depends(get_current_user)
+):
agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
if not agent:
return Response(code=404, msg="Agent not found")
- # 璇诲彇涓婁紶鐨勬枃浠跺唴瀹�
- try:
- file_content = await file.read()
- except Exception as e:
- return Response(code=400, msg=str(e))
- if agent.agent_type == AgentType.RAGFLOW:
- token = get_ragflow_token(db, current_user.id)
- ragflow_service = RagflowService(base_url=settings.fwr_base_url)
- # 鏌ヨ浼氳瘽鏄惁瀛樺湪锛屼笉瀛樺湪鍏堝垱寤轰細璇�
- history = await ragflow_service.get_session_history(token, chat_id)
- if len(history) == 0:
- message = {"role": "user", "message": file.filename}
- await ragflow_service.set_session(token, agent_id, message, chat_id, True)
+ # 妫�鏌� agent 绫诲瀷锛岀‘瀹氭槸鍚﹀厑璁镐笂浼犲涓枃浠�
+ if agent.agent_type in [AgentType.RAGFLOW, AgentType.BISHENG]:
+ if len(file) > 1:
+ return Response(code=400, msg="杩欎釜鏅鸿兘浣撳彧鏀寔浼犲崟涓枃浠�")
- ragflow_service = RagflowService(base_url=settings.fwr_base_url)
- token = get_ragflow_token(db, current_user.id)
- doc_ids = await ragflow_service.upload_and_parse(token, chat_id, file.filename, file_content)
- return Response(code=200, msg="", data={"doc_ids": doc_ids, "file_name": file.filename})
-
- elif agent.agent_type == AgentType.BISHENG:
- bisheng_service = BishengService(base_url=settings.sgb_base_url)
+ if agent.agent_type == AgentType.RAGFLOW or agent.agent_type == AgentType.BISHENG:
+ file = file[0]
+ # 璇诲彇涓婁紶鐨勬枃浠跺唴瀹�
try:
- token = get_bisheng_token(db, current_user.id)
- result = await bisheng_service.upload(token, file.filename, file_content)
+ file_content = await file.read()
except Exception as e:
- raise HTTPException(status_code=500, detail=str(e))
- result["file_name"] = file.filename
- return Response(code=200, msg="", data=result)
+ return Response(code=400, msg=str(e))
+
+ if agent.agent_type == AgentType.RAGFLOW:
+ token = get_ragflow_token(db, current_user.id)
+ ragflow_service = RagflowService(base_url=settings.fwr_base_url)
+ # 鏌ヨ浼氳瘽鏄惁瀛樺湪锛屼笉瀛樺湪鍏堝垱寤轰細璇�
+ history = await ragflow_service.get_session_history(token, chat_id)
+ if len(history) == 0:
+ message = {"role": "user", "message": file.filename}
+ await ragflow_service.set_session(token, agent_id, message, chat_id, True)
+
+ doc_ids = await ragflow_service.upload_and_parse(token, chat_id, file.filename, file_content)
+ # 瀵逛簬澶氭枃浠讹紝鍙兘闇�瑕佹敹闆嗘墍鏈塪oc_ids
+ return Response(code=200, msg="", data={"doc_ids": doc_ids, "file_name": file.filename})
+
+ elif agent.agent_type == AgentType.BISHENG:
+ bisheng_service = BishengService(base_url=settings.sgb_base_url)
+ try:
+ token = get_bisheng_token(db, current_user.id)
+ result = await bisheng_service.upload(token, file.filename, file_content)
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=str(e))
+ result["file_name"] = file.filename
+ return Response(code=200, msg="", data=result)
+
elif agent.agent_type == AgentType.BASIC:
if agent_id == "basic_excel_talk":
+ # 澶勭悊鍗曚釜鏂囦欢鐨勬儏鍐�
+ file_list = file
+ if len(file) == 1 and agent.agent_type != AgentType.BASIC:
+ file_list = [file[0]] # 濡傛灉鍙湁涓�涓枃浠讹紝纭繚瀹冩槸涓�涓垪琛�
service = BasicService(base_url=settings.basic_base_url)
- result = await service.excel_talk_upload(chat_id, file.filename, file_content)
+ # 閬嶅巻file_list锛屽瓨鍒癴iles 鍒楄〃涓�
+ files = []
+ for item in file_list:
+ file_content = await item.read()
+ files.append(('files', (item.filename, file_content, 'application/octet-stream')))
+
+ result = await service.excel_talk_upload(chat_id, files)
+ if not result:
+ return Response(code=400, msg="涓婁紶鏂囦欢鍑洪敊")
return Response(code=200, msg="", data=result)
@@ -72,10 +93,7 @@
service = BasicService(base_url=settings.basic_paper_url)
result = await service.paper_file_upload(chat_id, file.filename, file_content)
- return Response(code=200, msg="", data=result)
-
- else:
- return Response(code=200, msg="Unsupported agent type")
+ return Response(code=200, msg="", data=result)
@router.get("/download/", response_model=Response)
diff --git a/app/service/basic.py b/app/service/basic.py
index 9c22206..32b7fe5 100644
--- a/app/service/basic.py
+++ b/app/service/basic.py
@@ -44,12 +44,11 @@
url = f"{self.base_url}/exceltalk/download/excel"
return await self.download_from_url(url, params={'excel_name': file_id})
- async def excel_talk_upload(self, chat_id: str, filename: str, file_content: bytes):
+ async def excel_talk_upload(self, chat_id: str, files):
url = f"{self.base_url}/exceltalk/upload/files"
params = {'chat_id': chat_id, 'is_col': '0'}
- # 鍒涘缓 FormData 瀵硅薄
- files = [('files', (filename, file_content, 'application/octet-stream'))]
+
async with httpx.AsyncClient() as client:
response = await client.post(
--
Gitblit v1.8.0