From aa7ebd168dd512dcc99b4c91335819d73afd55b6 Mon Sep 17 00:00:00 2001 From: zhaoqingang <zhaoqg0118@163.com> Date: 星期五, 22 十一月 2024 16:34:21 +0800 Subject: [PATCH] 历史会话问题 --- app/api/files.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/app/api/files.py b/app/api/files.py index fe80f4a..863f174 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 @@ -66,6 +68,12 @@ 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) + + return Response(code=200, msg="", data=result) + else: return Response(code=200, msg="Unsupported agent type") @@ -76,6 +84,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 +103,12 @@ 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) + + elif agent_id == "basic_question_talk": + return await download_basic_file(file_id, file_type) else: return Response(code=400, msg="Unsupported agent type") @@ -109,3 +125,32 @@ ) 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}"} + ) + elif file_type == "word": + content, filename, mimetype = await service.questions_talk_word_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