Update app.py

changed strategy descriptor to download

app.py

@@ -214,26 +214,58 @@ def process_file(model_name,inc_slider,progress=Progress(track_tqdm=True)):
 
         print(f"CSV file '{filename}' created successfully.")
 
-    # Find indices where conditions match
-    for task_type in [0, 1]:  # test_info[6] = 1 or 2
-        for label in [0, 1]:  # tlb = plb = 0 or 1
-            matching_indices = [i for i in range(len(tlb)) if tlb[i] == plb[i] == label]
+    task_type_map = {0: "ER", 1: "ME"}
+    label_map = {0: "unsuccessful", 1: "successful"}
+
+    # -------------------------------
+    # 1. Where tlb == plb
+    # -------------------------------
+    for label in [0, 1]:
+        # All strategies
+        matching_indices = [i for i in range(len(tlb)) if tlb[i] == plb[i] == label]
+        filtered_data = selected_test_info.iloc[matching_indices]
+        filename = f"allstrategies-match-{label_map[label]}.csv"
+        process_and_write_csv(filtered_data, filename)
+
+        # Per task type
+        for task_type in [0, 1]:
+            task_data = filtered_data[filtered_data[8] == task_type]
+            filename = f"{task_type_map[task_type]}-match-{label_map[label]}.csv"
+            process_and_write_csv(task_data, filename)
+
+    # -------------------------------
+    # 2. Where tlb only
+    # -------------------------------
+    for label in [0, 1]:
+        # All strategies
+        matching_indices = [i for i in range(len(tlb)) if tlb[i] == label]
+        filtered_data = selected_test_info.iloc[matching_indices]
+        filename = f"allstrategies-groundtruth-{label_map[label]}.csv"
+        process_and_write_csv(filtered_data, filename)
+
+        # Per task type
+        for task_type in [0, 1]:
+            task_data = filtered_data[filtered_data[8] == task_type]
+            filename = f"{task_type_map[task_type]}-groundtruth-{label_map[label]}.csv"
+            process_and_write_csv(task_data, filename)
+
+    # -------------------------------
+    # 3. All data by task type (no label filtering)
+    # -------------------------------
+    # ER
+    task_data = selected_test_info[selected_test_info[8] == 0]
+    filename = f"ER-all.csv"
+    process_and_write_csv(task_data, filename)
+
+    # ME
+    task_data = selected_test_info[selected_test_info[8] == 1]
+    filename = f"ME-all.csv"
+    process_and_write_csv(task_data, filename)
+
+    # All strategies
+    filename = "allstrategies-all.csv"
+    process_and_write_csv(selected_test_info, filename)
 
-            # Filter the data
-            filtered_data = selected_test_info.iloc[matching_indices]
-            # new data contains etalon instead of 0/1 for ER/ME
-            filtered_data = filtered_data[filtered_data[8] == task_type]  # Ensure test_info[6] matches
-
-            # Define filename dynamically
-            task_type_map = {0: "ER", 1: "ME"}
-            label_map = {0: "unsuccessful", 1: "successful"}
-
-            filename = f"{task_type_map[task_type]}-{label_map[label]}-strategies.csv"
-
-
-            # Write to CSV
-            process_and_write_csv(filtered_data, filename)
-    
     with open("fileHandler/roc_data2.pkl", 'rb') as file:
         data = pickle.load(file)
     t_label=data[0]
@@ -539,7 +571,8 @@ def process_file(model_name,inc_slider,progress=Progress(track_tqdm=True)):
         textinfo='percent+label',
         textposition='auto',
         marker=dict(colors=colors),
-        sort=False
+        sort=False,
+        hole=0.4
        
     )])
 
@@ -577,7 +610,8 @@ def process_file(model_name,inc_slider,progress=Progress(track_tqdm=True)):
         textinfo='percent+label',
         textposition='auto',
         marker=dict(colors=colors),
