Update app.py

app.py

@@ -1,19 +1,16 @@
 import os
 import gradio as gr
-from flask import Flask, request, redirect
-from spotipy import Spotify, SpotifyOAuth
-from threading import Thread
+import spotipy
+from spotipy.oauth2 import SpotifyOAuth
 import random
 import time
 
-# ========== Spotify OAuth Setup ==========
-CLIENT_ID = os.getenv("SPOTIFY_CLIENT_ID")
-CLIENT_SECRET = os.getenv("SPOTIFY_CLIENT_SECRET")
-REDIRECT_URI = REDIRECT_URI = "https://jisaacso219-rng-shuffle.hf.space/callback"
+# Load environment variables securely from Hugging Face secrets
+CLIENT_ID = os.environ["SPOTIFY_CLIENT_ID"]
+CLIENT_SECRET = os.environ["SPOTIFY_CLIENT_SECRET"]
+REDIRECT_URI = os.environ.get("SPOTIFY_REDIRECT_URI", "https://jisaacso219-rng-shuffle.hf.space/callback")
 SCOPE = "user-read-playback-state user-modify-playback-state playlist-read-private"
 
-auth_codes = {}  # Store auth tokens per session (not secure for prod)
-
 sp_oauth = SpotifyOAuth(
     client_id=CLIENT_ID,
     client_secret=CLIENT_SECRET,
@@ -21,70 +18,69 @@ sp_oauth = SpotifyOAuth(
     scope=SCOPE
 )
 
-# ========== Flask Redirect Server ==========
-app = Flask(__name__)
-
-@app.route("/callback")
-def callback():
-    code = request.args.get("code")
-    token_info = sp_oauth.get_access_token(code, as_dict=True)
-    auth_codes["user"] = token_info  # Single-user session for now
-    return "✅ Spotify login successful! You can return to the app."
-
-Thread(target=lambda: app.run(host="0.0.0.0", port=7861)).start()
-
-# ========== Gradio UI ==========
-def login():
-    return sp_oauth.get_authorize_url()
-
-def list_playlists():
-    if "user" not in auth_codes:
-        return [], "⚠️ Please log in first."
-    sp = Spotify(auth=auth_codes["user"]["access_token"])
-    pl = sp.current_user_playlists(limit=50)
-    choices = {p['name']: p['id'] for p in pl['items']}
-    return list(choices.keys()), "Select a playlist to shuffle and play."
-
-def shuffle_and_play(playlist_name):
-    if "user" not in auth_codes:
-        return "⚠️ Please log in first."
-    sp = Spotify(auth=auth_codes["user"]["access_token"])
-    pl = sp.current_user_playlists(limit=50)
-    pl_map = {p['name']: p['id'] for p in pl['items']}
-    playlist_id = pl_map[playlist_name]
-
-    tracks = []
-    results = sp.playlist_tracks(playlist_id)
-    tracks.extend(results['items'])
-    while results['next']:
-        results = sp.next(results)
+auth_url = sp_oauth.get_authorize_url()
+
+sp = None  # Will be set after authorization
+user_playlists = {}
+selected_playlist_id = None
+
+with gr.Blocks(title="RNG Spotify Playlist Shuffler") as demo:
+    gr.Markdown("## 🎵 RNG Spotify Playlist Shuffler", elem_id="title")
+    gr.Markdown("A clean and simple way to shuffle your Spotify playlists with one click.")
+
+    with gr.Row():
+        login_button = gr.Button("🔐 Login to Spotify")
+
+    login_status = gr.Markdown(visible=False)
+    playlist_dropdown = gr.Dropdown(choices=[], label="🎧 Select a Playlist", visible=False)
+    shuffle_button = gr.Button("🔀 Shuffle and Play", visible=False)
+    result_box = gr.Markdown(visible=False)
+
+    # Open Spotify login in a new tab
+    login_button.click(
+        None,
+        _js=f"() => window.open('{auth_url}', '_blank')"
+    )
+
+    def check_login(code):
+        global sp, user_playlists
+        if not code:
+            return gr.update(visible=True, value="⚠️ No authorization code received."), gr.update(visible=False), gr.update(visible=False)
+        token_info = sp_oauth.get_access_token(code, as_dict=False)
+        sp = spotipy.Spotify(auth=token_info)
+        playlists = sp.current_user_playlists(limit=50)
+        user_playlists = {p['name']: p['id'] for p in playlists['items']}
+        return gr.update(visible=True, value="✅ Logged in! Select your playlist below."), gr.update(visible=True, choices=list(user_playlists.keys())), gr.update(visible=True)
+
+    def shuffle_and_play(playlist_name):
+        global selected_playlist_id
+        if not sp:
+            return gr.update(value="⚠️ You must login first.", visible=True)
+
+        selected_playlist_id = user_playlists[playlist_name]
+        tracks = []
+        results = sp.playlist_tracks(selected_playlist_id)
         tracks.extend(results['items'])
+        while results['next']:
+            results = sp.next(results)
+            tracks.extend(results['items'])
 
-    uris = [t['track']['uri'] for t in tracks if t['track']]
-    random.shuffle(uris)
-
-    devices = sp.devices()
-    if not devices['devices']:
-        return "⚠️ No active Spotify devices found. Open the Spotify app and try again."
-    device_id = devices['devices'][0]['id']
-
-    sp.start_playback(device_id=device_id, uris=uris)
-    return f"▶️ Playing {len(uris)} shuffled tracks from '{playlist_name}'!"
+        uris = [t['track']['uri'] for t in tracks if t['track']]
+        random.shuffle(uris)
 
-with gr.Blocks() as demo:
-    gr.Markdown("# 🎶 Spotify Playlist Shuffler")
-    login_btn = gr.Button("🔐 Log in to Spotify")
-    login_out = gr.Textbox(label="Login URL")
+        devices = sp.devices()
+        if not devices['devices']:
+            return gr.update(value="⚠️ No active Spotify devices found. Open the Spotify app and try again.", visible=True)
 
-    playlist_list = gr.Dropdown(label="Your Playlists")
-    refresh_btn = gr.Button("🔄 Load My Playlists")
-    status = gr.Textbox()
+        device_id = devices['devices'][0]['id']
+        sp.start_playback(device_id=device_id, uris=uris)
+        return gr.update(value=f"▶️ Now playing: **{playlist_name}** in shuffled order!", visible=True)
 
-    play_btn = gr.Button("▶️ Shuffle + Play")
-    result = gr.Textbox()
+    code_box = gr.Textbox(label="Paste the authorization code from the redirected URL here", placeholder="...?code=ABC123", visible=True)
+    authorize_button = gr.Button("✅ Complete Authorization", visible=True)
 
-    login_btn.click(fn=login, outputs=login_out)
-    refresh_btn.click(fn=list_playlists, outputs=[playlist_list, status])
-    play_btn.click(fn=shuffle_and_play, inputs=playlist_list, outputs=result)
+    authorize_button.click(check_login, inputs=[code_box], outputs=[login_status, playlist_dropdown, shuffle_button])
+    shuffle_button.click(shuffle_and_play, inputs=[playlist_dropdown], outputs=[result_box])
 
-demo.launch(server_port=7860, server_name="0.0.0.0")
+if __name__ == "__main__":
+    demo.launch()