audiometa-python 1.2.0__tar.gz → 1.2.1__tar.gz

{audiometa_python-1.2.0/audiometa_python.egg-info → audiometa_python-1.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: audiometa-python
-Version: 1.2.0
+Version: 1.2.1
 Summary: A comprehensive Python library for reading and writing audio metadata across multiple formats
 Author: AudioMeta Python Contributors
 Author-email: Andreas Garcia <garcia.andreas.1991@gmail.com>

{audiometa_python-1.2.0 → audiometa_python-1.2.1}/audiometa/cli.py

@@ -24,19 +24,31 @@ from audiometa.utils.metadata_format import MetadataFormat
 from audiometa.utils.types import UnifiedMetadata
 
 
+def _data_for_serialization(data: Any) -> Any:
+    """Convert data to a form suitable for YAML/JSON (UnifiedMetadataKey keys as strings)."""
+    if isinstance(data, dict):
+        return {
+            (k.value if isinstance(k, UnifiedMetadataKey) else k): _data_for_serialization(v) for k, v in data.items()
+        }
+    if isinstance(data, list):
+        return [_data_for_serialization(item) for item in data]
+    return data
+
+
 def format_output(data: Any, output_format: str) -> str:
     """Format output data according to specified format."""
+    serializable = _data_for_serialization(data)
     if output_format == "json":
-        return json.dumps(data, indent=2)
+        return json.dumps(serializable, indent=2)
     if output_format == "yaml":
         try:
             import yaml  # type: ignore[import-untyped]
 
-            result = yaml.dump(data, default_flow_style=False)
+            result = yaml.dump(serializable, default_flow_style=False)
             return str(result) if result is not None else ""
         except ImportError:
             sys.stderr.write("Warning: PyYAML not installed, falling back to JSON\n")
-            return json.dumps(data, indent=2)
+            return json.dumps(serializable, indent=2)
     elif output_format == "table":
         return format_as_table(data)
     else:
@@ -107,7 +119,8 @@ def format_as_table(data: dict[str, Any]) -> str:
         lines.append("=== UNIFIED METADATA ===")
         for key, value in data["unified_metadata"].items():
             if value is not None:
-                lines.append(f"{key:20}: {value}")
+                label = key.value if isinstance(key, UnifiedMetadataKey) else str(key)
+                lines.append(f"{label:20}: {value}")
         lines.append("")
 
     if "technical_info" in data:
@@ -124,7 +137,8 @@ def format_as_table(data: dict[str, Any]) -> str:
                 lines.append(f"\n{metadata_format_name.upper()}:")
                 for key, value in format_data.items():
                     if value is not None:
-                        lines.append(f"  {key:18}: {value}")
+                        label = key.value if isinstance(key, UnifiedMetadataKey) else str(key)
+                        lines.append(f"  {label:18}: {value}")
 
     return "\n".join(lines)
 

{audiometa_python-1.2.0 → audiometa_python-1.2.1}/audiometa/test/tests/e2e/cli/read/test_comprehensive.py

@@ -49,26 +49,26 @@ class TestCLIReadComprehensive:
             data = json.loads(result.stdout)
             unified = data.get("unified_metadata", {})
 
-            assert unified.get(UnifiedMetadataKey.TITLE) == "Comprehensive Test Title"
-            assert unified.get(UnifiedMetadataKey.ARTISTS) == ["Artist One", "Artist Two"]
-            assert unified.get(UnifiedMetadataKey.ALBUM) == "Test Album"
-            assert unified.get(UnifiedMetadataKey.ALBUM_ARTISTS) == ["Album Artist"]
-            assert unified.get(UnifiedMetadataKey.RELEASE_DATE) == "2024"
-            assert unified.get(UnifiedMetadataKey.GENRES_NAMES) == ["Rock", "Blues"]
-            assert unified.get(UnifiedMetadataKey.TRACK_NUMBER) == "5/12"
-            assert unified.get(UnifiedMetadataKey.DISC_NUMBER) == 1
-            assert unified.get(UnifiedMetadataKey.DISC_TOTAL) == 2
-            assert unified.get(UnifiedMetadataKey.RATING) == 85
-            assert unified.get(UnifiedMetadataKey.BPM) == 120
-            assert unified.get(UnifiedMetadataKey.LANGUAGE) == "eng"
-            assert unified.get(UnifiedMetadataKey.COMPOSERS) == ["Composer One", "Composer Two"]
-            assert unified.get(UnifiedMetadataKey.PUBLISHER) == "Test Publisher"
-            assert unified.get(UnifiedMetadataKey.COPYRIGHT) == "© 2024"
-            assert unified.get(UnifiedMetadataKey.UNSYNCHRONIZED_LYRICS) == "Test lyrics"
-            assert unified.get(UnifiedMetadataKey.COMMENT) == "Test comment"
-            assert unified.get(UnifiedMetadataKey.ISRC) == "USRC17607839"
-            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_TRACKID) == "9d6f6f7c-9d52-4c76-8f9e-01d18d8f8ec6"
-            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_ARTISTIDS) == [
+            assert unified.get(UnifiedMetadataKey.TITLE.value) == "Comprehensive Test Title"
+            assert unified.get(UnifiedMetadataKey.ARTISTS.value) == ["Artist One", "Artist Two"]
+            assert unified.get(UnifiedMetadataKey.ALBUM.value) == "Test Album"
+            assert unified.get(UnifiedMetadataKey.ALBUM_ARTISTS.value) == ["Album Artist"]
+            assert unified.get(UnifiedMetadataKey.RELEASE_DATE.value) == "2024"
+            assert unified.get(UnifiedMetadataKey.GENRES_NAMES.value) == ["Rock", "Blues"]
+            assert unified.get(UnifiedMetadataKey.TRACK_NUMBER.value) == "5/12"
+            assert unified.get(UnifiedMetadataKey.DISC_NUMBER.value) == 1
+            assert unified.get(UnifiedMetadataKey.DISC_TOTAL.value) == 2
+            assert unified.get(UnifiedMetadataKey.RATING.value) == 85
+            assert unified.get(UnifiedMetadataKey.BPM.value) == 120
+            assert unified.get(UnifiedMetadataKey.LANGUAGE.value) == "eng"
+            assert unified.get(UnifiedMetadataKey.COMPOSERS.value) == ["Composer One", "Composer Two"]
+            assert unified.get(UnifiedMetadataKey.PUBLISHER.value) == "Test Publisher"
+            assert unified.get(UnifiedMetadataKey.COPYRIGHT.value) == "© 2024"
+            assert unified.get(UnifiedMetadataKey.UNSYNCHRONIZED_LYRICS.value) == "Test lyrics"
+            assert unified.get(UnifiedMetadataKey.COMMENT.value) == "Test comment"
+            assert unified.get(UnifiedMetadataKey.ISRC.value) == "USRC17607839"
+            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_TRACKID.value) == "9d6f6f7c-9d52-4c76-8f9e-01d18d8f8ec6"
+            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_ARTISTIDS.value) == [
                 "9d6f6f7c-9d52-4c76-8f9e-01d18d8f8ec6",
                 "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee",
             ]
