From c89fa72d0d2772e52812331024dedf3ded1b0639 Mon Sep 17 00:00:00 2001
From: xuyonghao <898441624@qq.com>
Date: 星期一, 11 十一月 2024 17:32:43 +0800
Subject: [PATCH] fix bug
---
app/api/files.py | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index 5da2cc4..739c73e 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -1,5 +1,10 @@
-from fastapi import Depends, APIRouter, HTTPException, UploadFile, File, requests, Query
+from typing import Optional
+
+import requests
+from fastapi import Depends, APIRouter, HTTPException, UploadFile, File, Query
+from pydantic import BaseModel
from sqlalchemy.orm import Session
+from starlette.responses import StreamingResponse
from app.api import Response, get_current_user, ResponseList
from app.config.config import settings
@@ -9,6 +14,7 @@
from app.service.bisheng import BishengService
from app.service.ragflow import RagflowService
from app.service.token import get_ragflow_token, get_bisheng_token
+import urllib.parse
router = APIRouter()
@@ -31,20 +37,20 @@
if agent.agent_type == AgentType.RAGFLOW:
token = get_ragflow_token(db, current_user.id)
- ragflow_service = RagflowService(base_url=settings.ragflow_base_url)
+ ragflow_service = RagflowService(base_url=settings.fwr_base_url)
# 鏌ヨ浼氳瘽鏄惁瀛樺湪锛屼笉瀛樺湪鍏堝垱寤轰細璇�
history = await ragflow_service.get_session_history(token, chat_id)
if len(history) == 0:
message = {"role": "user", "message": file.filename}
await ragflow_service.set_session(token, agent_id, message, chat_id, True)
- ragflow_service = RagflowService(base_url=settings.ragflow_base_url)
+ ragflow_service = RagflowService(base_url=settings.fwr_base_url)
token = get_ragflow_token(db, current_user.id)
doc_ids = await ragflow_service.upload_and_parse(token, chat_id, file.filename, file_content)
return Response(code=200, msg="", data={"doc_ids": doc_ids, "file_name": file.filename})
elif agent.agent_type == AgentType.BISHENG:
- bisheng_service = BishengService(base_url=settings.bisheng_base_url)
+ bisheng_service = BishengService(base_url=settings.sgb_base_url)
try:
token = get_bisheng_token(db, current_user.id)
result = await bisheng_service.upload(token, file.filename, file_content)
@@ -55,3 +61,44 @@
else:
return Response(code=200, msg="Unsupported agent type")
+
+
+@router.get("/download/", response_model=Response)
+async def download_file(
+ url: Optional[str] = Query(None, description="URL of the file to download for bisheng"),
+ 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"),
+ db: Session = Depends(get_db)
+):
+ agent = db.query(AgentModel).filter(AgentModel.id == agent_id).first()
+ if not agent:
+ return Response(code=404, msg="Agent not found")
+
+ if agent.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:
+ 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
+ else:
+ return Response(code=400, msg="Unsupported agent type")
+
+ try:
+ # 鍙戦�丟ET璇锋眰鑾峰彇鏂囦欢鍐呭
+ response = requests.get(url, stream=True)
+ response.raise_for_status() # 妫�鏌ヨ姹傛槸鍚︽垚鍔�
+
+ # 杩斿洖娴佸紡鍝嶅簲
+ return StreamingResponse(
+ response.iter_content(chunk_size=1024),
+ media_type="application/octet-stream",
+ headers={"Content-Disposition": f"attachment; filename*=utf-8''{urllib.parse.quote(filename)}"}
+ )
+ except Exception as e:
+ raise HTTPException(status_code=400, detail=f"Error downloading file: {e}")
--
Gitblit v1.8.0