From cfb8a353c72f96494cd46a78bd917f6ed8aaef1d Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期三, 20 十一月 2024 17:01:07 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway
---
app/api/files.py | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/app/api/files.py b/app/api/files.py
index 12c55b0..968b6b3 100644
--- a/app/api/files.py
+++ b/app/api/files.py
@@ -1,19 +1,22 @@
+import io
from typing import Optional
import requests
-from fastapi import Depends, APIRouter, HTTPException, UploadFile, File, Query
+from fastapi import Depends, APIRouter, HTTPException, UploadFile, File, Query, Form
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
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.ragflow import RagflowService
-from app.service.token import get_ragflow_token, get_bisheng_token
+from app.service.service_token import get_ragflow_token, get_bisheng_token
import urllib.parse
router = APIRouter()
@@ -37,20 +40,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)
@@ -58,6 +61,12 @@
raise HTTPException(status_code=500, detail=str(e))
result["file_name"] = file.filename
return Response(code=200, msg="", data=result)
+ elif agent.agent_type == AgentType.BASIC:
+ if agent_id == "basic_excel_talk":
+ service = BasicService(base_url=settings.basic_base_url)
+ result = await service.excel_talk_upload(chat_id, file.filename, file_content)
+
+ return Response(code=200, msg="", data=result)
else:
return Response(code=200, msg="Unsupported agent type")
@@ -69,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()
@@ -80,12 +91,16 @@
# 浠� URL 涓彁鍙栨枃浠跺悕
parsed_url = urllib.parse.urlparse(url)
filename = urllib.parse.unquote(parsed_url.path.split('/')[-1])
- url = url.replace("http://minio:9000", settings.bisheng_base_url)
+ 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.ragflow_base_url}/v1/document/get/{doc_id}"
+ 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")
@@ -102,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