From 05592050e0f6e87b63952fc58117cb2f112d31ae Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期五, 27 十二月 2024 10:47:44 +0800
Subject: [PATCH] 注册密码 加密
---
app/api/files.py | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index dca7d3c..a84a0b3 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -10,12 +10,13 @@
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
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.v2.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
@@ -50,7 +51,7 @@
return Response(code=400, msg=str(e))
if agent.agent_type == AgentType.RAGFLOW:
- token = get_ragflow_token(db, current_user.id)
+ token = await 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)
@@ -65,7 +66,7 @@
elif agent.agent_type == AgentType.BISHENG:
bisheng_service = BishengService(base_url=settings.sgb_base_url)
try:
- token = get_bisheng_token(db, current_user.id)
+ token = await 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))
@@ -99,7 +100,7 @@
elif agent.agent_type == AgentType.DIFY:
dify_service = DifyService(base_url=settings.dify_base_url)
if agent.type == "imageTalk":
- token = DfTokenDao(db).get_token_by_id("image_and_text_conversion")
+ 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]
@@ -112,8 +113,8 @@
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")
+ elif agent.type == "reportWorkflow" or agent.type == "documentIa":
+ token = DfTokenDao(db).get_token_by_id(DOCUMENT_TO_REPORT)
if not token:
raise HTTPException(status_code=500, detail="鑾峰彇token澶辫触锛宒ocument_to_report锛�")
result = []
--
Gitblit v1.8.0