uxarray 2026.7.0__tar.gz → 2026.8.0__tar.gz

{uxarray-2026.7.0 → uxarray-2026.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: uxarray
-Version: 2026.7.0
+Version: 2026.8.0
 Summary: Xarray extension for unstructured climate and global weather data analysis and visualization.
 License:                                  Apache License
                                    Version 2.0, January 2004

{uxarray-2026.7.0 → uxarray-2026.8.0}/uxarray/__init__.py

@@ -1,4 +1,4 @@
-from . import tutorial
+from . import errors, tutorial
 from .constants import INT_DTYPE, INT_FILL_VALUE
 from .core.api import (
     concat,
@@ -37,4 +37,5 @@ __all__ = (
     "INT_DTYPE",
     "INT_FILL_VALUE",
     "Grid",
+    "errors",
 )

{uxarray-2026.7.0 → uxarray-2026.8.0}/uxarray/core/aggregation.py

@@ -1,7 +1,9 @@
 import numpy as np
 
 import uxarray.core.dataarray
+from uxarray.errors import DataCenteringError
 from uxarray.grid.connectivity import get_face_node_partitions
+from uxarray.utils.coords import _preserve_valid_coords
 
 NUMPY_AGGREGATIONS = {
     "mean": np.mean,
@@ -32,7 +34,7 @@ def _uxda_grid_aggregate(uxda, destination, aggregation, **kwargs):
         elif destination == "edge":
             return _node_to_edge_aggregation(uxda, aggregation, kwargs)
         else:
-            raise ValueError(
+            raise DataCenteringError(
                 f"Invalid destination for a node-centered data variable. Expected"
                 f"one of ['face', 'edge' but received {destination}"
             )
@@ -62,7 +64,7 @@ def _uxda_grid_aggregate(uxda, destination, aggregation, **kwargs):
         #     raise ValueError("TODO: ")
 
     else:
-        raise ValueError(
+        raise DataCenteringError(
             "Invalid data mapping. Data variable is expected to be mapped to either the "
             "nodes, faces, or edges of the source grid."
         )
@@ -73,7 +75,7 @@ def _node_to_face_aggregation(uxda, aggregation, aggregation_func_kwargs):
     import dask.array as da
 
     if not uxda._node_centered():
-        raise ValueError(
+        raise DataCenteringError(
             f"Data Variable must be mapped to the corner nodes of each face, with dimension "
             f"{uxda.uxgrid.n_face}."
         )
@@ -89,12 +91,14 @@ def _node_to_face_aggregation(uxda, aggregation, aggregation_func_kwargs):
             uxda, NUMPY_AGGREGATIONS[aggregation], aggregation_func_kwargs
         )
     else:
-        raise ValueError
+        raise TypeError
 
     return uxarray.core.dataarray.UxDataArray(
         uxgrid=uxda.uxgrid,
         data=aggregated_var,
         dims=uxda.dims,
+        coords=_preserve_valid_coords(uxda, "n_node"),
+        attrs=uxda.attrs,
         name=uxda.name,
     ).rename({"n_node": "n_face"})
 
@@ -141,7 +145,7 @@ def _node_to_edge_aggregation(uxda, aggregation, aggregation_func_kwargs):
     import dask.array as da
 
     if not uxda._node_centered():
-        raise ValueError(
+        raise DataCenteringError(
             f"Data Variable must be mapped to the corner nodes of each face, with dimension "
             f"{uxda.uxgrid.n_face}."
         )
@@ -157,12 +161,14 @@ def _node_to_edge_aggregation(uxda, aggregation, aggregation_func_kwargs):
             uxda, NUMPY_AGGREGATIONS[aggregation], aggregation_func_kwargs
         )
     else:
-        raise ValueError
+        raise TypeError
 
     return uxarray.core.dataarray.UxDataArray(
         uxgrid=uxda.uxgrid,
         data=aggregation_var,
         dims=uxda.dims,
+        coords=_preserve_valid_coords(uxda, "n_node"),
+        attrs=uxda.attrs,
         name=uxda.name,
     ).rename({"n_node": "n_edge"})
 

{uxarray-2026.7.0 → uxarray-2026.8.0}/uxarray/core/api.py

@@ -2,10 +2,11 @@ from __future__ import annotations
 
 import os
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Mapping, Sequence, TypeAlias
+from typing import Any, Mapping, Sequence, TypeAlias
 from warnings import warn
 
 import numpy as np
+import xarray as xr
 
 from uxarray.core.dataset import UxDataset
 from uxarray.core.utils import (
@@ -13,6 +14,7 @@ from uxarray.core.utils import (
     _open_dataset_with_fallback,
     match_chunks_to_ugrid,
 )
+from uxarray.errors import GridInvalidError
 from uxarray.grid import Grid
 from uxarray.io._scrip import (
     _detect_multigrid,
@@ -22,9 +24,6 @@ from uxarray.io._scrip import (
     _stack_cell_dims,
 )
 
-if TYPE_CHECKING:
-    from xarray import Dataset
-
 __all__ = [
     "open_grid",
     "open_multigrid",
@@ -35,7 +34,7 @@ __all__ = [
 
 
 def open_grid(
-    grid_filename_or_obj: str | os.PathLike[Any] | dict | Dataset,
+    grid_filename_or_obj: str | os.PathLike[Any] | dict | xr.Dataset,
     chunks=None,
     use_dual: bool | None = False,
     **kwargs: dict[str, Any],
@@ -85,8 +84,6 @@ def open_grid(
 
     >>> uxgrid = ux.open_grid("grid_filename.nc", chunks=-1)
     """
-    import xarray as xr
-
     # Handle chunk-related kwargs first.
     data_chunks = kwargs.pop("data_chunks", None)
     if data_chunks is not None:
@@ -144,9 +141,9 @@ MaskActiveValue: TypeAlias = MaskValue | Mapping[str, MaskValue] | None
 
 
 def open_multigrid(
-    grid_filename_or_obj: str | Path | "Dataset",
+    grid_filename_or_obj: str | Path | xr.Dataset,
     gridnames: list[str] | None = None,
-    mask_filename: str | Path | "Dataset" | None = None,
+    mask_filename: str | Path | xr.Dataset | None = None,
     mask_active_value: MaskActiveValue = 1,
     **kwargs: dict[str, Any],
 ) -> dict[str, Grid]:
@@ -175,8 +172,6 @@ def open_multigrid(
     dict[str, Grid]
         Dictionary mapping grid names to ``Grid`` objects.
     """
-    import xarray as xr
-
     grid_ds_opened = False
     if isinstance(grid_filename_or_obj, xr.Dataset):
         grid_ds = grid_filename_or_obj
@@ -254,7 +249,7 @@ def open_multigrid(
             }
 
         if not grids_dict:
-            raise ValueError(f"No grids detected in file: {grid_filename_or_obj}")
+            raise GridInvalidError(f"No grids detected in file: {grid_filename_or_obj}")
 
         available_grids = list(grids_dict.keys())
 
@@ -314,7 +309,7 @@ def open_multigrid(
 
 
 def list_grid_names(
-    grid_filename_or_obj: str | Path | "Dataset", **kwargs: dict[str, Any]
+    grid_filename_or_obj: str | Path | xr.Dataset, **kwargs: dict[str, Any]
 ) -> list[str]:
     """List all grid names available within a grid file.
 
@@ -331,8 +326,6 @@ def list_grid_names(
         ``['grid']`` for single-grid files or the detected grid names for
         multi-grid files.
     """
-    import xarray as xr
-
     grid_ds_opened = False
     if isinstance(grid_filename_or_obj, xr.Dataset):
         grid_ds = grid_filename_or_obj
@@ -352,8 +345,8 @@ def list_grid_names(
 
 
 def open_dataset(
-    grid_filename_or_obj: str | os.PathLike[Any] | dict | Dataset,
-    filename_or_obj: str | os.PathLike[Any] | Dataset | None = None,
+    grid_filename_or_obj: str | os.PathLike[Any] | dict | xr.Dataset,
+    filename_or_obj: str | os.PathLike[Any] | xr.Dataset | None = None,
     chunks=None,
     chunk_grid: bool = True,
     use_dual: bool | None = False,
@@ -426,8 +419,6 @@ def open_dataset(
 
     >>> ux_ds = ux.open_dataset("combined_file.nc")
     """
-    import xarray as xr
-
     if grid_kwargs is None:
         grid_kwargs = {}
 
@@ -481,7 +472,7 @@ def open_dataset(
 
 
 def open_mfdataset(
-    grid_filename_or_obj: str | os.PathLike[Any] | dict | Dataset,
+    grid_filename_or_obj: str | os.PathLike[Any] | dict | xr.Dataset,
     paths: str | os.PathLike,
     chunks=None,
     chunk_grid: bool = True,
@@ -546,8 +537,6 @@ def open_mfdataset(
 
     >>> ux_ds = ux.open_mfdataset("grid_filename.g", "grid_filename_vortex_*.nc")
     """
-    import xarray as xr
-
     if grid_kwargs is None:
         grid_kwargs = {}
 
@@ -588,8 +577,6 @@ def _get_grid(
 
 def concat(objs, *args, **kwargs):
     # Ensure there is at least one object to concat.
-    import xarray as xr
-
     if not objs:
         raise ValueError("No objects provided for concatenation.")