From 9683aeeafa2f1067ef061b34124a1c362df07e5e Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期四, 03 四月 2025 14:10:13 +0800
Subject: [PATCH] rg配置修改
---
app/api/v2/chat.py | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/app/api/v2/chat.py b/app/api/v2/chat.py
index 819b5a6..f9bbb11 100644
--- a/app/api/v2/chat.py
+++ b/app/api/v2/chat.py
@@ -1,19 +1,21 @@
import json
import uuid
-from typing import List
+from typing import List
from fastapi import Depends, APIRouter, File, UploadFile
from sqlalchemy.orm import Session
from starlette.responses import StreamingResponse, Response
-
-from app.api import get_current_user
-from app.config.const import dialog_chat, advanced_chat, base_chat, agent_chat, workflow_chat, basic_chat, \
- smart_message_error, http_400, http_500, http_200
+from app.api import get_current_user, get_api_key
+from app.config.const import smart_message_error, http_400, http_500, http_200, complex_dialog_chat, \
+ complex_knowledge_chat_deep, complex_knowledge_chat
from app.models import UserModel
from app.models.base_model import get_db
+from app.models.v2.chat import RetrievalRequest, ChatDataRequest, ComplexChatDao
from app.models.v2.session_model import ChatData
from app.service.v2.chat import service_chat_dialog, get_chat_info, service_chat_basic, \
- service_chat_workflow, service_chat_parameters, service_chat_sessions, service_chat_upload
+ service_chat_workflow, service_chat_parameters, service_chat_sessions, service_chat_upload, \
+ service_chat_sessions_list, service_chat_session_log, service_chunk_retrieval, service_complex_chat, \
+ service_complex_upload
chat_router_v2 = APIRouter()
@@ -34,13 +36,14 @@
media_type="text/event-stream")
if not session_id:
session = await service_chat_sessions(db, chatId, dialog.query)
+ # print(session)
if not session or session.get("code") != 0:
error_msg = json.dumps(
{"message": smart_message_error, "error": "\n**ERROR**: chat agent error", "status": http_500})
return StreamingResponse(f"data: {error_msg}\n\n",
media_type="text/event-stream")
session_id = session.get("data", {}).get("id")
- return StreamingResponse(service_chat_dialog(db, chatId, dialog.query, session_id, current_user.id, chat_info.mode),
+ return StreamingResponse(service_chat_dialog(db, chatId, dialog.query, session_id, current_user.id, chat_info.mode, chat_info.get_kb_ids()),
media_type="text/event-stream")
@chat_router_v2.post("/agent/{chatId}/completions")
@@ -73,7 +76,7 @@
media_type="text/event-stream")
-@chat_router_v2.post("/complex/{chatId}/completions")
+@chat_router_v2.post("/develop/{chatId}/completions")
async def api_chat_dialog(chatId:str, dialog: ChatData, current_user: UserModel = Depends(get_current_user), db: Session = Depends(get_db)): # current_user: UserModel = Depends(get_current_user)
chat_info = await get_chat_info(db, chatId)
if not chat_info:
@@ -97,7 +100,7 @@
data = await service_chat_parameters(db, chatId, current_user.id)
if not data:
status_code = http_400
- data = "{}"
+ data = json.dumps({"code": http_400})
return Response(data, media_type="application/json", status_code=status_code)
@@ -109,3 +112,57 @@
status_code = http_400
data = "{}"
return Response(data, media_type="application/json", status_code=status_code)
+
+
+
+@chat_router_v2.get("/chat/sessions")
+async def api_chat_sessions(chatId:str, current:int=1, pageSize:int=100, keyword:str="", current_user: UserModel = Depends(get_current_user), db: Session = Depends(get_db)): # current_user: UserModel = Depends(get_current_user)
+ data = await service_chat_sessions_list(db, chatId, current, pageSize, current_user.id, keyword)
+ return Response(data, media_type="application/json", status_code=http_200)
+
+
+@chat_router_v2.get("/chat/session_log")
+async def api_chat_sessions(sessionId:str, current_user: UserModel = Depends(get_current_user), db: Session = Depends(get_db)): # current_user: UserModel = Depends(get_current_user)
+ data = await service_chat_session_log(db, sessionId)
+ return Response(data, media_type="application/json", status_code=http_200)
+
+
+@chat_router_v2.post("/retrieval")
+async def retrieve_chunks(request_data: RetrievalRequest, api_key: str = Depends(get_api_key)):
+ records = await service_chunk_retrieval(request_data.query, request_data.knowledge_id, request_data.retrieval_setting.top_k, request_data.retrieval_setting.score_threshold, api_key)
+ return {"records": records}
+
+
+@chat_router_v2.post("/complex/chat/completions")
+async def api_complex_chat_completions(chat: ChatDataRequest, current_user: UserModel = Depends(get_current_user), db: Session = Depends(get_db)): # current_user: UserModel = Depends(get_current_user)
+ # chat_mode = chat.chatMode
+ if chat.isDeep == 2 and chat.chatMode == complex_knowledge_chat:
+ chat.chatMode = complex_knowledge_chat_deep
+ complex_chat = await ComplexChatDao(db).get_complex_chat_by_mode(chat.chatMode)
+ if complex_chat:
+ if not chat.sessionId:
+ chat.sessionId = str(uuid.uuid4()).replace("-", "")
+ return StreamingResponse(service_complex_chat(db, complex_chat.id, complex_chat.mode, current_user.id, chat),
+ media_type="text/event-stream")
+ else:
+ error_msg = json.dumps(
+ {"message": smart_message_error, "error": "\n**ERROR**: 缃戠粶寮傚父锛屾棤娉曠敓鎴愬璇濈粨鏋滐紒", "status": http_500})
+ return StreamingResponse(f"data: {error_msg}\n\n",
+ media_type="text/event-stream")
+
+
+@chat_router_v2.post("/complex/upload/{chatMode}")
+async def api_complex_upload(chatMode:int, file: List[UploadFile] = File(...), current_user: UserModel = Depends(get_current_user), db: Session = Depends(get_db)): # current_user: UserModel = Depends(get_current_user)
+ status_code = http_200
+ complex_chat = await ComplexChatDao(db).get_complex_chat_by_mode(chatMode)
+ if complex_chat:
+ data = await service_complex_upload(db, complex_chat.id, file, current_user.id)
+ if not data:
+ status_code = http_400
+ data = "{}"
+ else:
+ status_code = http_500
+ data = "{}"
+ return Response(data, media_type="application/json", status_code=status_code)
+
+
--
Gitblit v1.8.0