Removed CLI direct entrypoint, added couple more unit tests for 100 coverage of CLI

Author: beveradb

audio_separator/utils/cli.py

@@ -3,12 +3,6 @@
 import logging
 from importlib import metadata
 
-def get_package_distribution(logger, package_name):
-    try:
-        return metadata.distribution(package_name)
-    except metadata.PackageNotFoundError:
-        logger.debug(f"Python package: {package_name} not installed")
-        return None
 
 def main():
     logger = logging.getLogger(__name__)
@@ -24,7 +18,7 @@ def main():
 
     parser.add_argument("audio_file", nargs="?", help="The audio file path to separate, in any common format.", default=argparse.SUPPRESS)
 
-    package_version = get_package_distribution(logger, "audio-separator").version
+    package_version = metadata.distribution("audio-separator").version
     parser.add_argument("-v", "--version", action="version", version=f"%(prog)s {package_version}")
 
     parser.add_argument(
@@ -155,7 +149,3 @@ def main():
     output_files = separator.separate(args.audio_file)
 
     logger.info(f"Separation complete! Output file(s): {' '.join(output_files)}")
-
-
-if __name__ == "__main__":
-    main()

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "audio-separator"
-version = "0.13.0"
+version = "0.13.1"
 description = "Easy to use vocal separation, using MDX-Net models from UVR trained by @Anjok07"
 authors = ["Andrew Beveridge <andrew@beveridge.uk>"]
 license = "MIT"

tests/unit/test_cli.py

@@ -1,6 +1,7 @@
 import pytest
 import logging
 from audio_separator.utils.cli import main
+import subprocess
 from unittest import mock
 from unittest.mock import patch, MagicMock
 
@@ -26,13 +27,24 @@ def common_expected_args():
     }
 
 
+# Test the CLI with version argument using subprocess
+def test_cli_version_subprocess():
+    # Run the CLI script with the '--version' argument
+    result = subprocess.run(["poetry", "run", "audio-separator", "--version"], capture_output=True, text=True)
+    assert result.returncode == 0
+    assert "audio-separator" in result.stdout
+
+    # Test with the short version flag '-v'
+    result = subprocess.run(["poetry", "run", "audio-separator", "-v"], capture_output=True, text=True)
+    assert result.returncode == 0
+    assert "audio-separator" in result.stdout
+
+
 # Test the CLI with no arguments
 def test_cli_no_args(capsys):
-    with patch("sys.argv", ["cli.py"]), pytest.raises(SystemExit):
-        # Call the main function in cli.py
-        main()
-    captured = capsys.readouterr()
-    assert "usage:" in captured.out
+    result = subprocess.run(["poetry", "run", "audio-separator"], capture_output=True, text=True)
+    assert result.returncode == 1
+    assert "usage:" in result.stdout
 
 
 # Test with multiple filename arguments