Update app.py

app.py

@@ -74,11 +74,12 @@ def process(input_path):
             str(dict_desc['Articulation']),
             str(dict_desc['RhythmicStability']),
             str(dict_desc['Dissonance']),
-            str(dict_desc['Vocal/Instrumental']),
-
-
-('BPM', 47), ('Binary', 0.794377), ('Key', 10), ('Mode', 1), ('TexturalStability', 0.312802)]
-
+            str(dict_desc['BPM']),
+            str(dict_desc['Binary']),
+            str(dict_desc['Key']),
+            str(dict_desc['Mode']),
+            str(dict_desc['TexturalStability'])
+            
 
 
 with gr.Blocks() as demo:
@@ -104,7 +105,14 @@ with gr.Blocks() as demo:
                 with gr.Column():
                     gr.HTML("<h3>Genres</h3>")
                     genres  = gr.Label(label="Genres", show_label=False)
-                
+
+                    gr.HTML("<h3>BPM</h3>")
+                    bpm  = gr.TextBox(label="BPM", show_label=False)
+
+                    gr.HTML("<h3>Key</h3>")
+                    key  = gr.TextBox(label="Key", show_label=False)
+                    mode = gr.TextBox(label="Mode", show_label=False)
+
                 with gr.Column():
                     gr.HTML("<h3>Instruments</h3>")
                     instruments  = gr.Label(label="Instruments", show_label=False)
@@ -112,7 +120,19 @@ with gr.Blocks() as demo:
                 with gr.Column():
                     gr.HTML("<h3> Descriptors</h3>")
                     #gr.HTML("<h5> Vocal/Instrumental</h5>")
-                    vocalinstru = gr.Slider(label="Vocal/Instrumental", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    acousticness = gr.Slider(label="Electric/Acoustic", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    danceability = gr.Slider(label="Danceability", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    arousal = gr.Slider(label="Arousal", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    instrumentalness = gr.Slider(label="Vocal/Instrumental", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    liveness = gr.Slider(label="Studio/Live", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    speechiness = gr.Slider(label="Music/Speech", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    valence = gr.Slider(label="Valence", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    melodic = gr.Slider(label="Melodic", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    articulation = gr.Slider(label="Articulation", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    rhytmicstability = gr.Slider(label="Rhythmic Stability", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    dissonance = gr.Slider(label="Dissonance", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    binary = gr.Slider(label="Binary", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
+                    texturalstability = gr.Slider(label="Textural Stability", minimum=0, maximum=1.0)#, info="Information todo", show_label=False)
 
                     
             ''''
@@ -122,7 +142,28 @@ with gr.Blocks() as demo:
                     gr.HTML("<h3>Themes</h3>")
                     themes=gr.Label(label="Themes", show_label=False)
             ''' 
-       
-    analyze_btn.click(process, inputs=[audio_input], outputs=[dict_moods, genres, instruments, themes, vocalinstru])
+    
+    analyze_btn.click(process, inputs=[audio_input], 
+                      outputs=[dict_moods, 
+                               genres, 
+                               instruments, 
+                               themes, 
+                               acousticness,
+                               danceability,
+                               arousal,
+                               instrumentalness,
+                               liveness,
+                               speechiness,
+                               valence,
+                               melodic,
+                               articulation,
+                               rhythmicstability,
+                               dissonance,
+                               bpm,
+                               binary,
+                               key,
+                               mode,
+                               texturalstability
+                               ])
     
 demo.launch(debug=False)