@@ -108,24 +108,26 @@ class TestCLIReadComprehensive:
             data = json.loads(result.stdout)
             unified = data.get("unified_metadata", {})
 
-            assert unified.get(UnifiedMetadataKey.TITLE) == "FLAC Comprehensive Test"
-            assert unified.get(UnifiedMetadataKey.ARTISTS) == ["FLAC Artist"]
-            assert unified.get(UnifiedMetadataKey.ALBUM) == "FLAC Album"
-            assert unified.get(UnifiedMetadataKey.TRACK_NUMBER) == "3/10"
-            assert unified.get(UnifiedMetadataKey.DISC_NUMBER) == 1
-            assert unified.get(UnifiedMetadataKey.DISC_TOTAL) == 2
-            assert unified.get(UnifiedMetadataKey.BPM) == 140
-            assert unified.get(UnifiedMetadataKey.LANGUAGE) == "eng"
-            assert unified.get(UnifiedMetadataKey.COMPOSERS) == ["FLAC Composer"]
-            assert unified.get(UnifiedMetadataKey.PUBLISHER) == "FLAC Publisher"
-            assert unified.get(UnifiedMetadataKey.COPYRIGHT) == "© FLAC"
-            assert unified.get(UnifiedMetadataKey.UNSYNCHRONIZED_LYRICS) == "FLAC lyrics"
-            assert unified.get(UnifiedMetadataKey.COMMENT) == "FLAC comment"
-            assert unified.get(UnifiedMetadataKey.DESCRIPTION) == "FLAC description"
-            assert unified.get(UnifiedMetadataKey.REPLAYGAIN) == "+2.5 dB"
-            assert unified.get(UnifiedMetadataKey.ISRC) == "FRXXX1800001"
-            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_TRACKID) == "a1b2c3d4-e5f6-7890-abcd-ef1234567890"
-            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_ARTISTIDS) == ["a1b2c3d4-e5f6-7890-abcd-ef1234567890"]
+            assert unified.get(UnifiedMetadataKey.TITLE.value) == "FLAC Comprehensive Test"
+            assert unified.get(UnifiedMetadataKey.ARTISTS.value) == ["FLAC Artist"]
+            assert unified.get(UnifiedMetadataKey.ALBUM.value) == "FLAC Album"
+            assert unified.get(UnifiedMetadataKey.TRACK_NUMBER.value) == "3/10"
+            assert unified.get(UnifiedMetadataKey.DISC_NUMBER.value) == 1
+            assert unified.get(UnifiedMetadataKey.DISC_TOTAL.value) == 2
+            assert unified.get(UnifiedMetadataKey.BPM.value) == 140
+            assert unified.get(UnifiedMetadataKey.LANGUAGE.value) == "eng"
+            assert unified.get(UnifiedMetadataKey.COMPOSERS.value) == ["FLAC Composer"]
+            assert unified.get(UnifiedMetadataKey.PUBLISHER.value) == "FLAC Publisher"
+            assert unified.get(UnifiedMetadataKey.COPYRIGHT.value) == "© FLAC"
+            assert unified.get(UnifiedMetadataKey.UNSYNCHRONIZED_LYRICS.value) == "FLAC lyrics"
+            assert unified.get(UnifiedMetadataKey.COMMENT.value) == "FLAC comment"
+            assert unified.get(UnifiedMetadataKey.DESCRIPTION.value) == "FLAC description"
+            assert unified.get(UnifiedMetadataKey.REPLAYGAIN.value) == "+2.5 dB"
+            assert unified.get(UnifiedMetadataKey.ISRC.value) == "FRXXX1800001"
+            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_TRACKID.value) == "a1b2c3d4-e5f6-7890-abcd-ef1234567890"
+            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_ARTISTIDS.value) == [
+                "a1b2c3d4-e5f6-7890-abcd-ef1234567890"
+            ]
             # ARCHIVAL_LOCATION is not supported by Vorbis format (FLAC)
 
     def test_cli_read_all_fields_comprehensive_wav(self):
