Update app.py

app.py

@@ -82,17 +82,67 @@ load_dotenv()
 # demo.launch()  
 
 
+# import spotipy
+# from spotipy.oauth2 import SpotifyOAuth
+# import gradio as gr
+# import webbrowser
+# import os
+# from dotenv import load_dotenv
+# load_dotenv() 
+
+# client_id = os.getenv('SPOTIPY_CLIENT_ID')
+# client_secret = os.getenv('SPOTIPY_CLIENT_SECRET')
+# redirect_uri = os.getenv('SPOTIPY_REDIRECT_URI')
+
+# scope= ['user-library-read', 
+#         'user-read-playback-state', 
+#         'user-modify-playback-state', 
+#         'playlist-modify-public',
+#         'user-top-read']
+
+# def spotify_auth(code=None):
+#     auth_manager = SpotifyOAuth(client_id=client_id, 
+#                                 client_secret=client_secret,
+#                                 redirect_uri=redirect_uri, 
+#                                 scope=scope)
+#     if code:
+#         token_info = auth_manager.get_access_token(code=code)
+#         sp = spotipy.Spotify(auth_manager=auth_manager)
+#         devices = sp.devices()
+#         device_id = devices['devices'][0]['id']
+#         results = sp.search(q="No Pole", type='track')
+#         track_uri = results['tracks']['items'][0]['uri']
+#         sp.start_playback(device_id=device_id, uris=[track_uri])
+#         return f"Account switched successfully.\n{devices}", None
+#     else:
+#         auth_url = auth_manager.get_authorize_url()
+#         return f"Please authorize the app by clicking [here]({auth_url}) and then paste the code below.", auth_url
+
+# def gradio_interface():
+#     interface = gr.Interface(fn=spotify_auth, 
+#                              inputs=["text"],
+#                              outputs=["markdown", "text"],
+#                              live=False,
+#                              description="Authorize and paste the code here:")
+#     interface.launch()
+
+# gradio_interface()
+
+
+import os
 import spotipy
 from spotipy.oauth2 import SpotifyOAuth
 import gradio as gr
-import webbrowser
-import os
-from dotenv import load_dotenv
-load_dotenv() 
+from urllib.parse import urlparse, parse_qs
+#from dotenv import load_dotenv
+#load_dotenv() 
+
+
+# client_id = os.getenv('SPOTIPY_CLIENT_ID')
+# client_secret = os.getenv('SPOTIPY_CLIENT_SECRET')
+#redirect_uri = os.getenv('SPOTIPY_REDIRECT_URI')
+redirect_uri = "https://huggingface.co/sjw"
 
-client_id = os.getenv('SPOTIPY_CLIENT_ID')
-client_secret = os.getenv('SPOTIPY_CLIENT_SECRET')
-redirect_uri = os.getenv('SPOTIPY_REDIRECT_URI')
 
 scope= ['user-library-read', 
         'user-read-playback-state', 
@@ -100,30 +150,43 @@ scope= ['user-library-read',
         'playlist-modify-public',
         'user-top-read']
 
-def spotify_auth(code=None):
+
+def spotify_auth(client_id, client_secret, code=None):
     auth_manager = SpotifyOAuth(client_id=client_id, 
                                 client_secret=client_secret,
                                 redirect_uri=redirect_uri, 
                                 scope=scope)
     if code:
-        token_info = auth_manager.get_access_token(code=code)
+        parsed_url = urlparse(code)
+        code = parse_qs(parsed_url.query)['code'][0]
+        auth_manager.get_access_token(code=code, as_dict=False)
+        #auth_manager.get_cached_token() # if .cache exists
+
         sp = spotipy.Spotify(auth_manager=auth_manager)
         devices = sp.devices()
         device_id = devices['devices'][0]['id']
+
         results = sp.search(q="No Pole", type='track')
         track_uri = results['tracks']['items'][0]['uri']
         sp.start_playback(device_id=device_id, uris=[track_uri])
-        return f"Account switched successfully.\n{devices}", None
+
+        return "Login Successful"
     else:
         auth_url = auth_manager.get_authorize_url()
-        return f"Please authorize the app by clicking [here]({auth_url}) and then paste the code below.", auth_url
+        return f'<p>Please authorize the app by clicking <a href="{auth_url}">here</a> and then paste the code below.</p>'
+
 
 def gradio_interface():
     interface = gr.Interface(fn=spotify_auth, 
-                             inputs=["text"],
-                             outputs=["markdown", "text"],
-                             live=False,
-                             description="Authorize and paste the code here:")
+                             inputs=[
+                                 gr.Textbox(label="Client ID"),
+                                 gr.Textbox(label="Client Secret"),
+                                 gr.Textbox(label="Code")
+                             ],
+                             outputs=["markdown"],
+                             description="Authorize and paste the code here:",
+                             allow_flagging="never",
+                             theme="finlaymacklon/boxy_violet"
+                             )
     interface.launch()
-
 gradio_interface()