refactor: top-level accessor/ and alignment/ packages

src/mxalign/__init__.py

@@ -1,13 +1,16 @@
 from .transformations.transform import transform
 from .transformations.registry import available_transformations, register_transformation
-from .interpolations.interpolate import interpolate
-from .interpolations.registry import available_interpolations, register_interpolator
-from .align.time import align_time
-from .align.space import align_space
+from .alignment.interpolations.interpolate import interpolate
+from .alignment.interpolations.registry import (
+    available_interpolations,
+    register_interpolator,
+)
+from .alignment.time import align_time
+from .alignment.space import align_space
 
-from . import accessors
+from . import accessor
+from . import alignment
 from . import transformations
-from . import interpolations
 
 __all__ = [
     "transform",
@@ -18,7 +21,7 @@
     "register_interpolator",
     "align_time",
     "align_space",
-    "accessors",
+    "accessor",
+    "alignment",
     "transformations",
-    "interpolations",
 ]

src/mxalign/accessors/mx.py → src/mxalign/accessor/mx.py

@@ -7,8 +7,8 @@
 from mlwp_data_specs.specs.traits.time_coordinate import Time
 
 from ..utils.projections import create_cartopy_crs, BUILTIN
-from ..align import time as _time
-from ..align import space as _space
+from ..alignment import time as _time
+from ..alignment import space as _space
 
 
 @xr.register_dataset_accessor("mx")

src/mxalign/align/__init__.py → src/mxalign/alignment/__init__.py

@@ -1,7 +1,9 @@
 from . import time
 from . import space
+from . import interpolations
 
 __all__ = [
     "time",
     "space",
+    "interpolations",
 ]

src/mxalign/interpolations/base.py → src/mxalign/alignment/interpolations/base.py

@@ -1,6 +1,6 @@
 import xarray as xr
 from mlwp_data_specs.specs.traits.spatial_coordinate import Space
-from ..utils.traits import update_space_trait
+from ...utils.traits import update_space_trait
 
 # Attributes set by ds.mx.add_crs / add_grid_mapping that describe a source grid
 GRID_ONLY_ATTRS = ("crs", "grid_mapping")

src/mxalign/align/space.py → src/mxalign/alignment/space.py

@@ -72,7 +72,7 @@ def align_grid_point(
     ds1: xr.Dataset, ds2: xr.Dataset, method: str = "xarray", **kwargs
 ) -> xr.Dataset:
     """Interpolate grid ``ds1`` to the point locations of ``ds2`` using the named interpolator."""
-    from ..interpolations.registry import get_interpolation
+    from .interpolations.registry import get_interpolation
 
     interp_cls = get_interpolation(method)
     return interp_cls(ds2, **kwargs).interpolate(ds1.copy())

src/mxalign/runner.py

@@ -5,8 +5,8 @@
 
 from .utils.config import Config
 from .transformations.transform import transform
-from .align.time import align_time
-from .align.nans import broadcast_nans
+from .alignment.time import align_time
+from .alignment.nans import broadcast_nans
 from .utils.save import save_dataset, save_metrics
 from .verification import Metric
 

tests/test_align_time_global.py

@@ -19,7 +19,7 @@
 import pytest
 import xarray as xr
 
-from mxalign.align.time import align_time
+from mxalign.alignment.time import align_time
 
 T0 = np.datetime64("2020-01-01T00:00", "ns")
 H6 = np.timedelta64(6, "h")
@@ -143,7 +143,7 @@ def test_prunes_ref_times_before_reference_window(self, caplog):
         f2 = fcst(["2020-01-01", "2020-01-02", "2020-01-03"], ["0h", "6h", "12h"])
         ref = obs(pd.date_range("2020-01-03", "2020-01-05", freq="3h"))
 
-        with caplog.at_level(logging.WARNING, logger="mxalign.align.time"):
+        with caplog.at_level(logging.WARNING, logger="mxalign.alignment.time"):
             out = align_time({"f1": f1, "f2": f2, "ref": ref}, reference="ref")
 
         np.testing.assert_array_equal(

tests/test_interpolations.py

@@ -15,10 +15,10 @@
 import pytest
 import xarray as xr
 
-from mxalign.interpolations import delaunay
-from mxalign.interpolations.delaunay import DelaunayInterpolator
-from mxalign.interpolations.interpolate import interpolate
-from mxalign.interpolations.xarray import XarrayInterpolator
+from mxalign.alignment.interpolations import delaunay
+from mxalign.alignment.interpolations.delaunay import DelaunayInterpolator
+from mxalign.alignment.interpolations.interpolate import interpolate
+from mxalign.alignment.interpolations.xarray import XarrayInterpolator
 
 
 # ---------------------------------------------------------------------------