@@ -160,22 +162,24 @@ class TestCLIReadComprehensive:
             data = json.loads(result.stdout)
             unified = data.get("unified_metadata", {})
 
-            assert unified.get(UnifiedMetadataKey.TITLE) == "WAV Comprehensive Test"
-            assert unified.get(UnifiedMetadataKey.ARTISTS) == ["WAV Artist"]
-            assert unified.get(UnifiedMetadataKey.ALBUM) == "WAV Album"
-            assert unified.get(UnifiedMetadataKey.RELEASE_DATE) == "2024"
-            assert unified.get(UnifiedMetadataKey.GENRES_NAMES) == ["Rock"]
-            assert unified.get(UnifiedMetadataKey.RATING) == 100
-            assert unified.get(UnifiedMetadataKey.BPM) == 120
-            assert unified.get(UnifiedMetadataKey.LANGUAGE) == "eng"
-            assert unified.get(UnifiedMetadataKey.COMPOSERS) == ["WAV Composer"]
-            assert unified.get(UnifiedMetadataKey.COPYRIGHT) == "© WAV"
-            assert unified.get(UnifiedMetadataKey.COMMENT) == "WAV comment"
-            assert unified.get(UnifiedMetadataKey.DESCRIPTION) == "WAV description"
-            assert unified.get(UnifiedMetadataKey.ORIGINATOR) == "WAV originator"
-            assert unified.get(UnifiedMetadataKey.ISRC) == "GBUM71505078"
-            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_TRACKID) == "12345678-1234-5678-9abc-def123456789"
-            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_ARTISTIDS) == ["12345678-1234-5678-9abc-def123456789"]
+            assert unified.get(UnifiedMetadataKey.TITLE.value) == "WAV Comprehensive Test"
+            assert unified.get(UnifiedMetadataKey.ARTISTS.value) == ["WAV Artist"]
+            assert unified.get(UnifiedMetadataKey.ALBUM.value) == "WAV Album"
+            assert unified.get(UnifiedMetadataKey.RELEASE_DATE.value) == "2024"
+            assert unified.get(UnifiedMetadataKey.GENRES_NAMES.value) == ["Rock"]
+            assert unified.get(UnifiedMetadataKey.RATING.value) == 100
+            assert unified.get(UnifiedMetadataKey.BPM.value) == 120
+            assert unified.get(UnifiedMetadataKey.LANGUAGE.value) == "eng"
+            assert unified.get(UnifiedMetadataKey.COMPOSERS.value) == ["WAV Composer"]
+            assert unified.get(UnifiedMetadataKey.COPYRIGHT.value) == "© WAV"
+            assert unified.get(UnifiedMetadataKey.COMMENT.value) == "WAV comment"
+            assert unified.get(UnifiedMetadataKey.DESCRIPTION.value) == "WAV description"
+            assert unified.get(UnifiedMetadataKey.ORIGINATOR.value) == "WAV originator"
+            assert unified.get(UnifiedMetadataKey.ISRC.value) == "GBUM71505078"
+            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_TRACKID.value) == "12345678-1234-5678-9abc-def123456789"
+            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_ARTISTIDS.value) == [
+                "12345678-1234-5678-9abc-def123456789"
+            ]
 
     def test_cli_read_comprehensive_roundtrip(self):
         """Test that we can write all fields via CLI and read them back correctly."""
