coder-music-cli 0.1.0__tar.gz → 0.2.0__tar.gz

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coder-music-cli
-Version: 0.1.0
+Version: 0.2.0
 Summary: A command-line music application for coders with daemon support, radio streaming, and AI-generated music
 Author-email: Luong Nguyen <luongnv89@gmail.com>
 Maintainer-email: Luong Nguyen <luongnv89@gmail.com>
@@ -30,8 +30,12 @@ Requires-Dist: tomli>=2.0; python_version < "3.11"
 Requires-Dist: tomli-w>=1.0
 Provides-Extra: ai
 Requires-Dist: torch>=2.0; extra == "ai"
-Requires-Dist: transformers>=4.30; extra == "ai"
-Requires-Dist: audiocraft>=1.0; extra == "ai"
+Requires-Dist: transformers>=4.31; extra == "ai"
+Requires-Dist: scipy>=1.10; extra == "ai"
+Provides-Extra: ai-full
+Requires-Dist: torch>=2.0; extra == "ai-full"
+Requires-Dist: transformers>=4.30; extra == "ai-full"
+Requires-Dist: audiocraft>=1.0; python_version < "3.14" and extra == "ai-full"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21; extra == "dev"

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/coder_music_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coder-music-cli
-Version: 0.1.0
+Version: 0.2.0
 Summary: A command-line music application for coders with daemon support, radio streaming, and AI-generated music
 Author-email: Luong Nguyen <luongnv89@gmail.com>
 Maintainer-email: Luong Nguyen <luongnv89@gmail.com>
@@ -30,8 +30,12 @@ Requires-Dist: tomli>=2.0; python_version < "3.11"
 Requires-Dist: tomli-w>=1.0
 Provides-Extra: ai
 Requires-Dist: torch>=2.0; extra == "ai"
-Requires-Dist: transformers>=4.30; extra == "ai"
-Requires-Dist: audiocraft>=1.0; extra == "ai"
+Requires-Dist: transformers>=4.31; extra == "ai"
+Requires-Dist: scipy>=1.10; extra == "ai"
+Provides-Extra: ai-full
+Requires-Dist: torch>=2.0; extra == "ai-full"
+Requires-Dist: transformers>=4.30; extra == "ai-full"
+Requires-Dist: audiocraft>=1.0; python_version < "3.14" and extra == "ai-full"
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.21; extra == "dev"

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/coder_music_cli.egg-info/requires.txt

@@ -6,7 +6,14 @@ tomli>=2.0
 
 [ai]
 torch>=2.0
+transformers>=4.31
+scipy>=1.10
+
+[ai-full]
+torch>=2.0
 transformers>=4.30
+
+[ai-full:python_version < "3.14"]
 audiocraft>=1.0
 
 [dev]

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/music_cli/__init__.py

@@ -1,3 +1,3 @@
 """music-cli: A command-line music application for coders."""
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/music_cli/client.py

@@ -12,6 +12,8 @@ logger = logging.getLogger(__name__)
 # Constants
 SOCKET_BUFFER_SIZE = 4096
 MAX_RESPONSE_SIZE = 10 * 1024 * 1024  # 10MB limit
+DEFAULT_TIMEOUT = 10.0
+AI_TIMEOUT = 300.0  # 5 minutes for AI generation
 
 
 class DaemonClient:
@@ -21,12 +23,15 @@ class DaemonClient:
         self.config = get_config()
         self.socket_path = str(self.config.socket_path)
 
