lyrics-transcriber 0.30.1__py3-none-any.whl → 0.32.1__py3-none-any.whl

lyrics_transcriber/lyrics/base_lyrics_provider.py

@@ -1,48 +1,12 @@
-from dataclasses import dataclass, asdict
+from dataclasses import dataclass
 import logging
-from typing import Optional, Dict, Any, List
+from typing import Optional, Dict, Any
 import json
 import hashlib
 from pathlib import Path
 import os
 from abc import ABC, abstractmethod
-
-
-@dataclass
-class Word:
-    """Represents a single word with its timing and confidence information."""
-
-    text: str
-    start_time: float
-    end_time: float
-    confidence: Optional[float] = None
-
-    def to_dict(self) -> Dict[str, Any]:
-        """Convert Word to dictionary for JSON serialization."""
-        d = asdict(self)
-        # Remove confidence from output if it's None
-        if d["confidence"] is None:
-            del d["confidence"]
-        return d
-
-
-@dataclass
-class LyricsSegment:
-    """Represents a segment/line of lyrics with timing information."""
-
-    text: str
-    words: List[Word]
-    start_time: float
-    end_time: float
-
-    def to_dict(self) -> Dict[str, Any]:
-        """Convert LyricsSegment to dictionary for JSON serialization."""
-        return {
-            "text": self.text,
-            "words": [word.to_dict() for word in self.words],
-            "start_time": self.start_time,
-            "end_time": self.end_time,
-        }
+from lyrics_transcriber.types import LyricsData
 
 
 @dataclass
@@ -55,46 +19,6 @@ class LyricsProviderConfig:
     audio_filepath: Optional[str] = None
 
 
-@dataclass
-class LyricsMetadata:
-    """Standardized metadata for lyrics results."""
-
-    source: str
-    track_name: str
-    artist_names: str
-
-    # Common metadata fields
-    album_name: Optional[str] = None
-    duration_ms: Optional[int] = None
-    explicit: Optional[bool] = None
-    language: Optional[str] = None
-    is_synced: bool = False
-
-    # Lyrics provider details
-    lyrics_provider: Optional[str] = None
-    lyrics_provider_id: Optional[str] = None
-
-    # Provider-specific metadata
-    provider_metadata: Dict[str, Any] = None
-
-    def to_dict(self) -> Dict[str, Any]:
-        """Convert metadata to dictionary for JSON serialization."""
-        return asdict(self)
-
-
-@dataclass
-class LyricsData:
-    """Standardized response format for all lyrics providers."""
-
-    lyrics: str
-    segments: List[LyricsSegment]
-    metadata: LyricsMetadata
-
-    def to_dict(self) -> Dict[str, Any]:
-        """Convert result to dictionary for JSON serialization."""
-        return {"lyrics": self.lyrics, "segments": [segment.to_dict() for segment in self.segments], "metadata": self.metadata.to_dict()}
-
-
 class BaseLyricsProvider(ABC):
     """Base class for lyrics providers."""
 
@@ -189,12 +113,12 @@ class BaseLyricsProvider(ABC):
     @abstractmethod
     def _fetch_data_from_source(self, artist: str, title: str) -> Optional[Dict[str, Any]]:
         """Fetch raw data from the source (implemented by subclasses)."""
-        raise NotImplementedError("Subclasses must implement _fetch_data_from_source")
+        raise NotImplementedError("Subclasses must implement _fetch_data_from_source")  # pragma: no cover
 
     @abstractmethod
     def _convert_result_format(self, raw_data: Dict[str, Any]) -> LyricsData:
         """Convert raw API response to standardized format (implemented by subclasses)."""
-        raise NotImplementedError("Subclasses must implement _convert_result_format")
+        raise NotImplementedError("Subclasses must implement _convert_result_format")  # pragma: no cover
 
     def get_name(self) -> str:
         """Return the name of this lyrics provider."""

lyrics_transcriber/lyrics/genius.py

@@ -1,7 +1,8 @@
 import logging
 from typing import Optional, Dict, Any
 import lyricsgenius
-from .base_lyrics_provider import BaseLyricsProvider, LyricsMetadata, LyricsProviderConfig, LyricsData
+from lyrics_transcriber.types import LyricsData, LyricsMetadata
+from lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig
 
 
 class GeniusProvider(BaseLyricsProvider):
@@ -67,4 +68,6 @@ class GeniusProvider(BaseLyricsProvider):
         )
 
         # Create result object
-        return LyricsData(lyrics=raw_data.get("lyrics", ""), segments=[], metadata=metadata)  # Genius doesn't provide timestamp data
+        return LyricsData(
+            source="genius", lyrics=raw_data.get("lyrics", ""), segments=[], metadata=metadata
+        )  # Genius doesn't provide timestamp data

lyrics_transcriber/lyrics/spotify.py

@@ -2,8 +2,8 @@ import logging
 from typing import Optional, Dict, Any
 import syrics.api
 
-from lyrics_transcriber.lyrics.base_lyrics_provider import LyricsSegment, Word
-from .base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig, LyricsMetadata, LyricsData
+from lyrics_transcriber.types import LyricsData, LyricsMetadata, LyricsSegment
+from lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig
 
 
 class SpotifyProvider(BaseLyricsProvider):
@@ -79,4 +79,4 @@ class SpotifyProvider(BaseLyricsProvider):
             },
         )
 
-        return LyricsData(lyrics="\n".join(segment.text for segment in segments), segments=segments, metadata=metadata)
+        return LyricsData(source="spotify", lyrics="\n".join(segment.text for segment in segments), segments=segments, metadata=metadata)

lyrics_transcriber/output/ass/__init__.py

@@ -0,0 +1,21 @@
+from lyrics_transcriber.output.ass.lyrics_screen import LyricsScreen
+from lyrics_transcriber.output.ass.lyrics_line import LyricsLine
+from lyrics_transcriber.output.ass.section_screen import SectionScreen
+from lyrics_transcriber.output.ass.style import Style
+from lyrics_transcriber.output.ass.event import Event
+from lyrics_transcriber.output.ass.config import (
+    ScreenConfig,
+    LineTimingInfo,
+    LineState,
+)
+
+__all__ = [
+    'LyricsScreen',
+    'LyricsLine',
+    'SectionScreen',
+    'Style',
+    'Event',
+    'ScreenConfig',
+    'LineTimingInfo',
+    'LineState',
+]