From 370120fd4154ce6c5f69d16a4a343a016cf2e816 Mon Sep 17 00:00:00 2001
From: zhaoqingang <zhaoqg0118@163.com>
Date: 星期二, 04 三月 2025 09:53:17 +0800
Subject: [PATCH] 完善问题
---
app/service/v2/chat.py | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/app/service/v2/chat.py b/app/service/v2/chat.py
index 33634a9..68a7cd3 100644
--- a/app/service/v2/chat.py
+++ b/app/service/v2/chat.py
@@ -348,28 +348,39 @@
return await get_str_token(text)
-async def service_chunk_retrieval(query, top_k, similarity_threshold, api_key):
+async def service_chunk_retrieval(query, knowledge_id, top_k, similarity_threshold, api_key):
print(query)
try:
request_data = json.loads(query)
+ payload = {
+ "question": request_data.get("query", ""),
+ "dataset_ids": request_data.get("dataset_ids", []),
+ "page_size": top_k,
+ "similarity_threshold": similarity_threshold
+ }
except json.JSONDecodeError as e:
fixed_json = query.replace("'", '"')
- print("Fixed JSON:", fixed_json)
- request_data = json.loads(fixed_json)
- payload = {
- "question": request_data.get("query", ""),
- "dataset_ids": request_data.get("dataset_ids", []),
- "page_size": top_k,
- "similarity_threshold": similarity_threshold
- }
+ try:
+ request_data = json.loads(fixed_json)
+ payload = {
+ "question": request_data.get("query", ""),
+ "dataset_ids": request_data.get("dataset_ids", []),
+ "page_size": top_k,
+ "similarity_threshold": similarity_threshold
+ }
+ except Exception:
+ payload = {
+ "question":query,
+ "dataset_ids":[knowledge_id],
+ "page_size": top_k,
+ "similarity_threshold": similarity_threshold
+ }
url = settings.fwr_base_url + RG_ORIGINAL_URL
- # url = "http://192.168.20.116:11080/" + RG_ORIGINAL_URL
chat = ChatBaseApply()
response = await chat.chat_post(url, payload, await chat.get_headers(api_key))
if not response:
raise HTTPException(status_code=500, detail="鏈嶅姟寮傚父锛�")
- print(response)
records = [
{
"content": chunk["content"],
--
Gitblit v1.8.0