-    def send_command(self, command: str, args: dict | None = None) -> dict[str, Any]:
+    def send_command(
+        self, command: str, args: dict | None = None, timeout: float | None = None
+    ) -> dict[str, Any]:
         """Send a command to the daemon and get response.
 
         Args:
             command: Command name (play, stop, pause, resume, status, etc.)
             args: Command arguments
+            timeout: Socket timeout in seconds (default: 10s, AI commands: 300s)
 
         Returns:
             Response dictionary from daemon
@@ -37,6 +42,13 @@ class DaemonClient:
         if args is None:
             args = {}
 
+        # Use longer timeout for AI commands
+        if timeout is None:
+            if command == "play" and args.get("mode") == "ai":
+                timeout = AI_TIMEOUT
+            else:
+                timeout = DEFAULT_TIMEOUT
+
         request = {
             "command": command,
             "args": args,
@@ -44,7 +56,7 @@ class DaemonClient:
 
         sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
         try:
-            sock.settimeout(10.0)
+            sock.settimeout(timeout)
             sock.connect(self.socket_path)
 
             sock.sendall(json.dumps(request).encode())

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/music_cli/player/base.py

@@ -70,8 +70,13 @@ class Player(ABC):
         self._on_track_end = callback
 
     @abstractmethod
-    async def play(self, track: TrackInfo) -> bool:
-        """Start playing a track. Returns True if successful."""
+    async def play(self, track: TrackInfo, loop: bool = False) -> bool:
+        """Start playing a track. Returns True if successful.
+
+        Args:
+            track: Track information to play
+            loop: If True, loop the track indefinitely
+        """
         pass
 
     @abstractmethod

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/music_cli/player/ffplay.py

@@ -23,8 +23,13 @@ class FFplayPlayer(Player):
         if not shutil.which("ffplay"):
             logger.warning("ffplay not found in PATH. Please install FFmpeg.")
 
-    async def play(self, track: TrackInfo) -> bool:
-        """Start playing a track using ffplay."""
+    async def play(self, track: TrackInfo, loop: bool = False) -> bool:
+        """Start playing a track using ffplay.
+
+        Args:
+            track: Track information to play
+            loop: If True, loop the track indefinitely (useful for AI-generated short clips)
+        """
         # Stop any current playback
         await self.stop()
 
@@ -36,13 +41,18 @@ class FFplayPlayer(Player):
             cmd = [
                 "ffplay",
                 "-nodisp",  # No display window
-                "-autoexit",  # Exit when done (for files)
                 "-loglevel",
                 "quiet",  # Suppress output
                 "-volume",
                 str(self._volume),
             ]
 
+            # Loop mode for AI tracks or explicit loop request
+            if loop or track.source_type == "ai":
+                cmd.extend(["-loop", "0"])  # 0 = infinite loop
+            else:
+                cmd.append("-autoexit")  # Exit when done (for files)
+
             # For streams, add reconnect options
             if track.source_type == "radio":
                 cmd.extend(

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/music_cli/sources/ai_generator.py

@@ -1,4 +1,4 @@
-"""AI music generation using MusicGen (optional feature)."""
+"""AI music generation using MusicGen via HuggingFace Transformers (optional feature)."""
 
 import logging
 import tempfile
@@ -11,6 +11,7 @@ logger = logging.getLogger(__name__)
 # Flag to track if AI dependencies are available
 _AI_AVAILABLE: bool | None = None
 _musicgen_model = None
+_musicgen_processor = None
 
 
 def is_ai_available() -> bool:
@@ -22,10 +23,10 @@ def is_ai_available() -> bool:
 
     try:
         import torch  # noqa: F401
-        from audiocraft.models import MusicGen  # noqa: F401
+        from transformers import AutoProcessor, MusicgenForConditionalGeneration  # noqa: F401
 
         _AI_AVAILABLE = True
-        logger.info("AI music generation is available")
+        logger.info("AI music generation is available (using HuggingFace Transformers)")
     except ImportError as e:
         _AI_AVAILABLE = False
         logger.info(f"AI music generation not available: {e}")
@@ -34,26 +35,28 @@ def is_ai_available() -> bool:
 
 
 def _get_model():
-    """Lazy-load the MusicGen model."""
-    global _musicgen_model
+    """Lazy-load the MusicGen model via HuggingFace Transformers."""
+    global _musicgen_model, _musicgen_processor
 
     if not is_ai_available():
-        return None
+        return None, None
 
     if _musicgen_model is None:
         try:
-            from audiocraft.models import MusicGen
+            from transformers import AutoProcessor, MusicgenForConditionalGeneration
+
+            model_name = "facebook/musicgen-small"
+            logger.info(f"Loading MusicGen model ({model_name}) - this may take a moment...")
+
+            _musicgen_processor = AutoProcessor.from_pretrained(model_name)  # nosec B615
+            _musicgen_model = MusicgenForConditionalGeneration.from_pretrained(model_name)  # nosec B615
 
-            logger.info("Loading MusicGen model (this may take a moment)...")
-            # Use the small model for faster loading and lower memory usage
-            _musicgen_model = MusicGen.get_pretrained("facebook/musicgen-small")
-            _musicgen_model.set_generation_params(duration=30)  # 30 seconds default
             logger.info("MusicGen model loaded successfully")
         except Exception as e:
             logger.error(f"Failed to load MusicGen model: {e}")
-            return None
+            return None, None
 
-    return _musicgen_model
+    return _musicgen_model, _musicgen_processor
 
 
 class AIGenerator:
@@ -86,28 +89,45 @@ class AIGenerator:
 
         Args:
             prompt: Text description of the music to generate.
-            duration: Duration in seconds (5-300).
+            duration: Duration in seconds (5-60 for reasonable generation time).
             filename: Optional output filename.
 
         Returns:
             TrackInfo for the generated audio, or None if generation failed.
         """
