Update app.py

app.py

@@ -76,9 +76,9 @@ def refresh_prompt_fn():
 # based on how users should speak short vs longer prompts
 def _user_instructions(to_speak):
     if (len(to_speak.split(' '))<2) or ' – ' in to_speak:
-        instr = "Lestu eftirfarandi texta. Talaðu skýrt:"
+        return "Lestu eftirfarandi texta. Talaðu skýrt:"
     else:
-        instr = "Lestu eftirfarandi texta eins og þu segir í venjulegu samtali:"
+        return "Lestu eftirfarandi texta eins og þu segir í venjulegu samtali:"
 
         
 def recal_fb_fn(cslider):
@@ -86,7 +86,7 @@ def recal_fb_fn(cslider):
     return FeedbackConverter(fb_params['t_key'], fb_params['p_key'], lowr, uppr)
     
 
-def score_speech_fn(current_prompt, user_wav, fbc):
+def score_speech_fn(current_prompt, user_wav, fbc, devopts):
     
     task_id, norm_text = current_prompt
     task_text, task_model = scorer.task_scorer(task_id)
@@ -133,16 +133,16 @@ def score_speech_fn(current_prompt, user_wav, fbc):
         #print('WORD FB:', word_feedback)
         #print('PHONE FB', phone_feedback)
 
-        disp_fb = f'## Einkunn/gæði: {task_feedback}'
+        disp_fb = f'## Einkunn/gæði framburðar: {task_feedback}'
 
 #return ''.join([ hc_from_3(self.phone_3sort_monophone(score,label)) for label,score in scores_list ])
         disp_fb2 = ' '.join([''.join([fbc.hc_from_3(sc3,phid) for sc3,phid in wphones]) for wrd, wphones in phone_feedback])
 #disp_fb2 = ' '.join([htxt for wrd, htxt in phone_feedback])
         disp_fb2 = f'## {disp_fb2}'
 
-        disp_plot1 = fbc.generate_graphic_feedback_0(user_wav, word_aligns, phone_aligns, phone_feedback)
+        disp_plot1 = fbc.generate_graphic_feedback_0(user_wav, word_aligns, phone_aligns, phone_feedback, devopts)
 
-        disp_blocksplot = fbc.generate_graphic_feedback_blocks(phone_scores)
+        disp_blocksplot = fbc.generate_graphic_feedback_blocks(phone_scores) if devopts else gr.Plot()
 
     else:
         disp_fb = "Failure. If this happens every time try a different device/browser, "
@@ -167,7 +167,7 @@ def _disp_scorertype(scorertype):
 # toggle on/off some components
 def dev_opts_fn(check_box,phone_output_keyinfo):
     energy_key = """, <span style='color:#F49098;'>--- Hljóðstyrkur (root mean square energy)</span>"""
-    reset_fb = gr.State(FeedbackConverter(fb_params['t_key'], fb_params['p_key'], fb_params['lb'], fb_params['ub']))
+    reset_fb = FeedbackConverter(fb_params['t_key'], fb_params['p_key'], fb_params['lb'], fb_params['ub'])
     if check_box: # user has just turned ON extra options
         new_key = phone_output_keyinfo + energy_key
         new_vis = True
@@ -178,7 +178,10 @@ def dev_opts_fn(check_box,phone_output_keyinfo):
             gr.update(value= _disp_scorertype('...'),visible=new_vis), 
             gr.update(value=(fb_params['lb'], fb_params['ub']),visible=new_vis), 
             reset_fb, 
-            gr.update(visible=new_vis), gr.update(visible=new_vis), gr.update(visible=new_vis), gr.update(visible=new_vis)]
+            gr.update(visible=new_vis), 
+            gr.update(visible=new_vis), 
+            gr.update(visible=new_vis), #gr.Plot(), 
+            gr.update(visible=new_vis)]
         
 
 def display0(score_output):
@@ -239,7 +242,9 @@ with bl:
 
     with gr.Row():
         with gr.Column(scale=2):
-            phone_output_keyinfo = gr.Markdown("""### Lykill: <span style='color:#26701C;'>Meira nálægt</span>, <span style='color:#E85907;'>Minna nálægt</span>, <span style='color:#BBBBBB;'>Ekki hægt að greina (of stutt hljóð)</span>, <span style='color:#88447F;'>••• Ítónun (tónhæð)</span>""")
+            #phone_output_keyinfo = gr.Markdown("""### Lykill: <span style='color:#26701C;'>Meira nálægt</span>, <span style='color:#E85907;'>Minna nálægt</span>, <span style='color:#BBBBBB;'>Ekki hægt að greina (of stutt hljóð)</span>, <span style='color:#88447F;'>••• Ítónun (tónhæð)</span>""")
+            phone_output_keyinfo = gr.Markdown("""### Lykill: <span style='color:#26701C;'>Nálægt réttum framburði</span>, <span style='color:#E85907;'>Fjarri réttum framburði</span>, <span style='color:#BBBBBB;'>Ekki hægt að greina (of stutt hljóð)</span>, <span style='color:#88447F;'>••• Ítónun (tónhæð)</span>""")
+
         with gr.Column(scale=1):
             dev_checkbox = gr.Checkbox(label="[Sýna villuleitarverkfæri]", value=False)
             
@@ -266,7 +271,7 @@ with bl:
                              outputs = [fb] )
     
     score_speech_button.click(score_speech_fn, 
-                              inputs=[current_prompt, user_speech, fb], 
+                              inputs=[current_prompt, user_speech, fb, dev_checkbox], 
                               outputs = [placeholder_output, modeltype_info, plot_output, blocks_output])
                               #outputs = [placeholder_output, phone_output, modeltype_info, plot_output])