Update app.py

app.py

@@ -3,21 +3,46 @@ import pandas as pd
 import scipy
 from utils import *
 
-def demo(SPM_path_to_csv, SPM_identifier_column, SPM_sequence_column, SPM_sortby, SPM_sliding_window_min, SPM_sliding_window_max, SPM_min_gap, SPM_max_gap, SPM_S_support_thresh, SPM_I_support_thresh, SPM_dataset_format, DSM_path_to_csv_left, DSM_path_to_csv_right, DSM_identifier_column, DSM_sequence_column, DSM_sortby, DSM_sliding_window_min, DSM_sliding_window_max, DSM_min_gap, DSM_max_gap, DSM_S_support_thresh, DSM_I_support_thresh, DSM_threshold_pvalue, DSM_dataset_format, DSM_test_type,result_view):
-    # Your data processing logic here    
-    result = {
-        "SPM": {"path_to_csv": SPM_path_to_csv.name, "identifier_column": SPM_identifier_column, "sequence_column": SPM_sequence_column, "sortby": SPM_sortby, "sliding_window_min": SPM_sliding_window_min, "sliding_window_max": SPM_sliding_window_max, "min_gap": SPM_min_gap, "max_gap": SPM_max_gap, "S_support_thresh": SPM_S_support_thresh, "I_support_thresh": SPM_I_support_thresh, "dataset_format": SPM_dataset_format}, 
-        "DSM": {"path_to_csv_left": DSM_path_to_csv_left.name, "path_to_csv_right": DSM_path_to_csv_right.name, "identifier_column": DSM_identifier_column, "sequence_column": DSM_sequence_column, "sortby": DSM_sortby, "sliding_window_min": DSM_sliding_window_min, "sliding_window_max": DSM_sliding_window_max, "min_gap": DSM_min_gap, "max_gap": DSM_max_gap, "S_support_thresh": DSM_S_support_thresh, "I_support_thresh": DSM_I_support_thresh, "threshold_pvalue": DSM_threshold_pvalue, "dataset_format": DSM_dataset_format, "test_type": DSM_test_type}
+def spm_fn(SPM_path_to_csv, SPM_identifier_column, SPM_sequence_column, SPM_sortby, SPM_sliding_window_min, SPM_sliding_window_max, SPM_min_gap, SPM_max_gap, SPM_S_support_thresh, SPM_I_support_thresh, SPM_dataset_format):
+    spm_params = {
+        "path_to_csv": SPM_path_to_csv.name,
+        "identifier_column": SPM_identifier_column,
+        "sequence_column": SPM_sequence_column,
+        "sortby": SPM_sortby,
+        "sliding_window_min": SPM_sliding_window_min,
+        "sliding_window_max": SPM_sliding_window_max,
+        "min_gap": SPM_min_gap,
+        "max_gap": SPM_max_gap,
+        "S_support_thresh": SPM_S_support_thresh,
+        "I_support_thresh": SPM_I_support_thresh,
+        "dataset_format": SPM_dataset_format
     }
-    spm_result, occurrence_matrix = SPM(result["SPM"])
-    ptrn_left, ptrn_right, ptrn_both_left, ptrn_both_right, dsm_result = DSM(result["DSM"])
+    
+    spm_result, occurrence_matrix = SPM(spm_params)
     spm_result.to_csv("spm_result.csv")
+    return "spm_result.csv",spm_result
+
+def dsm_fn(DSM_path_to_csv_left, DSM_path_to_csv_right, DSM_identifier_column, DSM_sequence_column, DSM_sortby, DSM_sliding_window_min, DSM_sliding_window_max, DSM_min_gap, DSM_max_gap, DSM_S_support_thresh, DSM_I_support_thresh, DSM_threshold_pvalue, DSM_dataset_format, DSM_test_type):
+    dsm_params = {
+        "path_to_csv_left": DSM_path_to_csv_left.name,
+        "path_to_csv_right": DSM_path_to_csv_right.name,
+        "identifier_column": DSM_identifier_column,
+        "sequence_column": DSM_sequence_column,
+        "sortby": DSM_sortby,
+        "sliding_window_min": DSM_sliding_window_min,
+        "sliding_window_max": DSM_sliding_window_max,
+        "min_gap": DSM_min_gap,
+        "max_gap": DSM_max_gap,
+        "S_support_thresh": DSM_S_support_thresh,
+        "I_support_thresh": DSM_I_support_thresh,
+        "threshold_pvalue": DSM_threshold_pvalue,
+        "dataset_format": DSM_dataset_format,
+        "test_type": DSM_test_type
+    }
+    
+    ptrn_left, ptrn_right, ptrn_both_left, ptrn_both_right, dsm_result = DSM(dsm_params)
     dsm_result.to_csv("dsm_result.csv")
-    if result_view=="SPM":
-        re=spm_result
-    if result_view=="DSM":
-        re=dsm_result
-    return "spm_result.csv","dsm_result.csv",re
+    return "dsm_result.csv",dsm_result
 
 default_values = {
     "SPM Upload CSV file": None,
@@ -50,48 +75,83 @@ default_values = {
 
 
 
-with gr.Interface(
-    fn=None,
-    title="SPM And DSM Implementation in Python",
-    layout="vertical",
-    analytics_enabled=False,
-) as iface:
-
-    with gr.Tab("SPM"):
-        with gr.Row():
-            spm_file = gr.File(label="Upload CSV file")
-            identifier_column = gr.Textbox(label="Identifier Column", value="Identifier")
-            sequence_column = gr.Textbox(label="Sequence Column", value="Sequence")
-            sortby = gr.Dropdown(label="Sort By", choices=["S-Support", "I-Support"], value="S-Support")
-            sliding_window_min = gr.Number(label="Sliding Window Min", value=1)
-            sliding_window_max = gr.Number(label="Sliding Window Max", value=4)
-            min_gap = gr.Number(label="Min Gap", value=1)
-            max_gap = gr.Number(label="Max Gap", value=12)
-            S_support_thresh = gr.Number(label="S Support Threshold", value=0.4)
-            I_support_thresh = gr.Number(label="I Support Threshold", value=0)
-            dataset_format = gr.Number(label="Dataset Format", value=0)
-
-        spm_result = gr.Textbox(label="SPM Result")
-        spm_data = gr.Table(label="SPM Dataframe")
-
-    with gr.Tab("DSM"):
-        with gr.Row():
-            dsm_left_file = gr.File(label="Upload Left Dataset CSV file")
-            dsm_right_file = gr.File(label="Upload Right Dataset CSV file")
-            identifier_column = gr.Textbox(label="Identifier Column", value="Identifier")
-            sequence_column = gr.Textbox(label="Sequence Column", value="Sequence")
-            sortby = gr.Dropdown(label="Sort By", choices=["S-Support", "I-Support"], value="S-Support")
-            sliding_window_min = gr.Number(label="Sliding Window Min", value=1)
-            sliding_window_max = gr.Number(label="Sliding Window Max", value=1)
-            min_gap = gr.Number(label="Min Gap", value=1)
-            max_gap = gr.Number(label="Max Gap", value=12)
-            S_support_thresh = gr.Number(label="S Support Threshold", value=0.4)
-            I_support_thresh = gr.Number(label="I Support Threshold", value=0)
-            threshold_pvalue = gr.Number(label="Threshold P-value", value=0.1)
-            dataset_format = gr.Number(label="Dataset Format", value=0)
-            test_type = gr.Dropdown(label="Test Type", choices=["poisson_means_test", "ttest_ind", "mannwhitneyu", "bws_test", "ranksums", "brunnermunzel", "mood", "ansari", "cramervonmises_2samp", "epps_singleton_2samp", "ks_2samp", "kstest"], value="ttest_ind")
-
-        dsm_result = gr.Textbox(label="DSM Result")
-        dsm_left_data = gr.Table(label="Left DSM Dataframe")
+def demo():
+    with gr.Blocks(theme="base") as demo:
+        
+        gr.Markdown(
+            """<center><h2>SPM and DSM Implementation in Python</center></h2>
+            <h3>Sequential Pattern Mining (SPM) and Differential Sequential Mining (DSM)</h3>
+            """
+        )
+        
+        with gr.Tab("SPM"):
+            with gr.Row():
+                spm_file = gr.File(label="Upload CSV file")
+            with gr.Row():
+                identifier_column = gr.Textbox(label="Identifier Column", value="Identifier")
+            with gr.Row():
+                sequence_column = gr.Textbox(label="Sequence Column", value="Sequence")
+            with gr.Row():
+                sortby = gr.Dropdown(label="Sort By", choices=["S-Support", "I-Support"], value="S-Support")
+            with gr.Row():
+                sliding_window_min = gr.Number(label="Sliding Window Min", value=1)
+            with gr.Row():
+                sliding_window_max = gr.Number(label="Sliding Window Max", value=4)
+            with gr.Row():
+                min_gap = gr.Number(label="Min Gap", value=1)
+            with gr.Row():
+                max_gap = gr.Number(label="Max Gap", value=12)
+            with gr.Row():
+                S_support_thresh = gr.Number(label="S Support Threshold", value=0.4)
+            with gr.Row():
+                I_support_thresh = gr.Number(label="I Support Threshold", value=0)
+            with gr.Row():
+                dataset_format = gr.Number(label="Dataset Format", value=0)
+            with gr.Row():
+                spm_submit = gr.Button("Generate SPM Result...")
+                
+        
+        with gr.Tab("DSM"):
+            with gr.Row():
+                dsm_left_file = gr.File(label="Upload Left Dataset CSV file")
+            with gr.Row():
+                dsm_right_file = gr.File(label="Upload Right Dataset CSV file")
+            with gr.Row():
+                identifier_column_dsm = gr.Textbox(label="Identifier Column", value="Identifier")
+            with gr.Row():
+                sequence_column_dsm = gr.Textbox(label="Sequence Column", value="Sequence")
+            with gr.Row():
+                sortby_dsm = gr.Dropdown(label="Sort By", choices=["S-Support", "I-Support"], value="S-Support")
+            with gr.Row():
+                sliding_window_min_dsm = gr.Number(label="Sliding Window Min", value=1)
+            with gr.Row():
+                sliding_window_max_dsm = gr.Number(label="Sliding Window Max", value=1)
+            with gr.Row():
+                min_gap_dsm = gr.Number(label="Min Gap", value=1)
+            with gr.Row():
+                max_gap_dsm = gr.Number(label="Max Gap", value=12)
+            with gr.Row():
+                S_support_thresh_dsm = gr.Number(label="S Support Threshold", value=0.4)
+            with gr.Row():
+                I_support_thresh_dsm = gr.Number(label="I Support Threshold", value=0)
+            with gr.Row():
+                threshold_pvalue = gr.Number(label="Threshold P-value", value=0.1)
+            with gr.Row():
+                dataset_format_dsm = gr.Number(label="Dataset Format", value=0)
+            with gr.Row():
+                test_type = gr.Dropdown(label="Test Type", choices=["poisson_means_test", "ttest_ind", "mannwhitneyu", "bws_test", "ranksums", "brunnermunzel", "mood", "ansari", "cramervonmises_2samp", "epps_singleton_2samp", "ks_2samp", "kstest"], value="ttest_ind")
+            with gr.Row():
+                dsm_submit = gr.Button("Generate DSM Result...")
+            dsm_result_display = gr.Textbox(label="DSM Result")
+            dsm_left_data_display = gr.Table(label="Left DSM Dataframe")
+        spm_submit.click(spm_fn,inputs=)
+        spm_submit.click(spm_fn, \
+                inputs=[spm_file, identifier_column, sequence_column, sortby, sliding_window_min, sliding_window_max, min_gap, max_gap, S_support_thresh, I_support_thresh, dataset_format], \
+                outputs=[gr.File(label="SPM result"), "dataframe"])
+        dsm_submit.click(dsm_fn, \
+                inputs=[dsm_left_file, dsm_right_file, identifier_column_dsm, sequence_column_dsm, sortby_dsm, sliding_window_min_dsm, sliding_window_max_dsm, min_gap_dsm, max_gap_dsm, S_support_thresh_dsm, I_support_thresh_dsm, threshold_pvalue, dataset_format_dsm, test_type], \
+                outputs=[gr.File(label="DSM result"), "dataframe"])
+        demo.queue().launch(debug=True)
 
-    iface.launch()
+if __name__ == "__main__":
+    demo()