Просмотр исходного кода

Merge branch 'master' of http://192.168.5.5:10010/r/rag-gateway

zhaoqingang 1 год назад
Родитель
Сommit
e79d383437
2 измененных файлов с 8 добавлено и 5 удалено
  1. 0 2
      app/api/agent.py
  2. 8 3
      app/api/excel.py

+ 0 - 2
app/api/agent.py

@@ -192,8 +192,6 @@ async def session_log(agent_id: str, conversation_id: str, db: Session = Depends
             for i in session.log_to_json().get("message", []):
             for i in session.log_to_json().get("message", []):
                 if i.get("role") == "user":
                 if i.get("role") == "user":
                     tmp_data["question"]=i.get("content")
                     tmp_data["question"]=i.get("content")
-                    if i.get("download_url") is not None:
-                        tmp_data["download_url"] = i.get("download_url")
                 elif i.get("role") == "assistant":
                 elif i.get("role") == "assistant":
 
 
                     if isinstance(i.get("content"), dict):
                     if isinstance(i.get("content"), dict):

+ 8 - 3
app/api/excel.py

@@ -1,7 +1,7 @@
 import random
 import random
 import string
 import string
 
 
-from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks, Depends
+from fastapi import APIRouter, File, UploadFile, Form, BackgroundTasks, Depends, Request
 from fastapi.responses import JSONResponse, FileResponse
 from fastapi.responses import JSONResponse, FileResponse
 from sqlalchemy.orm import Session
 from sqlalchemy.orm import Session
 from starlette.websockets import WebSocket
 from starlette.websockets import WebSocket
@@ -128,8 +128,13 @@ async def ws_excel(websocket: WebSocket,
                     if session:
                     if session:
                         session_id = session.id
                         session_id = session.id
                         new_message = {
                         new_message = {
-                            "role": "user",
-                            "download_url": f"./api/document/download/{merge_file}.xlsx"
+                            "role": "assistant",
+                            "content": {
+                                "message": "\u5408\u5e76\u6210\u529f",
+                                "type": "message",
+                                "file_url": f"/api/document/download/{merge_file}.xlsx",
+                                "file_name": f"{merge_file}.xlsx"
+                            }
                         }
                         }
                         session_service = SessionService(db)
                         session_service = SessionService(db)
                         session_service.update_session(session_id, message=new_message)
                         session_service.update_session(session_id, message=new_message)