Update app.py

app.py

@@ -55,7 +55,7 @@ def parse_query(nl_query):
     ]
 
     try:
-        response = openai.chat.completions.create(
+        response = openai.ChatCompletion.create(
             model="gpt-4",
             messages=messages,
             temperature=0,
@@ -84,115 +84,222 @@ def execute_sql_query(sql_query):
 # Gradio Application UI
 # =========================
 
-with gr.Blocks() as demo:
-    gr.Markdown("""
-    # Use Text to SQL to analyze US Government contract data
+# Custom CSS for enhanced styling
+custom_css = """
+.gradio-container {
+    font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
+    background-color: #f9f9f9;
+}
 
-    ## Instructions
+.header {
+    background-color: #ff5a5f;
+    color: white;
+    padding: 20px;
+    text-align: center;
+    border-radius: 8px;
+}
 
-    ### 1. **Describe the data you want**: e.g., `Show awards over 1M in CA`
-    ### 2. **Use Example Queries**: Click on any example query button below to execute.
-    ### 3. **Generate SQL**: Or, enter your own query and click "Generate SQL" to see the SQL query.
+.button-primary {
+    background-color: #ff5a5f;
+    color: white;
+}
 
-    ## Example Queries
-    """)
+.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():
-        with gr.Column(scale=1):
-    
-            gr.Markdown("### Click on an example query:")
-            with gr.Row():
-                btn_example1 = gr.Button("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")
-                btn_example2 = gr.Button("Show top 10 departments by award amount")
-                btn_example3 = gr.Button("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")
-                btn_example4 = gr.Button("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")
-                btn_example5 = gr.Button("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;")
-                btn_example6 = gr.Button("SELECT awardee, CONCAT('$', ROUND(SUM(award), 0)) AS sum_award FROM contract_data GROUP BY awardee ORDER BY SUM(award) DESC LIMIT 25")
+        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.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
             query_input = gr.Textbox(
                 label="Your Query",
                 placeholder='e.g., "What are the total awards over 1M in California?"',
-                lines=1
+                lines=2
             )
 
-            btn_generate_sql = gr.Button("Generate SQL Query")
-            sql_query_out = gr.Code(label="Generated SQL Query", language="sql")
-            btn_execute_query = gr.Button("Execute Query")
-            error_out = gr.Markdown("", visible=False)
+            # 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")
+
+            # Error Output
+            error_out = gr.Markdown("", visible=False, elem_id="error-output")
+
+            # Copy Button for Results
+            with gr.Row():
+                btn_copy_results = gr.Button("Copy Results", variant="secondary")
+
         with gr.Column(scale=2):
-            results_out = gr.Dataframe(label="Query Results", interactive=False)
+            # Results Dataframe
+            results_out = gr.Dataframe(label="Query Results", interactive=False, height=400)
 
+    # Dataset Schema Tab
     with gr.Tab("Dataset Schema"):
-        gr.Markdown("### Dataset Schema")
-        schema_display = gr.JSON(label="Schema", value=get_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>
+    """)
 
     # =========================
     # Event Functions
     # =========================
 
     def generate_sql(nl_query):
+        if not nl_query.strip():
+            return "", "Please enter a valid query.", None
         sql_query, error = parse_query(nl_query)
-        return sql_query, error
+        if error:
+            return "", error, None
+        return sql_query, "", None
 
     def execute_query(sql_query):
+        if not sql_query.strip():
+            return None, "No SQL query to execute."
         result_df, error = execute_sql_query(sql_query)
-        return result_df, error
+        if error:
+            return None, error
+        return result_df, ""
 
-    def handle_example_click(example_query):
+    def load_example(example_query):
         if example_query.strip().upper().startswith("SELECT"):
             sql_query = example_query
             result_df, error = execute_sql_query(sql_query)
-            return sql_query, "", result_df, error
+            if error:
+                return "", error, None
+            return sql_query, "", result_df
         else:
             sql_query, error = parse_query(example_query)
             if error:
-                return sql_query, error, None, error
+                return "", error, None
             result_df, exec_error = execute_sql_query(sql_query)
-            return sql_query, exec_error, result_df, exec_error
+            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
 
     # =========================
     # 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]
+        outputs=[sql_query_out, error_out, results_out],
+        show_progress=True
     )
 
+    # Execute SQL Query
     btn_execute_query.click(
         fn=execute_query,
         inputs=sql_query_out,
-        outputs=[results_out, error_out]
+        outputs=[results_out, error_out],
+        show_progress=True
     )
 
-    btn_example1.click(
-        fn=lambda: handle_example_click("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"),
-        outputs=[sql_query_out, error_out, results_out, error_out]
-    )
-    btn_example2.click(
-        fn=lambda: handle_example_click("Show top 10 departments by award amount. Round to zero decimal places."),
-        outputs=[sql_query_out, error_out, results_out, error_out]
-    )
-    btn_example3.click(
-        fn=lambda: handle_example_click("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"),
-        outputs=[sql_query_out, error_out, results_out, error_out]
-    )
-    btn_example4.click(
-        fn=lambda: handle_example_click("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"),
-        outputs=[sql_query_out, error_out, results_out, error_out]
-    )
-    btn_example5.click(
-        fn=lambda: handle_example_click("SELECT award, office, department_ind_agency,awardee from contract_data WHERE awardee IS NOT NULL AND award IS NOT NULL AND award > 100000000 LIMIT 10;"),
-        outputs=[sql_query_out, error_out, results_out, error_out]
-    )
-    btn_example6.click(
-        fn=lambda: handle_example_click("SELECT awardee, CONCAT('$', ROUND(SUM(award), 0)) AS sum_award FROM contract_data GROUP BY awardee ORDER BY SUM(award) DESC LIMIT 25"),
-        outputs=[sql_query_out, error_out, results_out, error_out]
+    # Copy SQL Query
+    btn_copy_sql.click(
+        fn=copy_text,
+        inputs=sql_query_out,
+        outputs=None,
+        _js="(text) => { navigator.clipboard.writeText(text); }"
     )
 
-    
+    # 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);
+            });
+        }
+        """
+    )
 
-# Launch the Gradio App
-demo.launch()
+# 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)