Update app.py

app.py

@@ -23,9 +23,15 @@ def download_audio(id_video):
     embed_html_all = embed_html1 + id +embed_html2
     return audio_file, audio_file, embed_html_all
 
-def process(input_path):
+def process_url(input_path):
     # setup the client
     audio_file, audio_file, embed_html_all = download_audio(input_path)
+    return embed_html_all, process(audio_file)
+
+def process_file(input_path):
+    return "", process(input_path)
+
+def process(input_path)
     client = SimbalsAPIClient(os.environ['TOKEN'], debug=True)
     parameters = client.prepare_request("31415", audio_file=audio_file)
     
@@ -91,7 +97,8 @@ def process(input_path):
     audioquality = {}
     audioquality[res['audio_quality'][0]['name']]= res['audio_quality'][0]['probability']
     
-    return embed_html_all, 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'])
+    #return embed_html_all, 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'])
+    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'])
             
 
  
@@ -107,12 +114,12 @@ with gr.Blocks() as demo:
             
             with gr.Row():
                 audio_input = gr.Textbox(placeholder='YouTube video URL', label='YouTube video URL')
+                analyze_url_btn = gr.Button('Analyze URL')
 
-            #with gr.Row():
-            #    audio_input = gr.Audio(type="filepath", label='Audio Input')
-                
             with gr.Row():
-                analyze_btn = gr.Button('Analyze File')
+                audio_input_file = gr.Audio(type="filepath", label='Audio Input')
+                analyze_file_btn = gr.Button('Analyze File')
+                
 
             with gr.Row():
                 with gr.Column():
@@ -172,7 +179,7 @@ with gr.Blocks() as demo:
                     themes=gr.Label(label="Themes", show_label=False)
             ''' 
     
-    analyze_btn.click(process, inputs=[audio_input], 
+    analyze_url_btn.click(process, inputs=[audio_input], 
                       outputs=[html,
                                dict_moods, 
                                genres, 
@@ -198,5 +205,33 @@ with gr.Blocks() as demo:
                                mode,
                                texturalstability
                                ])
-    
+
+    analyze_file_btn.click(process_file, inputs=[audio_input], 
+                      outputs=[html,
+                               dict_moods, 
+                               genres, 
+                               instruments,
+                               vocalgender,
+                               timbres,
+                               themes, 
+                               audioquality,
+                               acousticness,
+                               danceability,
+                               arousal,
+                               instrumentalness,
+                               liveness,
+                               speechiness,
+                               valence,
+                               melodic,
+                               articulation,
+                               rhythmicstability,
+                               dissonance,
+                               bpm,
+                               binary,
+                               key,
+                               mode,
+                               texturalstability
+                               ])
+
+
 demo.launch(debug=True)