Update app.py

app.py

@@ -84,124 +84,46 @@ def execute_sql_query(sql_query):
 # Gradio Application UI
 # =========================
 
-# Custom CSS for enhanced styling
-custom_css = """
-.gradio-container {
-    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-    background-color: #f9f9f9;
-}
-
-.header {
-    background-color: #ff5a5f;
-    color: white;
-    padding: 20px;
-    text-align: center;
-    border-radius: 8px;
-}
-
-.button-primary {
-    background-color: #ff5a5f;
-    color: white;
-}
-
-.button-secondary {
-    background-color: #007A87;
-    color: white;
-}
-
-.footer {
-    text-align: center;
-    padding: 10px;
-    color: #555;
-}
-"""
-
-with gr.Blocks(css=custom_css, theme=gr.themes.Default()) as demo:
-    # Header Section
-    with gr.Row():
-        gr.HTML(f"""
-        <div class="header">
-            <h1>US Government Contract Data Analyzer</h1>
-            <p>Convert natural language queries into SQL and explore contract data effortlessly.</p>
-        </div>
-        """)
-
-    # Main Content
+with gr.Blocks(theme=gr.themes.Soft()) as demo:
+    gr.Markdown("""
+    <h1 style="text-align:center;">Text-to-SQL Contract Data Explorer</h1>
+    <p style="text-align:center; font-size:1.2em;">Analyze US Government contract data using natural language queries.</p>
+    """)
+    
     with gr.Row():
-        with gr.Column(scale=1, min_width=300):
-            # Instructions
-            gr.Markdown("""
-            ## How to Use
-
-            1. **Describe your query**: Enter a natural language description of the data you need.
-            2. **Select an example**: Choose from predefined example queries for inspiration.
-            3. **Generate SQL**: Click the button to convert your description into an SQL query.
-            4. **Execute**: Run the SQL query to view the results.
-
-            ### Example Queries
-            """)
-
-            # Example Queries Dropdown
-            example_queries = [
-                "Show awards over 1M in CA",
-                "Retrieve the top 15 records from contract_data where basetype is Award Notice, awardee has at least 12 characters, and popcity has more than 5 characters. Exclude the fields sub_tier, popzip, awardnumber, basetype, popstate, active, popcountry, type, countrycode, and popstreetaddress",
-                "Show top 10 departments by award amount",
-                "SELECT department_ind_agency, CONCAT('$', ROUND(SUM(award), 0)) AS sum_award FROM contract_data GROUP BY department_ind_agency ORDER BY SUM(award) DESC LIMIT 25",
-                "SELECT awardnumber, awarddate, award, office, department_ind_agency, awardee FROM contract_data WHERE awardee IS NOT NULL AND award IS NOT NULL AND popcity IS NOT NULL AND award > 100000000 LIMIT 10;",
-                "SELECT awardee, CONCAT('$', ROUND(SUM(award), 0)) AS sum_award FROM contract_data GROUP BY awardee ORDER BY SUM(award) DESC LIMIT 25"
-            ]
-
-            example_dropdown = gr.Dropdown(
-                label="Select an Example Query",
-                choices=example_queries,
-                value=example_queries[0],
-                interactive=True
-            )
-
-            # Copy Button for Example Queries
-            with gr.Row():
-                btn_load_example = gr.Button("Load Example", variant="primary")
-                btn_copy_example = gr.Button("Copy Query", variant="secondary")
-
-            # User Input
+        with gr.Column(scale=1, min_width=350):
+            gr.Markdown("### 🔍 Enter Your Query")
             query_input = gr.Textbox(
-                label="Your Query",
-                placeholder='e.g., "What are the total awards over 1M in California?"',
+                label="",
+                placeholder='e.g., "What are the total awards over $1M in California?"',
                 lines=2
             )
 
-            # Generate and Execute Buttons
-            with gr.Row():
-                btn_generate_sql = gr.Button("Generate SQL Query", variant="primary")
-                btn_execute_query = gr.Button("Execute Query", variant="secondary")
-
-            # SQL Query Output with Copy Button
-            with gr.Row():
-                sql_query_out = gr.Code(label="Generated SQL Query", language="sql", interactive=False)
-                btn_copy_sql = gr.Button("Copy SQL", variant="secondary")
+            btn_generate_sql = gr.Button("Generate SQL Query")
+            sql_query_out = gr.Code(label="Generated SQL Query", language="sql")
 
-            # Error Output
-            error_out = gr.Markdown("", visible=False, elem_id="error-output")
+            btn_execute_query = gr.Button("Execute Query")
+            error_out = gr.Markdown("", visible=False)
+            
+            gr.Markdown("### 💡 Example Queries")
+            example_queries = [
+                "Show the top 10 departments by total award amount.",
+                "List contracts where the award amount exceeds $5,000,000.",
+                "Retrieve awards over $1M in California.",
+                "Find the top 5 awardees by number of contracts.",
+                "Display contracts awarded after 2020 in New York.",
+                "What is the total award amount by state?"
+            ]
+            for i, query in enumerate(example_queries):
+                gr.Button(query, elem_id=f"example_{i}")
 
