Update app.py

app.py

@@ -34,7 +34,8 @@ def setup():
 #print('about to setup')
 setup()
 
-# display some of the selected corpus
+# return the whole corpus as a state
+# display some of it
 # (because gradio pagination is currently broken)
 # and reset all filter menus
 def pick_lang(langname):
@@ -44,24 +45,37 @@ def pick_lang(langname):
     elif langname =="Faroese":
         df = datas.ds_f
 
-    df = df.data.to_pandas()
-    df = df.drop(columns=['audio', 'speaker_id','duration'])
-    return (df[:15],"all") #(df, df[:50])
+    dfd = df.data.to_pandas()
+    dfd = dfd.drop(columns=['audio', 'speaker_id','duration'])
+    return (df, dfd[:15], "all") #(df, df[:50])
 
 
 
+def apply_filters(df,langname,gender):#,ageIS,ageFO):
 
-def f1(langname,gender):
     if langname=="Icelandic":
-        ds = datas.ds_i
-        lang_aligner = datas.a_i
+        df = datas.ds_i
     elif langname =="Faroese":
-        ds = datas.ds_f
-        lang_aligner = datas.a_f
+        df = datas.ds_f
+            
+    if gender != "all":
+        df = df.filter(lambda x: x["gender"].startswith(gender))
 
+    #if age != "all":
+    #    df = df.filter(lambda x: x["age"] == age)
+
+    #if age != "all":
+
+    dfd = df.data.to_pandas()
+    dfd = dfd.drop(columns=['audio', 'speaker_id','duration'])
+    return (df,dfd[:15])
 
-    if gender != "all":
-        ds = ds.filter(lambda x: x["gender"].startswith(gender))
+
+def f1(langname,ds):
+    if langname=="Icelandic":
+        lang_aligner = datas.a_i
+    elif langname =="Faroese":
+        lang_aligner = datas.a_f
 
     maxdat=len(ds)
 
@@ -94,16 +108,17 @@ with bl:
         The random example can be from the whole corpus, not necessarily one of the visible rows. More information below.
         """ )
 
-    align_func = gr.State()#value=ctcalign.aligner(model_path="carlosdanielhernandezmena/wav2vec2-large-xlsr-53-icelandic-ep10-1000h",model_word_separator = '|',model_blank_token = '[PAD]'))
-
+    ds = gr.State()
 
     with gr.Row():
         gmenu = gr.Dropdown(["all", "f", "m"], label="Gender", value="all")
         amenu = gr.Dropdown(["all", '15-35', '36-60', '61+'], label="Age", value="all")
+        btn0 = gr.Button(value="Apply filters")
 
+    # use 2 age menus
+    # and set 1 of them visible at a time dependeing on the language.....
 
     with gr.Row():
-        #invisidata = gr.DataFrame(interactive=False, visible=False)
         databrowser = gr.DataFrame(wrap=True, max_rows=50, interactive=False, overflow_row_behaviour='paginate')
 
 
@@ -121,13 +136,18 @@ with bl:
 
     
     # when user selects a language,
-    # display some data
+    # reset the dataset
+    # display some data from it
     # and reset all filter menus
-    langmenu.change(pick_lang,langmenu,[databrowser,gmenu])
+    langmenu.change(pick_lang,langmenu,[ds,databrowser,gmenu])
+
+    # filter the current data and change the state based on this
+    # and display the update
+    btn0.click(apply_filters,[ds,langmenu,gmenu],[ds,databrowser])
     
     
     # 
-    btn1.click(f1, [langmenu,gmenu], [pl1,audio1,ainfo])
+    btn1.click(f1, [langmenu,ds], [pl1,audio1,ainfo])