From 8e85ef5796e901a4860ab0d39961e9b343fd30e0 Mon Sep 17 00:00:00 2001
From: zhangxiao <898441624@qq.com>
Date: 星期三, 23 十月 2024 10:48:18 +0800
Subject: [PATCH] 指令由 {"action": "process"} 改为 '合并Excel文件' 收到的数据格式与报告生成返回一致
---
app/api/files.py | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index 401428a..5da2cc4 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -1,4 +1,4 @@
-from fastapi import Depends, APIRouter, HTTPException, UploadFile, File, requests
+from fastapi import Depends, APIRouter, HTTPException, UploadFile, File, requests, Query
from sqlalchemy.orm import Session
from app.api import Response, get_current_user, ResponseList
@@ -16,6 +16,7 @@
@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)
):
@@ -29,15 +30,27 @@
return Response(code=400, msg=str(e))
if agent.agent_type == AgentType.RAGFLOW:
- pass
+ token = get_ragflow_token(db, current_user.id)
+ ragflow_service = RagflowService(base_url=settings.ragflow_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.ragflow_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.bisheng_base_url)
try:
token = get_bisheng_token(db, current_user.id)
- result = await bisheng_service.upload(token, file_content)
+ 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)
else:
--
Gitblit v1.8.0