Merge branch 'feature/xueyiming/2025-09-29-update-res' of Server/rag_server into master

applications/utils/mysql/mapper.py

@@ -47,12 +47,13 @@ class ChatResult(BaseMySQLClient):
         ai_answer,
         ai_source,
         ai_status,
+        final_result,
         is_web=None,
     ):
         query = """
                     INSERT INTO chat_res
-                        (query, dataset_ids, search_res, chat_res, score, has_answer, ai_answer, ai_source, ai_status, is_web) 
-                        VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
+                        (query, dataset_ids, search_res, chat_res, score, has_answer, ai_answer, ai_source, ai_status, is_web, final_result) 
+                        VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s);
                 """
         return await self.pool.async_save(
             query=query,
@@ -67,6 +68,7 @@ class ChatResult(BaseMySQLClient):
                 ai_source,
                 ai_status,
                 is_web,
+                final_result,
             ),
         )
 
@@ -104,7 +106,7 @@ class ChatResult(BaseMySQLClient):
 
         # 查询分页数据
         query = f"""
-            SELECT search_res, query,create_time, chat_res, ai_answer FROM chat_res
+            SELECT search_res, query,create_time, chat_res, ai_answer, final_result FROM chat_res
             WHERE {where_sql}
             {order_sql}
             LIMIT %s OFFSET %s;

mcp_server/server.py

@@ -87,6 +87,7 @@ async def rag_search(query_text: str):
         llm_search_result["answer"],
         llm_search_result["source"],
         llm_search_result["status"],
+        decision["result"],
     )
 
     return data

routes/buleprint.py

@@ -415,6 +415,7 @@ async def chat():
         llm_search["answer"],
         llm_search["source"],
         llm_search["status"],
+        decision["result"],
         is_web=1,
     )
     # data = {"results": query_results, "chat_res": 'chat_res', 'rag_summary': 'rag_summary', 'llm_summary': 'llm_summary'}
@@ -530,6 +531,7 @@ async def rag_search():
         llm_search["answer"],
         llm_search["source"],
         llm_search["status"],
+        decision["result"],
     )
     return jsonify({"status_code": 200, "detail": "success", "data": data})