From b7ad7ae90cd832281afe6d743776ad87f1e56e07 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 03 一月 2025 16:55:47 +0800
Subject: [PATCH] 工作流日志
---
app/api/files.py | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index 44b8462..92ee599 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -10,12 +10,15 @@
from app.api import Response, get_current_user, ResponseList
from app.config.config import settings
+from app.config.const import DOCUMENT_TO_REPORT_TITLE, IMAGE_TO_TEXT
from app.models.agent_model import AgentType, AgentModel
from app.models.base_model import get_db
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.files import read_file
from app.service.ragflow import RagflowService
from app.service.service_token import get_ragflow_token, get_bisheng_token
import urllib.parse
@@ -91,13 +94,16 @@
return Response(code=200, msg="", data=result)
elif agent_id == "basic_paper_agent":
- service = BasicService(base_url=settings.basic_paper_url)
+ ...
+ # 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:
- token = settings.dify_api_token
dify_service = DifyService(base_url=settings.dify_base_url)
if agent.type == "imageTalk":
+ token = DfTokenDao(db).get_token_by_id(IMAGE_TO_TEXT)
+ if not token:
+ raise HTTPException(status_code=500, detail="鑾峰彇token澶辫触锛宨mage_and_text_conversion锛�")
file = file[0]
# 璇诲彇涓婁紶鐨勬枃浠跺唴瀹�
try:
@@ -108,7 +114,10 @@
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":
+ elif agent.type == "reportWorkflow" or agent.type == "documentIa":
+ token = DfTokenDao(db).get_token_by_id(DOCUMENT_TO_REPORT_TITLE)
+ if not token:
+ raise HTTPException(status_code=500, detail="鑾峰彇token澶辫触锛宒ocument_to_report锛�")
result = []
for f in file:
try:
@@ -116,7 +125,11 @@
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)
+ filename = f.filename
+ file_upload = await dify_service.upload(token, filename, file_content, current_user.id)
+ print(file_upload)
+ tokens = await read_file(file_content, filename, f.content_type)
+ file_upload["tokens"] = tokens
result.append(file_upload)
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
--
Gitblit v1.8.0