From d961b5e9290edef3bee5cd6adc4a636af209c1e7 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 09 一月 2025 18:52:21 +0800
Subject: [PATCH] tmp
---
app/api/files.py | 77 ++++++++++++++++++++++++++++----------
1 files changed, 56 insertions(+), 21 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index 22c2216..a84a0b3 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -10,11 +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.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
@@ -49,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)
@@ -64,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))
@@ -75,7 +77,7 @@
if agent_id == "basic_excel_talk":
# 澶勭悊鍗曚釜鏂囦欢鐨勬儏鍐�
file_list = file
- if len(file) == 1 and agent.agent_type != AgentType.BASIC:
+ if len(file) == 1: # and agent.agent_type != AgentType.BASIC
file_list = [file[0]] # 濡傛灉鍙湁涓�涓枃浠讹紝纭繚瀹冩槸涓�涓垪琛�
service = BasicService(base_url=settings.basic_base_url)
# 閬嶅巻file_list锛屽瓨鍒癴iles 鍒楄〃涓�
@@ -91,26 +93,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 = get_bisheng_token(db, current_user.id)
- 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))
- result["file_name"] = file.filename
- return Response(code=200, msg="", data=result)
-
- return Response(code=200, msg="", data=result)
+ 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:
+ 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" 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 = []
+ 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
+ data = {"files": result}
+ return Response(code=200, msg="", data=data)
@router.get("/download/", response_model=Response)
@@ -188,4 +208,19 @@
headers={"Content-Disposition": f"attachment; filename={filename}"}
)
else:
- return Response(code=400, msg="Unsupported file type")
\ No newline at end of file
+ return Response(code=400, msg="Unsupported file type")
+
+
+@router.get("/image/{imageId}", response_model=Response)
+async def download_image_file(imageId: str, db=Depends(get_db)):
+ file_path = f"app/images/{imageId}.png"
+
+ def generate():
+ with open(file_path, "rb") as file:
+ while True:
+ data = file.read(1048576) # 璇诲彇1MB
+ if not data:
+ break
+ yield data
+
+ return StreamingResponse(generate(), media_type="application/octet-stream")
\ No newline at end of file
--
Gitblit v1.8.0