-            # Copy Button for Results
-            with gr.Row():
-                btn_copy_results = gr.Button("Copy Results", variant="secondary")
+            with gr.Accordion("Dataset Schema", open=False):
+                gr.JSON(get_schema(), label="Schema")
 
         with gr.Column(scale=2):
-            # Results Dataframe
-            results_out = gr.Dataframe(label="Query Results", interactive=False, height=400)
-
-    # Dataset Schema Tab
-    with gr.Tab("Dataset Schema"):
-        with gr.Accordion("View Schema Details", open=True):
-            schema_display = gr.JSON(label="Schema", value=get_schema(), interactive=False)
-
-    # Footer
-    gr.HTML(f"""
-    <div class="footer">
-        <p>&copy; 2024 Your Company Name. All rights reserved.</p>
-    </div>
-    """)
+            gr.Markdown("### 📊 Query Results")
+            results_out = gr.DataFrame(label="", interactive=False)
+            status_info = gr.Markdown("", visible=False)
 
     # =========================
     # Event Functions
@@ -209,97 +131,59 @@ with gr.Blocks(css=custom_css, theme=gr.themes.Default()) as demo:
 
     def generate_sql(nl_query):
         if not nl_query.strip():
-            return "", "Please enter a valid query.", None
+            return "", "⚠️ Please enter a natural language query."
         sql_query, error = parse_query(nl_query)
         if error:
-            return "", error, None
-        return sql_query, "", None
+            return "", f"❌ {error}"
+        return sql_query, ""
 
     def execute_query(sql_query):
         if not sql_query.strip():
-            return None, "No SQL query to execute."
+            return None, "⚠️ Please generate an SQL query first."
         result_df, error = execute_sql_query(sql_query)
         if error:
-            return None, error
+            return None, f"❌ {error}"
+        if result_df.empty:
+            return None, "ℹ️ The query returned no results."
         return result_df, ""
 
-    def load_example(example_query):
-        if example_query.strip().upper().startswith("SELECT"):
-            sql_query = example_query
-            result_df, error = execute_sql_query(sql_query)
-            if error:
-                return "", error, None
-            return sql_query, "", result_df
-        else:
-            sql_query, error = parse_query(example_query)
-            if error:
-                return "", error, None
-            result_df, exec_error = execute_sql_query(sql_query)
-            if exec_error:
-                return sql_query, exec_error, None
-            return sql_query, "", result_df
-
-    def copy_text(text):
-        return text  # Gradio handles the copy functionality internally
+    def handle_example_click(example_query):
+        query_input.value = example_query
+        sql_query, error = parse_query(example_query)
+        if error:
+            sql_query_out.value = ""
+            error_out.value = f"❌ {error}"
+            return
+        sql_query_out.value = sql_query
+        result_df, exec_error = execute_sql_query(sql_query)
+        if exec_error:
+            results_out.value = None
+            error_out.value = f"❌ {exec_error}"
+            return
+        results_out.value = result_df
+        error_out.value = ""
 
     # =========================
     # Button Click Event Handlers
     # =========================
 
-    # Load Example Query
-    btn_load_example.click(
-        fn=load_example,
-        inputs=example_dropdown,
-        outputs=[sql_query_out, error_out, results_out],
-        show_progress=True
-    )
-
-    # Copy Example Query to Input
-    btn_copy_example.click(
-        fn=lambda x: x,
-        inputs=example_dropdown,
-        outputs=query_input
-    )
-
-    # Generate SQL Query
     btn_generate_sql.click(
         fn=generate_sql,
         inputs=query_input,
-        outputs=[sql_query_out, error_out, results_out],
-        show_progress=True
+        outputs=[sql_query_out, error_out]
     )
 
-    # Execute SQL Query
     btn_execute_query.click(
         fn=execute_query,
         inputs=sql_query_out,
-        outputs=[results_out, error_out],
-        show_progress=True
-    )
-
-    # Copy SQL Query
-    btn_copy_sql.click(
-        fn=copy_text,
-        inputs=sql_query_out,
-        outputs=None,
-        _js="(text) => { navigator.clipboard.writeText(text); }"
+        outputs=[results_out, error_out]
     )
 
-    # Copy Results
-    btn_copy_results.click(
-        fn=lambda df: df.to_csv(index=False),
-        inputs=results_out,
-        outputs=None,
-        _js="""
-        (csv) => {
-            navigator.clipboard.writeText(csv).then(function() {
-                alert('Results copied to clipboard!');
-            }, function(err) {
-                alert('Could not copy results: ', err);
-            });
-        }
-        """
-    )
+    for i, query in enumerate(example_queries):
+        gr.get_component(f"example_{i}").click(
+            fn=lambda q=query: handle_example_click(q),
+            outputs=[]
+        )
 
-# Launch the Gradio App with a larger server timeout and allow queueing
-demo.launch(server_name="0.0.0.0", server_port=7860, debug=True)
+# Launch the Gradio App
+demo.queue().launch()