chore(mypy): fixed all su6 checks

trialandsuccess · Sep 22, 2023 · bfcb264 · bfcb264
1 parent a55c239
commit bfcb264
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/coverage.json b/coverage.json
@@ -1 +1 @@
-{"meta": {"version": "7.3.1", "timestamp": "2023-09-22T16:10:45.011765", "branch_coverage": false, "show_contexts": false}, "files": {"src/verysimpletransformers/__about__.py": {"executed_lines": [1, 5], "summary": {"covered_lines": 1, "num_statements": 1, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/verysimpletransformers/__init__.py": {"executed_lines": [1, 9, 10, 12], "summary": {"covered_lines": 3, "num_statements": 3, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/verysimpletransformers/cli.py": {"executed_lines": [1, 2, 3, 4, 6, 7, 8, 9, 11, 12, 13, 14, 16, 21, 24, 27, 36, 52, 78, 90, 91, 94, 107, 115, 119, 120, 121, 122, 124, 125, 126, 128, 129, 130, 131, 132, 133, 134, 136, 138, 139, 140, 141, 144, 151, 152, 154, 157, 158, 159, 160, 161, 162, 163, 164, 165, 168, 169, 170, 171, 172, 173, 174, 175, 176, 180, 181, 183, 184, 187, 188, 189, 190, 191, 194, 198, 200, 203, 210, 248, 249], "summary": {"covered_lines": 72, "num_statements": 72, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 82}, "missing_lines": [], "excluded_lines": [16, 17, 19, 52, 53, 59, 60, 62, 63, 65, 66, 67, 70, 71, 72, 75, 78, 79, 82, 84, 85, 86, 87, 94, 95, 99, 101, 103, 104, 107, 108, 111, 112, 203, 204, 207, 210, 211, 214, 215, 216, 219, 221, 236, 237, 238, 239, 240, 241, 242, 243, 245, 249, 256, 259, 261, 262, 264, 266, 267, 268, 269, 271, 273, 275, 276, 278, 279, 281, 282, 284, 285, 287, 288, 290, 291, 293, 294, 296, 297, 299, 300]}, "src/verysimpletransformers/core.py": {"executed_lines": [1, 4, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 17, 19, 20, 28, 29, 39, 40, 42, 45, 48, 60, 61, 63, 65, 66, 67, 68, 69, 71, 73, 74, 76, 78, 79, 80, 82, 83, 85, 86, 89, 92, 98, 99, 100, 101, 103, 106, 107, 108, 109, 112, 114, 115, 118, 119, 121, 139, 140, 142, 145, 154, 155, 156, 157, 158, 159, 165, 166, 172, 174, 175, 182, 185, 228, 245, 247, 248, 249, 250, 254, 256, 258, 259, 261, 263, 264, 265, 266, 268, 269, 271, 272, 273, 274, 275, 276, 278, 280, 281, 282, 283, 285, 290, 294, 296, 297, 299, 300, 303, 311, 313, 314, 316, 317, 320, 330, 331, 333, 335, 336, 338, 340, 341, 342, 344, 345, 346, 348, 349, 352, 353, 356, 363, 364, 365, 366, 367, 368, 369, 370, 372, 374], "summary": {"covered_lines": 141, "num_statements": 141, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 17}, "missing_lines": [], "excluded_lines": [42, 43, 185, 187, 188, 195, 197, 198, 205, 207, 208, 215, 217, 218, 225, 286, 287]}, "src/verysimpletransformers/exceptions.py": {"executed_lines": [1, 4, 5, 6, 8, 10, 13, 14, 19, 20, 24, 25, 27, 31, 32, 33, 35, 36, 38, 41, 48], "summary": {"covered_lines": 18, "num_statements": 18, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/verysimpletransformers/metadata.py": {"executed_lines": [1, 5, 6, 7, 9, 10, 11, 12, 14, 15, 16, 19, 23, 24, 25, 27, 30, 34, 36, 38, 39, 43, 44, 45, 49, 51, 54, 58, 59, 60, 62, 65, 69, 72, 76, 79, 83, 86, 90, 93, 102, 103, 106, 108, 114, 115, 116, 118, 119, 120, 122, 124, 126, 127, 128, 129, 131], "summary": {"covered_lines": 55, "num_statements": 55, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 2}, "missing_lines": [], "excluded_lines": [103, 104]}, "src/verysimpletransformers/metadata_schema.py": {"executed_lines": [1, 5, 7, 10, 11, 15, 16, 17, 19, 23, 26, 27, 28, 32, 35, 36, 37, 46, 48, 49, 50, 52, 53, 54, 56, 58, 62, 63, 64, 65, 66, 69, 70, 76, 77, 78, 79], "summary": {"covered_lines": 32, "num_statements": 32, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/verysimpletransformers/serve.py": {"executed_lines": [1, 5, 7, 8, 9, 10, 12, 14, 18, 19, 23, 25, 29, 30, 32, 36, 38, 42, 44, 52, 53, 54, 60, 61, 62, 63, 65, 69, 70, 74, 76, 77, 81, 82, 84, 88, 89, 91, 92, 93, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 108, 109, 111, 112, 119, 120, 122, 125, 126, 133, 140], "summary": {"covered_lines": 55, "num_statements": 55, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 17}, "missing_lines": [], "excluded_lines": [14, 15, 38, 40, 55, 57, 58, 125, 126, 133, 134, 137, 138, 140, 141, 144, 145]}, "src/verysimpletransformers/support.py": {"executed_lines": [1, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 18, 20, 23, 27, 28, 29, 32, 33, 37, 38, 39, 40, 43, 47, 48, 49, 50, 51, 52, 53, 55, 57, 59, 62, 63, 67, 71, 72, 74, 78, 81, 83, 84, 88, 91, 92, 96, 100, 102, 107, 111, 114, 117, 118, 122, 128, 129, 135, 142, 143, 145, 149, 150, 151, 152, 154, 158, 159, 161, 162, 165], "summary": {"covered_lines": 45, "num_statements": 45, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 37}, "missing_lines": [], "excluded_lines": [74, 75, 78, 79, 80, 81, 91, 92, 96, 97, 100, 102, 103, 107, 108, 111, 128, 129, 135, 136, 142, 143, 145, 146, 149, 150, 151, 152, 154, 155, 158, 159, 161, 162, 165, 166, 171]}, "src/verysimpletransformers/types.py": {"executed_lines": [1, 5, 7, 8, 9, 12, 13, 17, 19, 20, 25, 26, 31, 35, 36, 38, 41, 74, 75, 76, 82, 84], "summary": {"covered_lines": 16, "num_statements": 16, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 17}, "missing_lines": [], "excluded_lines": [20, 21, 26, 27, 41, 42, 47, 48, 49, 50, 51, 52, 53, 54, 55, 57, 59]}, "src/verysimpletransformers/versioning.py": {"executed_lines": [1, 5, 6, 7, 9, 12, 13, 17, 20, 21, 26, 28, 31, 40, 41, 42, 43, 45, 48, 49, 50, 51, 54, 57, 61, 62, 63, 64, 65, 66, 68], "summary": {"covered_lines": 28, "num_statements": 28, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}}, "totals": {"covered_lines": 466, "num_statements": 466, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 172}}
+{"meta": {"version": "7.3.1", "timestamp": "2023-09-22T18:28:47.244437", "branch_coverage": false, "show_contexts": false}, "files": {"src/verysimpletransformers/__about__.py": {"executed_lines": [1, 5], "summary": {"covered_lines": 1, "num_statements": 1, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/verysimpletransformers/__init__.py": {"executed_lines": [1, 9, 10, 12], "summary": {"covered_lines": 3, "num_statements": 3, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/verysimpletransformers/cli.py": {"executed_lines": [1, 2, 3, 4, 6, 7, 8, 9, 11, 19, 20, 21, 23, 28, 31, 34, 43, 59, 85, 97, 98, 101, 114, 124, 128, 129, 130, 131, 133, 134, 135, 137, 138, 139, 140, 141, 142, 143, 145, 147, 148, 149, 150, 153, 160, 161, 163, 166, 167, 168, 169, 170, 171, 172, 173, 174, 177, 178, 179, 180, 181, 182, 183, 184, 185, 189, 193, 195, 196, 199, 200, 201, 202, 203, 206, 210, 212, 215, 222, 260, 261], "summary": {"covered_lines": 72, "num_statements": 72, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 82}, "missing_lines": [], "excluded_lines": [23, 24, 26, 59, 60, 66, 67, 69, 70, 72, 73, 74, 77, 78, 79, 82, 85, 86, 89, 91, 92, 93, 94, 101, 102, 106, 108, 110, 111, 114, 117, 120, 121, 215, 216, 219, 222, 223, 226, 227, 228, 231, 233, 248, 249, 250, 251, 252, 253, 254, 255, 257, 261, 268, 271, 273, 274, 276, 278, 279, 280, 281, 283, 285, 287, 288, 290, 291, 293, 294, 296, 297, 299, 300, 302, 303, 305, 306, 308, 309, 311, 312]}, "src/verysimpletransformers/core.py": {"executed_lines": [1, 4, 6, 7, 8, 9, 10, 11, 12, 14, 15, 16, 17, 19, 20, 28, 29, 39, 40, 42, 45, 47, 50, 62, 63, 65, 67, 68, 69, 70, 71, 73, 75, 76, 78, 80, 81, 82, 84, 85, 87, 88, 91, 94, 100, 101, 102, 103, 105, 108, 109, 110, 111, 114, 116, 117, 120, 121, 123, 141, 142, 144, 147, 156, 157, 158, 159, 160, 161, 167, 168, 174, 176, 177, 184, 187, 230, 247, 249, 250, 251, 252, 256, 258, 260, 261, 263, 265, 266, 267, 268, 270, 271, 273, 274, 275, 276, 277, 278, 280, 282, 283, 284, 285, 287, 292, 296, 298, 299, 301, 302, 305, 313, 315, 316, 318, 319, 322, 332, 333, 335, 337, 338, 340, 342, 343, 346, 348, 349, 350, 352, 353, 356, 357, 360, 367, 368, 369, 370, 371, 372, 373, 374, 376, 378], "summary": {"covered_lines": 142, "num_statements": 142, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 17}, "missing_lines": [], "excluded_lines": [42, 43, 187, 189, 190, 197, 199, 200, 207, 209, 210, 217, 219, 220, 227, 288, 289]}, "src/verysimpletransformers/exceptions.py": {"executed_lines": [1, 4, 5, 6, 8, 10, 13, 14, 19, 20, 24, 25, 27, 31, 32, 33, 35, 36, 38, 41, 48], "summary": {"covered_lines": 18, "num_statements": 18, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/verysimpletransformers/metadata.py": {"executed_lines": [1, 5, 6, 7, 9, 10, 11, 12, 14, 15, 16, 19, 23, 24, 25, 27, 30, 34, 36, 38, 39, 43, 44, 45, 49, 51, 54, 58, 59, 60, 62, 65, 69, 72, 76, 79, 83, 86, 90, 93, 102, 103, 106, 108, 114, 115, 116, 118, 119, 120, 122, 124, 126, 127, 128, 129, 131], "summary": {"covered_lines": 55, "num_statements": 55, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 2}, "missing_lines": [], "excluded_lines": [103, 104]}, "src/verysimpletransformers/metadata_schema.py": {"executed_lines": [1, 5, 7, 10, 11, 15, 16, 17, 19, 23, 26, 27, 28, 32, 35, 36, 37, 46, 48, 49, 50, 52, 53, 54, 56, 58, 62, 63, 64, 65, 66, 69, 70, 76, 77, 78, 79], "summary": {"covered_lines": 32, "num_statements": 32, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}, "src/verysimpletransformers/serve.py": {"executed_lines": [1, 5, 7, 8, 9, 10, 12, 14, 18, 19, 23, 25, 29, 30, 32, 36, 38, 42, 44, 52, 53, 54, 60, 61, 62, 63, 65, 69, 70, 74, 76, 77, 81, 82, 84, 88, 89, 91, 92, 93, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 108, 109, 111, 112, 119, 120, 122, 125, 126, 133, 140], "summary": {"covered_lines": 55, "num_statements": 55, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 17}, "missing_lines": [], "excluded_lines": [14, 15, 38, 40, 55, 57, 58, 125, 126, 133, 134, 137, 138, 140, 141, 144, 145]}, "src/verysimpletransformers/support.py": {"executed_lines": [1, 4, 6, 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, 18, 20, 23, 27, 28, 29, 32, 33, 37, 38, 39, 40, 43, 47, 48, 49, 50, 51, 52, 53, 55, 57, 59, 62, 63, 67, 71, 72, 74, 78, 81, 83, 84, 88, 91, 92, 96, 100, 102, 107, 111, 114, 117, 118, 122, 128, 129, 135, 142, 143, 145, 149, 150, 151, 152, 154, 158, 159, 161, 162, 165], "summary": {"covered_lines": 45, "num_statements": 45, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 37}, "missing_lines": [], "excluded_lines": [74, 75, 78, 79, 80, 81, 91, 92, 96, 97, 100, 102, 103, 107, 108, 111, 128, 129, 135, 136, 142, 143, 145, 146, 149, 150, 151, 152, 154, 155, 158, 159, 161, 162, 165, 166, 171]}, "src/verysimpletransformers/types.py": {"executed_lines": [1, 5, 7, 8, 9, 12, 13, 17, 19, 20, 25, 26, 31, 35, 36, 38, 41, 74, 75, 76, 82, 84], "summary": {"covered_lines": 16, "num_statements": 16, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 17}, "missing_lines": [], "excluded_lines": [20, 21, 26, 27, 41, 42, 47, 48, 49, 50, 51, 52, 53, 54, 55, 57, 59]}, "src/verysimpletransformers/versioning.py": {"executed_lines": [1, 5, 6, 7, 9, 12, 13, 17, 20, 21, 26, 28, 31, 40, 41, 42, 43, 45, 48, 49, 50, 51, 54, 57, 61, 62, 63, 64, 65, 66, 68], "summary": {"covered_lines": 28, "num_statements": 28, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 0}, "missing_lines": [], "excluded_lines": []}}, "totals": {"covered_lines": 467, "num_statements": 467, "percent_covered": 100.0, "percent_covered_display": "100", "missing_lines": 0, "excluded_lines": 172}}
diff --git a/src/verysimpletransformers/cli.py b/src/verysimpletransformers/cli.py
@@ -10,6 +10,7 @@
 
 from .core import (
     DEFAULT_COMPRESSION,
+    ZeroThroughNine,
     _from_vst,
     from_vst_with_metadata,
     simple_load,
@@ -110,12 +111,14 @@ def serve(filename: ModelOrFilename, port: int = DEFAULT_PORT, host: str = DEFAU
     MachineLearningModelServer(host, port).serve_forever(model)
 
 
-def upgrade(filename: str, output_file: str = None, compression: int = DEFAULT_COMPRESSION) -> None:  # pragma: no cover
+def upgrade(
+    filename: str, output_file: str = None, compression: ZeroThroughNine | int = DEFAULT_COMPRESSION
+) -> None:  # pragma: no cover
     """
     Upgrade the metadata of a model to the latest version.
     """
     output_file = output_file or filename
-    upgrade_metadata(filename, output_file, compression=compression)
+    upgrade_metadata(filename, output_file, compression=typing.cast(ZeroThroughNine, compression))
 
 
 def show_info(filename: str) -> None:

diff --git a/src/verysimpletransformers/core.py b/src/verysimpletransformers/core.py
@@ -44,7 +44,7 @@
 
 ZeroThroughNine = typing.Literal[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
 
-DEFAULT_COMPRESSION = 1
+DEFAULT_COMPRESSION: ZeroThroughNine = 1
 
 
 def to_vst(
@@ -322,7 +322,7 @@ def from_vst_with_metadata(
 def upgrade_metadata(
     input_file: str | Path | typing.BinaryIO,
     output_file: str | Path | typing.BinaryIO,
-    compression: int = DEFAULT_COMPRESSION,
+    compression: ZeroThroughNine | None = DEFAULT_COMPRESSION,
 ) -> bool:
     """
     Set the input_file's metadata to the latest version (on this system) and save it in output_file.
@@ -339,9 +339,11 @@ def upgrade_metadata(
 
     print("Starting upgrade on", input_file, file=sys.stderr)
 
-    compression_level = getattr(metadata.meta_header, "compression_level", 0)
-    if not compression and isinstance(compression_level, int):
-        compression = compression_level
+    if compression is None:
+        compression_level = typing.cast(
+            ZeroThroughNine, getattr(metadata.meta_header, "compression_level", DEFAULT_COMPRESSION)
+        )
+        compression = compression_level if isinstance(compression_level, int) else DEFAULT_COMPRESSION
 
     compression = min(compression, 9)
     compression = max(compression, 0)

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -208,7 +208,7 @@ def test_upgrade():
     model = _get_v0_dummy(fp)
 
     upgraded = io.BytesIO()
-    assert upgrade_metadata(fp, upgraded)
+    assert upgrade_metadata(fp, upgraded, compression=None)
 
     with fp.open("rb") as f:
         _, metadata, valid_meta = _from_vst(f, with_model=False, with_metadata=True)