refactor(anci.py, __init__.py): clean up and bring write to top level

LBNL-ETA · Aug 16, 2023 · e0865c4 · e0865c4
1 parent b503976
commit e0865c4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/pyradiance/__init__.py b/pyradiance/__init__.py
@@ -8,7 +8,7 @@
 import logging
 import os
 
-from .anci import BINPATH
+from .anci import BINPATH, write
 
 from .cal import (
     cnt,
@@ -37,21 +37,15 @@
     mkillum,
 )
 
-from .lib import (
-    ABASELIST, 
-    BSDF, 
-    read_rad, 
-    get_view_resolu, 
-    spec_xyz, 
-    xyz_rgb
-)
+from .lib import ABASELIST, BSDF, read_rad, get_view_resolu, spec_xyz, xyz_rgb
 
 from .model import (
     Sensor,
     Scene,
     View,
     Primitive,
     load_views,
+    parse_view,
     parse_primitive,
 )
 
@@ -130,6 +124,7 @@
     "oconv",
     "pabopto2bsdf",
     "parse_primitive",
+    "parse_view",
     "pkgbsdf",
     "pvalue",
     "pvaluer",
@@ -161,6 +156,7 @@
     "vwrays",
     "WrapBSDFInput",
     "wrapbsdf",
+    "write",
     "xform",
     "xyz_rgb",
 ]
diff --git a/pyradiance/anci.py b/pyradiance/anci.py
@@ -5,6 +5,7 @@
 from pathlib import Path
 from functools import wraps
 from subprocess import CalledProcessError
+from typing import Union
 import os
 
 BINPATH = Path(__file__).parent / "bin"
@@ -29,13 +30,12 @@ def wrapper(*args, **kwargs):
 
     return wrapper
 
+
 def write(
-        file_path,
-        data,
-        overwrite=True,
-        mode='wb') -> str:
-    """
-    Write data to a file.
+    file_path: Union[str, Path], data: Union[str, bytes], overwrite=True, mode="wb"
+) -> str:
+    """Write data to a file.
+
     Args:
         file_path: path to file
         data: data to write
@@ -46,9 +46,11 @@ def write(
         str: path to file
     """
     if not overwrite and os.path.exists(file_path):
-        raise Exception(f'The path {file_path} already exists and '
-                        f'"overwrite" has been set to False.')
+        raise Exception(
+            f"The path {file_path} already exists and "
+            f'"overwrite" has been set to False.'
+        )
     else:
         with open(file_path, mode=mode) as write_data:
             write_data.write(data)
-    return file_path
+    return str(file_path)