karaoke-gen 0.50.0__tar.gz → 0.55.0__tar.gz

{karaoke_gen-0.50.0 → karaoke_gen-0.55.0}/PKG-INFO

@@ -1,19 +1,20 @@
 Metadata-Version: 2.3
 Name: karaoke-gen
-Version: 0.50.0
+Version: 0.55.0
 Summary: Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens.
 License: MIT
 Author: Andrew Beveridge
 Author-email: andrew@beveridge.uk
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.10,<3.14
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: argparse (>=1.4.0)
 Requires-Dist: attrs (>=24.2.0)
-Requires-Dist: audio-separator[cpu] (>=0.21.0)
+Requires-Dist: audio-separator[cpu] (>=0.34.0)
 Requires-Dist: beautifulsoup4 (>=4)
 Requires-Dist: cattrs (>=24.1.2)
 Requires-Dist: fetch-lyrics-from-genius (>=0.1)
@@ -24,9 +25,9 @@ Requires-Dist: google-auth-httplib2
 Requires-Dist: google-auth-oauthlib
 Requires-Dist: kbputils (>=0.0.16,<0.0.17)
 Requires-Dist: lyrics-converter (>=0.2.1)
-Requires-Dist: lyrics-transcriber (>=0.34)
+Requires-Dist: lyrics-transcriber (>=0.54)
 Requires-Dist: lyricsgenius (>=3)
-Requires-Dist: numpy (>=1,<2)
+Requires-Dist: numpy (>=2)
 Requires-Dist: pillow (>=10.1)
 Requires-Dist: psutil (>=7.0.0,<8.0.0)
 Requires-Dist: pyinstaller (>=6.3)
@@ -35,20 +36,25 @@ Requires-Dist: pytest-asyncio (>=0.23.5,<0.24.0)
 Requires-Dist: requests (>=2)
 Requires-Dist: thefuzz (>=0.22)
 Requires-Dist: toml (>=0.10)
-Requires-Dist: torch (<2.5)
+Requires-Dist: torch (>=2.7)
 Requires-Dist: yt-dlp
-Project-URL: Documentation, https://github.com/karaokenerds/karaoke-gen/blob/main/README.md
-Project-URL: Homepage, https://github.com/karaokenerds/karaoke-gen
-Project-URL: Repository, https://github.com/karaokenerds/karaoke-gen
+Project-URL: Documentation, https://github.com/nomadkaraoke/karaoke-gen/blob/main/README.md
+Project-URL: Homepage, https://github.com/nomadkaraoke/karaoke-gen
+Project-URL: Repository, https://github.com/nomadkaraoke/karaoke-gen
 Description-Content-Type: text/markdown
 
-# Karaoke Gen
+# Karaoke Generator 🎶 🎥 🚀
 
-Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens.
+![PyPI - Version](https://img.shields.io/pypi/v/karaoke-gen)
+![Python Version](https://img.shields.io/badge/python-3.10+-blue)
+![Tests](https://github.com/nomadkaraoke/karaoke-gen/workflows/Test%20and%20Publish/badge.svg)
+![Test Coverage](https://codecov.io/gh/nomadkaraoke/karaoke-gen/branch/main/graph/badge.svg)
+
+Generate karaoke videos with instrumental audio and synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens, uploading the resulting video to YouTube.
 
 ## Overview
 
-Karaoke Gen is a comprehensive tool for creating high-quality karaoke videos. It automates the entire workflow:
+Karaoke Generator is a comprehensive tool for creating high-quality karaoke videos. It automates the entire workflow:
 
 1. **Download** audio and lyrics for a specified song
 2. **Separate** audio stems (vocals, instrumental)
@@ -134,6 +140,25 @@ For a complete list of options:
 karaoke-gen --help
 ```
 
+## Development
+
+### Running Tests
+
+The project uses pytest for testing with unit and integration tests:
+
+```bash
+# Run all tests (unit tests first, then integration tests)
+pytest
+
+# Run only unit tests (fast feedback during development)
+pytest -m "not integration"
+
+# Run only integration tests (comprehensive end-to-end testing)
+pytest -m integration
+```
+
+Unit tests run quickly and provide fast feedback, while integration tests are slower but test the full workflow end-to-end.
+
 ## License
 
 MIT

{karaoke_gen-0.50.0 → karaoke_gen-0.55.0}/README.md

@@ -1,10 +1,15 @@
-# Karaoke Gen
+# Karaoke Generator 🎶 🎥 🚀
 
-Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens.
+![PyPI - Version](https://img.shields.io/pypi/v/karaoke-gen)
+![Python Version](https://img.shields.io/badge/python-3.10+-blue)
+![Tests](https://github.com/nomadkaraoke/karaoke-gen/workflows/Test%20and%20Publish/badge.svg)
+![Test Coverage](https://codecov.io/gh/nomadkaraoke/karaoke-gen/branch/main/graph/badge.svg)
+
+Generate karaoke videos with instrumental audio and synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens, uploading the resulting video to YouTube.
 
 ## Overview
 
-Karaoke Gen is a comprehensive tool for creating high-quality karaoke videos. It automates the entire workflow:
+Karaoke Generator is a comprehensive tool for creating high-quality karaoke videos. It automates the entire workflow:
 
 1. **Download** audio and lyrics for a specified song
 2. **Separate** audio stems (vocals, instrumental)
@@ -90,6 +95,25 @@ For a complete list of options:
 karaoke-gen --help
 ```
 
+## Development
+
+### Running Tests
+
+The project uses pytest for testing with unit and integration tests:
+
+```bash
+# Run all tests (unit tests first, then integration tests)
+pytest
+
+# Run only unit tests (fast feedback during development)
+pytest -m "not integration"
+
+# Run only integration tests (comprehensive end-to-end testing)
+pytest -m integration
+```
+
+Unit tests run quickly and provide fast feedback, while integration tests are slower but test the full workflow end-to-end.
+
 ## License
 
 MIT

karaoke_gen-0.55.0/karaoke_gen/__init__.py

@@ -0,0 +1,7 @@
+import warnings
+
+# Suppress specific SyntaxWarnings from third-party packages
+warnings.filterwarnings("ignore", category=SyntaxWarning, module="pydub.*")
+warnings.filterwarnings("ignore", category=SyntaxWarning, module="syrics.*")
+
+from .karaoke_gen import KaraokePrep

{karaoke_gen-0.50.0/karaoke_prep → karaoke_gen-0.55.0/karaoke_gen}/audio_processor.py

@@ -133,8 +133,13 @@ class AudioProcessor:
                                 runtime_mins = runtime.total_seconds() / 60
 
                                 # Get process command line
-                                proc = psutil.Process(pid)
-                                cmd = " ".join(proc.cmdline())
+                                try:
+                                    proc = psutil.Process(pid)
+                                    cmdline_args = proc.cmdline()
+                                    # Handle potential bytes in cmdline args (cross-platform compatibility)
+                                    cmd = " ".join(arg.decode('utf-8', errors='replace') if isinstance(arg, bytes) else arg for arg in cmdline_args)
+                                except (psutil.AccessDenied, psutil.NoSuchProcess):
+                                    cmd = "<command unavailable>"
 
                                 self.logger.info(
                                     f"Waiting for other audio separation process to complete before starting separation for {artist_title}...\n"
@@ -182,7 +187,7 @@ class AudioProcessor:
             stems_dir = self._create_stems_directory(track_output_dir)
             result = {"clean_instrumental": {}, "other_stems": {}, "backing_vocals": {}, "combined_instrumentals": {}}
 
-            if os.environ.get("KARAOKE_PREP_SKIP_AUDIO_SEPARATION"):
+            if os.environ.get("KARAOKE_GEN_SKIP_AUDIO_SEPARATION"):
                 return result
 
             result["clean_instrumental"] = self._separate_clean_instrumental(

{karaoke_gen-0.50.0/karaoke_prep → karaoke_gen-0.55.0/karaoke_gen}/karaoke_finalise/karaoke_finalise.py

@@ -924,7 +924,14 @@ class KaraokeFinalise:
         else:
             shutil.copy2(output_files["final_karaoke_lossy_mp4"], dest_mp4_file)  # Changed to use lossy MP4
             shutil.copy2(output_files["final_karaoke_lossy_720p_mp4"], dest_720p_mp4_file)
-            shutil.copy2(output_files["final_karaoke_cdg_zip"], dest_zip_file)
+            
+            # Only copy CDG ZIP if CDG creation is enabled
+            if self.enable_cdg and "final_karaoke_cdg_zip" in output_files:
+                shutil.copy2(output_files["final_karaoke_cdg_zip"], dest_zip_file)
+                self.logger.info(f"Copied CDG ZIP file to public share directory")
+            else:
+                self.logger.info(f"CDG creation disabled, skipping CDG ZIP copy")
+                
             self.logger.info(f"Copied final files to public share directory")
 
     def sync_public_share_dir_to_rclone_destination(self):

karaoke_gen-0.50.0/karaoke_prep/karaoke_prep.py → karaoke_gen-0.55.0/karaoke_gen/karaoke_gen.py

@@ -382,14 +382,20 @@ class KaraokePrep:
                     # Run transcription in a separate thread
                     transcription_future = asyncio.create_task(
                         asyncio.to_thread(
-                            # Delegate to LyricsProcessor
-                            self.lyrics_processor.transcribe_lyrics, processed_track["input_audio_wav"], lyrics_artist, lyrics_title, track_output_dir
+                            # Delegate to LyricsProcessor - pass original artist/title for filenames, lyrics_artist/lyrics_title for processing
+                            self.lyrics_processor.transcribe_lyrics, 
+                            processed_track["input_audio_wav"], 
+                            self.artist,  # Original artist for filename generation
+                            self.title,   # Original title for filename generation  
+                            track_output_dir,
+                            lyrics_artist,  # Lyrics artist for processing
+                            lyrics_title    # Lyrics title for processing
                         )
                     )
                     self.logger.info(f"Transcription future created, type: {type(transcription_future)}")
 
-                # Default to a placeholder future if separation won't run
-                separation_future = asyncio.sleep(0)
+                # Default to a placeholder task if separation won't run
+                separation_future = asyncio.create_task(asyncio.sleep(0))
 
                 # Only create real separation future if not skipping AND no existing instrumental provided
                 if not self.skip_separation and not self.existing_instrumental:
@@ -501,7 +507,7 @@ class KaraokePrep:
             processed_track["title_video"] = os.path.join(track_output_dir, f"{artist_title} (Title).mov")
 
             # Use FileHandler._file_exists
-            if not self.file_handler._file_exists(processed_track["title_video"]) and not os.environ.get("KARAOKE_PREP_SKIP_TITLE_END_SCREENS"):
+            if not self.file_handler._file_exists(processed_track["title_video"]) and not os.environ.get("KARAOKE_GEN_SKIP_TITLE_END_SCREENS"):
                 self.logger.info(f"Creating title video...")
                 # Delegate to VideoGenerator
                 self.video_generator.create_title_video(
@@ -520,7 +526,7 @@ class KaraokePrep:
             processed_track["end_video"] = os.path.join(track_output_dir, f"{artist_title} (End).mov")
 
             # Use FileHandler._file_exists
-            if not self.file_handler._file_exists(processed_track["end_video"]) and not os.environ.get("KARAOKE_PREP_SKIP_TITLE_END_SCREENS"):
+            if not self.file_handler._file_exists(processed_track["end_video"]) and not os.environ.get("KARAOKE_GEN_SKIP_TITLE_END_SCREENS"):
                 self.logger.info(f"Creating end screen video...")
                  # Delegate to VideoGenerator
                 self.video_generator.create_end_video(

{karaoke_gen-0.50.0/karaoke_prep → karaoke_gen-0.55.0/karaoke_gen}/lyrics_processor.py

@@ -102,14 +102,33 @@ class LyricsProcessor:
 
         return processed_lines
 
-    def transcribe_lyrics(self, input_audio_wav, artist, title, track_output_dir):
+    def transcribe_lyrics(self, input_audio_wav, artist, title, track_output_dir, lyrics_artist=None, lyrics_title=None):
+        """
+        Transcribe lyrics for a track.
+        
+        Args:
+            input_audio_wav: Path to the audio file
+            artist: Original artist name (used for filename generation)
+            title: Original title (used for filename generation)
+            track_output_dir: Output directory path
+            lyrics_artist: Artist name for lyrics processing (defaults to artist if None)
+            lyrics_title: Title for lyrics processing (defaults to title if None)
+        """
+        # Use original artist/title for filename generation
+        filename_artist = artist
+        filename_title = title
+        
+        # Use lyrics_artist/lyrics_title for actual lyrics processing, fall back to originals if not provided
+        processing_artist = lyrics_artist or artist
+        processing_title = lyrics_title or title
+        
         self.logger.info(
-            f"Transcribing lyrics for track {artist} - {title} from audio file: {input_audio_wav} with output directory: {track_output_dir}"
+            f"Transcribing lyrics for track {processing_artist} - {processing_title} from audio file: {input_audio_wav} with output directory: {track_output_dir}"
         )
 
-        # Check for existing files first using sanitized names
-        sanitized_artist = sanitize_filename(artist)
-        sanitized_title = sanitize_filename(title)
+        # Check for existing files first using sanitized names from ORIGINAL artist/title for consistency
+        sanitized_artist = sanitize_filename(filename_artist)
+        sanitized_title = sanitize_filename(filename_title)
         parent_video_path = os.path.join(track_output_dir, f"{sanitized_artist} - {sanitized_title} (With Vocals).mkv")
         parent_lrc_path = os.path.join(track_output_dir, f"{sanitized_artist} - {sanitized_title} (Karaoke).lrc")
 
@@ -137,10 +156,15 @@ class LyricsProcessor:
                 "ass_filepath": parent_video_path,
             }
 
-        # Create lyrics subdirectory for new transcription
+        # Create lyrics directory if it doesn't exist
         os.makedirs(lyrics_dir, exist_ok=True)
         self.logger.info(f"Created lyrics directory: {lyrics_dir}")
 
+        # Set render_video to False if explicitly disabled
+        render_video = self.render_video
+        if not render_video:
+            self.logger.info("Video rendering disabled, skipping video output")
+
         # Load environment variables
         load_dotenv()
         env_config = {
@@ -165,7 +189,7 @@ class LyricsProcessor:
         output_config = OutputConfig(
             output_styles_json=self.style_params_json,
             output_dir=lyrics_dir,
-            render_video=self.render_video,
+            render_video=render_video,
             fetch_lyrics=True,
             run_transcription=not self.skip_transcription,
             run_correction=True,
@@ -180,11 +204,11 @@ class LyricsProcessor:
         # Add this log entry to debug the OutputConfig
         self.logger.info(f"Instantiating LyricsTranscriber with OutputConfig: {output_config}")
 
-        # Initialize transcriber with new config objects
+        # Initialize transcriber with new config objects - use PROCESSING artist/title for lyrics work
         transcriber = LyricsTranscriber(
             audio_filepath=input_audio_wav,
-            artist=artist,
-            title=title,
+            artist=processing_artist,  # Use lyrics_artist for processing
+            title=processing_title,   # Use lyrics_title for processing
             transcriber_config=transcriber_config,
             lyrics_config=lyrics_config,
             output_config=output_config,

{karaoke_gen-0.50.0/karaoke_prep → karaoke_gen-0.55.0/karaoke_gen}/utils/bulk_cli.py

@@ -7,8 +7,8 @@ import csv
 import asyncio
 import json
 import sys
-from karaoke_prep import KaraokePrep
-from karaoke_prep.karaoke_finalise import KaraokeFinalise
+from karaoke_gen import KaraokePrep
+from karaoke_gen.karaoke_finalise import KaraokeFinalise
 
 # Global logger
 logger = logging.getLogger(__name__)

{karaoke_gen-0.50.0/karaoke_prep → karaoke_gen-0.55.0/karaoke_gen}/utils/gen_cli.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-print("DEBUG: gen_cli.py starting imports...")
 import argparse
 import logging
 from importlib import metadata
@@ -10,10 +9,8 @@ import json
 import asyncio
 import time
 import pyperclip
-from karaoke_prep import KaraokePrep
-from karaoke_prep.karaoke_finalise import KaraokeFinalise
-
-print("DEBUG: gen_cli.py imports complete.")
+from karaoke_gen import KaraokePrep
+from karaoke_gen.karaoke_finalise import KaraokeFinalise
 
 
 def is_url(string):
@@ -27,15 +24,12 @@ def is_file(string):
 
 
 async def async_main():
-    print("DEBUG: async_main() started.")
     logger = logging.getLogger(__name__)
     log_handler = logging.StreamHandler()
     log_formatter = logging.Formatter(fmt="%(asctime)s.%(msecs)03d - %(levelname)s - %(module)s - %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
     log_handler.setFormatter(log_formatter)
     logger.addHandler(log_handler)
 
-    print("DEBUG: async_main() logger configured.")
-
     parser = argparse.ArgumentParser(
         description="Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video.",
         formatter_class=lambda prog: argparse.RawTextHelpFormatter(prog, max_help_position=54),
@@ -53,7 +47,6 @@ async def async_main():
         package_version = metadata.version("karaoke-gen")
     except metadata.PackageNotFoundError:
         package_version = "unknown"
-        print("DEBUG: Could not find version for karaoke-gen")
 
     parser.add_argument("-v", "--version", action="version", version=f"%(prog)s {package_version}")
 
@@ -290,8 +283,6 @@ async def async_main():
 
     args = parser.parse_args()
 
-    print("DEBUG: async_main() args parsed.")
-
     # Handle test email template case first
     if args.test_email_template:
         log_level = getattr(logging, args.log_level.upper())
@@ -305,8 +296,6 @@ async def async_main():
         kfinalise.test_email_template()
         return
 
-    print("DEBUG: async_main() continuing after test_email_template check.")
-
     # Handle edit-lyrics mode
     if args.edit_lyrics:
         log_level = getattr(logging, args.log_level.upper())
@@ -484,8 +473,6 @@ async def async_main():
             raise e
             
         return
-        
-    print("DEBUG: async_main() continuing after edit_lyrics check.")
 
     # Handle finalise-only mode
     if args.finalise_only:
@@ -512,7 +499,11 @@ async def async_main():
                 logger.error(f"Invalid JSON in CDG styles configuration file: {e}")
                 sys.exit(1)
                 return  # Explicit return for testing
-
+            except KeyError:
+                logger.error(f"'cdg' key not found in style parameters file: {args.style_params_json}")
+                sys.exit(1)
+                return # Explicit return for testing
+        
         kfinalise = KaraokeFinalise(
             log_formatter=log_formatter,
             log_level=log_level,
@@ -530,13 +521,16 @@ async def async_main():
             discord_webhook_url=args.discord_webhook_url,
             email_template_file=args.email_template_file,
             cdg_styles=cdg_styles,
-            keep_brand_code=args.keep_brand_code,
+            keep_brand_code=getattr(args, 'keep_brand_code', False),
             non_interactive=args.yes,
         )
-
+        
         try:
             track = kfinalise.process()
-            logger.info(f"Karaoke finalisation processing complete! Output files:")
+            logger.info(f"Successfully completed finalisation for: {track['artist']} - {track['title']}")
+            
+            # Display summary of outputs
+            logger.info(f"Karaoke finalisation complete! Output files:")
             logger.info(f"")
             logger.info(f"Track: {track['artist']} - {track['title']}")
             logger.info(f"")
@@ -564,7 +558,7 @@ async def async_main():
                 logger.info(f"")
                 logger.info(f"Organization:")
                 logger.info(f" Brand Code: {track['brand_code']}")
-                logger.info(f" New Directory: {track['new_brand_code_dir_path']}")
+                logger.info(f" Directory: {track['new_brand_code_dir_path']}")
 
             if track["youtube_url"] or track["brand_code_dir_sharing_link"]:
                 logger.info(f"")
@@ -592,8 +586,6 @@ async def async_main():
         
         return
 
-    print("DEBUG: async_main() parsed positional args.")
-
     # For prep or full workflow, parse input arguments
     input_media, artist, title, filename_pattern = None, None, None, None
 
@@ -643,23 +635,18 @@ async def async_main():
     log_level = getattr(logging, args.log_level.upper())
     logger.setLevel(log_level)
 
-    print("DEBUG: async_main() log level set.")
-
     # Set up environment variables for lyrics-only mode
     if args.lyrics_only:
         args.skip_separation = True
-        os.environ["KARAOKE_PREP_SKIP_AUDIO_SEPARATION"] = "1"
-        os.environ["KARAOKE_PREP_SKIP_TITLE_END_SCREENS"] = "1"
+        os.environ["KARAOKE_GEN_SKIP_AUDIO_SEPARATION"] = "1"
+        os.environ["KARAOKE_GEN_SKIP_TITLE_END_SCREENS"] = "1"
         logger.info("Lyrics-only mode enabled: skipping audio separation and title/end screen generation")
 
-    print("DEBUG: async_main() instantiating KaraokePrep...")
-
     # Step 1: Run KaraokePrep
-    logger.info(f"KaraokePrep beginning with input_media: {input_media} artist: {artist} and title: {title}")
     kprep_coroutine = KaraokePrep(
+        input_media=input_media,
         artist=artist,
         title=title,
-        input_media=input_media,
         filename_pattern=filename_pattern,
         dry_run=args.dry_run,
         log_formatter=log_formatter,
@@ -688,64 +675,16 @@ async def async_main():
     # No await needed for constructor
     kprep = kprep_coroutine
 
-    print("DEBUG: async_main() KaraokePrep instantiated.")
-    
-    print(f"DEBUG: kprep type: {type(kprep)}")
-    print(f"DEBUG: kprep.process type: {type(kprep.process)}")
-    process_coroutine = kprep.process()
-    print(f"DEBUG: process_coroutine type: {type(process_coroutine)}")
-    tracks = await process_coroutine
-
-    print("DEBUG: async_main() kprep.process() finished.")
+    # Create final tracks data structure
+    tracks = await kprep.process()
 
-    # If prep-only mode, display detailed output and exit
+    # If prep-only mode, we're done
     if args.prep_only:
-        logger.info(f"Karaoke Prep complete! Output files:")
-
-        for track in tracks:
-            logger.info(f"")
-            logger.info(f"Track: {track['artist']} - {track['title']}")
-            logger.info(f" Input Media: {track['input_media']}")
-            logger.info(f" Input WAV Audio: {track['input_audio_wav']}")
-            logger.info(f" Input Still Image: {track['input_still_image']}")
-            logger.info(f" Lyrics: {track['lyrics']}")
-            logger.info(f" Processed Lyrics: {track['processed_lyrics']}")
-
-            logger.info(f" Separated Audio:")
-
-            # Clean Instrumental
-            logger.info(f"  Clean Instrumental Model:")
-            for stem_type, file_path in track["separated_audio"]["clean_instrumental"].items():
-                logger.info(f"   {stem_type.capitalize()}: {file_path}")
-
-            # Other Stems
-            logger.info(f"  Other Stems Models:")
-            for model, stems in track["separated_audio"]["other_stems"].items():
-                logger.info(f"   Model: {model}")
-                for stem_type, file_path in stems.items():
-                    logger.info(f"    {stem_type.capitalize()}: {file_path}")
-
-            # Backing Vocals
-            logger.info(f"  Backing Vocals Models:")
-            for model, stems in track["separated_audio"]["backing_vocals"].items():
-                logger.info(f"   Model: {model}")
-                for stem_type, file_path in stems.items():
-                    logger.info(f"    {stem_type.capitalize()}: {file_path}")
-
-            # Combined Instrumentals
-            logger.info(f"  Combined Instrumentals:")
-            for model, file_path in track["separated_audio"]["combined_instrumentals"].items():
-                logger.info(f"   Model: {model}")
-                logger.info(f"    Combined Instrumental: {file_path}")
-
-        logger.info("Preparation phase complete. Exiting due to --prep-only flag.")
+        logger.info("Prep-only mode: skipping finalisation phase")
         return
 
-    print("DEBUG: async_main() continuing after prep_only check.")
-
     # Step 2: For each track, run KaraokeFinalise
     for track in tracks:
-        print(f"DEBUG: async_main() starting finalise loop for track: {track.get('track_output_dir')}")
         logger.info(f"Starting finalisation phase for {track['artist']} - {track['title']}...")
 
         # Use the track directory that was actually created by KaraokePrep
@@ -776,8 +715,11 @@ async def async_main():
                 logger.error(f"Invalid JSON in CDG styles configuration file: {e}")
                 sys.exit(1)
                 return  # Explicit return for testing
+            except KeyError:
+                logger.error(f"'cdg' key not found in style parameters file: {args.style_params_json}")
+                sys.exit(1)
+                return # Explicit return for testing
 
-        # Initialize KaraokeFinalise
         kfinalise = KaraokeFinalise(
             log_formatter=log_formatter,
             log_level=log_level,
@@ -795,16 +737,16 @@ async def async_main():
             discord_webhook_url=args.discord_webhook_url,
             email_template_file=args.email_template_file,
             cdg_styles=cdg_styles,
-            keep_brand_code=args.keep_brand_code,
+            keep_brand_code=getattr(args, 'keep_brand_code', False),
             non_interactive=args.yes,
         )
 
         try:
             final_track = kfinalise.process()
-            logger.info(f"Successfully completed processing for: {track['artist']} - {track['title']}")
+            logger.info(f"Successfully completed processing: {final_track['artist']} - {final_track['title']}")
             
             # Display summary of outputs
-            logger.info(f"Karaoke processing complete! Output files:")
+            logger.info(f"Karaoke generation complete! Output files:")
             logger.info(f"")
             logger.info(f"Track: {final_track['artist']} - {final_track['title']}")
             logger.info(f"")
@@ -832,7 +774,7 @@ async def async_main():
                 logger.info(f"")
                 logger.info(f"Organization:")
                 logger.info(f" Brand Code: {final_track['brand_code']}")
-                logger.info(f" New Directory: {final_track['new_brand_code_dir_path']}")
+                logger.info(f" Directory: {final_track['new_brand_code_dir_path']}")
 
             if final_track["youtube_url"] or final_track["brand_code_dir_sharing_link"]:
                 logger.info(f"")
@@ -854,20 +796,16 @@ async def async_main():
                     logger.info(f" (YouTube URL copied to clipboard)")
                 except Exception as e:
                     logger.warning(f" Failed to copy YouTube URL to clipboard: {str(e)}")
-                    
         except Exception as e:
-            logger.error(f"Error during finalisation: {str(e)}")
+            logger.error(f"An error occurred during finalisation, see stack trace below: {str(e)}")
             raise e
-
-    print("DEBUG: async_main() finished.")
+        
+        return
 
 
 def main():
-    print("DEBUG: main() started.")
     asyncio.run(async_main())
-    print("DEBUG: main() finished.")
 
 
 if __name__ == "__main__":
-    print("DEBUG: __main__ block executing.")
     main()

{karaoke_gen-0.50.0/karaoke_prep → karaoke_gen-0.55.0/karaoke_gen}/video_generator.py

@@ -71,7 +71,7 @@ class VideoGenerator:
             else:
                 # Try to load from package resources
                 try:
-                    with pkg_resources.path("karaoke_prep.resources", format["font"]) as font_path:
+                    with pkg_resources.path("karaoke_gen.resources", format["font"]) as font_path:
                         font_path = str(font_path)
                 except Exception as e:
                     self.logger.warning(f"Could not load font from resources: {e}, falling back to default font")
@@ -96,7 +96,7 @@ class VideoGenerator:
 
     def calculate_text_size_to_fit(self, draw, text, font_path, region):
         font_size = 500  # Start with a large font size
-        font = ImageFont.truetype(font_path, size=font_size) if os.path.exists(font_path) else ImageFont.load_default()
+        font = ImageFont.truetype(font_path, size=font_size) if font_path and os.path.exists(font_path) else ImageFont.load_default()
 
         def get_text_size(text, font):
             bbox = draw.textbbox((0, 0), text, font=font)
@@ -117,7 +117,7 @@ class VideoGenerator:
 
                 # Reset font size for two-line layout
                 font_size = 500
-                font = ImageFont.truetype(font_path, size=font_size) if os.path.exists(font_path) else ImageFont.load_default()
+                font = ImageFont.truetype(font_path, size=font_size) if font_path and os.path.exists(font_path) else ImageFont.load_default()
 
                 while True:
                     text_width1, text_height1 = get_text_size(line1, font)
@@ -134,9 +134,9 @@ class VideoGenerator:
                     font_size -= 10
                     if font_size <= 0:
                         raise ValueError("Cannot fit text within the defined region.")
-                    font = ImageFont.truetype(font_path, size=font_size) if os.path.exists(font_path) else ImageFont.load_default()
+                    font = ImageFont.truetype(font_path, size=font_size) if font_path and os.path.exists(font_path) else ImageFont.load_default()
 
-            font = ImageFont.truetype(font_path, size=font_size) if os.path.exists(font_path) else ImageFont.load_default()
+            font = ImageFont.truetype(font_path, size=font_size) if font_path and os.path.exists(font_path) else ImageFont.load_default()
             text_width, text_height = get_text_size(text, font)
 
         return font, text

karaoke_gen-0.55.0/pyproject.toml

@@ -0,0 +1,81 @@
+[tool.poetry]
+name = "karaoke-gen"
+version = "0.55.0"
+description = "Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens."
+authors = ["Andrew Beveridge <andrew@beveridge.uk>"]
+license = "MIT"
+readme = "README.md"
+packages = [{ include = "karaoke_gen" }]
+homepage = "https://github.com/nomadkaraoke/karaoke-gen"
+repository = "https://github.com/nomadkaraoke/karaoke-gen"
+documentation = "https://github.com/nomadkaraoke/karaoke-gen/blob/main/README.md"
+
+[tool.poetry.dependencies]
+python = ">=3.10,<3.14"
+torch = ">=2.7"
+requests = ">=2"
+beautifulsoup4 = ">=4"
+yt-dlp = "*"
+lyricsgenius = ">=3"
+fetch-lyrics-from-genius = ">=0.1"
+pillow = ">=10.1"
+pyinstaller = ">=6.3"
+google-api-python-client = "*"
+google-auth = "*"
+google-auth-oauthlib = "*"
+google-auth-httplib2 = "*"
+thefuzz = ">=0.22"
+numpy = ">=2"
+audio-separator = { version = ">=0.34.0", extras = ["cpu"] }
+lyrics-converter = ">=0.2.1"
+lyrics-transcriber = ">=0.54"
+kbputils = "^0.0.16"
+attrs = ">=24.2.0"
+cattrs = ">=24.1.2"
+toml = ">=0.10"
+argparse = ">=1.4.0"
+psutil = "^7.0.0"
+pyperclip = "*"
+pytest-asyncio = "^0.23.5"
+ffmpeg-python = "^0.2.0"
+
+[tool.poetry.group.dev.dependencies]
+black = ">=23"
+poetry = "*"
+pytest = ">=7.0"
+pytest-cov = ">=4.0"
+pytest-mock = ">=3.10"
+pytest-asyncio = ">=0.21.0"
+
+
+[tool.poetry.scripts]
+karaoke-gen = 'karaoke_gen.utils.gen_cli:main'
+karaoke-bulk = 'karaoke_gen.utils.bulk_cli:main'
+
+[tool.black]
+line-length = 140
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
+
+[tool.pytest.ini_options]
+testpaths = ["tests/unit", "tests/integration"]
+python_files = ["test_*.py"]
+addopts = [
+    "--cov=karaoke_gen",
+    "--cov-report=term-missing",
+    "--cov-report=html:htmlcov",
+    "--asyncio-mode=auto",
+]
+markers = [
+    "slow: marks tests as slow (deselect with '-m \"not slow\"')",
+    "integration: marks tests as integration tests",
+    "asyncio: mark test as async",
+]
+filterwarnings = [
+    "ignore::DeprecationWarning",
+    "ignore:'audioop' is deprecated:DeprecationWarning",
+    "ignore::RuntimeWarning",
+    "ignore::UserWarning",
+]

karaoke_gen-0.50.0/karaoke_prep/__init__.py

@@ -1 +0,0 @@
-from .karaoke_prep import KaraokePrep

karaoke_gen-0.50.0/pyproject.toml

@@ -1,56 +0,0 @@
-[tool.poetry]
-name = "karaoke-gen"
-version = "0.50.0"
-description = "Generate karaoke videos with synchronized lyrics. Handles the entire process from downloading audio and lyrics to creating the final video with title screens."
-authors = ["Andrew Beveridge <andrew@beveridge.uk>"]
-license = "MIT"
-readme = "README.md"
-packages = [{ include = "karaoke_prep" }]
-homepage = "https://github.com/karaokenerds/karaoke-gen"
-repository = "https://github.com/karaokenerds/karaoke-gen"
-documentation = "https://github.com/karaokenerds/karaoke-gen/blob/main/README.md"
-
-[tool.poetry.dependencies]
-python = ">=3.10,<3.13"
-torch = "<2.5"
-requests = ">=2"
-beautifulsoup4 = ">=4"
-yt-dlp = "*"
-lyricsgenius = ">=3"
-fetch-lyrics-from-genius = ">=0.1"
-pillow = ">=10.1"
-pyinstaller = ">=6.3"
-google-api-python-client = "*"
-google-auth = "*"
-google-auth-oauthlib = "*"
-google-auth-httplib2 = "*"
-thefuzz = ">=0.22"
-numpy = "^1"
-audio-separator = { version = ">=0.21.0", extras = ["cpu"] }
-lyrics-converter = ">=0.2.1"
-lyrics-transcriber = ">=0.34"
-kbputils = "^0.0.16"
-attrs = ">=24.2.0"
-cattrs = ">=24.1.2"
-toml = ">=0.10"
-argparse = ">=1.4.0"
-psutil = "^7.0.0"
-pyperclip = "*"
-pytest-asyncio = "^0.23.5"
-ffmpeg-python = "^0.2.0"
-
-[tool.poetry.group.dev.dependencies]
-black = ">=23"
-poetry = "*"
-pytest-mock = "*"
-
-[tool.poetry.scripts]
-karaoke-gen = 'karaoke_prep.utils.gen_cli:main'
-karaoke-bulk = 'karaoke_prep.utils.bulk_cli:main'
-
-[tool.black]
-line-length = 140
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"