diff --git a/.claude/plans/deprecate-lyrics-transcriber.plan.md b/.claude/plans/deprecate-lyrics-transcriber.plan.md index 0ff50b4a..0c87d54f 100644 --- a/.claude/plans/deprecate-lyrics-transcriber.plan.md +++ b/.claude/plans/deprecate-lyrics-transcriber.plan.md @@ -57,7 +57,7 @@ karaoke-gen/ 1. **`libs/`** - Clear convention for vendored/embedded libraries, separate from main codebase 2. **Single level** - `lyrics_transcriber` directly under `libs/`, not nested (no `libs/lyrics_transcriber/lyrics_transcriber/`) -3. **Clean imports** - `from lyrics_transcriber.core import ...` continues to work with proper Poetry config +3. **Clean imports** - `from karaoke_gen.lyrics_transcriber.core import ...` continues to work with proper Poetry config ### pyproject.toml Changes @@ -132,7 +132,7 @@ From current `lyrics_transcriber_temp/`: 7. [ ] Remove `lyrics_transcriber_temp/` directory (with all its extra files) 8. [ ] Update `pyproject.toml` packages and include paths 9. [ ] Update the one script that references `lyrics_transcriber_temp` directly: - - `scripts/benchmark_encoding.py` line 232: change `from lyrics_transcriber_temp.lyrics_transcriber.output.video` to `from lyrics_transcriber.output.video` + - `scripts/benchmark_encoding.py` line 232: change `from lyrics_transcriber_temp.lyrics_transcriber.output.video` to `from karaoke_gen.lyrics_transcriber.output.video` ### Phase 3: Verify and Test @@ -140,9 +140,9 @@ From current `lyrics_transcriber_temp/`: 11. [ ] Run `make test` to ensure all tests pass 12. [ ] Verify imports work: ```python - from lyrics_transcriber.core.controller import LyricsControllerResult - from lyrics_transcriber.output.generator import OutputGenerator - from lyrics_transcriber.types import CorrectionResult + from karaoke_gen.lyrics_transcriber.core.controller import LyricsControllerResult + from karaoke_gen.lyrics_transcriber.output.generator import OutputGenerator + from karaoke_gen.lyrics_transcriber.types import CorrectionResult ``` ### Phase 4: Handle Tests from lyrics_transcriber @@ -199,6 +199,6 @@ If issues arise: ## Notes -- The import paths like `from lyrics_transcriber.core import ...` will continue to work unchanged +- The import paths like `from karaoke_gen.lyrics_transcriber.core import ...` will continue to work unchanged - Only the internal project structure changes, not the API - This is primarily a cleanup/organization task with some external repo admin work diff --git a/backend/Dockerfile b/backend/Dockerfile index a67452c6..33323850 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -22,10 +22,9 @@ WORKDIR /app COPY backend /app/backend # Copy and reinstall karaoke_gen from local source -# This ensures new modules (like style_loader.py) are included without rebuilding base image -# Note: lyrics_transcriber is vendored in lyrics_transcriber_temp/ and bundled via pyproject.toml +# This ensures new modules are included without rebuilding base image +# Note: lyrics_transcriber is now a subpackage of karaoke_gen COPY karaoke_gen /app/karaoke_gen -COPY lyrics_transcriber_temp /app/lyrics_transcriber_temp COPY pyproject.toml README.md LICENSE /app/ RUN pip install --no-cache-dir -e . diff --git a/backend/api/routes/review.py b/backend/api/routes/review.py index 107a6dd4..1de7e34e 100644 --- a/backend/api/routes/review.py +++ b/backend/api/routes/review.py @@ -33,9 +33,9 @@ from backend.services.auth_service import UserType from backend.config import get_settings # LyricsTranscriber imports for preview generation -from lyrics_transcriber.types import CorrectionResult -from lyrics_transcriber.core.config import OutputConfig -from lyrics_transcriber.correction.operations import CorrectionOperations +from karaoke_gen.lyrics_transcriber.types import CorrectionResult +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig +from karaoke_gen.lyrics_transcriber.correction.operations import CorrectionOperations # Import from the unified style loader from karaoke_gen.style_loader import load_styles_from_gcs diff --git a/backend/services/packaging_service.py b/backend/services/packaging_service.py index 7d083aad..1104832b 100644 --- a/backend/services/packaging_service.py +++ b/backend/services/packaging_service.py @@ -120,7 +120,7 @@ class PackagingService: ) self.logger.info("Generating CDG and MP3 files") - from lyrics_transcriber.output.cdg import CDGGenerator + from karaoke_gen.lyrics_transcriber.output.cdg import CDGGenerator output_dir = os.path.dirname(output_zip_path) or os.getcwd() generator = CDGGenerator(output_dir=output_dir, logger=self.logger) diff --git a/backend/tests/test_packaging_service.py b/backend/tests/test_packaging_service.py index b93d995c..788298dc 100644 --- a/backend/tests/test_packaging_service.py +++ b/backend/tests/test_packaging_service.py @@ -201,7 +201,7 @@ class TestPackagingServiceCDGPackage: assert result[1] == mp3_file assert result[2] == cdg_file - @patch("lyrics_transcriber.output.cdg.CDGGenerator") + @patch("karaoke_gen.lyrics_transcriber.output.cdg.CDGGenerator") def test_create_cdg_package_with_generator(self, mock_cdg_generator_class): """Test CDG package creation using CDGGenerator.""" with tempfile.TemporaryDirectory() as tmpdir: diff --git a/backend/tests/test_routes_review.py b/backend/tests/test_routes_review.py index 7fd36fd4..d029ec68 100644 --- a/backend/tests/test_routes_review.py +++ b/backend/tests/test_routes_review.py @@ -204,7 +204,7 @@ class TestAddLyricsEndpoint: def test_add_lyrics_uses_correction_operations(self): """Verify CorrectionOperations.add_lyrics_source is available.""" - from lyrics_transcriber.correction.operations import CorrectionOperations + from karaoke_gen.lyrics_transcriber.correction.operations import CorrectionOperations # The method should exist assert hasattr(CorrectionOperations, 'add_lyrics_source') diff --git a/backend/tests/test_workers.py b/backend/tests/test_workers.py index e0d5f824..764601ce 100644 --- a/backend/tests/test_workers.py +++ b/backend/tests/test_workers.py @@ -560,7 +560,7 @@ class TestRenderVideoWorkerCountdownPadding: def test_countdown_processor_has_process_method(self): """Test that CountdownProcessor has the process method (main API).""" - from lyrics_transcriber.output.countdown_processor import CountdownProcessor + from karaoke_gen.lyrics_transcriber.output.countdown_processor import CountdownProcessor countdown_processor = CountdownProcessor(cache_dir="/tmp") assert hasattr(countdown_processor, 'process') @@ -568,7 +568,7 @@ class TestRenderVideoWorkerCountdownPadding: def test_countdown_processor_constants(self): """Test that CountdownProcessor has expected constants.""" - from lyrics_transcriber.output.countdown_processor import CountdownProcessor + from karaoke_gen.lyrics_transcriber.output.countdown_processor import CountdownProcessor # Verify the constants exist (these control countdown behavior) assert hasattr(CountdownProcessor, 'COUNTDOWN_TEXT') diff --git a/backend/workers/render_video_worker.py b/backend/workers/render_video_worker.py index 7a5a09fb..74e06475 100644 --- a/backend/workers/render_video_worker.py +++ b/backend/workers/render_video_worker.py @@ -36,10 +36,10 @@ from backend.workers.worker_logging import create_job_logger, setup_job_logging, from backend.services.tracing import job_span, add_span_event, add_span_attribute # Import from lyrics_transcriber (submodule) -from lyrics_transcriber.output.generator import OutputGenerator -from lyrics_transcriber.output.countdown_processor import CountdownProcessor -from lyrics_transcriber.types import CorrectionResult -from lyrics_transcriber.core.config import OutputConfig +from karaoke_gen.lyrics_transcriber.output.generator import OutputGenerator +from karaoke_gen.lyrics_transcriber.output.countdown_processor import CountdownProcessor +from karaoke_gen.lyrics_transcriber.types import CorrectionResult +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig # Import from the unified style loader from karaoke_gen.style_loader import load_styles_from_gcs @@ -51,10 +51,10 @@ logger = logging.getLogger(__name__) # Loggers to capture for render video worker RENDER_VIDEO_WORKER_LOGGERS = [ - "lyrics_transcriber.output", - "lyrics_transcriber.output.generator", - "lyrics_transcriber.output.video", - "lyrics_transcriber.output.ass", + "karaoke_gen.lyrics_transcriber.output", + "karaoke_gen.lyrics_transcriber.output.generator", + "karaoke_gen.lyrics_transcriber.output.video", + "karaoke_gen.lyrics_transcriber.output.ass", ] diff --git a/backend/workers/worker_logging.py b/backend/workers/worker_logging.py index d16a3ef8..e5a6f3dc 100644 --- a/backend/workers/worker_logging.py +++ b/backend/workers/worker_logging.py @@ -65,7 +65,7 @@ class JobLogHandler(logging.Handler): lyrics_logger.addHandler(handler) # Also capture logs from lyrics_transcriber package itself - lt_logger = logging.getLogger("lyrics_transcriber") + lt_logger = logging.getLogger("karaoke_gen.lyrics_transcriber") lt_logger.addHandler(handler) """ @@ -235,7 +235,7 @@ def setup_job_logging(job_id: str, worker_name: str, *logger_names: str) -> JobL Args: job_id: Job ID worker_name: Worker name - *logger_names: Names of loggers to capture (e.g., "lyrics_transcriber", "karaoke_gen") + *logger_names: Names of loggers to capture (e.g., "karaoke_gen.lyrics_transcriber", "karaoke_gen") Returns: The JobLogHandler (can be removed later if needed) @@ -246,7 +246,7 @@ def setup_job_logging(job_id: str, worker_name: str, *logger_names: str) -> JobL job_id, "lyrics", "karaoke_gen.lyrics_processor", - "lyrics_transcriber", # Capture LyricsTranscriber logs + "karaoke_gen.lyrics_transcriber", # Capture LyricsTranscriber logs ) # IMPORTANT: Use job_logging_context for proper isolation diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index 5a176d39..346d36a3 100644 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -265,7 +265,7 @@ gcloud logging read 'resource.type="cloud_run_revision" "ANCHOR SEARCH: Progress When adding new operations that may need investigation: ```python -from lyrics_transcriber.utils.tracing import create_span, add_span_attribute +from karaoke_gen.lyrics_transcriber.utils.tracing import create_span, add_span_attribute with create_span("operation_name", {"initial": "attributes"}) as span: # ... do work ... diff --git a/docs/archive/2025-12-next-steps.md b/docs/archive/2025-12-next-steps.md index c538d764..33b62f59 100644 --- a/docs/archive/2025-12-next-steps.md +++ b/docs/archive/2025-12-next-steps.md @@ -285,7 +285,7 @@ async def process_audio_separation_task(job_id: str): ```python # backend/workers/lyrics_worker.py from karaoke_gen.lyrics_processor import LyricsProcessor -from lyrics_transcriber.transcriber import LyricsTranscriber +from karaoke_gen.lyrics_transcriber.transcriber import LyricsTranscriber import os async def process_lyrics_transcription_task(job_id: str): @@ -735,7 +735,7 @@ async def encode_videos_task(job_id: str): **Implementation:** ```python # backend/workers/packaging_worker.py -from lyrics_transcriber.output.cdg import CDGGenerator +from karaoke_gen.lyrics_transcriber.output.cdg import CDGGenerator from lyrics_converter import convert_lrc_to_txt async def generate_cdg_package(job_id: str, work_dir: str): diff --git a/docs/archive/2025-12-phase1-whats-next.md b/docs/archive/2025-12-phase1-whats-next.md index 9e5dd399..423f28a3 100644 --- a/docs/archive/2025-12-phase1-whats-next.md +++ b/docs/archive/2025-12-phase1-whats-next.md @@ -246,9 +246,9 @@ import logging import tempfile from typing import Optional -from lyrics_transcriber.output.generator import OutputGenerator -from lyrics_transcriber.correction.corrector import CorrectionResult -from lyrics_transcriber.core.config import OutputConfig +from karaoke_gen.lyrics_transcriber.output.generator import OutputGenerator +from karaoke_gen.lyrics_transcriber.correction.corrector import CorrectionResult +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig from backend.services.job_manager import job_manager from backend.services.storage_service import storage diff --git a/docs/archive/2025-12-phase1-worker-implementation-plan.md b/docs/archive/2025-12-phase1-worker-implementation-plan.md index 6f3dc8cf..1c59725f 100644 --- a/docs/archive/2025-12-phase1-worker-implementation-plan.md +++ b/docs/archive/2025-12-phase1-worker-implementation-plan.md @@ -175,8 +175,8 @@ config = LyricsTranscriberConfig( **Key Insight:** Uses `OutputGenerator` from LyricsTranscriber library: ```python -from lyrics_transcriber.output.generator import OutputGenerator -from lyrics_transcriber.correction.corrector import CorrectionResult +from karaoke_gen.lyrics_transcriber.output.generator import OutputGenerator +from karaoke_gen.lyrics_transcriber.correction.corrector import CorrectionResult # Load corrected data (from human review) correction_result = CorrectionResult.from_dict(corrections_data) @@ -382,9 +382,9 @@ POST /api/jobs/{job_id}/select-instrumental ### Example: Using OutputGenerator ```python -from lyrics_transcriber.output.generator import OutputGenerator -from lyrics_transcriber.correction.corrector import CorrectionResult -from lyrics_transcriber.core.config import OutputConfig +from karaoke_gen.lyrics_transcriber.output.generator import OutputGenerator +from karaoke_gen.lyrics_transcriber.correction.corrector import CorrectionResult +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig # 1. Load corrected data from GCS (after human review) corrections_data = download_json_from_gcs(f"jobs/{job_id}/corrections_updated.json") diff --git a/docs/archive/2025-12-ref-countdown-padding.md b/docs/archive/2025-12-ref-countdown-padding.md index bf323a7a..829f7a26 100644 --- a/docs/archive/2025-12-ref-countdown-padding.md +++ b/docs/archive/2025-12-ref-countdown-padding.md @@ -181,7 +181,7 @@ You can also detect from LRC files: To disable countdown for a specific transcription: ```python -from lyrics_transcriber.core.config import OutputConfig +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig output_config = OutputConfig( # ... other options diff --git a/frontend/e2e/manual/README.md b/frontend/e2e/manual/README.md index c8d65be9..9a59abcb 100644 --- a/frontend/e2e/manual/README.md +++ b/frontend/e2e/manual/README.md @@ -21,7 +21,7 @@ yarn dev # Starts on port 5173 # Terminal 2: Start LyricsTranscriber backend (for API) # This serves the review API on port 8767 -poetry run python -c "from lyrics_transcriber.review.server import ReviewServer; ..." +poetry run python -c "from karaoke_gen.lyrics_transcriber.review.server import ReviewServer; ..." # Terminal 3: Run the test cd frontend diff --git a/karaoke_gen/karaoke_finalise/karaoke_finalise.py b/karaoke_gen/karaoke_finalise/karaoke_finalise.py index 48c58f25..b3fcb0fc 100644 --- a/karaoke_gen/karaoke_finalise/karaoke_finalise.py +++ b/karaoke_gen/karaoke_finalise/karaoke_finalise.py @@ -19,7 +19,7 @@ import time from google.oauth2.credentials import Credentials import base64 from email.mime.text import MIMEText -from lyrics_transcriber.output.cdg import CDGGenerator +from karaoke_gen.lyrics_transcriber.output.cdg import CDGGenerator from ..utils import sanitize_filename diff --git a/karaoke_gen/karaoke_gen.py b/karaoke_gen/karaoke_gen.py index 4bdc554f..2f0dc04d 100644 --- a/karaoke_gen/karaoke_gen.py +++ b/karaoke_gen/karaoke_gen.py @@ -32,10 +32,10 @@ from .video_background_processor import VideoBackgroundProcessor from .audio_fetcher import create_audio_fetcher, AudioFetcherError, NoResultsError, UserCancelledError # Import lyrics_transcriber components for post-review countdown and video rendering -from lyrics_transcriber.output.countdown_processor import CountdownProcessor -from lyrics_transcriber.output.generator import OutputGenerator -from lyrics_transcriber.types import CorrectionResult -from lyrics_transcriber.core.config import OutputConfig as LyricsOutputConfig +from karaoke_gen.lyrics_transcriber.output.countdown_processor import CountdownProcessor +from karaoke_gen.lyrics_transcriber.output.generator import OutputGenerator +from karaoke_gen.lyrics_transcriber.types import CorrectionResult +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig as LyricsOutputConfig class KaraokePrep: diff --git a/karaoke_gen/lyrics_processor.py b/karaoke_gen/lyrics_processor.py index f2bda35c..95461cab 100644 --- a/karaoke_gen/lyrics_processor.py +++ b/karaoke_gen/lyrics_processor.py @@ -4,8 +4,8 @@ import logging import shutil import json from typing import Optional -from lyrics_transcriber import LyricsTranscriber, OutputConfig, TranscriberConfig, LyricsConfig -from lyrics_transcriber.core.controller import LyricsControllerResult +from karaoke_gen.lyrics_transcriber import LyricsTranscriber, OutputConfig, TranscriberConfig, LyricsConfig +from karaoke_gen.lyrics_transcriber.core.controller import LyricsControllerResult from dotenv import load_dotenv from .utils import sanitize_filename diff --git a/libs/lyrics_transcriber/__init__.py b/karaoke_gen/lyrics_transcriber/__init__.py similarity index 59% rename from libs/lyrics_transcriber/__init__.py rename to karaoke_gen/lyrics_transcriber/__init__.py index 43994a89..f5676382 100644 --- a/libs/lyrics_transcriber/__init__.py +++ b/karaoke_gen/lyrics_transcriber/__init__.py @@ -1,5 +1,5 @@ -from lyrics_transcriber.core.config import TranscriberConfig, LyricsConfig, OutputConfig -from lyrics_transcriber.core.controller import LyricsTranscriber +from karaoke_gen.lyrics_transcriber.core.config import TranscriberConfig, LyricsConfig, OutputConfig +from karaoke_gen.lyrics_transcriber.core.controller import LyricsTranscriber from importlib.metadata import version, PackageNotFoundError try: diff --git a/libs/lyrics_transcriber/cli/__init__.py b/karaoke_gen/lyrics_transcriber/cli/__init__.py similarity index 100% rename from libs/lyrics_transcriber/cli/__init__.py rename to karaoke_gen/lyrics_transcriber/cli/__init__.py diff --git a/libs/lyrics_transcriber/cli/cli_main.py b/karaoke_gen/lyrics_transcriber/cli/cli_main.py similarity index 98% rename from libs/lyrics_transcriber/cli/cli_main.py rename to karaoke_gen/lyrics_transcriber/cli/cli_main.py index 2da4ecba..f9103da9 100755 --- a/libs/lyrics_transcriber/cli/cli_main.py +++ b/karaoke_gen/lyrics_transcriber/cli/cli_main.py @@ -11,8 +11,8 @@ from typing import Dict from importlib.metadata import version from dotenv import load_dotenv -from lyrics_transcriber import LyricsTranscriber -from lyrics_transcriber.core.controller import TranscriberConfig, LyricsConfig, OutputConfig +from karaoke_gen.lyrics_transcriber import LyricsTranscriber +from karaoke_gen.lyrics_transcriber.core.controller import TranscriberConfig, LyricsConfig, OutputConfig def create_arg_parser() -> argparse.ArgumentParser: diff --git a/libs/lyrics_transcriber/core/__init__.py b/karaoke_gen/lyrics_transcriber/core/__init__.py similarity index 100% rename from libs/lyrics_transcriber/core/__init__.py rename to karaoke_gen/lyrics_transcriber/core/__init__.py diff --git a/libs/lyrics_transcriber/core/config.py b/karaoke_gen/lyrics_transcriber/core/config.py similarity index 100% rename from libs/lyrics_transcriber/core/config.py rename to karaoke_gen/lyrics_transcriber/core/config.py diff --git a/libs/lyrics_transcriber/core/controller.py b/karaoke_gen/lyrics_transcriber/core/controller.py similarity index 95% rename from libs/lyrics_transcriber/core/controller.py rename to karaoke_gen/lyrics_transcriber/core/controller.py index 64b3fd25..7032392e 100644 --- a/libs/lyrics_transcriber/core/controller.py +++ b/karaoke_gen/lyrics_transcriber/core/controller.py @@ -3,20 +3,20 @@ import logging import json from dataclasses import dataclass, field from typing import Dict, Optional, List -from lyrics_transcriber.types import LyricsData, TranscriptionResult, CorrectionResult -from lyrics_transcriber.transcribers.base_transcriber import BaseTranscriber -from lyrics_transcriber.transcribers.audioshake import AudioShakeTranscriber, AudioShakeConfig -from lyrics_transcriber.transcribers.whisper import WhisperTranscriber, WhisperConfig -from lyrics_transcriber.transcribers.local_whisper import LocalWhisperTranscriber, LocalWhisperConfig -from lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig -from lyrics_transcriber.lyrics.genius import GeniusProvider -from lyrics_transcriber.lyrics.spotify import SpotifyProvider -from lyrics_transcriber.lyrics.musixmatch import MusixmatchProvider -from lyrics_transcriber.lyrics.lrclib import LRCLIBProvider -from lyrics_transcriber.output.generator import OutputGenerator -from lyrics_transcriber.correction.corrector import LyricsCorrector -from lyrics_transcriber.core.config import TranscriberConfig, LyricsConfig, OutputConfig -from lyrics_transcriber.lyrics.file_provider import FileProvider +from karaoke_gen.lyrics_transcriber.types import LyricsData, TranscriptionResult, CorrectionResult +from karaoke_gen.lyrics_transcriber.transcribers.base_transcriber import BaseTranscriber +from karaoke_gen.lyrics_transcriber.transcribers.audioshake import AudioShakeTranscriber, AudioShakeConfig +from karaoke_gen.lyrics_transcriber.transcribers.whisper import WhisperTranscriber, WhisperConfig +from karaoke_gen.lyrics_transcriber.transcribers.local_whisper import LocalWhisperTranscriber, LocalWhisperConfig +from karaoke_gen.lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig +from karaoke_gen.lyrics_transcriber.lyrics.genius import GeniusProvider +from karaoke_gen.lyrics_transcriber.lyrics.spotify import SpotifyProvider +from karaoke_gen.lyrics_transcriber.lyrics.musixmatch import MusixmatchProvider +from karaoke_gen.lyrics_transcriber.lyrics.lrclib import LRCLIBProvider +from karaoke_gen.lyrics_transcriber.output.generator import OutputGenerator +from karaoke_gen.lyrics_transcriber.correction.corrector import LyricsCorrector +from karaoke_gen.lyrics_transcriber.core.config import TranscriberConfig, LyricsConfig, OutputConfig +from karaoke_gen.lyrics_transcriber.lyrics.file_provider import FileProvider @dataclass @@ -301,7 +301,7 @@ class LyricsTranscriber: # Debug: Log package version and environment variables try: - import lyrics_transcriber + from karaoke_gen import lyrics_transcriber package_version = getattr(lyrics_transcriber, '__version__', 'unknown') self.logger.info(f"LyricsTranscriber package version: {package_version}") except Exception as e: @@ -345,7 +345,7 @@ class LyricsTranscriber: # This is important because the video needs to use padded audio to sync # with the countdown-adjusted timestamps in the ASS subtitles if self.output_config.add_countdown: - from lyrics_transcriber.output.countdown_processor import CountdownProcessor + from karaoke_gen.lyrics_transcriber.output.countdown_processor import CountdownProcessor countdown_processor = CountdownProcessor( cache_dir=self.output_config.cache_dir, @@ -572,7 +572,7 @@ class LyricsTranscriber: # Add human review step (moved outside the else block) if self.output_config.enable_review: - from lyrics_transcriber.review.server import ReviewServer + from karaoke_gen.lyrics_transcriber.review.server import ReviewServer self.logger.info("Starting human review process") @@ -590,7 +590,7 @@ class LyricsTranscriber: # Add countdown intro if enabled and needed (after review, before output generation) if self.output_config.add_countdown and self.results.transcription_corrected: - from lyrics_transcriber.output.countdown_processor import CountdownProcessor + from karaoke_gen.lyrics_transcriber.output.countdown_processor import CountdownProcessor self.logger.info("Processing countdown intro (if needed)") countdown_processor = CountdownProcessor( diff --git a/libs/lyrics_transcriber/correction/__init__.py b/karaoke_gen/lyrics_transcriber/correction/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/__init__.py diff --git a/libs/lyrics_transcriber/correction/agentic/__init__.py b/karaoke_gen/lyrics_transcriber/correction/agentic/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/__init__.py diff --git a/libs/lyrics_transcriber/correction/agentic/adapter.py b/karaoke_gen/lyrics_transcriber/correction/agentic/adapter.py similarity index 95% rename from libs/lyrics_transcriber/correction/agentic/adapter.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/adapter.py index 6cd4f51d..2bd7ea53 100644 --- a/libs/lyrics_transcriber/correction/agentic/adapter.py +++ b/karaoke_gen/lyrics_transcriber/correction/agentic/adapter.py @@ -3,8 +3,8 @@ from __future__ import annotations from typing import Dict, Any, List from .models.schemas import CorrectionProposal -from lyrics_transcriber.types import WordCorrection, Word -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import WordCorrection, Word +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils def adapt_proposals_to_word_corrections( diff --git a/libs/lyrics_transcriber/correction/agentic/agent.py b/karaoke_gen/lyrics_transcriber/correction/agentic/agent.py similarity index 99% rename from libs/lyrics_transcriber/correction/agentic/agent.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/agent.py index 35626dcf..907cf527 100644 --- a/libs/lyrics_transcriber/correction/agentic/agent.py +++ b/karaoke_gen/lyrics_transcriber/correction/agentic/agent.py @@ -13,7 +13,7 @@ from .models.schemas import CorrectionProposal, GapClassification, GapCategory from .workflows.correction_graph import build_correction_graph from .prompts.classifier import build_classification_prompt from .handlers.registry import HandlerRegistry -from lyrics_transcriber.utils.tracing import create_span, add_span_attribute +from karaoke_gen.lyrics_transcriber.utils.tracing import create_span, add_span_attribute logger = logging.getLogger(__name__) diff --git a/libs/lyrics_transcriber/correction/agentic/feedback/aggregator.py b/karaoke_gen/lyrics_transcriber/correction/agentic/feedback/aggregator.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/feedback/aggregator.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/feedback/aggregator.py diff --git a/libs/lyrics_transcriber/correction/agentic/feedback/collector.py b/karaoke_gen/lyrics_transcriber/correction/agentic/feedback/collector.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/feedback/collector.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/feedback/collector.py diff --git a/libs/lyrics_transcriber/correction/agentic/feedback/retention.py b/karaoke_gen/lyrics_transcriber/correction/agentic/feedback/retention.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/feedback/retention.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/feedback/retention.py diff --git a/libs/lyrics_transcriber/correction/agentic/feedback/store.py b/karaoke_gen/lyrics_transcriber/correction/agentic/feedback/store.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/feedback/store.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/feedback/store.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/__init__.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/__init__.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/ambiguous.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/ambiguous.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/ambiguous.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/ambiguous.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/background_vocals.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/background_vocals.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/background_vocals.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/background_vocals.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/base.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/base.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/base.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/base.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/complex_multi_error.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/complex_multi_error.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/complex_multi_error.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/complex_multi_error.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/extra_words.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/extra_words.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/extra_words.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/extra_words.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/no_error.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/no_error.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/no_error.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/no_error.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/punctuation.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/punctuation.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/punctuation.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/punctuation.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/registry.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/registry.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/registry.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/registry.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/repeated_section.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/repeated_section.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/repeated_section.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/repeated_section.py diff --git a/libs/lyrics_transcriber/correction/agentic/handlers/sound_alike.py b/karaoke_gen/lyrics_transcriber/correction/agentic/handlers/sound_alike.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/handlers/sound_alike.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/handlers/sound_alike.py diff --git a/libs/lyrics_transcriber/correction/agentic/models/__init__.py b/karaoke_gen/lyrics_transcriber/correction/agentic/models/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/models/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/models/__init__.py diff --git a/libs/lyrics_transcriber/correction/agentic/models/ai_correction.py b/karaoke_gen/lyrics_transcriber/correction/agentic/models/ai_correction.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/models/ai_correction.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/models/ai_correction.py diff --git a/libs/lyrics_transcriber/correction/agentic/models/correction_session.py b/karaoke_gen/lyrics_transcriber/correction/agentic/models/correction_session.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/models/correction_session.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/models/correction_session.py diff --git a/libs/lyrics_transcriber/correction/agentic/models/enums.py b/karaoke_gen/lyrics_transcriber/correction/agentic/models/enums.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/models/enums.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/models/enums.py diff --git a/libs/lyrics_transcriber/correction/agentic/models/human_feedback.py b/karaoke_gen/lyrics_transcriber/correction/agentic/models/human_feedback.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/models/human_feedback.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/models/human_feedback.py diff --git a/libs/lyrics_transcriber/correction/agentic/models/learning_data.py b/karaoke_gen/lyrics_transcriber/correction/agentic/models/learning_data.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/models/learning_data.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/models/learning_data.py diff --git a/libs/lyrics_transcriber/correction/agentic/models/observability_metrics.py b/karaoke_gen/lyrics_transcriber/correction/agentic/models/observability_metrics.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/models/observability_metrics.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/models/observability_metrics.py diff --git a/libs/lyrics_transcriber/correction/agentic/models/schemas.py b/karaoke_gen/lyrics_transcriber/correction/agentic/models/schemas.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/models/schemas.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/models/schemas.py diff --git a/libs/lyrics_transcriber/correction/agentic/models/utils.py b/karaoke_gen/lyrics_transcriber/correction/agentic/models/utils.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/models/utils.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/models/utils.py diff --git a/libs/lyrics_transcriber/correction/agentic/observability/__init__.py b/karaoke_gen/lyrics_transcriber/correction/agentic/observability/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/observability/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/observability/__init__.py diff --git a/libs/lyrics_transcriber/correction/agentic/observability/langfuse_integration.py b/karaoke_gen/lyrics_transcriber/correction/agentic/observability/langfuse_integration.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/observability/langfuse_integration.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/observability/langfuse_integration.py diff --git a/libs/lyrics_transcriber/correction/agentic/observability/metrics.py b/karaoke_gen/lyrics_transcriber/correction/agentic/observability/metrics.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/observability/metrics.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/observability/metrics.py diff --git a/libs/lyrics_transcriber/correction/agentic/observability/performance.py b/karaoke_gen/lyrics_transcriber/correction/agentic/observability/performance.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/observability/performance.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/observability/performance.py diff --git a/libs/lyrics_transcriber/correction/agentic/prompts/__init__.py b/karaoke_gen/lyrics_transcriber/correction/agentic/prompts/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/prompts/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/prompts/__init__.py diff --git a/libs/lyrics_transcriber/correction/agentic/prompts/classifier.py b/karaoke_gen/lyrics_transcriber/correction/agentic/prompts/classifier.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/prompts/classifier.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/prompts/classifier.py diff --git a/libs/lyrics_transcriber/correction/agentic/prompts/langfuse_prompts.py b/karaoke_gen/lyrics_transcriber/correction/agentic/prompts/langfuse_prompts.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/prompts/langfuse_prompts.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/prompts/langfuse_prompts.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/__init__.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/__init__.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/base.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/base.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/base.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/base.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/circuit_breaker.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/circuit_breaker.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/circuit_breaker.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/circuit_breaker.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/config.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/config.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/config.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/config.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/constants.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/constants.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/constants.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/constants.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/health.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/health.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/health.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/health.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/langchain_bridge.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/langchain_bridge.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/langchain_bridge.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/langchain_bridge.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/model_factory.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/model_factory.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/model_factory.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/model_factory.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/response_cache.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/response_cache.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/response_cache.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/response_cache.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/response_parser.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/response_parser.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/response_parser.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/response_parser.py diff --git a/libs/lyrics_transcriber/correction/agentic/providers/retry_executor.py b/karaoke_gen/lyrics_transcriber/correction/agentic/providers/retry_executor.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/providers/retry_executor.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/providers/retry_executor.py diff --git a/libs/lyrics_transcriber/correction/agentic/router.py b/karaoke_gen/lyrics_transcriber/correction/agentic/router.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/router.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/router.py diff --git a/libs/lyrics_transcriber/correction/agentic/workflows/__init__.py b/karaoke_gen/lyrics_transcriber/correction/agentic/workflows/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/workflows/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/workflows/__init__.py diff --git a/libs/lyrics_transcriber/correction/agentic/workflows/consensus_workflow.py b/karaoke_gen/lyrics_transcriber/correction/agentic/workflows/consensus_workflow.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/workflows/consensus_workflow.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/workflows/consensus_workflow.py diff --git a/libs/lyrics_transcriber/correction/agentic/workflows/correction_graph.py b/karaoke_gen/lyrics_transcriber/correction/agentic/workflows/correction_graph.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/workflows/correction_graph.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/workflows/correction_graph.py diff --git a/libs/lyrics_transcriber/correction/agentic/workflows/feedback_workflow.py b/karaoke_gen/lyrics_transcriber/correction/agentic/workflows/feedback_workflow.py similarity index 100% rename from libs/lyrics_transcriber/correction/agentic/workflows/feedback_workflow.py rename to karaoke_gen/lyrics_transcriber/correction/agentic/workflows/feedback_workflow.py diff --git a/libs/lyrics_transcriber/correction/anchor_sequence.py b/karaoke_gen/lyrics_transcriber/correction/anchor_sequence.py similarity index 98% rename from libs/lyrics_transcriber/correction/anchor_sequence.py rename to karaoke_gen/lyrics_transcriber/correction/anchor_sequence.py index bc7fb55f..b7f7093d 100644 --- a/libs/lyrics_transcriber/correction/anchor_sequence.py +++ b/karaoke_gen/lyrics_transcriber/correction/anchor_sequence.py @@ -9,12 +9,12 @@ import json import hashlib # Tracing utilities (optional - gracefully handles missing dependency) -from lyrics_transcriber.utils.tracing import create_span, add_span_attribute, add_span_event +from karaoke_gen.lyrics_transcriber.utils.tracing import create_span, add_span_attribute, add_span_event -from lyrics_transcriber.types import LyricsData, PhraseScore, PhraseType, AnchorSequence, GapSequence, ScoredAnchor, TranscriptionResult, Word -from lyrics_transcriber.correction.phrase_analyzer import PhraseAnalyzer -from lyrics_transcriber.correction.text_utils import clean_text -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import LyricsData, PhraseScore, PhraseType, AnchorSequence, GapSequence, ScoredAnchor, TranscriptionResult, Word +from karaoke_gen.lyrics_transcriber.correction.phrase_analyzer import PhraseAnalyzer +from karaoke_gen.lyrics_transcriber.correction.text_utils import clean_text +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils class AnchorSequenceTimeoutError(Exception): @@ -724,8 +724,8 @@ class AnchorSequenceFinder: # This can happen in tests using backwards compatible constructors # Create dummy Word objects with the text from _words if available if hasattr(anchor, '_words') and anchor._words is not None: - from lyrics_transcriber.types import Word - from lyrics_transcriber.utils.word_utils import WordUtils + from karaoke_gen.lyrics_transcriber.types import Word + from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils anchor.transcribed_words = [ Word( id=word_id, @@ -738,7 +738,7 @@ class AnchorSequenceFinder: ] else: # Create generic word objects for scoring - from lyrics_transcriber.types import Word + from karaoke_gen.lyrics_transcriber.types import Word anchor.transcribed_words = [ Word( id=word_id, diff --git a/libs/lyrics_transcriber/correction/corrector.py b/karaoke_gen/lyrics_transcriber/correction/corrector.py similarity index 96% rename from libs/lyrics_transcriber/correction/corrector.py rename to karaoke_gen/lyrics_transcriber/correction/corrector.py index 08e03c41..5884a125 100644 --- a/libs/lyrics_transcriber/correction/corrector.py +++ b/karaoke_gen/lyrics_transcriber/correction/corrector.py @@ -6,14 +6,14 @@ import os import shortuuid import time -from lyrics_transcriber.correction.handlers.levenshtein import LevenshteinHandler -from lyrics_transcriber.correction.handlers.no_space_punct_match import NoSpacePunctuationMatchHandler -from lyrics_transcriber.correction.handlers.relaxed_word_count_match import RelaxedWordCountMatchHandler -from lyrics_transcriber.correction.handlers.repeat import RepeatCorrectionHandler -from lyrics_transcriber.correction.handlers.sound_alike import SoundAlikeHandler -from lyrics_transcriber.correction.handlers.syllables_match import SyllablesMatchHandler -from lyrics_transcriber.correction.handlers.word_count_match import WordCountMatchHandler -from lyrics_transcriber.types import ( +from karaoke_gen.lyrics_transcriber.correction.handlers.levenshtein import LevenshteinHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.no_space_punct_match import NoSpacePunctuationMatchHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.relaxed_word_count_match import RelaxedWordCountMatchHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.repeat import RepeatCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.sound_alike import SoundAlikeHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.syllables_match import SyllablesMatchHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.word_count_match import WordCountMatchHandler +from karaoke_gen.lyrics_transcriber.types import ( CorrectionStep, GapSequence, LyricsData, @@ -23,11 +23,11 @@ from lyrics_transcriber.types import ( WordCorrection, Word, ) -from lyrics_transcriber.correction.anchor_sequence import AnchorSequenceFinder -from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler -from lyrics_transcriber.correction.handlers.extend_anchor import ExtendAnchorHandler -from lyrics_transcriber.utils.word_utils import WordUtils -from lyrics_transcriber.utils.tracing import create_span, add_span_attribute, add_span_event +from karaoke_gen.lyrics_transcriber.correction.anchor_sequence import AnchorSequenceFinder +from karaoke_gen.lyrics_transcriber.correction.handlers.base import GapCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.extend_anchor import ExtendAnchorHandler +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.utils.tracing import create_span, add_span_attribute, add_span_event class LyricsCorrector: @@ -299,9 +299,9 @@ class LyricsCorrector: if use_agentic_env: try: - from lyrics_transcriber.correction.agentic.agent import AgenticCorrector as _AgenticCorrector - from lyrics_transcriber.correction.agentic.adapter import adapt_proposals_to_word_corrections as _adapt - from lyrics_transcriber.correction.agentic.router import ModelRouter as _ModelRouter + from karaoke_gen.lyrics_transcriber.correction.agentic.agent import AgenticCorrector as _AgenticCorrector + from karaoke_gen.lyrics_transcriber.correction.agentic.adapter import adapt_proposals_to_word_corrections as _adapt + from karaoke_gen.lyrics_transcriber.correction.agentic.router import ModelRouter as _ModelRouter self.logger.info("🤖 Agentic modules imported successfully - running in AGENTIC-ONLY mode") # Create agent ONCE and reuse for all gaps (avoids repeated model initialization) @@ -486,7 +486,7 @@ class LyricsCorrector: # AGENTIC-ONLY MODE: Process all gaps in parallel for better performance if use_agentic_env: from concurrent.futures import ThreadPoolExecutor, as_completed - from lyrics_transcriber.correction.agentic.providers.config import ProviderConfig + from karaoke_gen.lyrics_transcriber.correction.agentic.providers.config import ProviderConfig # Get parallel processing config _config = ProviderConfig.from_env() diff --git a/libs/lyrics_transcriber/correction/feedback/__init__.py b/karaoke_gen/lyrics_transcriber/correction/feedback/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/feedback/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/feedback/__init__.py diff --git a/libs/lyrics_transcriber/correction/feedback/schemas.py b/karaoke_gen/lyrics_transcriber/correction/feedback/schemas.py similarity index 100% rename from libs/lyrics_transcriber/correction/feedback/schemas.py rename to karaoke_gen/lyrics_transcriber/correction/feedback/schemas.py diff --git a/libs/lyrics_transcriber/correction/feedback/store.py b/karaoke_gen/lyrics_transcriber/correction/feedback/store.py similarity index 100% rename from libs/lyrics_transcriber/correction/feedback/store.py rename to karaoke_gen/lyrics_transcriber/correction/feedback/store.py diff --git a/libs/lyrics_transcriber/correction/handlers/__init__.py b/karaoke_gen/lyrics_transcriber/correction/handlers/__init__.py similarity index 100% rename from libs/lyrics_transcriber/correction/handlers/__init__.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/__init__.py diff --git a/libs/lyrics_transcriber/correction/handlers/base.py b/karaoke_gen/lyrics_transcriber/correction/handlers/base.py similarity index 95% rename from libs/lyrics_transcriber/correction/handlers/base.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/base.py index 927430f7..0a4c1a2f 100644 --- a/libs/lyrics_transcriber/correction/handlers/base.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/base.py @@ -2,7 +2,7 @@ from abc import ABC, abstractmethod from typing import List, Optional, Tuple, Dict, Any import logging -from lyrics_transcriber.types import GapSequence, WordCorrection +from karaoke_gen.lyrics_transcriber.types import GapSequence, WordCorrection class GapCorrectionHandler(ABC): diff --git a/libs/lyrics_transcriber/correction/handlers/extend_anchor.py b/karaoke_gen/lyrics_transcriber/correction/handlers/extend_anchor.py similarity index 95% rename from libs/lyrics_transcriber/correction/handlers/extend_anchor.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/extend_anchor.py index e65eebac..133406b2 100644 --- a/libs/lyrics_transcriber/correction/handlers/extend_anchor.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/extend_anchor.py @@ -1,9 +1,9 @@ from typing import List, Optional, Tuple, Dict, Any import logging -from lyrics_transcriber.types import GapSequence, WordCorrection, Word -from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler -from lyrics_transcriber.correction.handlers.word_operations import WordOperations +from karaoke_gen.lyrics_transcriber.types import GapSequence, WordCorrection, Word +from karaoke_gen.lyrics_transcriber.correction.handlers.base import GapCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.word_operations import WordOperations class ExtendAnchorHandler(GapCorrectionHandler): diff --git a/libs/lyrics_transcriber/correction/handlers/levenshtein.py b/karaoke_gen/lyrics_transcriber/correction/handlers/levenshtein.py similarity index 96% rename from libs/lyrics_transcriber/correction/handlers/levenshtein.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/levenshtein.py index 1b6a7244..a8a8342f 100644 --- a/libs/lyrics_transcriber/correction/handlers/levenshtein.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/levenshtein.py @@ -3,9 +3,9 @@ import string import Levenshtein import logging -from lyrics_transcriber.types import GapSequence, WordCorrection -from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler -from lyrics_transcriber.correction.handlers.word_operations import WordOperations +from karaoke_gen.lyrics_transcriber.types import GapSequence, WordCorrection +from karaoke_gen.lyrics_transcriber.correction.handlers.base import GapCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.word_operations import WordOperations class LevenshteinHandler(GapCorrectionHandler): diff --git a/libs/lyrics_transcriber/correction/handlers/no_space_punct_match.py b/karaoke_gen/lyrics_transcriber/correction/handlers/no_space_punct_match.py similarity index 96% rename from libs/lyrics_transcriber/correction/handlers/no_space_punct_match.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/no_space_punct_match.py index 444570a9..b1f7cb7a 100644 --- a/libs/lyrics_transcriber/correction/handlers/no_space_punct_match.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/no_space_punct_match.py @@ -2,9 +2,9 @@ from typing import List, Optional, Tuple, Dict, Any import logging import re -from lyrics_transcriber.types import GapSequence, WordCorrection -from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler -from lyrics_transcriber.correction.handlers.word_operations import WordOperations +from karaoke_gen.lyrics_transcriber.types import GapSequence, WordCorrection +from karaoke_gen.lyrics_transcriber.correction.handlers.base import GapCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.word_operations import WordOperations class NoSpacePunctuationMatchHandler(GapCorrectionHandler): diff --git a/libs/lyrics_transcriber/correction/handlers/relaxed_word_count_match.py b/karaoke_gen/lyrics_transcriber/correction/handlers/relaxed_word_count_match.py similarity index 93% rename from libs/lyrics_transcriber/correction/handlers/relaxed_word_count_match.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/relaxed_word_count_match.py index 84b097ed..63c8f51c 100644 --- a/libs/lyrics_transcriber/correction/handlers/relaxed_word_count_match.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/relaxed_word_count_match.py @@ -1,9 +1,9 @@ from typing import List, Tuple, Dict, Any, Optional import logging -from lyrics_transcriber.types import GapSequence, WordCorrection -from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler -from lyrics_transcriber.correction.handlers.word_operations import WordOperations +from karaoke_gen.lyrics_transcriber.types import GapSequence, WordCorrection +from karaoke_gen.lyrics_transcriber.correction.handlers.base import GapCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.word_operations import WordOperations class RelaxedWordCountMatchHandler(GapCorrectionHandler): diff --git a/libs/lyrics_transcriber/correction/handlers/repeat.py b/karaoke_gen/lyrics_transcriber/correction/handlers/repeat.py similarity index 94% rename from libs/lyrics_transcriber/correction/handlers/repeat.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/repeat.py index 85d9fec6..8bd01de6 100644 --- a/libs/lyrics_transcriber/correction/handlers/repeat.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/repeat.py @@ -1,7 +1,7 @@ from typing import List, Dict, Optional, Tuple, Any -from lyrics_transcriber.types import GapSequence, WordCorrection -from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler -from lyrics_transcriber.correction.handlers.word_operations import WordOperations +from karaoke_gen.lyrics_transcriber.types import GapSequence, WordCorrection +from karaoke_gen.lyrics_transcriber.correction.handlers.base import GapCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.word_operations import WordOperations import logging diff --git a/libs/lyrics_transcriber/correction/handlers/sound_alike.py b/karaoke_gen/lyrics_transcriber/correction/handlers/sound_alike.py similarity index 97% rename from libs/lyrics_transcriber/correction/handlers/sound_alike.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/sound_alike.py index 5f92207a..c6410a7d 100644 --- a/libs/lyrics_transcriber/correction/handlers/sound_alike.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/sound_alike.py @@ -1,9 +1,9 @@ from typing import List, Dict, Tuple, Optional, Any import logging from metaphone import doublemetaphone -from lyrics_transcriber.types import GapSequence, WordCorrection -from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler -from lyrics_transcriber.correction.handlers.word_operations import WordOperations +from karaoke_gen.lyrics_transcriber.types import GapSequence, WordCorrection +from karaoke_gen.lyrics_transcriber.correction.handlers.base import GapCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.word_operations import WordOperations class SoundAlikeHandler(GapCorrectionHandler): diff --git a/libs/lyrics_transcriber/correction/handlers/syllables_match.py b/karaoke_gen/lyrics_transcriber/correction/handlers/syllables_match.py similarity index 98% rename from libs/lyrics_transcriber/correction/handlers/syllables_match.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/syllables_match.py index 0acb8113..e5dabe4b 100644 --- a/libs/lyrics_transcriber/correction/handlers/syllables_match.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/syllables_match.py @@ -8,9 +8,9 @@ from nltk.corpus import cmudict import syllables from spacy_syllables import SpacySyllables -from lyrics_transcriber.types import GapSequence, WordCorrection -from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler -from lyrics_transcriber.correction.handlers.word_operations import WordOperations +from karaoke_gen.lyrics_transcriber.types import GapSequence, WordCorrection +from karaoke_gen.lyrics_transcriber.correction.handlers.base import GapCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.word_operations import WordOperations # Try to import preloaders (may not exist in standalone library usage) try: diff --git a/libs/lyrics_transcriber/correction/handlers/word_count_match.py b/karaoke_gen/lyrics_transcriber/correction/handlers/word_count_match.py similarity index 92% rename from libs/lyrics_transcriber/correction/handlers/word_count_match.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/word_count_match.py index f7a18d8b..659ef1fc 100644 --- a/libs/lyrics_transcriber/correction/handlers/word_count_match.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/word_count_match.py @@ -1,9 +1,9 @@ from typing import List, Tuple, Dict, Any, Optional import logging -from lyrics_transcriber.types import GapSequence, WordCorrection -from lyrics_transcriber.correction.handlers.base import GapCorrectionHandler -from lyrics_transcriber.correction.handlers.word_operations import WordOperations +from karaoke_gen.lyrics_transcriber.types import GapSequence, WordCorrection +from karaoke_gen.lyrics_transcriber.correction.handlers.base import GapCorrectionHandler +from karaoke_gen.lyrics_transcriber.correction.handlers.word_operations import WordOperations class WordCountMatchHandler(GapCorrectionHandler): diff --git a/libs/lyrics_transcriber/correction/handlers/word_operations.py b/karaoke_gen/lyrics_transcriber/correction/handlers/word_operations.py similarity index 98% rename from libs/lyrics_transcriber/correction/handlers/word_operations.py rename to karaoke_gen/lyrics_transcriber/correction/handlers/word_operations.py index 52a24a75..a7867ca2 100644 --- a/libs/lyrics_transcriber/correction/handlers/word_operations.py +++ b/karaoke_gen/lyrics_transcriber/correction/handlers/word_operations.py @@ -1,6 +1,6 @@ from typing import List, Optional, Dict, Any -from lyrics_transcriber.types import WordCorrection, GapSequence -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import WordCorrection, GapSequence +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils class WordOperations: diff --git a/libs/lyrics_transcriber/correction/operations.py b/karaoke_gen/lyrics_transcriber/correction/operations.py similarity index 97% rename from libs/lyrics_transcriber/correction/operations.py rename to karaoke_gen/lyrics_transcriber/correction/operations.py index 253f5778..f972168a 100644 --- a/libs/lyrics_transcriber/correction/operations.py +++ b/karaoke_gen/lyrics_transcriber/correction/operations.py @@ -17,7 +17,7 @@ import logging from typing import Dict, Any, List, Optional from pathlib import Path -from lyrics_transcriber.types import ( +from karaoke_gen.lyrics_transcriber.types import ( CorrectionResult, WordCorrection, LyricsSegment, @@ -26,10 +26,10 @@ from lyrics_transcriber.types import ( TranscriptionData, LyricsData ) -from lyrics_transcriber.correction.corrector import LyricsCorrector -from lyrics_transcriber.lyrics.user_input_provider import UserInputProvider -from lyrics_transcriber.output.generator import OutputGenerator -from lyrics_transcriber.core.config import OutputConfig +from karaoke_gen.lyrics_transcriber.correction.corrector import LyricsCorrector +from karaoke_gen.lyrics_transcriber.lyrics.user_input_provider import UserInputProvider +from karaoke_gen.lyrics_transcriber.output.generator import OutputGenerator +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig class CorrectionOperations: diff --git a/libs/lyrics_transcriber/correction/phrase_analyzer.py b/karaoke_gen/lyrics_transcriber/correction/phrase_analyzer.py similarity index 99% rename from libs/lyrics_transcriber/correction/phrase_analyzer.py rename to karaoke_gen/lyrics_transcriber/correction/phrase_analyzer.py index 3e251720..c553d1ad 100644 --- a/libs/lyrics_transcriber/correction/phrase_analyzer.py +++ b/karaoke_gen/lyrics_transcriber/correction/phrase_analyzer.py @@ -2,8 +2,8 @@ from typing import List import spacy from spacy.tokens import Doc import logging -from lyrics_transcriber.correction.text_utils import clean_text -from lyrics_transcriber.types import PhraseType, PhraseScore +from karaoke_gen.lyrics_transcriber.correction.text_utils import clean_text +from karaoke_gen.lyrics_transcriber.types import PhraseType, PhraseScore # Try to import preloader (may not exist in standalone library usage) try: diff --git a/libs/lyrics_transcriber/correction/text_utils.py b/karaoke_gen/lyrics_transcriber/correction/text_utils.py similarity index 100% rename from libs/lyrics_transcriber/correction/text_utils.py rename to karaoke_gen/lyrics_transcriber/correction/text_utils.py diff --git a/libs/lyrics_transcriber/lyrics/__init__.py b/karaoke_gen/lyrics_transcriber/lyrics/__init__.py similarity index 100% rename from libs/lyrics_transcriber/lyrics/__init__.py rename to karaoke_gen/lyrics_transcriber/lyrics/__init__.py diff --git a/libs/lyrics_transcriber/lyrics/base_lyrics_provider.py b/karaoke_gen/lyrics_transcriber/lyrics/base_lyrics_provider.py similarity index 98% rename from libs/lyrics_transcriber/lyrics/base_lyrics_provider.py rename to karaoke_gen/lyrics_transcriber/lyrics/base_lyrics_provider.py index e1734599..44656937 100644 --- a/libs/lyrics_transcriber/lyrics/base_lyrics_provider.py +++ b/karaoke_gen/lyrics_transcriber/lyrics/base_lyrics_provider.py @@ -6,9 +6,9 @@ import hashlib from pathlib import Path import os from abc import ABC, abstractmethod -from lyrics_transcriber.types import LyricsData, LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.types import LyricsData, LyricsSegment, Word from karaoke_lyrics_processor import KaraokeLyricsProcessor -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils @dataclass diff --git a/libs/lyrics_transcriber/lyrics/file_provider.py b/karaoke_gen/lyrics_transcriber/lyrics/file_provider.py similarity index 98% rename from libs/lyrics_transcriber/lyrics/file_provider.py rename to karaoke_gen/lyrics_transcriber/lyrics/file_provider.py index 29650989..0e31fb5b 100644 --- a/libs/lyrics_transcriber/lyrics/file_provider.py +++ b/karaoke_gen/lyrics_transcriber/lyrics/file_provider.py @@ -2,7 +2,7 @@ from pathlib import Path import logging from typing import Optional, Dict, Any from .base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig -from lyrics_transcriber.types import LyricsData, LyricsMetadata +from karaoke_gen.lyrics_transcriber.types import LyricsData, LyricsMetadata from karaoke_lyrics_processor import KaraokeLyricsProcessor diff --git a/libs/lyrics_transcriber/lyrics/genius.py b/karaoke_gen/lyrics_transcriber/lyrics/genius.py similarity index 98% rename from libs/lyrics_transcriber/lyrics/genius.py rename to karaoke_gen/lyrics_transcriber/lyrics/genius.py index 5e3ae232..b8e03dcd 100644 --- a/libs/lyrics_transcriber/lyrics/genius.py +++ b/karaoke_gen/lyrics_transcriber/lyrics/genius.py @@ -3,8 +3,8 @@ import re from typing import Optional, Dict, Any import requests import lyricsgenius -from lyrics_transcriber.types import LyricsData, LyricsMetadata -from lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig +from karaoke_gen.lyrics_transcriber.types import LyricsData, LyricsMetadata +from karaoke_gen.lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig class GeniusProvider(BaseLyricsProvider): diff --git a/libs/lyrics_transcriber/lyrics/lrclib.py b/karaoke_gen/lyrics_transcriber/lyrics/lrclib.py similarity index 97% rename from libs/lyrics_transcriber/lyrics/lrclib.py rename to karaoke_gen/lyrics_transcriber/lyrics/lrclib.py index d880e5e4..f441d5ac 100644 --- a/libs/lyrics_transcriber/lyrics/lrclib.py +++ b/karaoke_gen/lyrics_transcriber/lyrics/lrclib.py @@ -2,9 +2,9 @@ import logging import re from typing import Optional, Dict, Any, List import requests -from lyrics_transcriber.types import LyricsData, LyricsMetadata, LyricsSegment, Word -from lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import LyricsData, LyricsMetadata, LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils class LRCLIBProvider(BaseLyricsProvider): diff --git a/libs/lyrics_transcriber/lyrics/musixmatch.py b/karaoke_gen/lyrics_transcriber/lyrics/musixmatch.py similarity index 97% rename from libs/lyrics_transcriber/lyrics/musixmatch.py rename to karaoke_gen/lyrics_transcriber/lyrics/musixmatch.py index 626e7cc5..7df313b1 100644 --- a/libs/lyrics_transcriber/lyrics/musixmatch.py +++ b/karaoke_gen/lyrics_transcriber/lyrics/musixmatch.py @@ -1,8 +1,8 @@ import logging from typing import Optional, Dict, Any import requests -from lyrics_transcriber.types import LyricsData, LyricsMetadata -from lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig +from karaoke_gen.lyrics_transcriber.types import LyricsData, LyricsMetadata +from karaoke_gen.lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig class MusixmatchProvider(BaseLyricsProvider): diff --git a/libs/lyrics_transcriber/lyrics/spotify.py b/karaoke_gen/lyrics_transcriber/lyrics/spotify.py similarity index 97% rename from libs/lyrics_transcriber/lyrics/spotify.py rename to karaoke_gen/lyrics_transcriber/lyrics/spotify.py index 105a4c8f..a3a1caa0 100644 --- a/libs/lyrics_transcriber/lyrics/spotify.py +++ b/karaoke_gen/lyrics_transcriber/lyrics/spotify.py @@ -4,9 +4,9 @@ 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 -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import LyricsData, LyricsMetadata, LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils class SpotifyProvider(BaseLyricsProvider): diff --git a/libs/lyrics_transcriber/lyrics/user_input_provider.py b/karaoke_gen/lyrics_transcriber/lyrics/user_input_provider.py similarity index 89% rename from libs/lyrics_transcriber/lyrics/user_input_provider.py rename to karaoke_gen/lyrics_transcriber/lyrics/user_input_provider.py index 9a033d99..054bdff8 100644 --- a/libs/lyrics_transcriber/lyrics/user_input_provider.py +++ b/karaoke_gen/lyrics_transcriber/lyrics/user_input_provider.py @@ -1,6 +1,6 @@ from typing import Optional, Dict, Any -from lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig -from lyrics_transcriber.types import LyricsData, LyricsMetadata +from karaoke_gen.lyrics_transcriber.lyrics.base_lyrics_provider import BaseLyricsProvider, LyricsProviderConfig +from karaoke_gen.lyrics_transcriber.types import LyricsData, LyricsMetadata class UserInputProvider(BaseLyricsProvider): diff --git a/libs/lyrics_transcriber/output/__init__.py b/karaoke_gen/lyrics_transcriber/output/__init__.py similarity index 100% rename from libs/lyrics_transcriber/output/__init__.py rename to karaoke_gen/lyrics_transcriber/output/__init__.py diff --git a/karaoke_gen/lyrics_transcriber/output/ass/__init__.py b/karaoke_gen/lyrics_transcriber/output/ass/__init__.py new file mode 100644 index 00000000..783ce958 --- /dev/null +++ b/karaoke_gen/lyrics_transcriber/output/ass/__init__.py @@ -0,0 +1,21 @@ +from karaoke_gen.lyrics_transcriber.output.ass.lyrics_screen import LyricsScreen +from karaoke_gen.lyrics_transcriber.output.ass.lyrics_line import LyricsLine +from karaoke_gen.lyrics_transcriber.output.ass.section_screen import SectionScreen +from karaoke_gen.lyrics_transcriber.output.ass.style import Style +from karaoke_gen.lyrics_transcriber.output.ass.event import Event +from karaoke_gen.lyrics_transcriber.output.ass.config import ( + ScreenConfig, + LineTimingInfo, + LineState, +) + +__all__ = [ + 'LyricsScreen', + 'LyricsLine', + 'SectionScreen', + 'Style', + 'Event', + 'ScreenConfig', + 'LineTimingInfo', + 'LineState', +] diff --git a/libs/lyrics_transcriber/output/ass/ass.py b/karaoke_gen/lyrics_transcriber/output/ass/ass.py similarity index 99% rename from libs/lyrics_transcriber/output/ass/ass.py rename to karaoke_gen/lyrics_transcriber/output/ass/ass.py index fb803e56..03ad40df 100644 --- a/libs/lyrics_transcriber/output/ass/ass.py +++ b/karaoke_gen/lyrics_transcriber/output/ass/ass.py @@ -1,9 +1,9 @@ #!/usr/bin/env python import os, re, sys, functools, collections -from lyrics_transcriber.output.ass.event import Event -from lyrics_transcriber.output.ass.style import Style -from lyrics_transcriber.output.ass.formatters import Formatters -from lyrics_transcriber.output.ass.constants import ( +from karaoke_gen.lyrics_transcriber.output.ass.event import Event +from karaoke_gen.lyrics_transcriber.output.ass.style import Style +from karaoke_gen.lyrics_transcriber.output.ass.formatters import Formatters +from karaoke_gen.lyrics_transcriber.output.ass.constants import ( ALIGN_BOTTOM_LEFT, ALIGN_BOTTOM_CENTER, ALIGN_BOTTOM_RIGHT, diff --git a/libs/lyrics_transcriber/output/ass/ass_specs.txt b/karaoke_gen/lyrics_transcriber/output/ass/ass_specs.txt similarity index 100% rename from libs/lyrics_transcriber/output/ass/ass_specs.txt rename to karaoke_gen/lyrics_transcriber/output/ass/ass_specs.txt diff --git a/libs/lyrics_transcriber/output/ass/config.py b/karaoke_gen/lyrics_transcriber/output/ass/config.py similarity index 100% rename from libs/lyrics_transcriber/output/ass/config.py rename to karaoke_gen/lyrics_transcriber/output/ass/config.py diff --git a/libs/lyrics_transcriber/output/ass/constants.py b/karaoke_gen/lyrics_transcriber/output/ass/constants.py similarity index 100% rename from libs/lyrics_transcriber/output/ass/constants.py rename to karaoke_gen/lyrics_transcriber/output/ass/constants.py diff --git a/libs/lyrics_transcriber/output/ass/event.py b/karaoke_gen/lyrics_transcriber/output/ass/event.py similarity index 100% rename from libs/lyrics_transcriber/output/ass/event.py rename to karaoke_gen/lyrics_transcriber/output/ass/event.py diff --git a/libs/lyrics_transcriber/output/ass/formatters.py b/karaoke_gen/lyrics_transcriber/output/ass/formatters.py similarity index 100% rename from libs/lyrics_transcriber/output/ass/formatters.py rename to karaoke_gen/lyrics_transcriber/output/ass/formatters.py diff --git a/libs/lyrics_transcriber/output/ass/lyrics_line.py b/karaoke_gen/lyrics_transcriber/output/ass/lyrics_line.py similarity index 97% rename from libs/lyrics_transcriber/output/ass/lyrics_line.py rename to karaoke_gen/lyrics_transcriber/output/ass/lyrics_line.py index 5c071905..4b2eed32 100644 --- a/libs/lyrics_transcriber/output/ass/lyrics_line.py +++ b/karaoke_gen/lyrics_transcriber/output/ass/lyrics_line.py @@ -5,10 +5,10 @@ from datetime import timedelta from PIL import Image, ImageDraw, ImageFont import os -from lyrics_transcriber.types import LyricsSegment -from lyrics_transcriber.output.ass.event import Event -from lyrics_transcriber.output.ass.style import Style -from lyrics_transcriber.output.ass.config import LineState, ScreenConfig +from karaoke_gen.lyrics_transcriber.types import LyricsSegment +from karaoke_gen.lyrics_transcriber.output.ass.event import Event +from karaoke_gen.lyrics_transcriber.output.ass.style import Style +from karaoke_gen.lyrics_transcriber.output.ass.config import LineState, ScreenConfig @dataclass diff --git a/libs/lyrics_transcriber/output/ass/lyrics_screen.py b/karaoke_gen/lyrics_transcriber/output/ass/lyrics_screen.py similarity index 97% rename from libs/lyrics_transcriber/output/ass/lyrics_screen.py rename to karaoke_gen/lyrics_transcriber/output/ass/lyrics_screen.py index fc2c33d9..5fc16861 100644 --- a/libs/lyrics_transcriber/output/ass/lyrics_screen.py +++ b/karaoke_gen/lyrics_transcriber/output/ass/lyrics_screen.py @@ -3,10 +3,10 @@ from typing import List, Optional, Tuple import logging from datetime import timedelta -from lyrics_transcriber.output.ass.style import Style -from lyrics_transcriber.output.ass.event import Event -from lyrics_transcriber.output.ass.lyrics_line import LyricsLine -from lyrics_transcriber.output.ass.config import ScreenConfig, LineTimingInfo, LineState +from karaoke_gen.lyrics_transcriber.output.ass.style import Style +from karaoke_gen.lyrics_transcriber.output.ass.event import Event +from karaoke_gen.lyrics_transcriber.output.ass.lyrics_line import LyricsLine +from karaoke_gen.lyrics_transcriber.output.ass.config import ScreenConfig, LineTimingInfo, LineState class PositionStrategy: diff --git a/libs/lyrics_transcriber/output/ass/section_detector.py b/karaoke_gen/lyrics_transcriber/output/ass/section_detector.py similarity index 96% rename from libs/lyrics_transcriber/output/ass/section_detector.py rename to karaoke_gen/lyrics_transcriber/output/ass/section_detector.py index fae99e3e..80b1538f 100644 --- a/libs/lyrics_transcriber/output/ass/section_detector.py +++ b/karaoke_gen/lyrics_transcriber/output/ass/section_detector.py @@ -1,8 +1,8 @@ from typing import List, Optional, Tuple import logging -from lyrics_transcriber.types import LyricsSegment -from lyrics_transcriber.output.ass import LyricsScreen, SectionScreen +from karaoke_gen.lyrics_transcriber.types import LyricsSegment +from karaoke_gen.lyrics_transcriber.output.ass import LyricsScreen, SectionScreen class SectionDetector: diff --git a/libs/lyrics_transcriber/output/ass/section_screen.py b/karaoke_gen/lyrics_transcriber/output/ass/section_screen.py similarity index 94% rename from libs/lyrics_transcriber/output/ass/section_screen.py rename to karaoke_gen/lyrics_transcriber/output/ass/section_screen.py index 865e793c..0d32872a 100644 --- a/libs/lyrics_transcriber/output/ass/section_screen.py +++ b/karaoke_gen/lyrics_transcriber/output/ass/section_screen.py @@ -3,9 +3,9 @@ from typing import List, Optional, Literal, Tuple import logging from datetime import timedelta -from lyrics_transcriber.output.ass.style import Style -from lyrics_transcriber.output.ass.event import Event -from lyrics_transcriber.output.ass.lyrics_screen import ScreenConfig +from karaoke_gen.lyrics_transcriber.output.ass.style import Style +from karaoke_gen.lyrics_transcriber.output.ass.event import Event +from karaoke_gen.lyrics_transcriber.output.ass.lyrics_screen import ScreenConfig @dataclass diff --git a/libs/lyrics_transcriber/output/ass/style.py b/karaoke_gen/lyrics_transcriber/output/ass/style.py similarity index 97% rename from libs/lyrics_transcriber/output/ass/style.py rename to karaoke_gen/lyrics_transcriber/output/ass/style.py index 93f79280..88b88aa5 100644 --- a/libs/lyrics_transcriber/output/ass/style.py +++ b/karaoke_gen/lyrics_transcriber/output/ass/style.py @@ -1,5 +1,5 @@ -from lyrics_transcriber.output.ass.formatters import Formatters -from lyrics_transcriber.output.ass.constants import ALIGN_BOTTOM_CENTER +from karaoke_gen.lyrics_transcriber.output.ass.formatters import Formatters +from karaoke_gen.lyrics_transcriber.output.ass.constants import ALIGN_BOTTOM_CENTER class Style: diff --git a/libs/lyrics_transcriber/output/cdg.py b/karaoke_gen/lyrics_transcriber/output/cdg.py similarity index 98% rename from libs/lyrics_transcriber/output/cdg.py rename to karaoke_gen/lyrics_transcriber/output/cdg.py index 7e30ac0a..b75df6ca 100644 --- a/libs/lyrics_transcriber/output/cdg.py +++ b/karaoke_gen/lyrics_transcriber/output/cdg.py @@ -9,10 +9,10 @@ import os import zipfile import shutil -from lyrics_transcriber.output.cdgmaker.cdg import CDG_VISIBLE_WIDTH -from lyrics_transcriber.output.cdgmaker.composer import KaraokeComposer -from lyrics_transcriber.output.cdgmaker.render import get_wrapped_text -from lyrics_transcriber.types import LyricsSegment +from karaoke_gen.lyrics_transcriber.output.cdgmaker.cdg import CDG_VISIBLE_WIDTH +from karaoke_gen.lyrics_transcriber.output.cdgmaker.composer import KaraokeComposer +from karaoke_gen.lyrics_transcriber.output.cdgmaker.render import get_wrapped_text +from karaoke_gen.lyrics_transcriber.types import LyricsSegment class CDGGenerator: diff --git a/libs/lyrics_transcriber/output/cdgmaker/__init__.py b/karaoke_gen/lyrics_transcriber/output/cdgmaker/__init__.py similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/__init__.py rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/__init__.py diff --git a/libs/lyrics_transcriber/output/cdgmaker/cdg.py b/karaoke_gen/lyrics_transcriber/output/cdgmaker/cdg.py similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/cdg.py rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/cdg.py diff --git a/libs/lyrics_transcriber/output/cdgmaker/composer.py b/karaoke_gen/lyrics_transcriber/output/cdgmaker/composer.py similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/composer.py rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/composer.py diff --git a/libs/lyrics_transcriber/output/cdgmaker/config.py b/karaoke_gen/lyrics_transcriber/output/cdgmaker/config.py similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/config.py rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/config.py diff --git a/libs/lyrics_transcriber/output/cdgmaker/images/instrumental.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/images/instrumental.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/images/instrumental.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/images/instrumental.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/images/intro.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/images/intro.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/images/intro.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/images/intro.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/pack.py b/karaoke_gen/lyrics_transcriber/output/cdgmaker/pack.py similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/pack.py rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/pack.py diff --git a/libs/lyrics_transcriber/output/cdgmaker/render.py b/karaoke_gen/lyrics_transcriber/output/cdgmaker/render.py similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/render.py rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/render.py diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/centertexttoplogobottomtext.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/centertexttoplogobottomtext.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/centertexttoplogobottomtext.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/centertexttoplogobottomtext.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/circlein.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/circlein.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/circlein.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/circlein.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/circleout.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/circleout.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/circleout.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/circleout.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/fizzle.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/fizzle.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/fizzle.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/fizzle.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/largecentertexttoplogo.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/largecentertexttoplogo.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/largecentertexttoplogo.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/largecentertexttoplogo.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/rectangle.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/rectangle.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/rectangle.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/rectangle.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/spiral.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/spiral.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/spiral.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/spiral.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/topleftmusicalnotes.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/topleftmusicalnotes.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/topleftmusicalnotes.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/topleftmusicalnotes.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/wipein.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/wipein.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/wipein.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/wipein.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/wipeleft.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/wipeleft.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/wipeleft.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/wipeleft.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/wipeout.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/wipeout.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/wipeout.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/wipeout.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/transitions/wiperight.png b/karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/wiperight.png similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/transitions/wiperight.png rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/wiperight.png diff --git a/libs/lyrics_transcriber/output/cdgmaker/utils.py b/karaoke_gen/lyrics_transcriber/output/cdgmaker/utils.py similarity index 100% rename from libs/lyrics_transcriber/output/cdgmaker/utils.py rename to karaoke_gen/lyrics_transcriber/output/cdgmaker/utils.py diff --git a/libs/lyrics_transcriber/output/countdown_processor.py b/karaoke_gen/lyrics_transcriber/output/countdown_processor.py similarity index 98% rename from libs/lyrics_transcriber/output/countdown_processor.py rename to karaoke_gen/lyrics_transcriber/output/countdown_processor.py index 26505017..8a7b4f9e 100644 --- a/libs/lyrics_transcriber/output/countdown_processor.py +++ b/karaoke_gen/lyrics_transcriber/output/countdown_processor.py @@ -6,8 +6,8 @@ import subprocess from typing import List, Optional, Tuple from copy import deepcopy -from lyrics_transcriber.types import CorrectionResult, LyricsSegment, Word -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import CorrectionResult, LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils class CountdownProcessor: diff --git a/libs/lyrics_transcriber/output/fonts/AvenirNext-Bold.ttf b/karaoke_gen/lyrics_transcriber/output/fonts/AvenirNext-Bold.ttf similarity index 100% rename from libs/lyrics_transcriber/output/fonts/AvenirNext-Bold.ttf rename to karaoke_gen/lyrics_transcriber/output/fonts/AvenirNext-Bold.ttf diff --git a/libs/lyrics_transcriber/output/fonts/DMSans-VariableFont_opsz,wght.ttf b/karaoke_gen/lyrics_transcriber/output/fonts/DMSans-VariableFont_opsz,wght.ttf similarity index 100% rename from libs/lyrics_transcriber/output/fonts/DMSans-VariableFont_opsz,wght.ttf rename to karaoke_gen/lyrics_transcriber/output/fonts/DMSans-VariableFont_opsz,wght.ttf diff --git a/libs/lyrics_transcriber/output/fonts/DMSerifDisplay-Regular.ttf b/karaoke_gen/lyrics_transcriber/output/fonts/DMSerifDisplay-Regular.ttf similarity index 100% rename from libs/lyrics_transcriber/output/fonts/DMSerifDisplay-Regular.ttf rename to karaoke_gen/lyrics_transcriber/output/fonts/DMSerifDisplay-Regular.ttf diff --git a/libs/lyrics_transcriber/output/fonts/Oswald-SemiBold.ttf b/karaoke_gen/lyrics_transcriber/output/fonts/Oswald-SemiBold.ttf similarity index 100% rename from libs/lyrics_transcriber/output/fonts/Oswald-SemiBold.ttf rename to karaoke_gen/lyrics_transcriber/output/fonts/Oswald-SemiBold.ttf diff --git a/libs/lyrics_transcriber/output/fonts/Zurich_Cn_BT_Bold.ttf b/karaoke_gen/lyrics_transcriber/output/fonts/Zurich_Cn_BT_Bold.ttf similarity index 100% rename from libs/lyrics_transcriber/output/fonts/Zurich_Cn_BT_Bold.ttf rename to karaoke_gen/lyrics_transcriber/output/fonts/Zurich_Cn_BT_Bold.ttf diff --git a/libs/lyrics_transcriber/output/fonts/arial.ttf b/karaoke_gen/lyrics_transcriber/output/fonts/arial.ttf similarity index 100% rename from libs/lyrics_transcriber/output/fonts/arial.ttf rename to karaoke_gen/lyrics_transcriber/output/fonts/arial.ttf diff --git a/libs/lyrics_transcriber/output/fonts/georgia.ttf b/karaoke_gen/lyrics_transcriber/output/fonts/georgia.ttf similarity index 100% rename from libs/lyrics_transcriber/output/fonts/georgia.ttf rename to karaoke_gen/lyrics_transcriber/output/fonts/georgia.ttf diff --git a/libs/lyrics_transcriber/output/fonts/verdana.ttf b/karaoke_gen/lyrics_transcriber/output/fonts/verdana.ttf similarity index 100% rename from libs/lyrics_transcriber/output/fonts/verdana.ttf rename to karaoke_gen/lyrics_transcriber/output/fonts/verdana.ttf diff --git a/libs/lyrics_transcriber/output/generator.py b/karaoke_gen/lyrics_transcriber/output/generator.py similarity index 95% rename from libs/lyrics_transcriber/output/generator.py rename to karaoke_gen/lyrics_transcriber/output/generator.py index 29d4d0e9..a55d628e 100644 --- a/libs/lyrics_transcriber/output/generator.py +++ b/karaoke_gen/lyrics_transcriber/output/generator.py @@ -4,15 +4,15 @@ import logging from typing import List, Optional import json -from lyrics_transcriber.types import LyricsData -from lyrics_transcriber.correction.corrector import CorrectionResult -from lyrics_transcriber.output.plain_text import PlainTextGenerator -from lyrics_transcriber.output.lyrics_file import LyricsFileGenerator -from lyrics_transcriber.output.subtitles import SubtitlesGenerator -from lyrics_transcriber.output.video import VideoGenerator -from lyrics_transcriber.output.segment_resizer import SegmentResizer -from lyrics_transcriber.output.cdg import CDGGenerator -from lyrics_transcriber.core.config import OutputConfig +from karaoke_gen.lyrics_transcriber.types import LyricsData +from karaoke_gen.lyrics_transcriber.correction.corrector import CorrectionResult +from karaoke_gen.lyrics_transcriber.output.plain_text import PlainTextGenerator +from karaoke_gen.lyrics_transcriber.output.lyrics_file import LyricsFileGenerator +from karaoke_gen.lyrics_transcriber.output.subtitles import SubtitlesGenerator +from karaoke_gen.lyrics_transcriber.output.video import VideoGenerator +from karaoke_gen.lyrics_transcriber.output.segment_resizer import SegmentResizer +from karaoke_gen.lyrics_transcriber.output.cdg import CDGGenerator +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig @dataclass diff --git a/libs/lyrics_transcriber/output/lrc_to_cdg.py b/karaoke_gen/lyrics_transcriber/output/lrc_to_cdg.py similarity index 96% rename from libs/lyrics_transcriber/output/lrc_to_cdg.py rename to karaoke_gen/lyrics_transcriber/output/lrc_to_cdg.py index 423b2381..a692d555 100755 --- a/libs/lyrics_transcriber/output/lrc_to_cdg.py +++ b/karaoke_gen/lyrics_transcriber/output/lrc_to_cdg.py @@ -6,7 +6,7 @@ import json import sys from pathlib import Path -from lyrics_transcriber.output.cdg import CDGGenerator +from karaoke_gen.lyrics_transcriber.output.cdg import CDGGenerator logger = logging.getLogger(__name__) diff --git a/libs/lyrics_transcriber/output/lyrics_file.py b/karaoke_gen/lyrics_transcriber/output/lyrics_file.py similarity index 98% rename from libs/lyrics_transcriber/output/lyrics_file.py rename to karaoke_gen/lyrics_transcriber/output/lyrics_file.py index 7cf9ef70..4c7ef6bc 100644 --- a/libs/lyrics_transcriber/output/lyrics_file.py +++ b/karaoke_gen/lyrics_transcriber/output/lyrics_file.py @@ -2,7 +2,7 @@ import logging import os from typing import List, Optional -from lyrics_transcriber.types import LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.types import LyricsSegment, Word class LyricsFileGenerator: diff --git a/libs/lyrics_transcriber/output/plain_text.py b/karaoke_gen/lyrics_transcriber/output/plain_text.py similarity index 95% rename from libs/lyrics_transcriber/output/plain_text.py rename to karaoke_gen/lyrics_transcriber/output/plain_text.py index 16da7d52..d5d2af72 100644 --- a/libs/lyrics_transcriber/output/plain_text.py +++ b/karaoke_gen/lyrics_transcriber/output/plain_text.py @@ -2,8 +2,8 @@ import logging import os from typing import List, Optional -from lyrics_transcriber.types import LyricsData, LyricsSegment -from lyrics_transcriber.correction.corrector import CorrectionResult +from karaoke_gen.lyrics_transcriber.types import LyricsData, LyricsSegment +from karaoke_gen.lyrics_transcriber.correction.corrector import CorrectionResult class PlainTextGenerator: diff --git a/libs/lyrics_transcriber/output/segment_resizer.py b/karaoke_gen/lyrics_transcriber/output/segment_resizer.py similarity index 99% rename from libs/lyrics_transcriber/output/segment_resizer.py rename to karaoke_gen/lyrics_transcriber/output/segment_resizer.py index 9729b76e..f38937da 100644 --- a/libs/lyrics_transcriber/output/segment_resizer.py +++ b/karaoke_gen/lyrics_transcriber/output/segment_resizer.py @@ -2,8 +2,8 @@ import logging import re from typing import List, Optional -from lyrics_transcriber.types import LyricsSegment, Word -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils class SegmentResizer: diff --git a/libs/lyrics_transcriber/output/subtitles.py b/karaoke_gen/lyrics_transcriber/output/subtitles.py similarity index 96% rename from libs/lyrics_transcriber/output/subtitles.py rename to karaoke_gen/lyrics_transcriber/output/subtitles.py index ba2e165b..fabaa04f 100644 --- a/libs/lyrics_transcriber/output/subtitles.py +++ b/karaoke_gen/lyrics_transcriber/output/subtitles.py @@ -4,15 +4,15 @@ from typing import List, Optional, Tuple, Union import subprocess import json -from lyrics_transcriber.output.ass.section_screen import SectionScreen -from lyrics_transcriber.types import LyricsSegment, Word -from lyrics_transcriber.output.ass import LyricsScreen, LyricsLine -from lyrics_transcriber.output.ass.ass import ASS -from lyrics_transcriber.output.ass.style import Style -from lyrics_transcriber.output.ass.constants import ALIGN_TOP_CENTER -from lyrics_transcriber.output.ass import LyricsScreen -from lyrics_transcriber.output.ass.section_detector import SectionDetector -from lyrics_transcriber.output.ass.config import ScreenConfig +from karaoke_gen.lyrics_transcriber.output.ass.section_screen import SectionScreen +from karaoke_gen.lyrics_transcriber.types import LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.output.ass import LyricsScreen, LyricsLine +from karaoke_gen.lyrics_transcriber.output.ass.ass import ASS +from karaoke_gen.lyrics_transcriber.output.ass.style import Style +from karaoke_gen.lyrics_transcriber.output.ass.constants import ALIGN_TOP_CENTER +from karaoke_gen.lyrics_transcriber.output.ass import LyricsScreen +from karaoke_gen.lyrics_transcriber.output.ass.section_detector import SectionDetector +from karaoke_gen.lyrics_transcriber.output.ass.config import ScreenConfig class SubtitlesGenerator: diff --git a/libs/lyrics_transcriber/output/video.py b/karaoke_gen/lyrics_transcriber/output/video.py similarity index 100% rename from libs/lyrics_transcriber/output/video.py rename to karaoke_gen/lyrics_transcriber/output/video.py diff --git a/libs/lyrics_transcriber/review/__init__.py b/karaoke_gen/lyrics_transcriber/review/__init__.py similarity index 100% rename from libs/lyrics_transcriber/review/__init__.py rename to karaoke_gen/lyrics_transcriber/review/__init__.py diff --git a/libs/lyrics_transcriber/review/server.py b/karaoke_gen/lyrics_transcriber/review/server.py similarity index 96% rename from libs/lyrics_transcriber/review/server.py rename to karaoke_gen/lyrics_transcriber/review/server.py index d99a0a25..b1203b82 100644 --- a/libs/lyrics_transcriber/review/server.py +++ b/karaoke_gen/lyrics_transcriber/review/server.py @@ -3,28 +3,28 @@ import socket from fastapi import FastAPI, Body, HTTPException from fastapi.middleware.cors import CORSMiddleware from typing import Dict, Any, List, Optional -from lyrics_transcriber.types import CorrectionResult, WordCorrection, LyricsSegment, LyricsData, LyricsMetadata, Word +from karaoke_gen.lyrics_transcriber.types import CorrectionResult, WordCorrection, LyricsSegment, LyricsData, LyricsMetadata, Word import time import os import urllib.parse from fastapi.staticfiles import StaticFiles from fastapi.responses import FileResponse, JSONResponse import hashlib -from lyrics_transcriber.core.config import OutputConfig +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig import uvicorn import webbrowser from threading import Thread -from lyrics_transcriber.output.generator import OutputGenerator +from karaoke_gen.lyrics_transcriber.output.generator import OutputGenerator import json -from lyrics_transcriber.correction.corrector import LyricsCorrector -from lyrics_transcriber.types import TranscriptionResult, TranscriptionData -from lyrics_transcriber.lyrics.user_input_provider import UserInputProvider -from lyrics_transcriber.correction.operations import CorrectionOperations +from karaoke_gen.lyrics_transcriber.correction.corrector import LyricsCorrector +from karaoke_gen.lyrics_transcriber.types import TranscriptionResult, TranscriptionData +from karaoke_gen.lyrics_transcriber.lyrics.user_input_provider import UserInputProvider +from karaoke_gen.lyrics_transcriber.correction.operations import CorrectionOperations import uuid try: # Optional: used to introspect local models for /api/v1/models - from lyrics_transcriber.correction.agentic.providers.health import ( + from karaoke_gen.lyrics_transcriber.correction.agentic.providers.health import ( is_ollama_available, get_ollama_models, ) @@ -36,12 +36,12 @@ except Exception: return [] try: - from lyrics_transcriber.correction.agentic.observability.metrics import MetricsAggregator + from karaoke_gen.lyrics_transcriber.correction.agentic.observability.metrics import MetricsAggregator except Exception: MetricsAggregator = None # type: ignore try: - from lyrics_transcriber.correction.agentic.observability.langfuse_integration import ( + from karaoke_gen.lyrics_transcriber.correction.agentic.observability.langfuse_integration import ( setup_langfuse, record_metrics as lf_record, ) @@ -50,13 +50,13 @@ except Exception: lf_record = lambda *args, **kwargs: None # type: ignore try: - from lyrics_transcriber.correction.agentic.feedback.store import FeedbackStore + from karaoke_gen.lyrics_transcriber.correction.agentic.feedback.store import FeedbackStore except Exception: FeedbackStore = None # type: ignore try: - from lyrics_transcriber.correction.feedback.store import FeedbackStore as NewFeedbackStore - from lyrics_transcriber.correction.feedback.schemas import CorrectionAnnotation + from karaoke_gen.lyrics_transcriber.correction.feedback.store import FeedbackStore as NewFeedbackStore + from karaoke_gen.lyrics_transcriber.correction.feedback.schemas import CorrectionAnnotation except Exception: NewFeedbackStore = None # type: ignore CorrectionAnnotation = None # type: ignore diff --git a/libs/lyrics_transcriber/storage/__init__.py b/karaoke_gen/lyrics_transcriber/storage/__init__.py similarity index 100% rename from libs/lyrics_transcriber/storage/__init__.py rename to karaoke_gen/lyrics_transcriber/storage/__init__.py diff --git a/libs/lyrics_transcriber/storage/dropbox.py b/karaoke_gen/lyrics_transcriber/storage/dropbox.py similarity index 100% rename from libs/lyrics_transcriber/storage/dropbox.py rename to karaoke_gen/lyrics_transcriber/storage/dropbox.py diff --git a/libs/lyrics_transcriber/transcribers/__init__.py b/karaoke_gen/lyrics_transcriber/transcribers/__init__.py similarity index 100% rename from libs/lyrics_transcriber/transcribers/__init__.py rename to karaoke_gen/lyrics_transcriber/transcribers/__init__.py diff --git a/libs/lyrics_transcriber/transcribers/audioshake.py b/karaoke_gen/lyrics_transcriber/transcribers/audioshake.py similarity index 98% rename from libs/lyrics_transcriber/transcribers/audioshake.py rename to karaoke_gen/lyrics_transcriber/transcribers/audioshake.py index 779c66ff..0fce3138 100644 --- a/libs/lyrics_transcriber/transcribers/audioshake.py +++ b/karaoke_gen/lyrics_transcriber/transcribers/audioshake.py @@ -6,9 +6,9 @@ import tempfile from typing import Dict, Optional, Any, Union, Tuple from pathlib import Path from pydub import AudioSegment -from lyrics_transcriber.types import TranscriptionData, LyricsSegment, Word -from lyrics_transcriber.transcribers.base_transcriber import BaseTranscriber, TranscriptionError -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import TranscriptionData, LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.transcribers.base_transcriber import BaseTranscriber, TranscriptionError +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils # Lossy formats that should be uploaded directly (transcoding would cause quality loss) LOSSY_FORMATS = {'.mp3', '.aac', '.ogg', '.m4a', '.wma', '.opus'} diff --git a/libs/lyrics_transcriber/transcribers/base_transcriber.py b/karaoke_gen/lyrics_transcriber/transcribers/base_transcriber.py similarity index 98% rename from libs/lyrics_transcriber/transcribers/base_transcriber.py rename to karaoke_gen/lyrics_transcriber/transcribers/base_transcriber.py index 09080656..e320e075 100644 --- a/libs/lyrics_transcriber/transcribers/base_transcriber.py +++ b/karaoke_gen/lyrics_transcriber/transcribers/base_transcriber.py @@ -5,7 +5,7 @@ import logging import os import json import hashlib -from lyrics_transcriber.types import TranscriptionData +from karaoke_gen.lyrics_transcriber.types import TranscriptionData class TranscriptionError(Exception): diff --git a/libs/lyrics_transcriber/transcribers/local_whisper.py b/karaoke_gen/lyrics_transcriber/transcribers/local_whisper.py similarity index 97% rename from libs/lyrics_transcriber/transcribers/local_whisper.py rename to karaoke_gen/lyrics_transcriber/transcribers/local_whisper.py index 30fd5e6e..fc9ed2c6 100644 --- a/libs/lyrics_transcriber/transcribers/local_whisper.py +++ b/karaoke_gen/lyrics_transcriber/transcribers/local_whisper.py @@ -6,9 +6,9 @@ import logging from typing import Optional, Dict, Any, Union from pathlib import Path -from lyrics_transcriber.types import TranscriptionData, LyricsSegment, Word -from lyrics_transcriber.transcribers.base_transcriber import BaseTranscriber, TranscriptionError -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import TranscriptionData, LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.transcribers.base_transcriber import BaseTranscriber, TranscriptionError +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils @dataclass diff --git a/libs/lyrics_transcriber/transcribers/whisper.py b/karaoke_gen/lyrics_transcriber/transcribers/whisper.py similarity index 97% rename from libs/lyrics_transcriber/transcribers/whisper.py rename to karaoke_gen/lyrics_transcriber/transcribers/whisper.py index 0a1d0827..6f712b27 100755 --- a/libs/lyrics_transcriber/transcribers/whisper.py +++ b/karaoke_gen/lyrics_transcriber/transcribers/whisper.py @@ -9,9 +9,9 @@ import time from typing import Optional, Dict, Any, Protocol, Union from pathlib import Path from pydub import AudioSegment -from lyrics_transcriber.types import TranscriptionData, LyricsSegment, Word -from lyrics_transcriber.transcribers.base_transcriber import BaseTranscriber, TranscriptionError -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.types import TranscriptionData, LyricsSegment, Word +from karaoke_gen.lyrics_transcriber.transcribers.base_transcriber import BaseTranscriber, TranscriptionError +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils @dataclass @@ -196,7 +196,7 @@ class WhisperTranscriber(BaseTranscriber): def _initialize_storage(self) -> FileStorageProtocol: """Initialize storage client.""" - from lyrics_transcriber.storage.dropbox import DropboxHandler, DropboxConfig + from karaoke_gen.lyrics_transcriber.storage.dropbox import DropboxHandler, DropboxConfig # Create config using os.getenv directly config = DropboxConfig( diff --git a/libs/lyrics_transcriber/types.py b/karaoke_gen/lyrics_transcriber/types.py similarity index 99% rename from libs/lyrics_transcriber/types.py rename to karaoke_gen/lyrics_transcriber/types.py index b927b857..93e14aed 100644 --- a/libs/lyrics_transcriber/types.py +++ b/karaoke_gen/lyrics_transcriber/types.py @@ -1,7 +1,7 @@ from dataclasses import dataclass, asdict, field, fields from typing import Any, Dict, List, Optional, Set, Tuple from enum import Enum -from lyrics_transcriber.utils.word_utils import WordUtils +from karaoke_gen.lyrics_transcriber.utils.word_utils import WordUtils @dataclass diff --git a/libs/lyrics_transcriber/utils/__init__.py b/karaoke_gen/lyrics_transcriber/utils/__init__.py similarity index 100% rename from libs/lyrics_transcriber/utils/__init__.py rename to karaoke_gen/lyrics_transcriber/utils/__init__.py diff --git a/libs/lyrics_transcriber/utils/tracing.py b/karaoke_gen/lyrics_transcriber/utils/tracing.py similarity index 98% rename from libs/lyrics_transcriber/utils/tracing.py rename to karaoke_gen/lyrics_transcriber/utils/tracing.py index a89abac5..f9cef9d7 100644 --- a/libs/lyrics_transcriber/utils/tracing.py +++ b/karaoke_gen/lyrics_transcriber/utils/tracing.py @@ -7,7 +7,7 @@ traces will export to Google Cloud Trace. When running standalone (CLI), tracing is no-op unless explicitly configured. Usage: - from lyrics_transcriber.utils.tracing import create_span, traced + from karaoke_gen.lyrics_transcriber.utils.tracing import create_span, traced # Context manager for spans with create_span("operation_name", {"key": "value"}) as span: diff --git a/libs/lyrics_transcriber/utils/word_utils.py b/karaoke_gen/lyrics_transcriber/utils/word_utils.py similarity index 100% rename from libs/lyrics_transcriber/utils/word_utils.py rename to karaoke_gen/lyrics_transcriber/utils/word_utils.py diff --git a/karaoke_gen/pipeline/stages/render.py b/karaoke_gen/pipeline/stages/render.py index a82bbd6d..38c648cf 100644 --- a/karaoke_gen/pipeline/stages/render.py +++ b/karaoke_gen/pipeline/stages/render.py @@ -22,7 +22,7 @@ class RenderStage(PipelineStage): Video rendering stage. Renders the karaoke video with synchronized lyrics overlay. - Uses OutputGenerator from lyrics_transcriber. + Uses OutputGenerator from karaoke_gen.lyrics_transcriber. """ def __init__( @@ -91,7 +91,7 @@ class RenderStage(PipelineStage): ) # Import OutputGenerator - from lyrics_transcriber import OutputGenerator, OutputConfig + from karaoke_gen.lyrics_transcriber import OutputGenerator, OutputConfig # Build output config output_config = OutputConfig( diff --git a/libs/lyrics_transcriber/output/ass/__init__.py b/libs/lyrics_transcriber/output/ass/__init__.py deleted file mode 100644 index a9bf3fe0..00000000 --- a/libs/lyrics_transcriber/output/ass/__init__.py +++ /dev/null @@ -1,21 +0,0 @@ -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', -] diff --git a/lyrics_transcriber_temp/lyrics_transcriber/frontend/.yarn/install-state.gz b/lyrics_transcriber_temp/lyrics_transcriber/frontend/.yarn/install-state.gz new file mode 100644 index 00000000..87468e39 Binary files /dev/null and b/lyrics_transcriber_temp/lyrics_transcriber/frontend/.yarn/install-state.gz differ diff --git a/pyproject.toml b/pyproject.toml index 92d65b8a..e48be7e5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,15 +7,14 @@ license = "MIT" readme = "README.md" packages = [ { include = "karaoke_gen" }, - { include = "lyrics_transcriber", from = "libs" }, { include = "backend" } ] include = [ "karaoke_gen/nextjs_frontend/out", "karaoke_gen/nextjs_frontend/out/**/*", - "libs/lyrics_transcriber/output/fonts/*", - "libs/lyrics_transcriber/output/cdgmaker/images/*", - "libs/lyrics_transcriber/output/cdgmaker/transitions/*" + "karaoke_gen/lyrics_transcriber/output/fonts/*", + "karaoke_gen/lyrics_transcriber/output/cdgmaker/images/*", + "karaoke_gen/lyrics_transcriber/output/cdgmaker/transitions/*" ] homepage = "https://github.com/nomadkaraoke/karaoke-gen" repository = "https://github.com/nomadkaraoke/karaoke-gen" @@ -39,7 +38,7 @@ thefuzz = ">=0.22" numpy = ">=2" audio-separator = { version = ">=0.34.0", extras = ["cpu"] } lyrics-converter = ">=0.2.1" -# lyrics-transcriber is vendored in libs/lyrics_transcriber/ and included via packages +# lyrics_transcriber is now a subpackage of karaoke_gen (karaoke_gen/lyrics_transcriber/) # Dependencies from vendored lyrics_transcriber: mutagen = ">=1.47" # For LRCLIB provider to get track duration for better matching python-slugify = ">=8" @@ -160,3 +159,10 @@ filterwarnings = [ "ignore::RuntimeWarning", "ignore::UserWarning", ] + +[tool.coverage.run] +# Exclude lyrics_transcriber subpackage from coverage since it was a separate vendored package +# with its own test suite - including it in karaoke_gen coverage would unfairly lower the percentage +omit = [ + "karaoke_gen/lyrics_transcriber/*", +] diff --git a/scripts/benchmark_encoding.py b/scripts/benchmark_encoding.py index 840a87b3..fa216ad0 100644 --- a/scripts/benchmark_encoding.py +++ b/scripts/benchmark_encoding.py @@ -229,7 +229,7 @@ def run_benchmarks(benchmark_dir: Path, output_dir: Path) -> List[BenchmarkResul from backend.services.local_preview_encoding_service import ( LocalPreviewEncodingService, PreviewEncodingConfig ) - from lyrics_transcriber.output.video import VideoGenerator + from karaoke_gen.lyrics_transcriber.output.video import VideoGenerator results = [] output_dir.mkdir(parents=True, exist_ok=True) diff --git a/scripts/migrate-prompts-to-langfuse.py b/scripts/migrate-prompts-to-langfuse.py index 77f89b8d..e8dbcf36 100755 --- a/scripts/migrate-prompts-to-langfuse.py +++ b/scripts/migrate-prompts-to-langfuse.py @@ -119,7 +119,7 @@ Provide ONLY the JSON response, no other text.""" def get_examples(): """Get the few-shot examples from the hardcoded source.""" - from lyrics_transcriber.correction.agentic.prompts.classifier import get_hardcoded_examples + from karaoke_gen.lyrics_transcriber.correction.agentic.prompts.classifier import get_hardcoded_examples examples = get_hardcoded_examples() diff --git a/scripts/test-lyrics-review.py b/scripts/test-lyrics-review.py index 24addcb6..4eee4382 100755 --- a/scripts/test-lyrics-review.py +++ b/scripts/test-lyrics-review.py @@ -24,7 +24,7 @@ project_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) sys.path.insert(0, project_root) sys.path.insert(0, os.path.join(project_root, "lyrics_transcriber_temp")) -from lyrics_transcriber.types import ( +from karaoke_gen.lyrics_transcriber.types import ( CorrectionResult, LyricsData, LyricsMetadata, @@ -32,8 +32,8 @@ from lyrics_transcriber.types import ( Word, WordCorrection, ) -from lyrics_transcriber.core.config import OutputConfig -from lyrics_transcriber.review.server import ReviewServer +from karaoke_gen.lyrics_transcriber.core.config import OutputConfig +from karaoke_gen.lyrics_transcriber.review.server import ReviewServer logging.basicConfig( level=logging.INFO, diff --git a/scripts/test_agentic_correction.py b/scripts/test_agentic_correction.py index 9a1368f0..a68aa1bf 100755 --- a/scripts/test_agentic_correction.py +++ b/scripts/test_agentic_correction.py @@ -195,9 +195,9 @@ def main(): # Import after path setup try: - from lyrics_transcriber.correction.agentic.agent import AgenticCorrector - from lyrics_transcriber.correction.agentic.router import ModelRouter - from lyrics_transcriber.correction.agentic.providers.config import ProviderConfig + from karaoke_gen.lyrics_transcriber.correction.agentic.agent import AgenticCorrector + from karaoke_gen.lyrics_transcriber.correction.agentic.router import ModelRouter + from karaoke_gen.lyrics_transcriber.correction.agentic.providers.config import ProviderConfig except ImportError as e: logger.error(f"Failed to import agentic correction modules: {e}") logger.error("Make sure you're running from the karaoke-gen directory") diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py index 04fa0e9a..01b842be 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -655,7 +655,7 @@ async def test_full_cli_integration(tmp_path, mocker): # Patch the 'start' method where ReviewServer is defined mocker.patch( - 'lyrics_transcriber.review.server.ReviewServer.start', + 'karaoke_gen.lyrics_transcriber.review.server.ReviewServer.start', side_effect=mock_start_return_self_correction_result, autospec=True ) @@ -805,7 +805,7 @@ async def test_full_cli_integration(tmp_path, mocker): return cdg_file, mp3_file, zip_file - mocker.patch('lyrics_transcriber.output.cdg.CDGGenerator.generate_cdg_from_lrc', + mocker.patch('karaoke_gen.lyrics_transcriber.output.cdg.CDGGenerator.generate_cdg_from_lrc', side_effect=mock_generate_cdg_from_lrc) # Mock all FFmpeg command execution in finalisation to prevent system dependencies @@ -1626,7 +1626,7 @@ async def test_full_cli_integration_no_video(tmp_path, mocker): return mock_instance.correction_result mocker.patch( - 'lyrics_transcriber.review.server.ReviewServer.start', + 'karaoke_gen.lyrics_transcriber.review.server.ReviewServer.start', side_effect=mock_start_return_self_correction_result, autospec=True ) diff --git a/tests/unit/test_karaoke_finalise/test_zip_creation.py b/tests/unit/test_karaoke_finalise/test_zip_creation.py index 17194c28..bf99a4ff 100644 --- a/tests/unit/test_karaoke_finalise/test_zip_creation.py +++ b/tests/unit/test_karaoke_finalise/test_zip_creation.py @@ -138,7 +138,7 @@ def test_create_cdg_zip_generate_new(mock_prompt, mock_rename, mock_zipfile, bas @patch('os.path.isfile') @patch('zipfile.ZipFile') # Patch the class -@patch('lyrics_transcriber.output.cdg.CDGGenerator') +@patch('karaoke_gen.lyrics_transcriber.output.cdg.CDGGenerator') @patch.object(KaraokeFinalise, 'prompt_user_bool', return_value=True) # Confirm overwrite def test_create_cdg_zip_use_existing_mp3_cdg(mock_prompt, mock_cdg_gen_cls, mock_zipfile_cls, mock_isfile, basic_finaliser): """Test creating ZIP from existing MP3 and CDG files.""" @@ -193,7 +193,7 @@ def test_create_cdg_zip_use_existing_mp3_cdg(mock_prompt, mock_cdg_gen_cls, mock @patch('os.path.isfile', return_value=True) # ZIP exists @patch('zipfile.ZipFile') -@patch('lyrics_transcriber.output.cdg.CDGGenerator') +@patch('karaoke_gen.lyrics_transcriber.output.cdg.CDGGenerator') @patch.object(KaraokeFinalise, 'prompt_user_bool', return_value=False) # Skip overwrite def test_create_cdg_zip_skip_overwrite(mock_prompt, mock_cdg_gen_cls, mock_zipfile, mock_isfile, basic_finaliser): """Test skipping CDG ZIP creation if user chooses not to overwrite.""" @@ -212,7 +212,7 @@ def test_create_cdg_zip_missing_styles(basic_finaliser): @patch('os.path.isfile', return_value=False) # No existing files @patch('zipfile.ZipFile') -@patch('lyrics_transcriber.output.cdg.CDGGenerator') +@patch('karaoke_gen.lyrics_transcriber.output.cdg.CDGGenerator') @patch.object(KaraokeFinalise, 'prompt_user_bool', return_value=True) def test_create_cdg_zip_generation_fails_to_create_zip(mock_prompt, mock_cdg_gen_cls, mock_zipfile, mock_isfile, basic_finaliser): """Test error if CDGGenerator runs but zip isn't found afterwards."""