ytm-cli 0.7.1__tar.gz → 0.7.2__tar.gz

{ytm_cli-0.7.1/ytm_cli.egg-info → ytm_cli-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ytm-cli
-Version: 0.7.1
+Version: 0.7.2
 Summary: YouTube Music CLI tool with interactive terminal interface
 Author-email: thieuluan <thieuluan.dark@gmail.com>
 License-Expression: MIT
@@ -11,7 +11,8 @@ Keywords: youtube-music,cli,terminal,music-player,mpv
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: End Users/Desktop
-Classifier: Operating System :: OS Independent
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Operating System :: MacOS
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Multimedia :: Sound/Audio :: Players
@@ -32,9 +33,16 @@ Dynamic: license-file
 
 Stream music directly from YouTube Music in your terminal with intuitive controls, playlist management, and smart filtering.
 
-![YTM CLI Player](image.png)
+<p align="center">
+  <a href="https://github.com/thieuluan1618/ytm/raw/main/screenshots/player.webm">
+    <img src="screenshots/player.gif" alt="ytm-cli player demo" width="800">
+  </a>
+</p>
 
-![YTM CLI Lyrics](image-lyric.png)
+<p align="center">
+  <em>Player UI with the real-time FFT spectrum visualizer (synthetic demo capture).
+  Click for the higher-quality .webm.</em>
+</p>
 
 ## ✨ Features
 
@@ -45,21 +53,23 @@ Stream music directly from YouTube Music in your terminal with intuitive control
 - **👎 Smart Filtering**: Dislike songs to filter them from future results
 - **📜 Synced Lyrics**: Live-highlighted lyrics with auto-scroll (press `l`)
 - **🎯 Radio Mode**: Automatic playlist generation based on your selection
+- **📊 Real-time Spectrum Visualizer**: 24-band FFT bars driven by an `ffmpeg` sidecar — bass left, treble right (stereo oscilloscope fallback when `ffmpeg` is unavailable)
 - **🤖 AI-Powered**: Natural language music requests and AI-generated playlists
 
 ## 🚀 Quick Start
 
 ### Requirements
 
-- Python 3.8+
+- Python **3.14+** (set in `pyproject.toml`)
 - [mpv media player](https://mpv.io/installation/) (must be installed system-wide)
+- [`ffmpeg`](https://ffmpeg.org/) on `PATH` for the real-time spectrum visualizer (optional — falls back to a stereo oscilloscope if missing)
 
 ### Installation
 
 **One command with [uv](https://docs.astral.sh/uv/) (recommended):**
 
 ```bash
-# Install from PyPI
+# Install from PyPI — gets latest version automatically
 uvx ytm-cli "song name"
 ```
 
@@ -75,36 +85,16 @@ uv run ytm-cli "song name"
 </details>
 
 <details>
-<summary>Alternative: one-shot setup scripts</summary>
+<summary>Alternative: one-shot setup script (Linux / macOS)</summary>
 
 ```bash
 git clone https://github.com/thieuluan1618/ytm.git
 cd ytm
-```
-
-These create the virtual environment, install dependencies, and configure the `ytm` command globally.
-
-**Linux/macOS:**
-
-```bash
 ./setup.sh
-source ~/.zshrc  # or ~/.bashrc for bash
-```
-
-**Windows PowerShell:**
-
-```powershell
-.\setup.ps1
-. $PROFILE
-```
-
-**Windows Command Prompt:**
-
-```cmd
-setup.bat
+source ~/.zshrc            # or ~/.bashrc for bash
 ```
 
-After setup, use `ytm` (alias for `ytm-cli`) from anywhere.
+This creates the venv, installs runtime deps from `pyproject.toml`, and adds a `ytm` shell alias.
 
 </details>
 
@@ -114,14 +104,15 @@ After setup, use `ytm` (alias for `ytm-cli`) from anywhere.
 ```bash
 git clone https://github.com/thieuluan1618/ytm.git
 cd ytm
-python -m venv venv
-source venv/bin/activate  # Windows: venv\Scripts\activate
-pip install -r requirements.txt
-./setup_alias.sh          # or setup_alias.ps1 / setup_alias.bat
+uv sync                   # installs runtime deps from pyproject.toml + uv.lock
+./setup_alias.sh          # optional: registers the `ytm` alias
+# Run with: uv run ytm-cli "song"
 ```
 
 </details>
 
+> **Windows users:** native Windows is not supported (the codebase uses POSIX-only `termios`/`tty`/`fcntl`). Use [WSL2](https://learn.microsoft.com/en-us/windows/wsl/install) and follow the Linux instructions above.
+
 ### Basic Usage
 
 **Interactive search:**
@@ -140,9 +131,10 @@ ytm-cli "your favorite song"
 **Non-interactive mode (automation/scripting):**
 
 ```bash
-ytm-cli search "song name" --select 1           # Auto-select first result
-ytm-cli search "song" -s 1 -v                   # With verbose output
-ytm-cli search "song" -s 1 -v --log-file debug.log  # Save debug logs
+ytm-cli search "song name" --select 1                     # Auto-select first result
+ytm-cli search "song" -s 1 --verbose                      # With verbose output
+ytm-cli search "song" -s 1 --verbose --log-file debug.log # Save debug logs
+ytm-cli -v                                                # Print version
 ```
 
 > **Tip:** Set up the shell alias to use `ytm` as a shortcut for `ytm-cli`. See the setup scripts above.
@@ -249,7 +241,7 @@ Having issues? Check out the [**Troubleshooting Guide**](TROUBLESHOOTING.md) for
 
 ```bash
 # Enable verbose logging to see what's happening
-ytm-cli search "test" -s 1 -v --log-file debug.log
+ytm-cli search "test" -s 1 --verbose --log-file debug.log
 
 # Check versions
 mpv --version

{ytm_cli-0.7.1 → ytm_cli-0.7.2}/README.md

@@ -4,9 +4,16 @@
 
 Stream music directly from YouTube Music in your terminal with intuitive controls, playlist management, and smart filtering.
 
-![YTM CLI Player](image.png)
+<p align="center">
+  <a href="https://github.com/thieuluan1618/ytm/raw/main/screenshots/player.webm">
+    <img src="screenshots/player.gif" alt="ytm-cli player demo" width="800">
+  </a>
+</p>
 
-![YTM CLI Lyrics](image-lyric.png)
+<p align="center">
+  <em>Player UI with the real-time FFT spectrum visualizer (synthetic demo capture).
+  Click for the higher-quality .webm.</em>
+</p>
 
 ## ✨ Features
 
@@ -17,21 +24,23 @@ Stream music directly from YouTube Music in your terminal with intuitive control
 - **👎 Smart Filtering**: Dislike songs to filter them from future results
 - **📜 Synced Lyrics**: Live-highlighted lyrics with auto-scroll (press `l`)
 - **🎯 Radio Mode**: Automatic playlist generation based on your selection
+- **📊 Real-time Spectrum Visualizer**: 24-band FFT bars driven by an `ffmpeg` sidecar — bass left, treble right (stereo oscilloscope fallback when `ffmpeg` is unavailable)
 - **🤖 AI-Powered**: Natural language music requests and AI-generated playlists
 
 ## 🚀 Quick Start
 
 ### Requirements
 
-- Python 3.8+
+- Python **3.14+** (set in `pyproject.toml`)
 - [mpv media player](https://mpv.io/installation/) (must be installed system-wide)
+- [`ffmpeg`](https://ffmpeg.org/) on `PATH` for the real-time spectrum visualizer (optional — falls back to a stereo oscilloscope if missing)
 
 ### Installation
 
 **One command with [uv](https://docs.astral.sh/uv/) (recommended):**
 
 ```bash
-# Install from PyPI
+# Install from PyPI — gets latest version automatically
 uvx ytm-cli "song name"
 ```
 
@@ -47,36 +56,16 @@ uv run ytm-cli "song name"
 </details>
 
 <details>
-<summary>Alternative: one-shot setup scripts</summary>
+<summary>Alternative: one-shot setup script (Linux / macOS)</summary>
 
 ```bash
 git clone https://github.com/thieuluan1618/ytm.git
 cd ytm
-```
-
-These create the virtual environment, install dependencies, and configure the `ytm` command globally.
-
-**Linux/macOS:**
-
-```bash
 ./setup.sh
-source ~/.zshrc  # or ~/.bashrc for bash
-```
-
-**Windows PowerShell:**
-
-```powershell
-.\setup.ps1
-. $PROFILE
-```
-
-**Windows Command Prompt:**
-
-```cmd
-setup.bat
+source ~/.zshrc            # or ~/.bashrc for bash
 ```
 
-After setup, use `ytm` (alias for `ytm-cli`) from anywhere.
+This creates the venv, installs runtime deps from `pyproject.toml`, and adds a `ytm` shell alias.
 
 </details>
 
@@ -86,14 +75,15 @@ After setup, use `ytm` (alias for `ytm-cli`) from anywhere.
 ```bash
 git clone https://github.com/thieuluan1618/ytm.git
 cd ytm
-python -m venv venv
-source venv/bin/activate  # Windows: venv\Scripts\activate
-pip install -r requirements.txt
-./setup_alias.sh          # or setup_alias.ps1 / setup_alias.bat
+uv sync                   # installs runtime deps from pyproject.toml + uv.lock
+./setup_alias.sh          # optional: registers the `ytm` alias
+# Run with: uv run ytm-cli "song"
 ```
 
 </details>
 
+> **Windows users:** native Windows is not supported (the codebase uses POSIX-only `termios`/`tty`/`fcntl`). Use [WSL2](https://learn.microsoft.com/en-us/windows/wsl/install) and follow the Linux instructions above.
+
 ### Basic Usage
 
 **Interactive search:**
@@ -112,9 +102,10 @@ ytm-cli "your favorite song"
 **Non-interactive mode (automation/scripting):**
 
 ```bash
-ytm-cli search "song name" --select 1           # Auto-select first result
-ytm-cli search "song" -s 1 -v                   # With verbose output
-ytm-cli search "song" -s 1 -v --log-file debug.log  # Save debug logs
+ytm-cli search "song name" --select 1                     # Auto-select first result
+ytm-cli search "song" -s 1 --verbose                      # With verbose output
+ytm-cli search "song" -s 1 --verbose --log-file debug.log # Save debug logs
+ytm-cli -v                                                # Print version
 ```
 
 > **Tip:** Set up the shell alias to use `ytm` as a shortcut for `ytm-cli`. See the setup scripts above.
@@ -221,7 +212,7 @@ Having issues? Check out the [**Troubleshooting Guide**](TROUBLESHOOTING.md) for
 
 ```bash
 # Enable verbose logging to see what's happening
-ytm-cli search "test" -s 1 -v --log-file debug.log
+ytm-cli search "test" -s 1 --verbose --log-file debug.log
 
 # Check versions
 mpv --version

{ytm_cli-0.7.1 → ytm_cli-0.7.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ytm-cli"
-version = "0.7.1"
+version = "0.7.2"
 description = "YouTube Music CLI tool with interactive terminal interface"
 readme = "README.md"
 license = "MIT"
@@ -17,7 +17,8 @@ classifiers = [
     "Development Status :: 4 - Beta",
     "Environment :: Console",
     "Intended Audience :: End Users/Desktop",
-    "Operating System :: OS Independent",
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: MacOS",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3.14",
     "Topic :: Multimedia :: Sound/Audio :: Players",
@@ -31,6 +32,16 @@ dependencies = [
     "numpy",
 ]
 
+[dependency-groups]
+dev = [
+    "ruff>=0.14.0",
+    "pytest>=9.0.3",
+    "pytest-cov>=6.0.0",
+    "pytest-mock>=3.15.0",
+    "coverage>=7.0.0",
+    "yt-dlp>=2024.0.0",
+]
+
 [project.urls]
 Homepage = "https://github.com/thieuluan1618/ytm"
 Repository = "https://github.com/thieuluan1618/ytm"

{ytm_cli-0.7.1 → ytm_cli-0.7.2}/tests/test_config.py

@@ -8,7 +8,7 @@ import pytest
 
 # We need to mock the imports before importing the config module
 # since it initializes global objects on import
-with patch("ytm_cli.config.AuthManager"), patch("ytm_cli.config.configparser.ConfigParser"):
+with patch("ytm_cli.config.configparser.ConfigParser"):
     from ytm_cli.config import get_mpv_flags, get_songs_to_display
 
 
@@ -139,10 +139,9 @@ class TestConfigModule:
     """Tests for config module initialization and behavior"""
 
     def test_config_reads_file(self):
-        """Test that config reads from config.ini file"""
+        """Test that config reads from ~/.config/ytm-cli/config.ini"""
         with (
             patch("ytm_cli.config.configparser.ConfigParser") as mock_parser_class,
-            patch("ytm_cli.config.AuthManager"),
         ):
             mock_parser = Mock()
             mock_parser_class.return_value = mock_parser
@@ -154,25 +153,10 @@ class TestConfigModule:
 
             importlib.reload(ytm_cli.config)
 
-            mock_parser.read.assert_called_with("config.ini")
-
-    def test_auth_manager_initialization(self):
-        """Test that AuthManager is properly initialized"""
-        mock_auth_manager = Mock()
-        mock_auth_manager.get_ytmusic_instance.return_value = Mock()
-
-        with patch(
-            "ytm_cli.auth.AuthManager", return_value=mock_auth_manager
-        ) as mock_auth_manager_class:
-            # Re-import to trigger initialization
-            import importlib
-
-            import ytm_cli.config
-
-            importlib.reload(ytm_cli.config)
-
-            mock_auth_manager_class.assert_called_once()
-            mock_auth_manager.get_ytmusic_instance.assert_called_once()
+            # Config now lives under ~/.config/ytm-cli/
+            mock_parser.read.assert_called_once()
+            called_path = mock_parser.read.call_args[0][0]
+            assert called_path.endswith(os.path.join(".config", "ytm-cli", "config.ini"))
 
 
 class TestConfigIntegration:

{ytm_cli-0.7.1 → ytm_cli-0.7.2}/tests/test_dislikes.py

@@ -11,11 +11,13 @@ class TestDislikeManagerInit:
     """Tests for DislikeManager initialization"""
 
     def test_init_default_file(self):
-        """Test initialization with default file"""
+        """Test initialization with default file (~/.config/ytm-cli/dislikes.json)"""
         with patch("os.path.exists", return_value=False):
             manager = DislikeManager()
 
-            assert manager.dislikes_file == "dislikes.json"
+            assert manager.dislikes_file.endswith(
+                os.path.join(".config", "ytm-cli", "dislikes.json")
+            )
             assert manager._disliked_ids == set()
 
     def test_init_custom_file(self):

{ytm_cli-0.7.1 → ytm_cli-0.7.2}/tests/test_integration.py

@@ -1,10 +1,8 @@
 """Integration tests for YTM CLI components"""
 
-import json
 import os
-from unittest.mock import Mock, patch
+from unittest.mock import patch
 
-from ytm_cli.auth import AuthManager
 from ytm_cli.dislikes import DislikeManager
 from ytm_cli.playlists import PlaylistManager
 
@@ -48,121 +46,6 @@ class TestPlaylistDislikeIntegration:
 
         # Should have 2 songs left (song1 and song3)
         assert len(filtered_songs) == 2
-        video_ids = [song["videoId"] for song in filtered_songs]
-        assert "song1" in video_ids
-        assert "song3" in video_ids
-        assert "song2" not in video_ids
-
-    def test_playlist_creation_with_auth_enabled(self, temp_dir):
-        """Test playlist creation when authentication is enabled"""
-        # Setup auth manager with enabled auth
-        config_file = os.path.join(temp_dir, "config.ini")
-        auth_manager = AuthManager(config_path=config_file)
-
-        auth_manager._update_auth_config("oauth")
-
-        # Setup playlist manager
-        playlist_manager = PlaylistManager(temp_dir)
-
-        # Create playlist - should work regardless of auth status
-        result = playlist_manager.create_playlist("Auth Test Playlist")
-
-        assert result is True
-        assert auth_manager.is_auth_enabled() is True
-
-        # Verify playlist exists
-        playlists = playlist_manager.list_playlists()
-        assert len(playlists) == 1
-        assert playlists[0]["name"] == "Auth Test Playlist"
-
-    def test_dislike_persistence_across_playlist_operations(self, temp_dir, sample_songs):
-        """Test that dislikes persist across playlist operations"""
-        dislikes_file = os.path.join(temp_dir, "dislikes.json")
-        dislike_manager = DislikeManager(dislikes_file)
-        playlist_manager = PlaylistManager(temp_dir)
-
-        # Dislike a song first
-        with patch("builtins.print"):
-            dislike_manager.dislike_song(sample_songs[0])
-
-        # Create playlist and add songs
-        with patch("builtins.print"):
-            playlist_manager.create_playlist("Test Playlist")
-            for song in sample_songs:
-                playlist_manager.add_song_to_playlist("Test Playlist", song)
-
-        # Create new dislike manager instance to test persistence
-        dislike_manager2 = DislikeManager(dislikes_file)
-
-        # Should still have the disliked song
-        assert dislike_manager2.is_disliked("song1")
-        assert dislike_manager2.get_dislike_count() == 1
-
-
-class TestAuthConfigIntegration:
-    """Integration tests between auth and config management"""
-
-    def test_auth_config_file_management(self, temp_dir):
-        """Test auth configuration file management"""
-        config_file = os.path.join(temp_dir, "config.ini")
-
-        auth_manager = AuthManager(config_path=config_file)
-
-        # Initially no auth
-        assert auth_manager.is_auth_enabled() is False
-
-        # Enable OAuth
-        auth_manager._update_auth_config("oauth")
-
-        assert auth_manager.is_auth_enabled() is True
-        assert auth_manager.get_auth_method() == "oauth"
-
-        # Create new instance to test persistence
-        auth_manager2 = AuthManager(config_path=config_file)
-        assert auth_manager2.is_auth_enabled() is True
-        assert auth_manager2.get_auth_method() == "oauth"
-
-        # Disable auth
-        auth_manager2._update_auth_config("none", enabled=False)
-
-        # Create third instance to verify disable persisted
-        auth_manager3 = AuthManager(config_path=config_file)
-        assert auth_manager3.is_auth_enabled() is False
-
-    def test_auth_with_ytmusic_instance_creation(self, temp_dir):
-        """Test YTMusic instance creation with different auth states"""
-        config_file = os.path.join(temp_dir, "config.ini")
-        oauth_file = os.path.join(temp_dir, "oauth.json")
-
-        auth_manager = AuthManager(config_path=config_file)
-        auth_manager.oauth_file = oauth_file
-
-        # Test unauthenticated instance
-        with patch("ytm_cli.auth.YTMusic") as mock_ytmusic, patch("ytm_cli.auth.print"):
-            mock_instance = Mock()
-            mock_ytmusic.return_value = mock_instance
-
-            instance = auth_manager.get_ytmusic_instance()
-
-            assert instance == mock_instance
-            mock_ytmusic.assert_called_once_with()
-
-        # Enable auth and create OAuth file
-        oauth_data = {"access_token": "test_token"}
-        with open(oauth_file, "w") as f:
-            json.dump(oauth_data, f)
-
-        auth_manager._update_auth_config("oauth")
-
-        # Test authenticated instance
-        with patch("ytm_cli.auth.YTMusic") as mock_ytmusic, patch("ytm_cli.auth.print"):
-            mock_instance = Mock()
-            mock_ytmusic.return_value = mock_instance
-
-            instance = auth_manager.get_ytmusic_instance()
-
-            assert instance == mock_instance
-            mock_ytmusic.assert_called_once_with(oauth_file)
 
 
 class TestFullWorkflowIntegration:
@@ -224,55 +107,6 @@ class TestFullWorkflowIntegration:
             deleted_playlist = playlist_manager.get_playlist("My Workflow Playlist")
             assert deleted_playlist is None
 
-    def test_auth_setup_to_usage_workflow(self, temp_dir):
-        """Test complete auth workflow from setup to usage"""
-        config_file = os.path.join(temp_dir, "config.ini")
-        oauth_file = os.path.join(temp_dir, "oauth.json")
-
-        auth_manager = AuthManager(config_path=config_file)
-        auth_manager.oauth_file = oauth_file
-
-        with patch("ytm_cli.auth.print"):
-            # Setup OAuth
-            mock_oauth_data = {
-                "access_token": "test_token",
-                "refresh_token": "refresh_token",
-            }
-
-            with patch("ytm_cli.auth.setup_oauth"):
-                result = auth_manager.setup_oauth_auth("client_id", "client_secret")
-                assert result is True
-
-            # Verify auth is enabled
-            assert auth_manager.is_auth_enabled() is True
-            assert auth_manager.get_auth_method() == "oauth"
-
-            # Verify OAuth file was created by setup_oauth_auth
-            # (setup_oauth is mocked, so we create the file manually for downstream tests)
-            with open(oauth_file, "w") as f:
-                json.dump(mock_oauth_data, f)
-
-            assert os.path.exists(oauth_file)
-            with open(oauth_file) as f:
-                saved_data = json.load(f)
-                assert saved_data == mock_oauth_data
-
-            # Test YTMusic instance creation
-            with patch("ytm_cli.auth.YTMusic") as mock_ytmusic:
-                mock_instance = Mock()
-                mock_ytmusic.return_value = mock_instance
-
-                instance = auth_manager.get_ytmusic_instance()
-
-                assert instance == mock_instance
-                mock_ytmusic.assert_called_once_with(oauth_file)
-
-            # Disable auth
-            with patch("builtins.input", return_value="n"):
-                result = auth_manager.disable_auth()
-            assert result is True
-            assert auth_manager.is_auth_enabled() is False
-
     def test_error_recovery_workflow(self, temp_dir, sample_songs):
         """Test error recovery in integrated workflows"""
         playlist_manager = PlaylistManager(temp_dir)
@@ -285,7 +119,7 @@ class TestFullWorkflowIntegration:
 
             # Try to add song with missing data
             incomplete_song = {"title": "Incomplete Song"}  # Missing videoId
-            result = playlist_manager.add_song_to_playlist("Error Test Playlist", incomplete_song)
+            playlist_manager.add_song_to_playlist("Error Test Playlist", incomplete_song)
             # Should handle gracefully (behavior depends on implementation)
 
             # Add valid songs

{ytm_cli-0.7.1 → ytm_cli-0.7.2}/tests/test_main.py

@@ -7,7 +7,7 @@ import pytest
 # Mock the imports before importing main to avoid initialization issues
 with (
     patch("ytm_cli.main.get_songs_to_display"),
-    patch("ytm_cli.main.ytmusic"),
+    patch("ytm_cli.main.get_ytmusic"),
     patch("ytm_cli.main.dislike_manager"),
     patch("ytm_cli.main.playlist_manager"),
     patch("ytm_cli.main.setup_signal_handler"),
@@ -29,13 +29,14 @@ class TestSearchAndPlay:
     def test_search_and_play_with_query(self, sample_songs):
         """Test search and play with provided query"""
         with (
-            patch("ytm_cli.main.ytmusic") as mock_ytmusic,
+            patch("ytm_cli.main.get_ytmusic") as mock_get_ytmusic,
             patch("ytm_cli.main.dislike_manager") as mock_dislike_manager,
             patch("ytm_cli.main.get_songs_to_display", return_value=5),
             patch("ytm_cli.main.wrapper", return_value=0),
             patch("ytm_cli.main.play_music_with_controls"),
             patch("ytm_cli.main.print") as mock_print,
         ):
+            mock_ytmusic = mock_get_ytmusic.return_value
             mock_ytmusic.search.return_value = sample_songs
             mock_dislike_manager.filter_disliked_songs.return_value = sample_songs
             mock_ytmusic.get_watch_playlist.return_value = {"tracks": []}
@@ -48,13 +49,14 @@ class TestSearchAndPlay:
     def test_search_and_play_no_query_prompts_input(self, sample_songs):
         """Test search and play without query prompts for input"""
         with (
-            patch("ytm_cli.main.ytmusic") as mock_ytmusic,
+            patch("ytm_cli.main.get_ytmusic") as mock_get_ytmusic,
             patch("ytm_cli.main.dislike_manager") as mock_dislike_manager,
             patch("ytm_cli.main.get_songs_to_display", return_value=5),
             patch("ytm_cli.main.wrapper", return_value=0),
             patch("ytm_cli.main.play_music_with_controls"),
             patch("builtins.input", return_value="user input query"),
         ):
+            mock_ytmusic = mock_get_ytmusic.return_value
             mock_ytmusic.search.return_value = sample_songs
             mock_dislike_manager.filter_disliked_songs.return_value = sample_songs
             mock_ytmusic.get_watch_playlist.return_value = {"tracks": []}
@@ -66,9 +68,10 @@ class TestSearchAndPlay:
     def test_search_and_play_no_results(self):
         """Test search and play when no results found"""
         with (
-            patch("ytm_cli.main.ytmusic") as mock_ytmusic,
+            patch("ytm_cli.main.get_ytmusic") as mock_get_ytmusic,
             patch("ytm_cli.main.print") as mock_print,
         ):
+            mock_ytmusic = mock_get_ytmusic.return_value
             mock_ytmusic.search.return_value = []
 
             search_and_play("no results query")
@@ -78,10 +81,11 @@ class TestSearchAndPlay:
     def test_search_and_play_all_filtered_out(self, sample_songs):
         """Test search and play when all results are filtered out"""
         with (
-            patch("ytm_cli.main.ytmusic") as mock_ytmusic,
+            patch("ytm_cli.main.get_ytmusic") as mock_get_ytmusic,
             patch("ytm_cli.main.dislike_manager") as mock_dislike_manager,
             patch("ytm_cli.main.print") as mock_print,
         ):
+            mock_ytmusic = mock_get_ytmusic.return_value
             mock_ytmusic.search.return_value = sample_songs
             mock_dislike_manager.filter_disliked_songs.return_value = []
 
@@ -92,12 +96,13 @@ class TestSearchAndPlay:
     def test_search_and_play_user_quits(self, sample_songs):
         """Test search and play when user quits selection"""
         with (
-            patch("ytm_cli.main.ytmusic") as mock_ytmusic,
+            patch("ytm_cli.main.get_ytmusic") as mock_get_ytmusic,
             patch("ytm_cli.main.dislike_manager") as mock_dislike_manager,
             patch("ytm_cli.main.get_songs_to_display", return_value=5),
             patch("ytm_cli.main.wrapper", return_value=None),
             patch("ytm_cli.main.play_music_with_controls") as mock_play,
         ):
+            mock_ytmusic = mock_get_ytmusic.return_value
             mock_ytmusic.search.return_value = sample_songs
             mock_dislike_manager.filter_disliked_songs.return_value = sample_songs
 
@@ -109,13 +114,14 @@ class TestSearchAndPlay:
     def test_search_and_play_radio_fetch_error(self, sample_songs):
         """Test search and play when radio fetch fails"""
         with (
-            patch("ytm_cli.main.ytmusic") as mock_ytmusic,
+            patch("ytm_cli.main.get_ytmusic") as mock_get_ytmusic,
             patch("ytm_cli.main.dislike_manager") as mock_dislike_manager,
             patch("ytm_cli.main.get_songs_to_display", return_value=5),
             patch("ytm_cli.main.wrapper", return_value=0),
             patch("ytm_cli.main.play_music_with_controls") as mock_play,
             patch("ytm_cli.main.print"),
         ):
+            mock_ytmusic = mock_get_ytmusic.return_value
             mock_ytmusic.search.return_value = sample_songs
             mock_dislike_manager.filter_disliked_songs.return_value = sample_songs
             mock_ytmusic.get_watch_playlist.side_effect = Exception("Radio error")