From fe918ced376839c2b34676199f6d7d925f71a6a3 Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期三, 20 十一月 2024 17:00:13 +0800
Subject: [PATCH] fix
---
app/api/files.py | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index fe80f4a..968b6b3 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -1,3 +1,4 @@
+import io
from typing import Optional
import requests
@@ -5,6 +6,7 @@
from pydantic import BaseModel
from sqlalchemy.orm import Session
from starlette.responses import StreamingResponse
+from werkzeug.utils import send_file
from app.api import Response, get_current_user, ResponseList
from app.config.config import settings
@@ -76,6 +78,8 @@
agent_id: str = Query(..., description="Agent ID"),
doc_id: Optional[str] = Query(None, description="Optional doc id for ragflow agents"),
doc_name: Optional[str] = Query(None, description="Optional doc name for ragflow agents"),
+ file_id: Optional[str] = Query(None, description="Optional file id for basic agents"),
+ 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()
@@ -93,6 +97,10 @@
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:
+ if agent_id == "basic_excel_talk":
+ return await download_basic_file(file_id, file_type)
+
else:
return Response(code=400, msg="Unsupported agent type")
@@ -109,3 +117,25 @@
)
except Exception as e:
raise HTTPException(status_code=400, detail=f"Error downloading file: {e}")
+
+
+async def download_basic_file(file_id: str, file_type: str):
+ service = BasicService(base_url=settings.basic_base_url)
+ if not file_type or not file_id:
+ return Response(code=400, msg="file_type and file_id is required")
+ if file_type == "image":
+ content, filename, mimetype = await service.excel_talk_image_download(file_id)
+ return StreamingResponse(
+ io.BytesIO(content),
+ media_type=mimetype,
+ headers={"Content-Disposition": f"attachment; filename={filename}"}
+ )
+ elif file_type == "excel":
+ content, filename, mimetype = await service.excel_talk_excel_download(file_id)
+ return StreamingResponse(
+ io.BytesIO(content),
+ media_type=mimetype,
+ headers={"Content-Disposition": f"attachment; filename={filename}"}
+ )
+ else:
+ return Response(code=400, msg="Unsupported file type")
\ No newline at end of file
--
Gitblit v1.8.0