Extract code from __main__ into fmix/read_tyro.py

Author: rec

fmix/__main__.py

@@ -1,49 +1,13 @@
-import json
 import sys
-import tomllib
-from functools import partial
-from pathlib import Path
-from typing import Any, TypeIs
 
-import tyro
-from pydantic import ValidationError
+from fmix.read_tyro import read_tyro
 
 from .fmix import FMix
 
 
-def is_str_dict(x: Any) -> TypeIs[dict[str, Any]]:
-    return isinstance(x, dict) and all(isinstance(k, str) for k in x.keys())
-
-
-def read_file(path: Path) -> dict[str, Any]:
-    data = path.read_text()
-    match path.suffix:
-        case '.toml':
-            result = tomllib.loads(data)
-        case '.json':
-            result = json.loads(data)
-        case _:
-            raise ValueError(f'Do not understand file {path}')
-    if not is_str_dict(result):
-        raise ValueError(f'File {path} does not contain a string dictionary')
-    return result
-
-
-def read_fmix(path: Path) -> FMix:
-    return FMix(**read_file(path))
-
-
 def main():
-    try:
-        cli = partial(tyro.cli, FMix, prog='fmix')
-        if (f := cli()).config_file:
-            f = cli(default=read_fmix(f.config_file))
-        result = f()
-    except (ValidationError, FileExistsError) as e:
-        if getattr(locals().get('f'), 'verbose', False):
-            raise
-        result = str(e)
-    sys.exit(result)
+    fmix = read_tyro(cls=FMix, prog='fmix')
+    sys.exit(fmix())
 
 
 if __name__ == '__main__':

fmix/read_tyro.py

@@ -0,0 +1,40 @@
+import json
+import sys
+import tomllib
+from functools import partial
+from pathlib import Path
+from typing import Any, TypeIs
+
+import tyro
+from pydantic import ValidationError
+
+
+def is_str_dict(x: Any) -> TypeIs[dict[str, Any]]:
+    return isinstance(x, dict) and all(isinstance(k, str) for k in x.keys())
+
+
+def read_file(path: Path) -> dict[str, Any]:
+    data = path.read_text()
+    match path.suffix:
+        case '.toml':
+            result = tomllib.loads(data)
+        case '.json':
+            result = json.loads(data)
+        case _:
+            raise ValueError(f'Do not understand file {path}')
+    if not is_str_dict(result):
+        raise ValueError(f'File {path} does not contain a string dictionary')
+    return result
+
+
+def read_tyro(cls: type, prog: str):
+    cli = partial(tyro.cli, cls, prog=prog)
+    try:
+        if (f := cli()).config_file:
+            f = cli(default=cls(**read_file(f.config_file)))
+        result = f()
+    except (ValidationError, FileExistsError) as e:
+        if getattr(locals().get('f'), 'verbose', False):
+            raise
+        result = str(e)
+    sys.exit(result)

test/test_render_data.py

@@ -8,7 +8,8 @@
 from pytest import mark
 
 from fmix import audio_file, constants
-from fmix.__main__ import read_fmix
+from fmix.fmix import FMix
+from fmix.read_tyro import read_file
 from fmix.render import render_samples
 
 from . import REWRITE_TEST_DATA
@@ -21,7 +22,7 @@ def test_render_data(mixfile, monkeypatch):
     monkeypatch.setattr(constants, '_dtype', 'float64')
     monkeypatch.setattr(constants, '_samplerate', 48_000)
     path = Path('test') / mixfile
-    actual = render_samples(read_fmix(path))
+    actual = render_samples(FMix(**read_file(path)))
 
     if RESULT_FILE.exists() and not REWRITE_TEST_DATA:
         expected, _ = audio_file.read(RESULT_FILE)