Update app.py

app.py

@@ -12,7 +12,7 @@ FLASK_API_URL = "http://52.15.175.95:5000"
 
 def query_database(question, dashboard_mode=False, chart_type=None):
     if not question.strip():
-        return "", None, None, "⚠️ Please enter a question.", "", "", "", "", ""
+        return "", None, None, "⚠️ Please enter a question.", "", "", "", "", "", ""
     
     try:
         start_time = time.time()
@@ -59,7 +59,7 @@ def query_database(question, dashboard_mode=False, chart_type=None):
         if not response.text:
             error_msg = "Empty response from server"
             print(f"ERROR: {error_msg}")
-            return "", None, None, f"❌ {error_msg}", f"Request time: {elapsed_time:.2f}s", "Empty response", "", "", ""
+            return "", None, None, "⚠️ Please enter a question.", "", f"❌ {error_msg}", f"Request time: {elapsed_time:.2f}s", "Empty response", "", "", "", ""
         
         # Try to parse JSON response
         try:
@@ -69,7 +69,7 @@ def query_database(question, dashboard_mode=False, chart_type=None):
             error_msg = f"Invalid JSON response: {str(e)}"
             print(f"ERROR: {error_msg}")
             print(f"Response text (first 1000 chars): {response.text[:1000]}")
-            return "", None, None, f"❌ {error_msg}", f"Request time: {elapsed_time:.2f}s", "JSON parse error", "", "", ""
+            return "", None, None, "⚠️ Please enter a question.", "", f"❌ {error_msg}", f"Request time: {elapsed_time:.2f}s", "JSON parse error", "", "", "", ""
         
         # Check HTTP status
         if response.status_code != 200:
@@ -80,9 +80,9 @@ def query_database(question, dashboard_mode=False, chart_type=None):
             if response.status_code == 500:
                 error_details = f"Server Error (500): {error_msg}\n"
                 error_details += f"Response: {json.dumps(result, indent=2)}"
-                return "", None, None, f"❌ Server error: {error_msg}", f"Request time: {elapsed_time:.2f}s", error_details, "", "", ""
+                return "", None, None, "⚠️ Please enter a question.", "", f"❌ Server error: {error_msg}", f"Request time: {elapsed_time:.2f}s", error_details, "", "", "", ""
             
-            return "", None, None, f"❌ Server error: {error_msg}", f"Request time: {elapsed_time:.2f}s", "HTTP error", "", "", ""
+            return "", None, None, "⚠️ Please enter a question.", "", f"❌ Server error: {error_msg}", f"Request time: {elapsed_time:.2f}s", "HTTP error", "", "", "", ""
         
         # Extract data
         sql = result.get("sql", "")
@@ -107,6 +107,8 @@ def query_database(question, dashboard_mode=False, chart_type=None):
         chart_type_result = ""
         chart_error = None
         chart_format = ""
+        show_image = True
+        show_html = False
         
         if visualization:
             try:
@@ -127,6 +129,8 @@ def query_database(question, dashboard_mode=False, chart_type=None):
                                 chart_image = Image.open(BytesIO(image_bytes))
                                 print("Chart decoded successfully")
                                 chart_format = "png"
+                                show_image = True
+                                show_html = False
                             except Exception as e:
                                 print(f"Error decoding chart: {e}")
                                 chart_error = f"Chart decoding error: {str(e)}"
@@ -136,6 +140,8 @@ def query_database(question, dashboard_mode=False, chart_type=None):
                             chart_html = visualization["html"]
                             print("HTML chart fallback available")
                             chart_format = "html"
+                            show_image = False
+                            show_html = True
                         
                         # Extract chart metadata
                         chart_title = visualization.get("title", "")
@@ -154,6 +160,8 @@ def query_database(question, dashboard_mode=False, chart_type=None):
                         chart_image = Image.open(BytesIO(image_bytes))
                         print("Chart decoded successfully (fallback)")
                         chart_format = "png"
+                        show_image = True
+                        show_html = False
                     except Exception as e:
                         print(f"Error decoding chart (fallback): {e}")
                         chart_error = f"Chart decoding error: {str(e)}"
@@ -178,27 +186,27 @@ def query_database(question, dashboard_mode=False, chart_type=None):
         
         print(f"=== REQUEST COMPLETED SUCCESSFULLY ===")
         
-        return sql, df, chart_image, chart_html, f"✅ Query completed successfully", details, "Success", chart_type_result, chart_title, chart_error
+        return sql, df, chart_image, chart_html, show_image, show_html, f"✅ Query completed successfully", details, "Success", chart_type_result, chart_title, chart_format, chart_error
     
     except requests.exceptions.ConnectionError as e:
         error_msg = f"Connection failed: {str(e)}"
         print(f"CONNECTION ERROR: {error_msg}")
         print(f"Traceback: {traceback.format_exc()}")
-        return "", None, None, None, f"❌ {error_msg}", "Connection error", "Connection error", "", "", ""
+        return "", None, None, "⚠️ Please enter a question.", "", True, False, f"❌ {error_msg}", "Connection error", "Connection error", "", "", "", ""
     except requests.exceptions.Timeout:
         error_msg = "Request timed out after 300 seconds"
         print(f"TIMEOUT ERROR: {error_msg}")
-        return "", None, None, None, f"⏱️ {error_msg}", "Timeout error", "Timeout error", "", "", ""
+        return "", None, None, "⚠️ Please enter a question.", "", True, False, f"⏱️ {error_msg}", "Timeout error", "Timeout error", "", "", "", ""
     except requests.exceptions.RequestException as e:
         error_msg = f"Request exception: {str(e)}"
         print(f"REQUEST ERROR: {error_msg}")
         print(f"Traceback: {traceback.format_exc()}")
-        return "", None, None, None, f"❌ {error_msg}", "Request error", "Request error", "", "", ""
+        return "", None, None, "⚠️ Please enter a question.", "", True, False, f"❌ {error_msg}", "Request error", "Request error", "", "", "", ""
     except Exception as e:
         error_msg = f"Unexpected error: {str(e)}"
         print(f"UNEXPECTED ERROR: {error_msg}")
         print(f"Traceback: {traceback.format_exc()}")
-        return "", None, None, None, f"🚨 {error_msg}", f"Error: {str(e)}", "Unexpected error", "", "", ""
+        return "", None, None, "⚠️ Please enter a question.", "", True, False, f"🚨 {error_msg}", f"Error: {str(e)}", "Unexpected error", "", "", "", ""
 
 def check_health():
     try:
@@ -525,7 +533,7 @@ with gr.Blocks(theme=theme, title="Enterprise SQL Assistant", css="""
     submit_btn.click(
         fn=query_database,
         inputs=[question_input, dashboard_checkbox, chart_type_dropdown],
-        outputs=[sql_output, results_output, chart_output, html_output, chatbot_output, request_details, error_details, chart_type_output, chart_title_output, chart_format_output, chart_error_output]
+        outputs=[sql_output, results_output, chart_output, html_output, gr.Number(visible=False, value=1), gr.Number(visible=False, value=0), chatbot_output, request_details, error_details, chart_type_output, chart_title_output, chart_format_output, chart_error_output]
     )
 
 # Launch