Update app.py

app.py

@@ -417,7 +417,7 @@ Example final answer:
 
 If you can answer the query directly without tools (e.g., a simple greeting, acknowledging instructions), use the 'answer' tool immediately with a direct, polite response.
 
-Think step-by-step. Decide if tools are needed based on the **Tool Usage Priority**. If so, which ones? What parameters? Consider if a broad query requires setting a lower `threshold` and higher `max_matches` for `lookup_business_info`. If you have results, how do they help answer the user? Synthesize ALL relevant information into your final answer. If results are insufficient or indicate an error, how should you respond gracefully? Finally, formulate the comprehensive answer using the 'answer' tool.
+Think step-by-step. Decide if tools are needed based on the **Tool Usage Priority**. If so, which ones? What parameters? Consider if a broad query requires setting a lower `threshold` and higher `max_matches` for `lookup_business_info`. If you have results, how do they help answer the user? Synthesize ALL relevant information into a comprehensive answer. If results are insufficient or indicate an error, how should you respond gracefully? Finally, formulate the comprehensive answer using the 'answer' tool.
 
 Output ONLY tool calls within <tool_code> tags or a final answer using the 'answer' tool. Do not include any other text unless it's within the 'answer' tool's parameters.
 </system>
@@ -446,8 +446,9 @@ def chat_with_bot(user_input, chat_history_state, system_message, max_new_tokens
     # Append user message to history immediately for display
     # The bot message will be updated iteratively
     # We append a placeholder now, and update it with the final response later.
-    chat_history_state = chat_history_state + [[user_input, "..."]]
-    yield chat_history_state # Yield state with placeholder
+    # Ensure the initial yield is a list of lists for Gradio, even if it's just one turn
+    initial_history = chat_history_state + [[user_input, "..."]]
+    yield initial_history # Yield state with placeholder
 
     original_user_input = user_input
     print(f"\n--- Starting turn with input: {user_input} ---") # Debug Print
@@ -469,7 +470,7 @@ def chat_with_bot(user_input, chat_history_state, system_message, max_new_tokens
     # Ensure strict alternation: user, assistant, user, assistant...
     # Only add complete turns from the *past* history (exclude the current incomplete turn)
     # Limit the history length
-    history_to_process = chat_history_state[:-1] # Exclude the current turn being processed (which has the placeholder)
+    history_to_process = chat_history_state # Use the full history passed to the function initially
 
     # Ensure we only take pairs [user, bot] from past history where bot is NOT the initial placeholder
     # This guarantees that the last message in `recent_complete_turns` corresponds to a *completed* assistant response.
@@ -478,7 +479,7 @@ def chat_with_bot(user_input, chat_history_state, system_message, max_new_tokens
         if turn is not None and len(turn) == 2 and turn[0] is not None and turn[1] is not None and str(turn[1]).strip() != "..."
     ]
 
-# Take the last MAX_HISTORY_TURNS complete turns
+    # Take the last MAX_HISTORY_TURNS complete turns
     recent_complete_turns = complete_past_turns[max(0, len(complete_past_turns) - MAX_HISTORY_TURNS):]
 
     for user_msg, bot_msg in recent_complete_turns:
@@ -704,7 +705,7 @@ def chat_with_bot(user_input, chat_history_state, system_message, max_new_tokens
                                        print(f"Executed date calculation for '{query}'. No specific result.")
                                   current_tool_results_text += "</perform_date_calculation_results_for_query>\n"
                              else:
-                                  current_tool_results_text += f"<perform_date_calculation_results_for_query query='{query}'><error>Missing 'query' parameter.</error></perform_date_calculation_results_for_query>\n"
+                                  current_tool_results_text += f"<perform_date_calculation_results_for_query query='{query}'><error>Missing 'query' parameter.</error></lookup_business_info_results_for_query>\n"
                                   print(f"Skipping date calculation tool call: Missing 'query' parameter.")
 
 
@@ -869,7 +870,7 @@ If Search Results were used, list the relevant URLs under a "Sources:" heading a
                                        # Add other fields here...
                                        # if contact_person: gathered_info_summary += f"    Contact Person: {contact_person.group(1).strip()}\n"
 
-                             elif "No relevant matches found" in lr_content:
+                              elif "No relevant matches found" in lr_content:
                                   score_match = re.search(r"final_best_score='(.*?)'", lr_content) # Look for final_best_score
                                   score = float(score_match.group(1)) if score_match else 0.0
                                   threshold_match = re.search(r"requested_threshold='(.*?)'", lr_content)
@@ -979,19 +980,27 @@ If Search Results were used, list the relevant URLs under a "Sources:" heading a
 
 
     # Update the last message in chat_history_state with the final response
-    chat_history_state[-1][1] = final_response_text
+    # Find the last turn in the original chat_history_state (which was already updated with the placeholder)
+    if chat_history_state and len(chat_history_state) > 0:
+        chat_history_state[-1][1] = final_response_text # Update the bot's message in the last turn
 
     # Remove the [[TEXT]] marker from the chat_history_state *before* yielding
     # Iterate through the history and clean each item
-    cleaned_chat_history = []
+    cleaned_chat_history_list_of_lists = []
     for user_msg, bot_msg in chat_history_state:
         cleaned_user_msg = user_msg.replace('[[TEXT]] ', '') if isinstance(user_msg, str) else user_msg
         cleaned_bot_msg = bot_msg.replace('[[TEXT]] ', '') if isinstance(bot_msg, str) else bot_msg
-        cleaned_chat_history.append([cleaned_user_msg, cleaned_bot_msg])
+        cleaned_chat_history_list_of_lists.append([cleaned_user_msg, cleaned_bot_msg])
+
+    # Convert the cleaned list of lists to a list of tuples as required by Gradio
+    cleaned_chat_history_list_of_tuples = [(user_msg, bot_msg) for user_msg, bot_msg in cleaned_chat_history_list_of_lists]
 
 
     print(f"\n--- Final Response: {final_response_text[:100]}... ---") # Debug Print
-    yield cleaned_chat_history # Yield the CLEANED history
+
+    # Yield the cleaned history as a list of tuples
+    yield cleaned_chat_history_list_of_tuples # Yield the cleaned history as tuples
+
 
 # ──────────────────────────
 # 3  Gradio interface
@@ -1030,4 +1039,4 @@ if __name__ == "__main__":
     # The print statement for RAG status is added here, before launching the demo.
     print(f"RAG functionality available: {business_info_available}")
 
-    demo.launch(debug=True) # Added debug=True for more detailed logs
+    demo.launch(debug=True) # Added