From b4acf278db581ce5e70b513407b70db2d9b29b23 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 07 一月 2025 17:33:32 +0800
Subject: [PATCH] 报告生成
---
app/api/files.py | 64 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index dd9166a..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
@@ -75,7 +78,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 +94,48 @@
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:
+ 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_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))
- 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)
+ 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))
- result["file_name"] = file.filename
- return Response(code=200, msg="", data=result)
-
- return Response(code=200, msg="", data=result)
+ 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:
+ file_content = await f.read()
+ except Exception as e:
+ return Response(code=400, msg=str(e))
+ try:
+ 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))
+ # result["file_name"] = file.filename
+ data = {"files": result}
+ return Response(code=200, msg="", data=data)
@router.get("/download/", response_model=Response)
@@ -188,4 +213,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