Update app.py

app.py

@@ -43,16 +43,13 @@ def process(input_path):
     for d in res['genres']:
       genres[d['name']] = d['probability']
         
-    themes = []
+    themes = {}
     for d in res['themes']:
-      themes.append((d['name'],d['probability']))
-    print(themes)
-    
-    
-    instruments = []
+      themes[d['name']]= d['probability']
+        
+    instruments = {}
     for d in res['instruments']:
-      instruments.append((d['name'],d['probability']))
-    print(instruments)
+      instruments[d['name']] = d['probability']
     
     timbres = []
     for d in res['timbres']:
@@ -65,7 +62,7 @@ def process(input_path):
     audioquality = [res['audio_quality'][0]['name'], res['audio_quality'][0]['probability']]
     print(audioquality)
 
-    return dict_moods, dict_desc, genres
+    return dict_moods, dict_desc, genres, instruments, themes
 
 
 demo = gr.Interface(fn=process,
@@ -92,11 +89,12 @@ with gr.Blocks() as demo:
 
             with gr.Row():
                 dict_moods=gr.outputs.Label(label="Moods")
-                dict_desc=gr.outputs.Label(label="Descriptors")
+                themes=gr.outputs.Label(label="Themes")
                 genres  = gr.outputs.Label(label="Genres")
+                instruments  = gr.outputs.Label(label="Instruments")
                 
 
-    analyze_btn.click(process, inputs=[audio_input], outputs=[dict_moods, dict_desc, genres])
+    analyze_btn.click(process, inputs=[audio_input], outputs=[dict_moods, dict_desc, genres, instruments, themes])
     #audio_input.submit(process, inputs=[audio_input], outputs=[moods])    # pas de sens !
     
 demo.launch(debug=False)