@@ -248,23 +252,25 @@ class TestCLIReadComprehensive:
             data = json.loads(read_result.stdout)
             unified = data.get("unified_metadata", {})
 
-            assert unified.get(UnifiedMetadataKey.TITLE) == "Roundtrip Test"
-            assert unified.get(UnifiedMetadataKey.ARTISTS) == ["Roundtrip Artist One", "Roundtrip Artist Two"]
-            assert unified.get(UnifiedMetadataKey.ALBUM) == "Roundtrip Album"
-            assert unified.get(UnifiedMetadataKey.ALBUM_ARTISTS) == ["Roundtrip Album Artist"]
-            assert unified.get(UnifiedMetadataKey.RELEASE_DATE) == "2024"
-            assert unified.get(UnifiedMetadataKey.GENRES_NAMES) == ["Rock", "Blues"]
-            assert unified.get(UnifiedMetadataKey.TRACK_NUMBER) == "5/12"
-            assert unified.get(UnifiedMetadataKey.DISC_NUMBER) == 1
-            assert unified.get(UnifiedMetadataKey.DISC_TOTAL) == 2
-            assert unified.get(UnifiedMetadataKey.RATING) == 85
-            assert unified.get(UnifiedMetadataKey.BPM) == 120
-            assert unified.get(UnifiedMetadataKey.LANGUAGE) == "eng"
-            assert unified.get(UnifiedMetadataKey.COMPOSERS) == ["Roundtrip Composer"]
-            assert unified.get(UnifiedMetadataKey.PUBLISHER) == "Roundtrip Publisher"
-            assert unified.get(UnifiedMetadataKey.COPYRIGHT) == "© Roundtrip"
-            assert unified.get(UnifiedMetadataKey.UNSYNCHRONIZED_LYRICS) == "Roundtrip lyrics"
-            assert unified.get(UnifiedMetadataKey.COMMENT) == "Roundtrip comment"
-            assert unified.get(UnifiedMetadataKey.ISRC) == "USRC17607839"
-            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_TRACKID) == "9d6f6f7c-9d52-4c76-8f9e-01d18d8f8ec6"
-            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_ARTISTIDS) == ["9d6f6f7c-9d52-4c76-8f9e-01d18d8f8ec6"]
+            assert unified.get(UnifiedMetadataKey.TITLE.value) == "Roundtrip Test"
+            assert unified.get(UnifiedMetadataKey.ARTISTS.value) == ["Roundtrip Artist One", "Roundtrip Artist Two"]
+            assert unified.get(UnifiedMetadataKey.ALBUM.value) == "Roundtrip Album"
+            assert unified.get(UnifiedMetadataKey.ALBUM_ARTISTS.value) == ["Roundtrip Album Artist"]
+            assert unified.get(UnifiedMetadataKey.RELEASE_DATE.value) == "2024"
+            assert unified.get(UnifiedMetadataKey.GENRES_NAMES.value) == ["Rock", "Blues"]
+            assert unified.get(UnifiedMetadataKey.TRACK_NUMBER.value) == "5/12"
+            assert unified.get(UnifiedMetadataKey.DISC_NUMBER.value) == 1
+            assert unified.get(UnifiedMetadataKey.DISC_TOTAL.value) == 2
+            assert unified.get(UnifiedMetadataKey.RATING.value) == 85
+            assert unified.get(UnifiedMetadataKey.BPM.value) == 120
+            assert unified.get(UnifiedMetadataKey.LANGUAGE.value) == "eng"
+            assert unified.get(UnifiedMetadataKey.COMPOSERS.value) == ["Roundtrip Composer"]
+            assert unified.get(UnifiedMetadataKey.PUBLISHER.value) == "Roundtrip Publisher"
+            assert unified.get(UnifiedMetadataKey.COPYRIGHT.value) == "© Roundtrip"
+            assert unified.get(UnifiedMetadataKey.UNSYNCHRONIZED_LYRICS.value) == "Roundtrip lyrics"
+            assert unified.get(UnifiedMetadataKey.COMMENT.value) == "Roundtrip comment"
+            assert unified.get(UnifiedMetadataKey.ISRC.value) == "USRC17607839"
+            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_TRACKID.value) == "9d6f6f7c-9d52-4c76-8f9e-01d18d8f8ec6"
+            assert unified.get(UnifiedMetadataKey.MUSICBRAINZ_ARTISTIDS.value) == [
+                "9d6f6f7c-9d52-4c76-8f9e-01d18d8f8ec6"
+            ]

