Update app.py

app.py

@@ -38,37 +38,41 @@ setup()
 # display some of it
 # (because gradio pagination is currently broken)
 # and reset all filter menus
+# return [ds,databrowser,gmenu,amenu,dmenu]
 def pick_lang(langname):
     if langname=="Icelandic":
         df = datas.ds_i
+        ages = ["all", '18-19', '20-29', '30-39', '40-49', '50-59', '60-69', '70-79', '80-89', '90']
+        diaVis = False
         
     elif langname =="Faroese":
         df = datas.ds_f
+        ages = ["all", '15-35', '36-60', '61+']
+        diaVis = True
 
     dfd = df.drop(columns=['audio', 'speaker_id','duration'])
-    return (df, dfd[:15], "all") #(df, df[:50])
+    return (df, dfd[:15], "all", gr.update(choices=ages,value="all"),gr.update(visible=diaVis,value="all"))
 
 
 
-def apply_filters(df,langname,gender):#,ageIS,ageFO):
+def apply_filters(df,langname,gender,age,dia):
 
     if langname=="Icelandic":
         df = datas.ds_i
-        # ++ age by lang here...
     elif langname =="Faroese":
         df = datas.ds_f
-        # filter by ages
-        # filter by dialect
+        if dia != all:
+            df = df[df.dialect.lower() == dia.lower()]
             
     if gender != "all":
         df = df[df.gender.str.startswith(gender)]
 
-    #if age != "all":
-    #    df = df.filter(lambda x: x["age"] == age)
+    if age != "all":
+        df = df[df.age == age]
 
 
     dfd = df.drop(columns=['audio', 'speaker_id','duration'])
-    return (df,dfd[:15])
+    return (df,dfd[:max(15,len(dfd))])
 
 
 def f1(langname,ds):
@@ -111,11 +115,12 @@ with bl:
 
     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")
+        amenu = gr.Dropdown(["all"], label="Age", value="all")
+        dmenu = gr.Dropdown(["all", "Norðuroyggjar (inklusive of Eiði, Gjógv og Funningur)",
+                             'Norðurstreymoy/Eysturoy (exclusive of Eiði, Gjógv og Funningur)',
+                             'Vágar', 'Sandoy', 'Suðuroy', 'Suðurstreymoy'], label="Dialect", value = "all", visible = False)
         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():
         databrowser = gr.DataFrame(wrap=True, max_rows=50, interactive=False, overflow_row_behaviour='paginate')
@@ -138,11 +143,11 @@ with bl:
     # reset the dataset
     # display some data from it
     # and reset all filter menus
-    langmenu.change(pick_lang,langmenu,[ds,databrowser,gmenu])
+    langmenu.change(pick_lang,langmenu,[ds,databrowser,gmenu,amenu,dmenu])
 
     # filter the current data and change the state based on this
     # and display the update
-    btn0.click(apply_filters,[ds,langmenu,gmenu],[ds,databrowser])
+    btn0.click(apply_filters,[ds,langmenu,gmenu,amenu,dmenu],[ds,databrowser])
     
     
     #