Update app.py

app.py

@@ -32,7 +32,7 @@ def log_to_spotify():
             st.session_state['login'] = (sp, user_id, legit_genres)
 
 
-@st.cache
+@st.cache(suppress_st_warning=True)
 def get_user_playlists(users_links):
     global sp
     # Scanning users
@@ -40,7 +40,10 @@ def get_user_playlists(users_links):
     all_uris, all_names = [], []
     if users_links != "":
         try:
-            all_uris, all_names = get_all_playlists_uris_from_users(users_links.split('\n'))
+            print(users_links)
+            user_ids = extract_uris_from_links(users_links, url_type='user')
+            print(user_ids)
+            all_uris, all_names = get_all_playlists_uris_from_users(sp, user_ids)
             n_playlists = len(all_uris)
         except:
             st.warning('Please enter a valid list of user names (one url per line)')
@@ -51,7 +54,6 @@ def get_filtered_user_playlists(user_links):
     st.spinner(text="Scanning users..")
     all_uris, all_names, n_playlists = get_user_playlists(user_links)
     if n_playlists <= 1:
-        st.success(f'Currently {len(all_uris)} user playlists taken into account.')
         return all_uris
     else:
         # let the user uncheck playlists
@@ -74,13 +76,13 @@ def get_filtered_user_playlists(user_links):
         for i_emc, emc in enumerate(empty_checkboxes):
             st.session_state['checkboxes_playlists'][i_emc] = emc.checkbox(all_names[i_emc], value=st.session_state['checkboxes_playlists'][i_emc])
 
-        filter_playlist = st.button('Update user playlists')
+        filter_playlist = centered_button(st.button, 'Update user playlists', n_columns=5)
         if filter_playlist:
             return list(np.array(all_uris)[np.where(st.session_state['checkboxes_playlists'])])
         else:
             return []
 
-@st.cache
+@st.cache(suppress_st_warning=True)
 def get_non_user_playlists(playlist_links):
     # Scanning playlists
     new_playlist_uris = []
@@ -104,6 +106,9 @@ def extract_audio_features(data_tracks, legit_genres):
     # Extract audio features
     all_tracks_uris = np.array(list(data_tracks.keys()))
     all_audio_features = [data_tracks[uri]['track']['audio_features'] for uri in all_tracks_uris]
+    valid_indexes = np.array([i for i in range(len(all_tracks_uris)) if all_audio_features[i] is not None])
+    all_tracks_uris = all_tracks_uris[valid_indexes]
+    all_audio_features = np.array(all_audio_features)[valid_indexes]
     all_tracks_audio_features = dict(zip(relevant_audio_features, [[audio_f[k] for audio_f in all_audio_features] for k in relevant_audio_features]))
     genres = dict()
     for index, uri in enumerate(all_tracks_uris):
@@ -128,11 +133,11 @@ def select_songs(legit_genres):
     st.markdown("This can be done in two ways: \n"
                 "1. Get songs from a list of users (and their playlists)\n"
                 "2. Get songs from a list of playlists.\n"
-                "For this you'll need to collect user names (e.g. 'bkayf') and/or playlist urls (e.g. "
+                "For this you'll need to collect user urls (e.g. https://open.spotify.com/user/bkayf) and/or playlist urls (e.g. "
                 "https://open.spotify.com/playlist/1H7a4q8JZArMQiidRy6qon) by clicking on 'Share' and copying the url. "
                 "You need to provide at least one source of music.")
 
-    users_playlists = "Add a list of user names, one per line (optional)"
+    users_playlists = "Add a list of user urls, one per line (optional)"
     users_links = st.text_area(users_playlists, value="")
     label_playlists = "Add a list of playlists urls, one per line (optional)"
     playlist_links = st.text_area(label_playlists, value="https://open.spotify.com/playlist/1H7a4q8JZArMQiidRy6qon")
@@ -155,7 +160,8 @@ def select_songs(legit_genres):
             init_time = time.time()
             new_playlist_uris = get_non_user_playlists(playlist_links)
             playlist_uris += new_playlist_uris
-            st.success(f'{len(new_playlist_uris)} new playlists added from {len(user_playlists)} users.')
+            n_users = len(users_links.split('\n'))
+            st.success(f'{len(playlist_uris)} new playlists added from {n_users} users.')
             print(f'2. non user playlist: {time.time() - init_time:.2f}')
             init_time = time.time()
             if str(playlist_uris) in st.session_state.keys():
@@ -165,10 +171,13 @@ def select_songs(legit_genres):
                 st.session_state[str(playlist_uris)] = data_tracks
             print(f'3. track extraction: {time.time() - init_time:.2f}')
             init_time = time.time()
-            all_tracks_uris, all_tracks_audio_features, genres, genres_labels = extract_audio_features(data_tracks, legit_genres)
-            print(f'4. audio feature extraction: {time.time() - init_time:.2f}')
-            print(f'\t total extraction: {time.time() - init_time_tot:.2f}')
-            st.success(f'{len(data_tracks.keys())} tracks found!')
+            if len(data_tracks.keys()) < 10:
+                st.warning('Please select more music sources.')
+            else:
+                all_tracks_uris, all_tracks_audio_features, genres, genres_labels = extract_audio_features(data_tracks, legit_genres)
+                print(f'4. audio feature extraction: {time.time() - init_time:.2f}')
+                print(f'\t total extraction: {time.time() - init_time_tot:.2f}')
+                st.success(f'{len(data_tracks.keys())} tracks found!')
     return all_tracks_uris, all_tracks_audio_features, genres, genres_labels
 
 def customize_widgets(genres_labels):
@@ -274,9 +283,10 @@ def run_app():
                             init_time = time.time()
                             generation_button = centered_button(st.button, 'Generate playlist', n_columns=5)
                             if generation_button:
-                                description = f'Emotion Playlist for Valence: {target_mood[0]}, ' \
-                                              f'Energy: {target_mood[1]}, ' \
-                                              f'Danceability: {target_mood[2]}). ' \
+                                target_mood = np.array(target_mood).flatten() * 100
+                                description = f'Emotion Playlist for Valence: {int(target_mood[0])}, ' \
+                                              f'Energy: {int(target_mood[1])}, ' \
+                                              f'Danceability: {int(target_mood[2])}). ' \
                                               f'Playlist generated by the EmotionPlaylist app: https://huggingface.co/spaces/ccolas/EmotionPlaylist.'
                                 playlist_info = sp.user_playlist_create(user_id, playlist_name, public=True, collaborative=False, description=description)
                                 playlist_uri = playlist_info['uri'].split(':')[-1]