Update app.py

app.py

@@ -1,114 +1,30 @@
-import streamlit as st
-import streamlit.components.v1 as components
 from PIL import Image
-import spotipy.util as util
-import pickle
-import spotipy
 from utils import *
+from app_utils import *
 
+debug = False
+dir_path = os.path.dirname(os.path.realpath(__file__))
+# os.environ['FLASK_APP'] = dir_path + 'app2.py'
+# if debug: os.environ['FLASK_ENV'] = 'development'
+#
+#
+# app = Flask(__name__)
+# app.config['SECRET_KEY'] = os.urandom(64)
+# app.config['SESSION_TYPE'] = 'filesystem'
+# app.config['SESSION_FILE_DIR'] = './.flask_session/'
+# Session(app)
 st.set_page_config(
     page_title="EmotionPlaylist",
     page_icon="🎧",
 )
-debug = False
-dir_path = os.path.dirname(os.path.realpath(__file__))
-
 st.title('Customize Emotional Playlists')
 
-def centered_button(func, text, n_columns=7, args=None):
-    columns = st.columns(np.ones(n_columns))
-    with columns[n_columns//2]:
-        return func(text)
-
-# get credentials
-def setup_credentials():
-    if 'client_id' in os.environ.keys() and 'client_secret' in os.environ.keys():
-        client_info = dict(client_id=os.environ['client_id'],
-                           client_secret=os.environ['client_secret'])
-    else:
-        with open(dir_path + "/ids.pk", 'rb') as f:
-            client_info = pickle.load(f)
-
-    os.environ['SPOTIPY_CLIENT_ID'] = client_info['client_id']
-    os.environ['SPOTIPY_CLIENT_SECRET'] = client_info['client_secret']
-    os.environ['SPOTIPY_REDIRECT_URI'] = 'https://huggingface.co/spaces/ccolas/EmotionPlaylist/'
-
-relevant_audio_features = ["danceability", "energy", "loudness", "mode", "valence", "tempo"]
-
 
-def get_client():
-    scope = "playlist-modify-public"
-    token = util.prompt_for_user_token(scope=scope)
-    sp = spotipy.Spotify(auth=token)
-    user_id = sp.me()['id']
-    return sp, user_id
-
-def extract_uris_from_links(links, url_type):
-    assert url_type in ['playlist', 'artist', 'user']
-    urls = links.split('\n')
-    uris = []
-    for url in urls:
-        if 'playlist' in url:
-            uri = url.split(f'{url_type}/')[-1].split('?')[0]
-        else:
-            uri = url.split('?')[0]
-        uris.append(uri)
-    return uris
-
-def wall_of_checkboxes(labels, max_width=10):
-    n_labels = len(labels)
-    n_rows = int(np.ceil(n_labels/max_width))
-    checkboxes = []
-    for i in range(n_rows):
-        columns = st.columns(np.ones(max_width))
-        row_length = n_labels % max_width if i == n_rows - 1 else max_width
-        for j in range(row_length):
-            with columns[j]:
-                checkboxes.append(st.empty())
-    return checkboxes
-
-def aggregate_genres(genres, legit_genres, verbose=False):
-    genres_output = dict()
-    legit_genres_formatted = [lg.replace('-', '').replace(' ', '') for lg in legit_genres]
-    for glabel in genres.keys():
-        if verbose: print('\n', glabel)
-        glabel_formatted = glabel.replace(' ', '').replace('-', '')
-        best_match = None
-        best_match_score = 0
-        for legit_glabel, legit_glabel_formatted in zip(legit_genres, legit_genres_formatted):
-            if 'jazz' in glabel_formatted:
-                best_match = 'jazz'
-                if verbose: print('\t', 'pop')
-                break
-            if 'ukpop' in glabel_formatted:
-                best_match = 'pop'
-                if verbose: print('\t', 'pop')
-                break
-            if legit_glabel_formatted == glabel_formatted:
-                if verbose: print('\t', legit_glabel_formatted)
-                best_match = legit_glabel
-                break
-            elif glabel_formatted in legit_glabel_formatted:
-                if verbose: print('\t', legit_glabel_formatted)
-                if len(glabel_formatted) > best_match_score:
-                    best_match = legit_glabel
-                    best_match_score = len(glabel_formatted)
-            elif legit_glabel_formatted in glabel_formatted:
-                if verbose: print('\t', legit_glabel_formatted)
-                if len(legit_glabel_formatted) > best_match_score:
-                    best_match = legit_glabel
-                    best_match_score = len(legit_glabel_formatted)
-
-        if best_match is not None:
-            if verbose: print('\t', '-->', best_match)
-            if best_match in genres_output.keys():
-                genres_output[best_match] += genres[glabel]
-            else:
-                genres_output[best_match] = genres[glabel]
-    return genres_output
 
 def setup_streamlite():
     setup_credentials()
+
+    print('Here1')
     image = Image.open(dir_path + '/image.png')
     st.image(image)
     st.markdown("This app let's you quickly build playlists in a customized way: ")
@@ -117,14 +33,24 @@ def setup_streamlite():
 
     st.subheader("Step 1: Connect to your Spotify app")
     st.markdown("Log into your Spotify account to let the app create the custom playlist.")
+    print('Here2')
     if 'login' not in st.session_state:
-        login = centered_button(st.button, 'Log in', n_columns=7)
-        if login or debug:
-            sp, user_id = get_client()
+        sp, user_id = new_get_client(session=st.session_state)
+        if sp != None:
+            print("USER", user_id)
             legit_genres = sp.recommendation_genre_seeds()['genres']
             st.session_state['login'] = (sp, user_id, legit_genres)
 
+    # if 'login' not in st.session_state:
+    #     login = centered_button(st.button, 'Log in', n_columns=7)
+    #     if login or debug:
+    #         sp, user_id = get_client(session=st.session_state)
+    #         user_id = sp.me()['id']
+    #         legit_genres = sp.recommendation_genre_seeds()['genres']
+    #         st.session_state['login'] = (sp, user_id, legit_genres)
+
     if 'login' in st.session_state or debug:
+        print('Here8')
         if not debug: sp, user_id, legit_genres = st.session_state['login']
         st.success('You are logged in.')
 
@@ -260,6 +186,5 @@ def setup_streamlite():
 
                     stop = 1
 
-
 if __name__ == '__main__':
     setup_streamlite()