lyrics-transcriber 0.58.0__py3-none-any.whl → 0.60.0__py3-none-any.whl

lyrics_transcriber/lyrics/spotify.py

@@ -2,6 +2,7 @@ import logging
 from typing import Optional, Dict, Any
 import syrics.api
 import time
+import requests
 
 from lyrics_transcriber.types import LyricsData, LyricsMetadata, LyricsSegment, Word
 from lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig
@@ -14,9 +15,11 @@ class SpotifyProvider(BaseLyricsProvider):
     def __init__(self, config: LyricsProviderConfig, logger: Optional[logging.Logger] = None):
         super().__init__(config, logger)
         self.cookie = config.spotify_cookie
+        self.rapidapi_key = config.rapidapi_key
         self.client = None
 
-        if self.cookie:
+        # Only initialize syrics client if rapidapi_key is not set
+        if self.cookie and not self.rapidapi_key:
             max_retries = 5
             retry_delay = 5  # seconds
 
@@ -32,9 +35,17 @@ class SpotifyProvider(BaseLyricsProvider):
                     time.sleep(retry_delay)
 
     def _fetch_data_from_source(self, artist: str, title: str) -> Optional[Dict[str, Any]]:
-        """Fetch raw data from Spotify APIs using syrics library."""
+        """Fetch raw data from Spotify APIs using RapidAPI or syrics library."""
+        # Try RapidAPI first if available
+        if self.rapidapi_key:
+            self.logger.info(f"Trying RapidAPI for {artist} - {title}")
+            result = self._fetch_from_rapidapi(artist, title)
+            if result:
+                return result
+                
+        # Fall back to syrics library
         if not self.client:
-            self.logger.warning("No Spotify cookie provided")
+            self.logger.warning("No Spotify cookie provided and RapidAPI failed")
             return None
 
         try:
@@ -57,8 +68,82 @@ class SpotifyProvider(BaseLyricsProvider):
             self.logger.error(f"Error fetching from Spotify: {str(e)}")
             return None
 
+    def _fetch_from_rapidapi(self, artist: str, title: str) -> Optional[Dict[str, Any]]:
+        """Fetch song data using RapidAPI."""
+        try:
+            # Step 1: Search for the track
+            search_url = "https://spotify-scraper.p.rapidapi.com/v1/track/search"
+            search_params = {
+                "name": f"{title} {artist}"
+            }
+            
+            headers = {
+                "x-rapidapi-key": self.rapidapi_key,
+                "x-rapidapi-host": "spotify-scraper.p.rapidapi.com"
+            }
+            
+            self.logger.debug(f"Making RapidAPI search request for '{artist} {title}'")
+            search_response = requests.get(search_url, headers=headers, params=search_params, timeout=10)
+            search_response.raise_for_status()
+            
+            search_data = search_response.json()
+            
+            # Check if search was successful
+            if not search_data.get("status") or search_data.get("errorId") != "Success":
+                self.logger.warning("RapidAPI search failed")
+                return None
+                
+            track_id = search_data.get("id")
+            if not track_id:
+                self.logger.warning("No track ID found in RapidAPI search results")
+                return None
+                
+            self.logger.debug(f"Found track ID: {track_id}")
+            
+            # Step 2: Fetch lyrics using the track ID
+            lyrics_url = "https://spotify-scraper.p.rapidapi.com/v1/track/lyrics"
+            lyrics_params = {
+                "trackId": track_id,
+                "format": "json",
+                "removeNote": "true"
+            }
+            
+            self.logger.debug(f"Making RapidAPI lyrics request for track ID {track_id}")
+            lyrics_response = requests.get(lyrics_url, headers=headers, params=lyrics_params, timeout=10)
+            lyrics_response.raise_for_status()
+            
+            lyrics_data = lyrics_response.json()
+            
+            # Create a clean RapidAPI response structure
+            rapidapi_response = {
+                "track_data": search_data,
+                "lyrics_data": lyrics_data,
+                # Mark this as RapidAPI source
+                "_rapidapi_source": True
+            }
+            
+            self.logger.info("Successfully fetched lyrics from RapidAPI")
+            return rapidapi_response
+            
+        except requests.exceptions.RequestException as e:
+            self.logger.error(f"RapidAPI request failed: {str(e)}")
+            return None
+        except Exception as e:
+            self.logger.error(f"Error fetching from RapidAPI: {str(e)}")
+            return None
+
     def _convert_result_format(self, raw_data: Dict[str, Any]) -> LyricsData:
         """Convert Spotify's raw API response to standardized format."""
