Update app.py

app.py

@@ -15,12 +15,6 @@ from database import (
 def process_uploaded_file(file):
     """
     Process the uploaded CSV file and load it into the database.
-    
-    Args:
-        file: Path to the uploaded file
-        
-    Returns:
-        tuple: (success_flag, message)
     """
     try:
         if file is None:
@@ -57,7 +51,6 @@ def get_data_table():
             if not rows:
                 return pd.DataFrame()
                 
-            # Get column names from the result
             columns = result.keys()
             df = pd.DataFrame(rows, columns=columns)
             return df
@@ -74,9 +67,7 @@ def sql_engine(query: str) -> str:
         query: The SQL query string to execute on the database. Must be a valid SELECT query.
 
     Returns:
-        str: The formatted query results as a string. For single value results, returns the value.
-             For multiple rows/columns, returns newline-separated rows with comma-separated values.
-             Returns error message as string if query execution fails.
+        str: The formatted query results as a string.
     """
     try:
         with engine.connect() as con:
@@ -100,8 +91,7 @@ agent = CodeAgent(
 
 def query_sql(user_query: str) -> str:
     """
-    Converts natural language input to an SQL query using CodeAgent
-    and returns the execution results.
+    Converts natural language input to an SQL query using CodeAgent.
     """
     schema = get_table_schema()
     if not schema:
@@ -130,44 +120,9 @@ def query_sql(user_query: str) -> str:
     except ValueError:
         return result
 
-# Create the upload interface
-def create_upload_interface():
-    with gr.Blocks() as upload_interface:
-        gr.Markdown("""
-        # Data Query Interface
-
-        Upload your CSV file to begin.
-        
-        ### Requirements:
-        - File must be in CSV format
-        - First column will be used as the primary key
-        - All columns will be automatically typed based on their content
-        """)
-        
-        file_input = gr.File(
-            label="Upload CSV File",
-            file_types=[".csv"],
-            type="filepath"  # Changed from 'file' to 'filepath'
-        )
-        status = gr.Textbox(label="Status", interactive=False)
-        
-        def handle_upload(file):
-            success, message = process_uploaded_file(file)
-            if success:
-                return message, gr.Blocks.update(visible=False), gr.Blocks.update(visible=True)
-            return message, gr.Blocks.update(visible=True), gr.Blocks.update(visible=False)
-        
-        file_input.upload(
-            fn=handle_upload,
-            inputs=[file_input],
-            outputs=[status, upload_interface, query_interface]
-        )
-    
-    return upload_interface
-
-# Create the query interface
-def create_query_interface():
-    with gr.Blocks(visible=False) as query_interface:
+with gr.Blocks() as demo:
+    # First create both interfaces
+    with gr.Blocks() as query_interface:
         gr.Markdown("""
         ## Data Query Interface
         
@@ -188,7 +143,6 @@ def create_query_interface():
                     interactive=False
                 )
         
-        # Show current schema
         schema_display = gr.Markdown(value="Loading schema...")
         
         def update_schema():
@@ -203,7 +157,6 @@ def create_query_interface():
             outputs=[query_output]
         )
         
-        # Add refresh buttons
         with gr.Row():
             refresh_table_btn = gr.Button("Refresh Table")
             refresh_schema_btn = gr.Button("Refresh Schema")
@@ -218,18 +171,45 @@ def create_query_interface():
             outputs=[schema_display]
         )
         
-        # Update schema on load
         query_interface.load(
             fn=update_schema,
             outputs=[schema_display]
         )
     
-    return query_interface
+    # Set query interface initially invisible
+    query_interface.visible = False
+    
+    # Create upload interface
+    with gr.Blocks() as upload_interface:
+        gr.Markdown("""
+        # Data Query Interface
 
-# Create the main interface
-with gr.Blocks() as demo:
-    upload_interface = create_upload_interface()
-    query_interface = create_query_interface()
+        Upload your CSV file to begin.
+        
+        ### Requirements:
+        - File must be in CSV format
+        - First column will be used as the primary key
+        - All columns will be automatically typed based on their content
+        """)
+        
+        file_input = gr.File(
+            label="Upload CSV File",
+            file_types=[".csv"],
+            type="filepath"
+        )
+        status = gr.Textbox(label="Status", interactive=False)
+        
+        def handle_upload(file):
+            success, message = process_uploaded_file(file)
+            if success:
+                return message, gr.Blocks.update(visible=False), gr.Blocks.update(visible=True)
+            return message, gr.Blocks.update(visible=True), gr.Blocks.update(visible=False)
+        
+        file_input.upload(
+            fn=handle_upload,
+            inputs=[file_input],
+            outputs=[status, upload_interface, query_interface]
+        )
 
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", server_port=7860, share=True)