Update app.py

app.py

@@ -481,72 +481,72 @@ def extract_json(text: str) -> list | dict:
         raise ValueError(f"清理後仍然無法解析 JSON。原始錯誤: {e}")
 
 
-def reflect_post(api_key, api_key2, api_key3, api_key4, user_input):
-    """
-    API 呼叫總次數固定為 4 次。
-    """
-    # Step 1：拆解子問題 (API Call #1)
-    decomposed_text = reply(api_key, system_reviewer, user_input)
-    if "抱歉～" in decomposed_text:
-        return "", decomposed_text
-    try:
-        parsed_list = extract_json(decomposed_text)
-        if not isinstance(parsed_list, list): raise ValueError("回傳的不是列表格式")
-    except Exception as e:
-        return "", f"⚠️ 查詢意圖格式錯誤：{e}"
+# def reflect_post(api_key, api_key2, api_key3, api_key4, user_input):
+#     """
+#     API 呼叫總次數固定為 4 次。
+#     """
+#     # Step 1：拆解子問題 (API Call #1)
+#     decomposed_text = reply(api_key, system_reviewer, user_input)
+#     if "抱歉～" in decomposed_text:
+#         return "", decomposed_text
+#     try:
+#         parsed_list = extract_json(decomposed_text)
+#         if not isinstance(parsed_list, list): raise ValueError("回傳的不是列表格式")
+#     except Exception as e:
+#         return "", f"⚠️ 查詢意圖格式錯誤：{e}"
 
-    direct_queries = [item for item in parsed_list if item.get("type") == "direct"]
-    if not direct_queries:
-        return "", "⚠️ 無法從輸入問題中擷取有效查詢項目。"
+#     direct_queries = [item for item in parsed_list if item.get("type") == "direct"]
+#     if not direct_queries:
+#         return "", "⚠️ 無法從輸入問題中擷取有效查詢項目。"
 
-    all_querys_summary = "🔹 關鍵查詢：\n" + "\n".join(f"- {q['sub_query']}" for q in direct_queries)
+#     all_querys_summary = "🔹 關鍵查詢：\n" + "\n".join(f"- {q['sub_query']}" for q in direct_queries)
     
-    sub_query_texts = [q["sub_query"] for q in direct_queries]
+#     sub_query_texts = [q["sub_query"] for q in direct_queries]
 
-    # Step 2：批次匹配表名 (API Call #2)
-    table_map = batch_find_relevant_tables(api_key2, sub_query_texts)
-    if not table_map:
-        return all_querys_summary, "⚠️ 系統無法為您的查詢匹配到合適的資料表。"
+#     # Step 2：批次匹配表名 (API Call #2)
+#     table_map = batch_find_relevant_tables(api_key2, sub_query_texts)
+#     if not table_map:
+#         return all_querys_summary, "⚠️ 系統無法為您的查詢匹配到合適的資料表。"
         
-    # Step 3: 批次解析所有子問題的參數 (API Call #3)
-    params_map = batch_parse_sub_queries_with_gemini(api_key3, sub_query_texts)
-    if not params_map:
-        return all_querys_summary, "⚠️ 系統無法解析您問題中的查詢參數。"
-
-    # Step 4：逐一執行查詢 (零 API 呼叫)
-    context_list = []
-    for q in direct_queries:
-        sub_query = q["sub_query"]
-        table_name = table_map.get(sub_query)
-        params = params_map.get(sub_query)
-
-        if not table_name or not params:
-            context_list.append(f"【{sub_query}】\n查詢失敗：未能匹配到資料表或解析參數。")
-            continue
+#     # Step 3: 批次解析所有子問題的參數 (API Call #3)
+#     params_map = batch_parse_sub_queries_with_gemini(api_key3, sub_query_texts)
+#     if not params_map:
+#         return all_querys_summary, "⚠️ 系統無法解析您問題中的查詢參數。"
+
+#     # Step 4：逐一執行查詢 (零 API 呼叫)
+#     context_list = []
+#     for q in direct_queries:
+#         sub_query = q["sub_query"]
+#         table_name = table_map.get(sub_query)
+#         params = params_map.get(sub_query)
+
+#         if not table_name or not params:
+#             context_list.append(f"【{sub_query}】\n查詢失敗：未能匹配到資料表或解析參數。")
+#             continue
         
-        try:
-            # 帶著所有精準參數執行查詢
-            result_json = semantic_query_logic(
-                time_query=params.get("time_query", ""),
-                item_query=params.get("item_query", ""),
-                district_query=params.get("district_query", ""),
-                project_name=table_name
-            )
-            result_data = json.loads(result_json)
-            if result_data:
-                formatted_result = json.dumps(result_data, ensure_ascii=False, indent=2)
-                context_list.append(f"【{sub_query}】\n查詢結果：\n{formatted_result}")
-            else:
-                context_list.append(f"【{sub_query}】\n查無資料。")
-        except Exception as e:
-            context_list.append(f"【{sub_query}】\n查詢失敗：{e}")
-
-    combined_context = "\n\n".join(context_list)
-
-    # Step 5：整合分析 (API Call #4)
-    integration_prompt = f"使用者問題：{user_input}\n\n查詢資料如下：\n{combined_context}"
-    integration_result = reply(api_key4, system_integration, integration_prompt)
-    return all_querys_summary, integration_result
+#         try:
+#             # 帶著所有精準參數執行查詢
+#             result_json = semantic_query_logic(
+#                 time_query=params.get("time_query", ""),
+#                 item_query=params.get("item_query", ""),
+#                 district_query=params.get("district_query", ""),
+#                 project_name=table_name
+#             )
+#             result_data = json.loads(result_json)
+#             if result_data:
+#                 formatted_result = json.dumps(result_data, ensure_ascii=False, indent=2)
+#                 context_list.append(f"【{sub_query}】\n查詢結果：\n{formatted_result}")
+#             else:
+#                 context_list.append(f"【{sub_query}】\n查無資料。")
+#         except Exception as e:
+#             context_list.append(f"【{sub_query}】\n查詢失敗：{e}")
+
+#     combined_context = "\n\n".join(context_list)
+
+#     # Step 5：整合分析 (API Call #4)
+#     integration_prompt = f"使用者問題：{user_input}\n\n查詢資料如下：\n{combined_context}"
+#     integration_result = reply(api_key4, system_integration, integration_prompt)
+#     return all_querys_summary, integration_result
 
 # =======================================================================
 # 5. Gradio Web UI
@@ -687,7 +687,6 @@ def gradio_interface(user_input):
 
         # Step 4：執行查詢
         yield all_querys_summary, "⏳ 正在從資料庫中檢索資訊..."
-        # ... (此處省略查詢邏輯，與原 reflect_post 相同) ...
         context_list = []
         for q in direct_queries:
             sub_query = q["sub_query"]
@@ -788,11 +787,12 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="orange"),
                 lines=5,
                 visible=True,
             )
-            output_result = gr.Markdown(
-                label="🧐 查詢結果",
-                show_label=True,
-                elem_id="output_markdown" 
-            )
+            with gr.Group():
+                output_result = gr.Markdown(
+                    label="🧐 查詢結果",
+                    show_label=True,
+                    elem_id="output_markdown" 
+                )
 
     gr.Markdown(
         """