Update app.py

app.py

@@ -4,11 +4,13 @@ import gradio as gr
 import spotipy
 from spotipy.oauth2 import SpotifyOAuth
 
+# Set credentials from environment (Hugging Face Secrets)
 CLIENT_ID = os.environ["SPOTIFY_CLIENT_ID"]
 CLIENT_SECRET = os.environ["SPOTIFY_CLIENT_SECRET"]
 REDIRECT_URI = "https://jisaacso219-rng-shuffle.hf.space/"
 SCOPE = "user-read-playback-state user-modify-playback-state playlist-read-private"
 
+# Initialize Spotify auth
 sp_oauth = SpotifyOAuth(
     client_id=CLIENT_ID,
     client_secret=CLIENT_SECRET,
@@ -19,100 +21,93 @@ sp_oauth = SpotifyOAuth(
 
 sp = None
 user_playlists = {}
-devices_dict = {}
+device_map = {}
 
 def get_auth_url():
     return sp_oauth.get_authorize_url()
 
-def try_login(full_url):
-    global sp, user_playlists, devices_dict
+def try_login(current_url):
+    global sp, user_playlists, device_map
 
-    if "?code=" not in full_url:
+    if "?code=" not in current_url:
         return (
-            gr.update(value="🔐 Please login via Spotify to continue."),
+            gr.update(value="🔐 Please login to Spotify."),
             gr.update(visible=False),
             gr.update(visible=False),
-        )
-
-    try:
-        code = full_url.split("?code=")[1].split("&")[0]
-        token = sp_oauth.get_access_token(code, as_dict=True)
-        access_token = token["access_token"]
-    except Exception as e:
-        return (
-            gr.update(value=f"❌ OAuth failed: {str(e)}. Please log in again."),
-            gr.update(visible=False),
             gr.update(visible=False),
         )
 
+    code = current_url.split("?code=")[1].split("&")[0]
+    token_info = sp_oauth.get_access_token(code, as_dict=True)
+    access_token = token_info["access_token"]
     sp = spotipy.Spotify(auth=access_token)
 
+    # Get playlists
     playlists = sp.current_user_playlists(limit=50)["items"]
     user_playlists = {p["name"]: p["id"] for p in playlists}
 
+    # Get devices
     devices = sp.devices()["devices"]
-    devices_dict = {d["name"]: d["id"] for d in devices}
+    device_map = {d["name"]: d["id"] for d in devices}
 
-    if not devices_dict:
+    if not device_map:
         return (
-            gr.update(value="⚠️ No active Spotify devices found. Open Spotify app."),
+            gr.update(value="⚠️ No active Spotify devices found. Open Spotify on your phone or PC."),
+            gr.update(visible=False),
             gr.update(visible=False),
             gr.update(visible=False),
         )
 
     return (
-        gr.update(value="✅ Logged in! Select playlist and device."),
+        gr.update(value="✅ Logged in! Pick a playlist and device."),
         gr.update(visible=True, choices=list(user_playlists.keys())),
-        gr.update(visible=True, choices=list(devices_dict.keys())),
+        gr.update(visible=True, choices=list(device_map.keys())),
+        gr.update(visible=True),
     )
 
 def shuffle_and_play(playlist_name, device_name):
-    pid = user_playlists[playlist_name]
-    device_id = devices_dict[device_name]
+    pid = user_playlists.get(playlist_name)
+    device_id = device_map.get(device_name)
+
+    if not pid or not device_id:
+        return "❌ Invalid playlist or device selection."
 
-    tracks, results = [], sp.playlist_tracks(pid)
-    tracks.extend(results["items"])
-    while results["next"]:
-        results = sp.next(results)
-        tracks.extend(results["items"])
+    tracks = []
+    res = sp.playlist_tracks(pid)
+    tracks.extend(res["items"])
+    while res["next"]:
+        res = sp.next(res)
+        tracks.extend(res["items"])
 
     uris = [t["track"]["uri"] for t in tracks if t["track"]]
     random.shuffle(uris)
 
-    sp.start_playback(device_id=device_id, uris=uris)
-
-    return f"▶️ Playing shuffled **{playlist_name}** on **{device_name}**."
+    try:
+        sp.start_playback(device_id=device_id, uris=uris)
+        return f"▶️ Now playing: **{playlist_name}** on **{device_name}**"
+    except Exception as e:
+        return f"❌ Playback failed: {str(e)}"
 
 with gr.Blocks() as demo:
     gr.Markdown("## 🎵 RNG Spotify Playlist Shuffler")
 
-    login_btn = gr.HTML(
-        f'<a href="{get_auth_url()}"><button style="width:100%;height:40px;font-size:16px;">🔐 Login to Spotify</button></a>'
-    )
+    gr.HTML(f'<a href="{get_auth_url()}"><button style="width:100%; height:40px;">🔐 Login to Spotify</button></a>')
 
-    status = gr.Markdown()
+    url_state   = gr.Textbox(visible=False)
+    status      = gr.Markdown()
     playlist_dd = gr.Dropdown(label="Select a Playlist", visible=False)
-    device_dd = gr.Dropdown(label="Select Playback Device", visible=False)
-
+    device_dd   = gr.Dropdown(label="Select a Device", visible=False)
     shuffle_btn = gr.Button("🔀 Shuffle & Play", visible=False)
-    result = gr.Markdown()
-
-    url_state = gr.Textbox(visible=False)
+    result      = gr.Markdown()
 
     demo.load(
-        try_login,
+        fn=try_login,
         inputs=[url_state],
-        outputs=[status, playlist_dd, device_dd],
+        outputs=[status, playlist_dd, device_dd, shuffle_btn],
         js="() => window.location.href"
     )
 
-    playlist_dd.change(lambda: gr.update(visible=True), None, shuffle_btn)
-
-    shuffle_btn.click(
-        shuffle_and_play,
-        inputs=[playlist_dd, device_dd],
-        outputs=[result]
-    )
+    shuffle_btn.click(shuffle_and_play, [playlist_dd, device_dd], [result])
 
 if __name__ == "__main__":
     demo.launch(server_name="0.0.0.0", ssr_mode=False)