+        # Use our explicit source marker for detection
+        is_rapidapi = raw_data.get("_rapidapi_source", False)
+        
+        if is_rapidapi:
+            return self._convert_rapidapi_format(raw_data)
+        else:
+            return self._convert_syrics_format(raw_data)
+
+    def _convert_syrics_format(self, raw_data: Dict[str, Any]) -> LyricsData:
+        """Convert syrics format to standardized format."""
         track_data = raw_data["track_data"]
         lyrics_data = raw_data["lyrics_data"]["lyrics"]
 
@@ -79,6 +164,7 @@ class SpotifyProvider(BaseLyricsProvider):
                 "preview_url": track_data.get("preview_url"),
                 "external_urls": track_data.get("external_urls"),
                 "sync_type": lyrics_data.get("syncType"),
+                "api_source": "syrics",
             },
         )
 
@@ -122,6 +208,80 @@ class SpotifyProvider(BaseLyricsProvider):
 
         return LyricsData(source="spotify", segments=segments, metadata=metadata)
 
+    def _convert_rapidapi_format(self, raw_data: Dict[str, Any]) -> LyricsData:
+        """Convert RapidAPI format to standardized format."""
+        track_data = raw_data["track_data"]
+        lyrics_data = raw_data["lyrics_data"]
+
+        # Extract artist names from RapidAPI format
+        artist_names = []
+        if "artists" in track_data:
+            artist_names = [artist.get("name", "") for artist in track_data["artists"]]
+        
+        # Create metadata object
+        metadata = LyricsMetadata(
+            source="spotify",
+            track_name=track_data.get("name"),
+            artist_names=", ".join(artist_names),
+            album_name=track_data.get("album", {}).get("name"),
+            duration_ms=track_data.get("durationMs"),
+            explicit=track_data.get("explicit"),
+            is_synced=True,  # RapidAPI format includes timing information
+            lyrics_provider="spotify",
+            lyrics_provider_id=track_data.get("id"),
+            provider_metadata={
+                "spotify_id": track_data.get("id"),
+                "share_url": track_data.get("shareUrl"),
+                "duration_text": track_data.get("durationText"),
+                "album_cover": track_data.get("album", {}).get("cover"),
+                "api_source": "rapidapi",
+            },
+        )
+
+        # Create segments with timing information from RapidAPI format
+        segments = []
+        for line in lyrics_data:
+            if not line.get("text"):
+                continue
+
+            # Skip lines that are just musical notes
+            if not self._clean_lyrics(line["text"]):
+                continue
+
+            # Split line into words
+            word_texts = line["text"].strip().split()
+            if not word_texts:
+                continue
+
+            # Calculate timing for each word
+            start_time = float(line["startMs"]) / 1000 if line.get("startMs") else 0.0
+            duration = float(line["durMs"]) / 1000 if line.get("durMs") else 0.0
+            end_time = start_time + duration
+            word_duration = duration / len(word_texts)
+
+            words = []
+            for i, word_text in enumerate(word_texts):
+                word = Word(
+                    id=WordUtils.generate_id(),
+                    text=word_text,
+                    start_time=start_time + (i * word_duration),
+                    end_time=start_time + ((i + 1) * word_duration),
+                    confidence=1.0,
+                    created_during_correction=False,
+                )
+                words.append(word)
+
+            segment = LyricsSegment(
+                id=WordUtils.generate_id(),
+                text=line["text"].strip(),
+                words=words,
+                start_time=start_time,
+                end_time=end_time
+            )
+            segments.append(segment)
+
+        return LyricsData(source="spotify", segments=segments, metadata=metadata)
+
     def _clean_lyrics(self, lyrics: str) -> str:
         """Clean and process lyrics from Spotify to remove unwanted content."""
         # Remove lines that contain only musical note symbols

