add in run_ids

app.py

@@ -10,6 +10,7 @@ source_finders = []
 questions_dict = {}
 source_finders_dict = {}
 question_options = []
+run_ids = []
 finder_options = []
 finder_labels = {"All": "All Source Finders"}
 
@@ -29,17 +30,10 @@ async def get_source_finders():
 
 
 # Get distinct run IDs for a question
-async def get_run_ids(question_id: int, source_finder_id: Optional[int] = None):
+async def get_run_ids(question_id: int):
     async with get_async_connection() as conn:
-        query = "SELECT DISTINCT run_id FROM source_runs WHERE question_id = $1"
+        query = "SELECT DISTINCT run_id FROM source_runs WHERE question_id = $1 order by run_id desc"
         params = [question_id]
-
-        if source_finder_id != "All" and source_finder_id is not None:
-            query += " AND source_finder_id = $2"
-            params.append(source_finder_id)
-
-        query += " ORDER BY run_id"
-
         run_ids = await conn.fetch(query, *params)
         return [r["run_id"] for r in run_ids]
 
@@ -53,22 +47,12 @@ async def get_source_runs(question_id: int, source_finder_id: Optional[int] = No
             SELECT sr.*, sf.source_finder_type as finder_name
             FROM source_runs sr
             JOIN source_finders sf ON sr.source_finder_id = sf.id
-            WHERE sr.question_id = $1 and sr.run_id = 1
+            WHERE sr.question_id = $1 and sr.run_id = $2
+            AND sr.source_finder_id = $3
         """
-        params = [question_id]
-        param_counter = 2
-
-        if source_finder_id:
-            query += f" AND sr.source_finder_id = ${param_counter}"
-            params.append(source_finder_id)
-            param_counter += 1
+        params = [question_id, run_id, source_finder_id]
 
-        # if run_id:
-        #     query += f" AND sr.run_id = ${param_counter}"
-        #     params.append(run_id)
-        #     param_counter += 1
-
-        query += " ORDER BY sr.run_id, sr.rank DESC"
+        query += " ORDER BY sr.rank DESC"
 
         sources = await conn.fetch(query, *params)
         return [dict(s) for s in sources]
@@ -92,7 +76,7 @@ async def initialize_data():
 
 
 # Main function to handle UI interactions
-def update_source_runs(question_option, source_finder_id):
+def update_source_runs(question_option, source_finder_id, run_id):
     if not question_option:
         return None, [], "No question selected", None
 
@@ -100,22 +84,22 @@ def update_source_runs(question_option, source_finder_id):
     question_id = int(question_option.split(":")[0])
 
     # Get run_ids for filtering - use asyncio.run for each independent operation
-    # available_run_ids = asyncio.run(get_run_ids(question_id, source_finder_id))
-    # run_id_options = [str(r_id) for r_id in available_run_ids]
+    available_run_ids = asyncio.run(get_run_ids(question_id))
+    run_id_options = [str(r_id) for r_id in available_run_ids]
 
     # If the selected run_id is not in available options, reset it
     # if run_id not in run_id_options:
     #     run_id = None
     #
     # # Convert run_id to int if not "All"
-    # run_id_int = None if len(run_id) == 0 else int(run_id)
+    run_id_int = available_run_ids[0]
     finder_id_int = None if len(source_finder_id) == 0 else int(source_finder_id)
 
     # Get source runs data
-    source_runs = asyncio.run(get_source_runs(question_id, finder_id_int))
+    source_runs = asyncio.run(get_source_runs(question_id, finder_id_int, run_id_int))
 
     if not source_runs:
-        return None, None, "No results found for the selected filters"
+        return None, run_id_options, "No results found for the selected filters"
 
     # Create DataFrame for display
     df = pd.DataFrame(source_runs)
@@ -129,25 +113,7 @@ def update_source_runs(question_option, source_finder_id):
 
     result_message = f"Found {len(source_runs)} results"
 
-    return df_display, result_message
-
-
-# Function to update run_id dropdown when question or source_finder changes
-def update_run_ids(question_option, source_finder_id):
-    if not question_option:
-        return [], None, "No question selected", None
-
-    # Extract question ID
-    question_id = int(question_option.split(":")[0])
-
-    # Convert source_finder_id if not "All"
-    finder_id_int = None if source_finder_id == "All" else int(source_finder_id)
-
-    # Get available run IDs
-    available_run_ids = asyncio.run(get_run_ids(question_id, finder_id_int))
-    run_id_options = ["All"] + [str(run_id) for run_id in available_run_ids]
-
-    return run_id_options, None, "", None
+    return df_display, run_id_options, result_message,
 
 
 
@@ -170,6 +136,14 @@ async def main():
                     interactive=True
                 )
 
+                run_id_dropdown = gr.Dropdown(
+                    choices=run_ids,
+                    value="1",
+                    allow_custom_value=True,
+                    label="Run ids for Question",
+                    interactive=True
+                )
+
                 with gr.Row():
                     source_finder_dropdown = gr.Dropdown(
                         choices=finder_options,
@@ -177,13 +151,6 @@ async def main():
                         interactive=True
                     )
 
-                    # run_id_dropdown = gr.Dropdown(
-                    #     choices=[],
-                    #     value="",
-                    #     label="Run ID",
-                    #     interactive=True
-                    # )
-
                 result_text = gr.Markdown("Select a question to view source runs")
 
                 results_table = gr.DataFrame(
@@ -214,29 +181,29 @@ async def main():
         # Set up event handlers
         question_dropdown.change(
             update_source_runs,
-            inputs=[question_dropdown, source_finder_dropdown],
+            inputs=[question_dropdown, source_finder_dropdown, run_id_dropdown],
             # outputs=[run_id_dropdown, results_table, result_text, download_button]
-            outputs=[results_table, result_text]
+            outputs=[results_table, run_id_dropdown, result_text]
         )
 
         source_finder_dropdown.change(
             update_source_runs,
-            inputs=[question_dropdown, source_finder_dropdown],
+            inputs=[question_dropdown, source_finder_dropdown, run_id_dropdown],
             # outputs=[run_id_dropdown, results_table, result_text, download_button]
-            outputs=[results_table, result_text]
+            outputs=[results_table, run_id_dropdown, result_text]
         )
 
-        # run_id_dropdown.change(
-        #     update_source_runs,
-        #     inputs=[question_dropdown, source_finder_dropdown, run_id_dropdown],
-        #     outputs=[results_table, run_id_dropdown, result_text, download_button]
-        # )
+        run_id_dropdown.change(
+             update_source_runs,
+             inputs=[question_dropdown, source_finder_dropdown, run_id_dropdown],
+             outputs=[results_table, run_id_dropdown, result_text]
+        )
 
         # Initial load of data when question is selected
         question_dropdown.change(
             update_source_runs,
-            inputs=[question_dropdown, source_finder_dropdown],
-            outputs=[results_table, result_text]
+            inputs=[question_dropdown, source_finder_dropdown, run_id_dropdown],
+            outputs=[results_table, run_id_dropdown, result_text]
         )
 
     app.queue()