文档上传接口支持前端传多个文件

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 = APIRouter()
 
 
 @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)
-
-        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)
+
+    # 检查 agent 类型，确定是否允许上传多个文件
+    if agent.agent_type in [AgentType.RAGFLOW, AgentType.BISHENG]:
+        if len(file) > 1:
+            return Response(code=400, msg="这个智能体只支持传单个文件")
+
+    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)
+            # 对于多文件，可能需要收集所有doc_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，存到files 列表中
+            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 @@ async def upload_file(agent_id: str,
             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)

app/service/basic.py

@@ -44,12 +44,11 @@ class BasicService:
         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(