{lyrics_transcriber-0.58.0.dist-info → lyrics_transcriber-0.60.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: lyrics-transcriber
-Version: 0.58.0
+Version: 0.60.0
 Summary: Automatically create synchronised lyrics files in ASS and MidiCo LRC formats with word-level timestamps, using Whisper and lyrics from Genius and Spotify
 License: MIT
 Author: Andrew Beveridge

{lyrics_transcriber-0.58.0.dist-info → lyrics_transcriber-0.60.0.dist-info}/RECORD

@@ -1,9 +1,9 @@
 lyrics_transcriber/__init__.py,sha256=g9ZbJg9U1qo7XzrC25J3bTKcNzzwUJWDVdi_7-hjcM4,412
 lyrics_transcriber/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lyrics_transcriber/cli/cli_main.py,sha256=kMWoV_89KRD2XAU39Brs2rdkbQmG6OxrEn7SAh2zCTM,10648
+lyrics_transcriber/cli/cli_main.py,sha256=Tk_PtZyAogsPSrmAD8KNQsPMWFW_patX2XM0EZGaVis,10752
 lyrics_transcriber/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-lyrics_transcriber/core/config.py,sha256=euwOOtuNbXy4-a1xs8QKdjcf5jXZQle0zf6X1Wthurw,1229
-lyrics_transcriber/core/controller.py,sha256=66qwIv-2jEW94wU5RVFRIcfrTyszC-aC_Fcx5dCjG7k,20255
+lyrics_transcriber/core/config.py,sha256=G4Z5kEBMDXRscEiRKbnofAPuFTDB5h1fLJvwxaHaT4I,1268
+lyrics_transcriber/core/controller.py,sha256=hBSkvHtcdmnLKRx82Szya-UMKil_QwnmcpmO8-H2Sm0,20700
 lyrics_transcriber/correction/anchor_sequence.py,sha256=Bz08zB8yS8orz73aA5dDyNUgBBU87KtQM6yOZGNDoFI,32228
 lyrics_transcriber/correction/corrector.py,sha256=wwSLHat4SGKEJffFQVcmSfMN_I8Drv-jpeTkO8ndLu0,20930
 lyrics_transcriber/correction/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,7 +29,7 @@ lyrics_transcriber/frontend/README.md,sha256=-D6CAfKTT7Y0V3EjlZ2fMy7fyctFQ4x2TJ9
 lyrics_transcriber/frontend/__init__.py,sha256=nW8acRSWTjXoRwGqcTU4w-__X7tMAE0iXL0uihBN3CU,836
 lyrics_transcriber/frontend/eslint.config.js,sha256=3ADH23ANA4NNBKFy6nCVk65e8bx1DrVd_FIaYNnhuqA,734
 lyrics_transcriber/frontend/index.html,sha256=KfqJVONzpUyPIwV73nZRiCWlwLnFWeB3z0vzxDPNudU,376
-lyrics_transcriber/frontend/package.json,sha256=MMCglMWJSeiXc8AmFTCZHAiAMGKTYRa7oAQMCJrMY_4,1182
+lyrics_transcriber/frontend/package.json,sha256=CvGu-kAvDW1zqGICBQqzpeaNtweFj8r8Ig_Kgl6H9TQ,1182
 lyrics_transcriber/frontend/public/vite.svg,sha256=SnSK_UQ5GLsWWRyDTEAdrjPoeGGrXbrQgRw6O0qSFPs,1497
 lyrics_transcriber/frontend/src/App.tsx,sha256=f1-dp-MU8vap18eAXacwVDO5P4eE2iG9zSvjau-7NJs,6533
 lyrics_transcriber/frontend/src/api.ts,sha256=UgqPc1jo8DEVgxh3_9Lyf9GBsHYpqMAqsPEE5BzTV4w,6640
@@ -83,15 +83,16 @@ lyrics_transcriber/frontend/update_version.js,sha256=PxkqCnsucXnXiIqutsanVcx00Gq
 lyrics_transcriber/frontend/vite.config.d.ts,sha256=S5bdGf0pSdKM6A6RNBKwAm3EIeW_bDHYfHtesRtXU7Q,76
 lyrics_transcriber/frontend/vite.config.js,sha256=P4GuPgRZzwEWPQZpyujUe7eA3mjPoFAe2CgE5sQAXg8,232
 lyrics_transcriber/frontend/vite.config.ts,sha256=8FdW0dN8zDFqfhQSxX5h7sIu72X2piLYlp_TZYRQvBQ,216
-lyrics_transcriber/frontend/web_assets/assets/index-fO30CduZ.js,sha256=mweQzzHIH-rLHty92kWFaie7V8sCOz8xAg21ugSLiBM,1257959
-lyrics_transcriber/frontend/web_assets/assets/index-fO30CduZ.js.map,sha256=qgdhzBuYAqsfLFflCxfy8rDePS6KoCMeAUDhrm85K2k,2678465
-lyrics_transcriber/frontend/web_assets/index.html,sha256=gacSk2b2_RFh_x2aGiiidBzukUldKMEQtlRhFnUarso,400
+lyrics_transcriber/frontend/web_assets/assets/index-Bktwnsnn.js,sha256=zH60jX1R-f07xK0LTeeXJe9xX2DO3vIOSI4Z-pwMko8,1257959
+lyrics_transcriber/frontend/web_assets/assets/index-Bktwnsnn.js.map,sha256=CkhEETBBDcAouzUG4qr5FsMgNnOS5-E5pq2Lf0ojrcI,2678465
+lyrics_transcriber/frontend/web_assets/index.html,sha256=dzIvCdIPwwrs6ADqTHJxh_phyBvKplrYDkaDD3I3klg,400
 lyrics_transcriber/frontend/web_assets/vite.svg,sha256=SnSK_UQ5GLsWWRyDTEAdrjPoeGGrXbrQgRw6O0qSFPs,1497
 lyrics_transcriber/frontend/yarn.lock,sha256=wtImLsCO1P1Lpkhc1jAN6IiHQ0As4xn39n0cwKoh4LM,131996
-lyrics_transcriber/lyrics/base_lyrics_provider.py,sha256=mqlqssKG2AofvqEU48nCwLnz0FhO9Ee6MNixF6GBnYY,9133
+lyrics_transcriber/lyrics/base_lyrics_provider.py,sha256=LCzmwpBFgSfC6VVY5AtJHmE0OvgjAQyjPnL-dYLLwg4,9172
 lyrics_transcriber/lyrics/file_provider.py,sha256=WNd6mHMV2FhrnHiWBvxUxPkdVi47mbLE4hXaTYqStTM,4290
-lyrics_transcriber/lyrics/genius.py,sha256=SIMFEmD_QbXUB8hpDhRU7AAyVrJbRvKyTWsShA9jecE,5693
-lyrics_transcriber/lyrics/spotify.py,sha256=K7aL_OHdQjhI8ydnHUq8-PUvkyDu2s-et7njiLIBVgY,5457
+lyrics_transcriber/lyrics/genius.py,sha256=XTKLAjwzopYIOvvn0na_Ym5yM1JZjp8a-f1Ebr4cuN0,17121
+lyrics_transcriber/lyrics/musixmatch.py,sha256=mlTuRm7XxeXy1NAHqqLUhilf90IY0JiGdX9nAmiZ2M0,7368
+lyrics_transcriber/lyrics/spotify.py,sha256=O8rzDRjM-wdF2KntLqPe414-1jRTmVGfRCfMwSovHVg,12044
 lyrics_transcriber/lyrics/user_input_provider.py,sha256=oNzwjk2bOQYyUXvVqPcbrF8vJU7LLtwTvJTXxtPaQto,1798
 lyrics_transcriber/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lyrics_transcriber/output/ass/__init__.py,sha256=EYQ45gI7_-vclVgzISL0ML8VgxCdB0odqEyPyiPCIw0,578
@@ -152,8 +153,8 @@ lyrics_transcriber/transcribers/base_transcriber.py,sha256=T3m4ZCwZ9Bpv6Jvb2hNcn
 lyrics_transcriber/transcribers/whisper.py,sha256=YcCB1ic9H6zL1GS0jD0emu8-qlcH0QVEjjjYB4aLlIQ,13260
 lyrics_transcriber/types.py,sha256=wqFrTKhb8qAUB48zH-51_EEGCGrxm0Ji-ETfQumtSKc,27666
 lyrics_transcriber/utils/word_utils.py,sha256=-cMGpj9UV4F6IsoDKAV2i1aiqSO8eI91HMAm_igtVMk,958
-lyrics_transcriber-0.58.0.dist-info/LICENSE,sha256=81R_4XwMZDODHD7JcZeUR8IiCU8AD7Ajl6bmwR9tYDk,1074
-lyrics_transcriber-0.58.0.dist-info/METADATA,sha256=0voXGbhwVigZppC-My5uCpqvdX2Z-dBAr5TpQAZ7Upw,6637
-lyrics_transcriber-0.58.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-lyrics_transcriber-0.58.0.dist-info/entry_points.txt,sha256=kcp-bSFkCACAEA0t166Kek0HpaJUXRo5SlF5tVrqNBU,216
-lyrics_transcriber-0.58.0.dist-info/RECORD,,
+lyrics_transcriber-0.60.0.dist-info/LICENSE,sha256=81R_4XwMZDODHD7JcZeUR8IiCU8AD7Ajl6bmwR9tYDk,1074
+lyrics_transcriber-0.60.0.dist-info/METADATA,sha256=029j3LSsxZ7bKfCfKOHcX8J6UzFEJmqCHMmXdQZR3jI,6637
+lyrics_transcriber-0.60.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+lyrics_transcriber-0.60.0.dist-info/entry_points.txt,sha256=kcp-bSFkCACAEA0t166Kek0HpaJUXRo5SlF5tVrqNBU,216
+lyrics_transcriber-0.60.0.dist-info/RECORD,,