Update app.py

app.py

@@ -67,7 +67,7 @@ def process_sql_file(file_path):
                 if statement.strip():
                     conn.execute(text(statement))
                     
-        return True, "SQL file successfully executed! Click 'Continue' to proceed to query interface..."
+        return True, "SQL file successfully executed!"
         
     except Exception as e:
         return False, f"Error processing SQL file: {str(e)}"
@@ -91,7 +91,7 @@ def process_csv_file(file_path):
         records = df.to_dict('records')
         insert_rows_into_table(records, table)
         
-        return True, "CSV file successfully loaded! Click 'Continue' to proceed to query interface..."
+        return True, "CSV file successfully loaded!"
         
     except Exception as e:
         return False, f"Error processing CSV file: {str(e)}"
@@ -180,9 +180,6 @@ def query_sql(user_query: str) -> str:
         return result
 
 def update_schema():
-    """
-    Updates the schema display.
-    """
     schema = get_table_schema()
     if schema:
         return f"### Current Schema:\n```\n{schema}\n```"
@@ -190,7 +187,6 @@ def update_schema():
 
 # Create the Gradio interface
 with gr.Blocks() as demo:
-    # Upload Interface Components
     with gr.Group() as upload_group:
         gr.Markdown("""
         # Data Query Interface
@@ -217,120 +213,83 @@ with gr.Blocks() as demo:
             file_types=[".csv", ".sql"],
             type="filepath"
         )
-        upload_status = gr.Textbox(label="Status", interactive=False)
-        continue_btn = gr.Button("Continue", visible=False)
+        status = gr.Textbox(label="Status", interactive=False)
 
-    # Query Interface Components
     with gr.Group(visible=False) as query_group:
-        gr.Markdown("## Data Query Interface")
-        
-        # Data Display Section
-        gr.Markdown("### Current Data")
-        data_table = gr.Dataframe(
-            value=get_data_table(),
-            label="Data Table",
-            interactive=False
-        )
-        
-        schema_display = gr.Markdown(value="Loading schema...")
-        
-        # Query Section
         with gr.Row():
-            with gr.Column():
-                user_input = gr.Textbox(
-                    label="Ask a question about the data",
-                    placeholder="Enter your question here..."
-                )
-                query_output = gr.Textbox(
-                    label="Result",
+            with gr.Column(scale=1):
+                user_input = gr.Textbox(label="Ask a question about the data")
+                query_output = gr.Textbox(label="Result")
+            
+            with gr.Column(scale=2):
+                gr.Markdown("### Current Data")
+                data_table = gr.Dataframe(
+                    value=None,
+                    label="Data Table",
                     interactive=False
                 )
         
-        with gr.Row():
-            refresh_table_btn = gr.Button("Refresh Table")
-            refresh_schema_btn = gr.Button("Refresh Schema")
-            back_btn = gr.Button("Upload New File")
+        schema_display = gr.Markdown(value="Loading schema...")
+        refresh_btn = gr.Button("Refresh Data")
 
-    def handle_upload(file):
-        success, message = process_uploaded_file(file)
+    def handle_upload(file_obj):
+        if file_obj is None:
+            return "Please upload a file.", None, None, "No schema available", gr.update(visible=True), gr.update(visible=False)
+        
+        success, message = process_uploaded_file(file_obj)
         if success:
             df = get_data_table()
             schema = get_table_schema()
-            return {
-                upload_status: message,
-                continue_btn: gr.update(visible=True),
-                data_table: df,
-                schema_display: f"### Current Schema:\n```\n{schema}\n```" if schema else "No schema available"
-            }
-        return {
-            upload_status: message,
-            continue_btn: gr.update(visible=False)
-        }
+            return (
+                message,
+                df,
+                schema,
+                f"### Current Schema:\n```\n{schema}\n```" if schema else "No schema available",
+                gr.update(visible=False),
+                gr.update(visible=True)
+            )
+        return (
+            message,
+            None,
+            None,
+            "No schema available",
+            gr.update(visible=True),
+            gr.update(visible=False)
+        )
 
-    def switch_to_query():
+    def refresh_data():
         df = get_data_table()
         schema = get_table_schema()
-        return {
-            upload_group: gr.update(visible=False),
-            query_group: gr.update(visible=True),
-            data_table: df,
-            schema_display: f"### Current Schema:\n```\n{schema}\n```" if schema else "No schema available"
-        }
-
-    def switch_to_upload():
-        return {
-            upload_group: gr.update(visible=True),
-            query_group: gr.update(visible=False),
-            continue_btn: gr.update(visible=False),
-            upload_status: gr.update(value="")
-        }
+        return df, f"### Current Schema:\n```\n{schema}\n```" if schema else "No schema available"
 
     # Event handlers
     file_input.upload(
         fn=handle_upload,
+        inputs=file_input,
         outputs=[
-            upload_status,
-            continue_btn,
+            status,
             data_table,
-            schema_display
-        ]
-    )
-
-    continue_btn.click(
-        fn=switch_to_query,
-        outputs=[
+            schema_display,
+            schema_display,
             upload_group,
-            query_group,
-            data_table,
-            schema_display
-        ]
-    )
-
-    back_btn.click(
-        fn=switch_to_upload,
-        outputs=[
-            upload_group,
-            query_group,
-            continue_btn,
-            upload_status
+            query_group
         ]
     )
 
     user_input.change(
         fn=query_sql,
-        inputs=[user_input],
-        outputs=[query_output]
-    )
-    
-    refresh_table_btn.click(
-        fn=get_data_table,
-        outputs=[data_table]
+        inputs=user_input,
+        outputs=query_output
     )
     
-    refresh_schema_btn.click(
-        fn=update_schema,
-        outputs=[schema_display]
+    refresh_btn.click(
+        fn=refresh_data,
+        outputs=[data_table, schema_display]
     )
 
 if __name__ == "__main__":
-    demo.launch(server_name="0.0.0.0", server_port=7860)
+    demo.launch(
+        server_name="0.0.0.0",
+        server_port=7860,
+        ssr=False
+    )