From ac9373fd6f0db53c983d87c4790cb627e82759e9 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 25 二月 2025 17:25:39 +0800
Subject: [PATCH] merge
---
app/api/files.py | 65 +++++++++++++++++++++++---------
1 files changed, 46 insertions(+), 19 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index 44b8462..0592b4b 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -8,13 +8,19 @@
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_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
from app.service.service_token import get_ragflow_token, get_bisheng_token
@@ -31,16 +37,17 @@
db: Session = Depends(get_db),
current_user: UserModel = Depends(get_current_user)
):
- agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ agent = db.query(MenuCapacityModel).filter(MenuCapacityModel.chat_id == agent_id).first()
if not agent:
- return Response(code=404, msg="Agent not found")
+ return ResponseList(code=404, msg="Agent not found")
+ agent_type = int(agent.capacity_type)
# 妫�鏌� agent 绫诲瀷锛岀‘瀹氭槸鍚﹀厑璁镐笂浼犲涓枃浠�
- if agent.agent_type in [AgentType.RAGFLOW, AgentType.BISHENG]:
+ if agent_type in [AgentType.RAGFLOW, AgentType.BISHENG]:
if len(file) > 1:
return Response(code=400, msg="杩欎釜鏅鸿兘浣撳彧鏀寔浼犲崟涓枃浠�")
- if agent.agent_type == AgentType.RAGFLOW or agent.agent_type == AgentType.BISHENG:
+ if agent_type == AgentType.RAGFLOW or agent_type == AgentType.BISHENG:
file = file[0]
# 璇诲彇涓婁紶鐨勬枃浠跺唴瀹�
try:
@@ -48,8 +55,8 @@
except Exception as e:
return Response(code=400, msg=str(e))
- if agent.agent_type == AgentType.RAGFLOW:
- token = get_ragflow_token(db, current_user.id)
+ if agent_type == AgentType.RAGFLOW:
+ 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)
@@ -61,17 +68,17 @@
# 瀵逛簬澶氭枃浠讹紝鍙兘闇�瑕佹敹闆嗘墍鏈塪oc_ids
return Response(code=200, msg="", data={"doc_ids": doc_ids, "file_name": file.filename})
- elif agent.agent_type == AgentType.BISHENG:
+ elif 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))
result["file_name"] = file.filename
return Response(code=200, msg="", data=result)
- elif agent.agent_type == AgentType.BASIC:
+ elif agent_type == AgentType.BASIC:
if agent_id == "basic_excel_talk":
# 澶勭悊鍗曚釜鏂囦欢鐨勬儏鍐�
file_list = file
@@ -91,13 +98,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
+ elif agent_type == AgentType.DIFY:
dify_service = DifyService(base_url=settings.dify_base_url)
- if agent.type == "imageTalk":
+ if agent.chat_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 +118,17 @@
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.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_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:
+ raise HTTPException(status_code=500, detail="鑾峰彇token澶辫触锛宒ocument_to_report锛�")
result = []
for f in file:
try:
@@ -117,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))
@@ -135,22 +160,24 @@
file_type: Optional[str] = Query(None, description="Optional file type for basic agents"),
db: Session = Depends(get_db)
):
- agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ # agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ agent = db.query(MenuCapacityModel).filter(MenuCapacityModel.chat_id == agent_id).first()
+
if not agent:
return Response(code=404, msg="Agent not found")
-
- if agent.agent_type == AgentType.BISHENG:
+ agent_type = int(agent.capacity_type)
+ if agent_type == AgentType.BISHENG:
url = urllib.parse.unquote(url)
# 浠� URL 涓彁鍙栨枃浠跺悕
parsed_url = urllib.parse.urlparse(url)
filename = urllib.parse.unquote(parsed_url.path.split('/')[-1])
url = url.replace("http://minio:9000", settings.sgb_base_url)
- elif agent.agent_type == AgentType.RAGFLOW:
+ elif agent_type == AgentType.RAGFLOW:
if not doc_id:
return Response(code=400, msg="doc_id is required")
url = f"{settings.fwr_base_url}/v1/document/get/{doc_id}"
filename = doc_name
- elif agent.agent_type == AgentType.BASIC:
+ elif agent_type == AgentType.BASIC:
if agent_id == "basic_excel_talk":
return await download_basic_file(file_id, file_type)
--
Gitblit v1.8.0