-        sort=False
+        sort=False,
+        hole=0.4
         # pull=[0, 0.2, 0, 0] # for pulling part of pie chart out (depends on position)
         
     )])
@@ -1142,31 +1176,82 @@ button, select, .slider-percentage {
     margin-bottom: 1rem !important;
     text-align: center !important;
 
+#file-box {
+        border: 1px solid #ccc;
+        border-radius: 6px;
+        padding: 10px;
+        margin-top: 12px;
+        background-color: #f9f9f9;
+    }
 
+.file-download {
+        margin-bottom: 5px !important;
+        padding: 4px !important;
+        height: 10px;
+    }
 }
 
 
 '''
+
 # Define the file directory
 FILE_DIR = "fileHandler"
 
 # Function to get list of files
 def list_files():
-    return ['Unsuccessful Strategies (ER)', 'Successful Strategies (ER)', 'Unsuccessful Strategies (ME)', 'Successful Strategies (ME)']
+    return ['Unsuccessful Strategies (ER)', 'Successful Strategies (ER)', 'Unsuccessful Strategies (ME)', 'Successful Strategies (ME)','Ground Truth Unsuccessful Strategies (ER)','Ground Truth Successful Strategies (ER)','Ground Truth Unsuccessful Strategies (ME)','Ground Truth Successful Strategies (ME)']
 label_to_filename = {
-    'Unsuccessful Strategies (ER)': 'ER-unsuccessful-strategies.csv',
-    'Successful Strategies (ER)': 'ER-successful-strategies.csv',
-    'Unsuccessful Strategies (ME)': 'ME-unsuccessful-strategies.csv',
-    'Successful Strategies (ME)': 'ME-successful-strategies.csv'
+    # Predicted (tlb == plb)
+    'Predicted Successful Strategies (ER)': 'ER-match-successful.csv',
+    'Predicted Unsuccessful Strategies (ER)': 'ER-match-unsuccessful.csv',
+    'Predicted Successful Strategies (ME)': 'ME-match-successful.csv',
+    'Predicted Unsuccessful Strategies (ME)': 'ME-match-unsuccessful.csv',
+    'Predicted Successful Strategies (All)': 'allstrategies-match-successful.csv',
+    'Predicted Unsuccessful Strategies (All)': 'allstrategies-match-unsuccessful.csv',
+
+    # Ground Truth (tlb only)
+    'Ground Truth Successful Strategies (ER)': 'ER-groundtruth-successful.csv',
+    'Ground Truth Unsuccessful Strategies (ER)': 'ER-groundtruth-unsuccessful.csv',
+    'Ground Truth Successful Strategies (ME)': 'ME-groundtruth-successful.csv',
+    'Ground Truth Unsuccessful Strategies (ME)': 'ME-groundtruth-unsuccessful.csv',
+    'Ground Truth Successful Strategies (All)': 'allstrategies-groundtruth-successful.csv',
+    'Ground Truth Unsuccessful Strategies (All)': 'allstrategies-groundtruth-unsuccessful.csv',
+
+    # All data
+    'All Strategies (ER)': 'ER-all.csv',
+    'All Strategies (ME)': 'ME-all.csv',
+    'All Strategies (All)': 'allstrategies-all.csv'
 }
+
 # Function to provide the selected file path
-def provide_file_path(label_name):
-    file_name = label_to_filename.get(label_name, None)
-    if file_name:
-        file_path = f"{FILE_DIR}/{file_name}"
-        dynamic_text = "🔍 [Visualize the strategies](https://path-analysis.vercel.app/)"
-        return file_path, gr.update(value=dynamic_text, visible=True)
-    return None, gr.update(visible=False)
+def provide_file_paths(task_type, source):
+    if not task_type or not source:
+        return None, None, gr.update(visible=False)
+
+    # Handle "All" case for combined strategies
+    if source == "All":
+        label_success = f"All Strategies ({task_type})"
+        label_unsuccess = f"All Strategies ({task_type})"
+    else:
+        label_success = f"{source} Successful Strategies ({task_type})"
+        label_unsuccess = f"{source} Unsuccessful Strategies ({task_type})"
+        label_all=f"All Strategies ({task_type})"
+
+    file_success = label_to_filename.get(label_success)
+    file_unsuccess = label_to_filename.get(label_unsuccess)
+    file_all=label_to_filename.get(label_all)
+
+    file_success_path = f"{FILE_DIR}/{file_success}" if file_success else None
+    file_unsuccess_path = f"{FILE_DIR}/{file_unsuccess}" if file_unsuccess else None
+    file_all_path = f"{FILE_DIR}/{file_all}" if file_all else None
+
+    dynamic_text = "🔍 [Visualize the strategies](https://path-analysis.vercel.app/)"
+    if file_success and file_unsuccess and file_all:
+        return file_success_path, file_unsuccess_path,file_all_path, gr.update(value=dynamic_text, visible=True)
+
+    return None, None,None, gr.update(visible=False)
+
+
 
 
 with gr.Blocks(theme='gstaff/sketch', css=custom_css) as demo:
@@ -1205,31 +1290,53 @@ with gr.Blocks(theme='gstaff/sketch', css=custom_css) as demo:
         opt2_pie = gr.Plot(label="ME")
 
     with gr.Row():
-        gr.Markdown("Select a strategy from the dropdown")
-    with gr.Row():
-        file_dropdown = gr.Dropdown(choices=list_files(),label=" ")
-        download_button = gr.Button("Generate Strategies")
-    with gr.Row():
-        file_output = gr.File(label="Download File")
-        visualize_markdown = gr.Markdown(visible=False)
-    
-    download_button.click(
-        fn=provide_file_path,
-        inputs=[file_dropdown],
-        outputs=[file_output, visualize_markdown]
-    )
+        with gr.Column():
+            # gr.Markdown("Select strategy filters and click Generate")
+            task_type_radio = gr.Dropdown(
+                choices=["ER", "ME", "All"],
+                label="Filter by Problem Type",
+                interactive=True
+            )
+            source_radio = gr.Checkbox(
+                label="Predicted Labels",
+                value=True
+            )
+            generate_button = gr.Button("Generate Strategies")
+
+    # with gr.Row():
+        with gr.Column():
+            with gr.Group(visible=False) as file_output_group:
+            
+                gr.Markdown("**Download strategy descriptor files**")
+                file_output_success = gr.File(label=" ")
+                file_output_unsuccess = gr.File(label=" ")
+                file_output_all = gr.File(label=" ")
+                visualize_markdown = gr.Markdown(visible=False)
+
+
+    def handle_generate(task_type_dropdown, use_predicted):
+        label_source = "Predicted" if use_predicted else "Ground Truth"
+        file_success_path, file_unsuccess_path,file_all_path, viz_link = provide_file_paths(task_type_dropdown, label_source)
+        
+        return file_success_path, file_unsuccess_path,file_all_path, viz_link,gr.update(visible=True)
 
 
+    generate_button.click(
+        fn=handle_generate,
+        inputs=[task_type_radio, source_radio],
+        outputs=[file_output_success, file_output_unsuccess,file_output_all, visualize_markdown,file_output_group]
+    )
 
     btn.click(
         fn=lambda model, increment: (
             *process_file(model, increment),  # Unpack all outputs from process_file
-            gr.update(value=None),  # Reset dropdown to first item
+            gr.update(value=None),     # update outcome_radio
+            gr.update(value=None), # Reset dropdown to first item
             None,                              # Clear file output
             gr.update(visible=False)           # Hide visualize markdown
         ),
         inputs=[model_dropdown, increment_slider],
-        outputs=[output_text, plot_output, opt1_pie, opt2_pie, file_dropdown, file_output, visualize_markdown]
+        outputs=[output_text, plot_output, opt1_pie, opt2_pie, task_type_radio,source_radio,file_output_success,file_output_unsuccess, visualize_markdown]
     )