Update app.py

app.py

@@ -51,18 +51,15 @@ def process(input_path):
     for d in res['instruments']:
       instruments[d['name']] = d['probability']
     
-    timbres = []
+    timbres = {}
     for d in res['timbres']:
-      timbres.append((d['name'],d['probability']))
-    print(timbres)
+      timbres[d['name']] = d['probability']
+        
+    vocalgender[res['vocal_gender'][0]['name']]= res['vocal_gender'][0]['probability']
     
-    vocalgender = [res['vocal_gender'][0]['name'], res['vocal_gender'][0]['probability']]
-    print(vocalgender)
+    audioquality[res['audio_quality'][0]['name']]= res['audio_quality'][0]['probability']
     
-    audioquality = [res['audio_quality'][0]['name'], res['audio_quality'][0]['probability']]
-    print(audioquality)
-
-    return dict_moods, genres, instruments, themes, str(dict_desc['Electric/Acoustic']),str(dict_desc['Danceability']),str(dict_desc['Arousal']),str(dict_desc['Vocal/Instrumental']),str(dict_desc['Studio/Live']),str(dict_desc['Music/Speech']),str(dict_desc['Valence']),str(dict_desc['Melodic']),str(dict_desc['Articulation']),str(dict_desc['RhythmicStability']),str(dict_desc['Dissonance']),str(dict_desc['BPM']),str(dict_desc['Binary']),str(dict_desc['Key']),str(dict_desc['Mode']),str(dict_desc['TexturalStability'])
+    return dict_moods, genres, instruments, vocalgender, timbres, themes, audioquality,str(dict_desc['Electric/Acoustic']),str(dict_desc['Danceability']),str(dict_desc['Arousal']),str(dict_desc['Vocal/Instrumental']),str(dict_desc['Studio/Live']),str(dict_desc['Music/Speech']),str(dict_desc['Valence']),str(dict_desc['Melodic']),str(dict_desc['Articulation']),str(dict_desc['RhythmicStability']),str(dict_desc['Dissonance']),str(dict_desc['BPM']),str(dict_desc['Binary']),str(dict_desc['Key']),str(dict_desc['Mode']),str(dict_desc['TexturalStability'])
             
 
  
@@ -100,6 +97,9 @@ with gr.Blocks() as demo:
                 with gr.Column():
                     gr.HTML("<h3>Instruments</h3>")
                     instruments  = gr.Label(label="Instruments", show_label=False)
+                    vocalgender  = gr.Label(label="Vocal Gender", show_label=False)
+                    timbres  = gr.Label(label="Texture", show_label=False)
+                    audioquality  = gr.Label(label="Audio Quality", show_label=False)
 
                 with gr.Column():
                     gr.HTML("<h3> Descriptors</h3>")
@@ -130,8 +130,11 @@ with gr.Blocks() as demo:
     analyze_btn.click(process, inputs=[audio_input], 
                       outputs=[dict_moods, 
                                genres, 
-                               instruments, 
+                               instruments,
+                               vocalgender,
+                               timbres,
                                themes, 
+                               audioquality,
                                acousticness,
                                danceability,
                                arousal,