add solr data display to analysis flow and update yield statements for consistency

app.py

@@ -423,47 +423,50 @@ def process_analysis_flow(user_input, history, state):
         state = {'query_count': 0, 'last_suggestions': []}
 
     # Reset UI components for the new analysis
-    yield (history, state, gr.update(value=None, visible=False), gr.update(value=None, visible=False), gr.update(value=None, visible=False))
+    yield (history, state, gr.update(value=None, visible=False), gr.update(value=None, visible=False), gr.update(value=None, visible=False), gr.update(value=None, visible=False))
 
     query_context = user_input.strip()
     if not query_context:
         history.append((user_input, "Please enter a question to analyze."))
-        yield (history, state, None, None, None)
+        yield (history, state, None, None, None, None)
         return
 
     # 1. Acknowledge and start the process
     history.append((user_input, f"Analyzing: '{query_context}'\n\n*Generating Solr query...*"))
-    yield (history, state, None, None, None)
+    yield (history, state, None, None, None, None)
 
     # 2. Generate Solr Query
     llm_solr_obj = llm_generate_solr_query(query_context, field_metadata)
     if not llm_solr_obj or 'query' not in llm_solr_obj or 'json.facet' not in llm_solr_obj:
         history.append((None, "I'm sorry, I couldn't generate a valid Solr query for that request. Please try rephrasing your question."))
-        yield (history, state, None, None, None)
+        yield (history, state, None, None, None, None)
         return
 
     solr_q, solr_facet = llm_solr_obj.get('query'), llm_solr_obj.get('json.facet')
     history.append((None, "✅ Solr query generated!"))
     formatted_query = f"**Query:**\n```\n{solr_q}\n```\n\n**Facet JSON:**\n```json\n{json.dumps(solr_facet, indent=2)}\n```"
-    yield (history, state, None, None, gr.update(value=formatted_query, visible=True))
+    yield (history, state, None, None, gr.update(value=formatted_query, visible=True), None)
 
     # 3. Execute Query
     try:
         history.append((None, "*Executing query against the database...*"))
-        yield (history, state, None, None, gr.update(value=formatted_query, visible=True))
+        yield (history, state, None, None, gr.update(value=formatted_query, visible=True), None)
 
         search_params = {"rows": 0, "json.facet": json.dumps(solr_facet)}
         results = solr_client.search(q=solr_q, **search_params)
         facet_data = results.raw_response.get("facets", {})
+        
+        formatted_data = f"**Facet Data:**\n```json\n{json.dumps(facet_data, indent=2)}\n```"
+
 
         if not facet_data or facet_data.get('count', 0) == 0:
             history.append((None, "No data was found for your query. Please try a different question."))
-            yield (history, state, None, None, gr.update(value=formatted_query, visible=True))
+            yield (history, state, None, None, gr.update(value=formatted_query, visible=True), gr.update(value=formatted_data, visible=True))
             return
 
         # 4. Generate Visualization
         history.append((None, "✅ Data retrieved. Generating visualization..."))
-        yield (history, state, None, None, gr.update(value=formatted_query, visible=True))
+        yield (history, state, None, None, gr.update(value=formatted_query, visible=True), gr.update(value=formatted_data, visible=True))
 
         viz_code = llm_generate_visualization_code(query_context, facet_data)
         plot_path = execute_viz_code_and_get_path(viz_code, facet_data)
@@ -471,17 +474,17 @@ def process_analysis_flow(user_input, history, state):
         output_plot = gr.update(value=plot_path, visible=True) if plot_path else gr.update(visible=False)
         if not plot_path:
             history.append((None, "*I was unable to generate a plot for this data.*\n"))
-        yield (history, state, output_plot, None, gr.update(value=formatted_query, visible=True))
+        yield (history, state, output_plot, None, gr.update(value=formatted_query, visible=True), gr.update(value=formatted_data, visible=True))
 
         # 5. Generate and Stream Report
         history.append((None, "✅ Plot created. Streaming final report..."))
         output_report = gr.update(value="", visible=True) # Make it visible before streaming
-        yield (history, state, output_plot, output_report, gr.update(value=formatted_query, visible=True))
+        yield (history, state, output_plot, output_report, gr.update(value=formatted_query, visible=True), gr.update(value=formatted_data, visible=True))
 
         report_text = ""
         for chunk in llm_generate_summary_and_suggestions_stream(query_context, facet_data):
             report_text += chunk
-            yield (history, state, output_plot, report_text, gr.update(value=formatted_query, visible=True))
+            yield (history, state, output_plot, report_text, gr.update(value=formatted_query, visible=True), gr.update(value=formatted_data, visible=True))
 
         # 6. Finalize and prompt for next action
         state['query_count'] += 1
@@ -489,13 +492,13 @@ def process_analysis_flow(user_input, history, state):
 
         next_prompt = "Analysis complete. What would you like to explore next? You can ask a follow-up question, pick a suggestion, or ask something new."
         history.append((None, next_prompt))
-        yield (history, state, output_plot, report_text, gr.update(value=formatted_query, visible=True))
+        yield (history, state, output_plot, report_text, gr.update(value=formatted_query, visible=True), gr.update(value=formatted_data, visible=True))
 
     except Exception as e:
         error_message = f"An unexpected error occurred during analysis: {e}"
         history.append((None, error_message))
         print(f"Error during analysis execution: {e}")
-        yield (history, state, None, None, gr.update(value=formatted_query, visible=True))
+        yield (history, state, None, None, gr.update(value=formatted_query, visible=True), None)
 
 with gr.Blocks(theme=gr.themes.Soft(), css="footer {display: none !important}") as demo:
     state = gr.State()
@@ -517,6 +520,8 @@ with gr.Blocks(theme=gr.themes.Soft(), css="footer {display: none !important}")
         with gr.Column(scale=2):
             with gr.Accordion("Generated Solr Query", open=False):
                 solr_query_display = gr.Markdown("Query will appear here...", visible=True)
+            with gr.Accordion("Retrieved Solr Data", open=False):
+                solr_data_display = gr.Markdown("Data will appear here...", visible=False)
             plot_display = gr.Image(label="Visualization", type="filepath", visible=False)
             report_display = gr.Markdown("Report will be streamed here...", visible=False)
 
@@ -527,7 +532,7 @@ with gr.Blocks(theme=gr.themes.Soft(), css="footer {display: none !important}")
     msg_textbox.submit(
         fn=process_analysis_flow,
         inputs=[msg_textbox, chatbot, state],
-        outputs=[chatbot, state, plot_display, report_display, solr_query_display]
+        outputs=[chatbot, state, plot_display, report_display, solr_query_display, solr_data_display]
     )
 
     def reset_all():
@@ -538,10 +543,11 @@ with gr.Blocks(theme=gr.themes.Soft(), css="footer {display: none !important}")
             "",   # msg_textbox
             gr.update(value=None, visible=False), # plot_display
             gr.update(value=None, visible=False), # report_display
-            gr.update(value=None, visible=False)  # solr_query_display
+            gr.update(value=None, visible=False),  # solr_query_display
+            gr.update(value=None, visible=False)   # solr_data_display
         )
 
-    clear_button.click(fn=reset_all, inputs=None, outputs=[chatbot, state, msg_textbox, plot_display, report_display, solr_query_display], queue=False)
+    clear_button.click(fn=reset_all, inputs=None, outputs=[chatbot, state, msg_textbox, plot_display, report_display, solr_query_display, solr_data_display], queue=False)
 
 if is_initialized:
     demo.queue().launch(debug=True, share=True)