From 370120fd4154ce6c5f69d16a4a343a016cf2e816 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 04 三月 2025 09:53:17 +0800
Subject: [PATCH] 完善问题
---
app/api/v2/chat.py | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/app/api/v2/chat.py b/app/api/v2/chat.py
index 79bbe9c..b65541e 100644
--- a/app/api/v2/chat.py
+++ b/app/api/v2/chat.py
@@ -7,15 +7,16 @@
from starlette.responses import StreamingResponse, Response
from werkzeug.http import HTTP_STATUS_CODES
-from app.api import get_current_user
+from app.api import get_current_user, get_api_key
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.models import UserModel
from app.models.base_model import get_db
+from app.models.v2.chat import RetrievalRequest
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_sessions_list, service_chat_session_log
+ service_chat_sessions_list, service_chat_session_log, service_chunk_retrieval, service_base_chunk_retrieval
chat_router_v2 = APIRouter()
@@ -36,6 +37,7 @@
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})
@@ -99,7 +101,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)
@@ -123,4 +125,19 @@
@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)
\ No newline at end of file
+ return Response(data, media_type="application/json", status_code=http_200)
+
+
+
+# @chat_router_v2.post("/conversation/mindmap")
+# async def api_conversation_mindmap(chatId:str, current:int=1, 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.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}
+
--
Gitblit v1.8.0