{audiometa_python-1.2.0 → audiometa_python-1.2.1}/audiometa/test/tests/e2e/cli/read/test_unified.py

@@ -37,6 +37,26 @@ class TestCLIReadUnified:
             assert data.get("title") == "Unified Test"
             assert data.get("artists") == ["Unified Artist"]
 
+    def test_cli_unified_yaml_uses_plain_string_keys(self):
+        with temp_file_with_metadata({"title": "YAML Key Test", "artist": "YAML Artist"}, "mp3") as test_file:
+            result = subprocess.run(
+                [sys.executable, "-m", "audiometa", "unified", str(test_file), "--format", "yaml"],
+                capture_output=True,
+                text=True,
+                check=False,
+            )
+            assert result.returncode == 0
+            assert "!!python" not in result.stdout
+            try:
+                import yaml
+
+                data = yaml.safe_load(result.stdout)
+                assert isinstance(data, dict)
+                assert data.get("title") == "YAML Key Test"
+                assert data.get("artists") == ["YAML Artist"]
+            except ImportError:
+                pass
+
     def test_cli_unified_table_format(self):
         with temp_file_with_metadata({"title": "Table Test", "artist": "Table Artist"}, "mp3") as test_file:
             result = subprocess.run(

{audiometa_python-1.2.0 → audiometa_python-1.2.1}/audiometa/test/tests/e2e/cli/test_formatting.py

@@ -2,6 +2,7 @@ import json
 
 import pytest
 
+from audiometa import UnifiedMetadataKey
 from audiometa.cli import format_as_table, format_output
 
 
@@ -29,3 +30,23 @@ class TestCLIFormatting:
         assert "Test Artist" in result
         assert "180" in result
         assert "320" in result
+
+    def test_format_output_table_displays_key_labels_not_enum_repr(self):
+        data = {
+            "unified_metadata": {
+                UnifiedMetadataKey.TITLE: "Song Title",
+                UnifiedMetadataKey.ALBUM_ARTISTS: ["Album Artist"],
+            },
+            "metadata_format": {
+                "id3v2": {
+                    UnifiedMetadataKey.TITLE: "Song Title",
+                    UnifiedMetadataKey.ALBUM_ARTISTS: ["Album Artist"],
+                },
+            },
+        }
+        result = format_as_table(data)
+        assert "UnifiedMetadataKey." not in result
+        assert "title" in result
+        assert "album_artists" in result
+        assert "Song Title" in result
+        assert "Album Artist" in result or "['Album Artist']" in result

{audiometa_python-1.2.0 → audiometa_python-1.2.1/audiometa_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: audiometa-python
-Version: 1.2.0
+Version: 1.2.1
 Summary: A comprehensive Python library for reading and writing audio metadata across multiple formats
 Author: AudioMeta Python Contributors
 Author-email: Andreas Garcia <garcia.andreas.1991@gmail.com>

{audiometa_python-1.2.0 → audiometa_python-1.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "audiometa-python"
-version = "1.2.0"
+version = "1.2.1"
 description = "A comprehensive Python library for reading and writing audio metadata across multiple formats"
 readme = "README.md"
 requires-python = ">=3.12"