-        model = _get_model()
-        if model is None:
+        model, processor = _get_model()
+        if model is None or processor is None:
             logger.warning("AI model not available")
             return None
 
         try:
             import scipy.io.wavfile
+            import torch
+
+            # Clamp duration (keep reasonable for generation time)
+            duration = max(5, min(60, duration))
 
-            # Clamp duration
-            duration = max(5, min(300, duration))
-            model.set_generation_params(duration=duration)
+            # Calculate max_new_tokens based on duration
+            # MusicGen generates at ~50 tokens per second of audio
+            tokens_per_second = 50
+            max_new_tokens = duration * tokens_per_second
 
             logger.info(f"Generating {duration}s of music: {prompt[:50]}...")
 
+            # Process the prompt
+            inputs = processor(
+                text=[prompt],
+                padding=True,
+                return_tensors="pt",
+            )
+
             # Generate audio
-            wav = model.generate([prompt])
+            with torch.no_grad():
+                audio_values = model.generate(
+                    **inputs,
+                    max_new_tokens=max_new_tokens,
+                    do_sample=True,
+                )
 
             # Generate filename if not provided
             if filename is None:
@@ -124,11 +144,15 @@ class AIGenerator:
             output_path = self.output_dir / filename
 
             # Get the audio tensor and sample rate
-            audio = wav[0].cpu().numpy()
-            sample_rate = model.sample_rate
+            # MusicGen uses 32kHz sample rate
+            sample_rate = model.config.audio_encoder.sampling_rate
+            audio = audio_values[0, 0].cpu().numpy()
+
+            # Normalize audio to int16 range for WAV
+            audio = (audio * 32767).astype("int16")
 
             # Save as WAV
-            scipy.io.wavfile.write(str(output_path), sample_rate, audio.T)
+            scipy.io.wavfile.write(str(output_path), sample_rate, audio)
 
             logger.info(f"Generated audio saved to: {output_path}")
 
@@ -145,6 +169,9 @@ class AIGenerator:
 
         except Exception as e:
             logger.error(f"Failed to generate music: {e}")
+            import traceback
+
+            traceback.print_exc()
             return None
 
     def generate_for_context(
@@ -208,12 +235,12 @@ def get_ai_install_instructions() -> str:
 AI music generation requires additional dependencies.
 Install them with:
 
-    pip install 'music-cli[ai]'
+    pip install 'coder-music-cli[ai]'
 
 Or install manually:
 
-    pip install torch transformers audiocraft
+    pip install torch transformers scipy
 
 Note: This requires significant disk space (~5GB) and RAM (~8GB minimum).
-The first generation will download the MusicGen model (~3GB).
+The first generation will download the MusicGen model (~1.5GB).
 """

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "coder-music-cli"
-version = "0.1.0"
+version = "0.2.0"
 description = "A command-line music application for coders with daemon support, radio streaming, and AI-generated music"
 readme = "README.md"
 requires-python = ">=3.9"
@@ -38,9 +38,14 @@ dependencies = [
 
 [project.optional-dependencies]
 ai = [
+    "torch>=2.0",
+    "transformers>=4.31",
+    "scipy>=1.10",
+]
+ai-full = [
     "torch>=2.0",
     "transformers>=4.30",
-    "audiocraft>=1.0",
+    "audiocraft>=1.0;python_version<'3.14'",
 ]
 dev = [
     "pytest>=7.0",

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/tests/test_config.py

@@ -1,10 +1,7 @@
 """Tests for configuration module."""
 
-import tempfile
 from pathlib import Path
 
-import pytest
-
 from music_cli.config import Config
 
 

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/tests/test_context.py

@@ -2,8 +2,6 @@
 
 from datetime import datetime
 
-import pytest
-
 from music_cli.context.mood import Mood, MoodContext
 from music_cli.context.temporal import DayType, Season, TemporalContext, TimePeriod
 

{coder_music_cli-0.1.0 → coder_music_cli-0.2.0}/tests/test_history.py

@@ -2,8 +2,6 @@
 
 from pathlib import Path
 
-import pytest
-
 from music_cli.history import History, HistoryEntry