Update app.py

app.py

@@ -5,6 +5,8 @@ import time
 from tempfile import NamedTemporaryFile
 from openpyxl import Workbook
 import shutil
+from collections import deque
+from datetime import datetime, timedelta
 
 # Lista de credenciales de API de Spotify
 client_ids = [
@@ -27,6 +29,7 @@ client_secrets = [
 ]
 current_api_index = 0
 session = requests.Session()
+requests_queue = deque(maxlen=100)
 
 def obtener_token(client_id, client_secret):
     print(f"Obteniendo token de Spotify con client_id: {client_id}")
@@ -62,14 +65,22 @@ def obtener_nuevo_token():
     print(f"Nuevo token obtenido: {token}")
     return token
 
-def realizar_solicitud_con_nuevo_token(url, headers, params, retry=True):
-    token = obtener_nuevo_token()
-    headers['Authorization'] = f'Bearer {token}'
+def manejar_limite_peticiones():
+    now = datetime.now()
+    while requests_queue and now - requests_queue[0] > timedelta(minutes=1):
+        requests_queue.popleft()
+    if len(requests_queue) >= 100:
+        print("Límite de 100 peticiones por minuto alcanzado, esperando...")
+        time.sleep(60 - (now - requests_queue[0]).seconds)
+    requests_queue.append(now)
+
+def realizar_solicitud(url, headers, params):
+    manejar_limite_peticiones()
     response = session.get(url, headers=headers, params=params)
-    if response.status_code == 429 and retry:
-        print("Límite de peticiones alcanzado, esperando 30 segundos antes de reintentar...")
-        time.sleep(30)  # Esperar 30 segundos antes de reintentar
-        return realizar_solicitud_con_nuevo_token(url, headers, params, retry=False)
+    if response.status_code == 429:
+        print("Límite de peticiones alcanzado, esperando y reintentando...")
+        time.sleep(60)
+        response = session.get(url, headers=headers, params=params)
     return response
 
 def buscar_playlists_spotify(token, query, limit=50):
@@ -81,23 +92,16 @@ def buscar_playlists_spotify(token, query, limit=50):
     try:
         if limit <= 50:
             params = {'q': query, 'type': 'playlist', 'limit': limit}
-            response = session.get(url, headers=headers, params=params)
-            if response.status_code == 429:  # Límite alcanzado
-                print("Límite de peticiones alcanzado, cambiando API Key...")
-                response = realizar_solicitud_con_nuevo_token(url, headers, params)
+            response = realizar_solicitud(url, headers, params)
             playlists.extend(response.json().get('playlists', {}).get('items', []))
         else:
             offset = 0
             while limit > 0:
                 params = {'q': query, 'type': 'playlist', 'limit': min(50, limit), 'offset': offset}
-                response = session.get(url, headers=headers, params=params)
-                if response.status_code == 429:  # Límite alcanzado
-                    print("Límite de peticiones alcanzado, cambiando API Key...")
-                    response = realizar_solicitud_con_nuevo_token(url, headers, params)
+                response = realizar_solicitud(url, headers, params)
                 playlists.extend(response.json().get('playlists', {}).get('items', []))
                 limit -= min(50, limit)
                 offset += 50
-                time.sleep(5)  # Pausa de 5 segundos entre las solicitudes para evitar el límite de tasa
     except Exception as e:
         print(f"Error al buscar playlists: {e}")
     
@@ -110,16 +114,13 @@ def obtener_canciones_playlist_spotify(token, playlist_id, playlist_name):
     canciones = []
 
     try:
-        response = session.get(url, headers=headers)
-        if response.status_code == 429:  # Límite alcanzado
-            print("Límite de peticiones alcanzado, cambiando API Key...")
-            response = realizar_solicitud_con_nuevo_token(url, headers, {})
+        response = realizar_solicitud(url, headers, {})
         if response.status_code == 200:
             tracks = response.json().get('items')
             for item in tracks:
                 track = item.get('track')
                 if track:
-                    audio_features = obtener_caracteristicas_audio(track['id'])
+                    audio_features = obtener_caracteristicas_audio(token, track['id'])
                     canciones.append({
                         'playlist_name': playlist_name,
                         'artista': track['artists'][0]['name'] if track['artists'] else 'Desconocido',
@@ -134,29 +135,23 @@ def obtener_canciones_playlist_spotify(token, playlist_id, playlist_name):
                         'instrumentalness': audio_features.get('instrumentalness', 'No disponible'),
                         'duration': track.get('duration_ms', 'No disponible'),
                         'release_year': track.get('album', {}).get('release_date', 'No disponible').split('-')[0] if track.get('album', {}).get('release_date') else 'No disponible',
-                        'record_label': obtener_record_label_spotify(track['album']['id'])
+                        'record_label': obtener_record_label_spotify(track['album']['id'], token)
                     })
     except Exception as e:
         print(f"Error al obtener canciones de la playlist: {e}")
 
     return canciones
 
-def obtener_caracteristicas_audio(track_id):
+def obtener_caracteristicas_audio(token, track_id):
     url = f'https://api.spotify.com/v1/audio-features/{track_id}'
-    headers = {'Authorization': f'Bearer {obtener_nuevo_token()}'}
-    response = session.get(url, headers=headers)
-    if response.status_code == 429:  # Límite alcanzado
-        print("Límite de peticiones alcanzado al obtener características de audio, cambiando API Key...")
-        response = realizar_solicitud_con_nuevo_token(url, headers, {})
+    headers = {'Authorization': f'Bearer {token}'}
+    response = realizar_solicitud(url, headers, {})
     return response.json() if response.status_code == 200 else {}
 
-def obtener_record_label_spotify(album_id):
+def obtener_record_label_spotify(album_id, token):
     url = f'https://api.spotify.com/v1/albums/{album_id}'
-    headers = {'Authorization': f'Bearer {obtener_nuevo_token()}'}
-    response = session.get(url, headers=headers)
-    if response.status_code == 429:  # Límite alcanzado
-        print("Límite de peticiones alcanzado al obtener la discográfica, cambiando API Key...")
-        response = realizar_solicitud_con_nuevo_token(url, headers, {})
+    headers = {'Authorization': f'Bearer {token}'}
+    response = realizar_solicitud(url, headers, {})
     album_info = response.json() if response.status_code == 200 else {}
     return album_info.get('label', 'No disponible')
 
@@ -171,7 +166,6 @@ def interface(project_name, query, num_spotify_playlists=50):
     for playlist in playlists_spotify:
         songs = obtener_canciones_playlist_spotify(token_spotify, playlist['playlist_id'], playlist['playlist_name'])
         canciones_spotify.extend(songs)
-        time.sleep(1)  # Pausa de 1 segundo entre la obtención de canciones para evitar el límite de tasa
 
     # Crear DataFrame
     df = pd.DataFrame(canciones_spotify)