From 370120fd4154ce6c5f69d16a4a343a016cf2e816 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 04 三月 2025 09:53:17 +0800
Subject: [PATCH] 完善问题
---
app/api/files.py | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index c9f0524..0592b4b 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -8,16 +8,18 @@
from starlette.responses import StreamingResponse
from werkzeug.utils import send_file
+from Log import logger
from app.api import Response, get_current_user, ResponseList
from app.config.config import settings
from app.config.const import DOCUMENT_TO_REPORT, IMAGE_TO_TEXT, DOCUMENT_TO_REPORT_TITLE, DOCUMENT_IA_QUESTIONS, \
- DOCUMENT_TO_PAPER
+ DOCUMENT_TO_PAPER, DOCUMENT_IA_QUESTIONS_DS, DOCUMENT_IA_QUESTIONS_EQUIPMENT
from app.models import MenuCapacityModel
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.files import read_file
from app.service.v2.api_token import DfTokenDao
from app.service.difyService import DifyService
from app.service.ragflow import RagflowService
@@ -116,11 +118,13 @@
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.chat_type == "reportWorkflow" or agent.chat_type == "documentIa" or agent.chat_type == "paperTalk":
+ elif agent.chat_type == "reportWorkflow" or agent.chat_type == "documentIa" or agent.chat_type == "paperTalk" or agent.chat_type == "documentIaDs" or agent.chat_type == "documentIaEq":
token_dict = {
- "reportWorkflow": DOCUMENT_TO_REPORT,
+ "reportWorkflow": DOCUMENT_TO_REPORT_TITLE,
"documentIa": DOCUMENT_IA_QUESTIONS,
"paperTalk": DOCUMENT_TO_PAPER,
+ "documentIaDs": DOCUMENT_IA_QUESTIONS_DS,
+ "documentIaEq": DOCUMENT_IA_QUESTIONS_EQUIPMENT,
}
token = DfTokenDao(db).get_token_by_id(token_dict[agent.chat_type])
if not token:
@@ -133,6 +137,11 @@
return Response(code=400, msg=str(e))
try:
file_upload = await dify_service.upload(token, f.filename, file_content, current_user.id)
+ try:
+ tokens = await read_file(file_content, f.filename, f.content_type)
+ file_upload["tokens"] = tokens
+ except Exception as e:
+ logger.error(e)
result.append(file_upload)
except Exception as e:
raise HTTPException(status_code=500, detail=str(e))
--
Gitblit v1.8.0