From 6b6a86143389bcb7add382b5f78d4a24684b78fa Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 04 十二月 2024 17:40:43 +0800
Subject: [PATCH] merge
---
app/api/files.py | 51 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index 2189f94..dca7d3c 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -15,6 +15,7 @@
from app.models.user_model import UserModel
from app.service.basic import BasicService
from app.service.bisheng import BishengService
+from app.service.common.api_token import DfTokenDao
from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
from app.service.service_token import get_ragflow_token, get_bisheng_token
@@ -91,26 +92,44 @@
return Response(code=200, msg="", data=result)
elif agent_id == "basic_paper_agent":
- service = BasicService(base_url=settings.basic_paper_url)
- result = await service.paper_file_upload(chat_id, file.filename, file_content)
+ ...
+ # service = BasicService(base_url=settings.basic_paper_url)
+ # result = await service.paper_file_upload(chat_id, file.filename, file_content)
elif agent.agent_type == AgentType.DIFY:
- file = file[0]
- # 璇诲彇涓婁紶鐨勬枃浠跺唴瀹�
- try:
- file_content = await file.read()
- except Exception as e:
- return Response(code=400, msg=str(e))
dify_service = DifyService(base_url=settings.dify_base_url)
- try:
- token = settings.dify_api_token
- result = await dify_service.upload(token, file.filename, file_content, current_user.id)
- except Exception as e:
- raise HTTPException(status_code=500, detail=str(e))
+ if agent.type == "imageTalk":
+ token = DfTokenDao(db).get_token_by_id("image_and_text_conversion")
+ if not token:
+ raise HTTPException(status_code=500, detail="鑾峰彇token澶辫触锛宨mage_and_text_conversion锛�")
+ file = file[0]
+ # 璇诲彇涓婁紶鐨勬枃浠跺唴瀹�
+ try:
+ file_content = await file.read()
+ except Exception as e:
+ return Response(code=400, msg=str(e))
+ try:
+ data = await dify_service.upload(token, file.filename, file_content, current_user.id)
+ except Exception as e:
+ raise HTTPException(status_code=500, detail=str(e))
+ elif agent.type == "reportWorkflow":
+ token = DfTokenDao(db).get_token_by_id("document_to_report")
+ if not token:
+ raise HTTPException(status_code=500, detail="鑾峰彇token澶辫触锛宒ocument_to_report锛�")
+ result = []
+ for f in file:
+ try:
+ file_content = await f.read()
+ except Exception as e:
+ return Response(code=400, msg=str(e))
+ try:
+ file_upload = await dify_service.upload(token, f.filename, file_content, current_user.id)
+ result.append(file_upload)
+ 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=200, msg="", data=result)
+ data = {"files": result}
+ return Response(code=200, msg="", data=data)
@router.get("/download/", response_model=Response)
--
Gitblit v1.8.0