FIX: Fix rasters(_rio).get_window function (with None and with xarray input)

Author: remi-braun

CHANGES.md

@@ -2,6 +2,7 @@
 
 ## 1.54.2 (2026-mm-dd)
 
+- FIX: Fix `rasters(_rio).get_window` function (with `None` and with xarray input)
 - DEPS: Add an `arcpy` optional dependency to install `python-json-logger` needed for the backend logger
 
 ## 1.54.1 (2026-06-02)

ci/test_rasters.py

@@ -1535,3 +1535,8 @@ def test_reproject(tmp_path, raster_path):
     ci.assert_val(shape_arr.rio.count, 1, "Reprojected count")
     with pytest.raises(AssertionError):
         ci.assert_val(xda.rio.shape, (1, 161, 232), "Native shape")
+
+
+def test_none_window(raster_path):
+    ds = get_xda(raster_path)
+    ci.assert_val(rasters.get_window(ds, window=None), None, "None window")

ci/test_rasters_rio.py

@@ -425,3 +425,8 @@ def _test_idx(idx_list):
     _test_idx([1])
     _test_idx([1, 2])
     _test_idx(1)
+
+
+def test_none_window(raster_path):
+    with rasterio.open(str(raster_path)) as ds:
+        ci.assert_val(rasters_rio.get_window(ds, None), None, "None window")

sertit/rasters.py

@@ -1005,20 +1005,19 @@ def wrapper(xda: xr.DataArray, *_args, **_kwargs):
     return wrapper
 
 
-@__read__any_raster_to_rio_ds
-def get_window(ds: AnyRasterType, window: Any):
+def get_window(xda: AnyRasterType, window: Any):
     """
     Get a window from any type of input
 
     Args:
-        ds (AnyRasterType): Path to the raster, its dataset, its :code:`xarray` or a tuple containing its array and metadata
+        xda (AnyRasterType): Path to the raster, its dataset, its :code:`xarray` or a tuple containing its array and metadata
         window (Any): Anything that can be returned as a window. In case of iterable, assumption is made it's geographic bounds. For pixel, please provide a Window directly.
 
     Returns:
         Window: Rasterio window
 
     """
-    return rasters_rio.get_window(ds, window)
+    return rasters_rio.get_window(xda, window)
 
 
 @__read__any_raster_to_rio_ds

sertit/rasters_rio.py

@@ -932,26 +932,26 @@ def get_window(ds: AnyRasterType, window: Any):
                 "Window should either be a GeoDataFrame, tuple, list, Window, readable as a vector or set to None"
             ) from exc
 
-    # Use rioxarray way to convert window to integer
-    try:
-        (row_start, row_stop), (col_start, col_stop) = window.toranges()
-        row_start = 0 if row_start < 0 else np.floor(row_start)
-        row_stop = 0 if row_stop < 0 else np.ceil(row_stop)
-        col_start = 0 if col_start < 0 else np.floor(col_start)
-        col_stop = 0 if col_stop < 0 else np.ceil(col_stop)
-        row_slice = slice(int(row_start), int(row_stop))
-        col_slice = slice(int(col_start), int(col_stop))
-
-        window = Window.from_slices(
-            rows=row_slice,
-            cols=col_slice,
-            width=int(window.width),
-            height=int(window.height),
-        )
-    except ValueError as exc:
-        raise ValueError(
-            "Impossible to create a window on your dataset! Make sure the two are overlapping."
-        ) from exc
+        # Use rioxarray way to convert window to integer
+        try:
+            (row_start, row_stop), (col_start, col_stop) = window.toranges()
+            row_start = 0 if row_start < 0 else np.floor(row_start)
+            row_stop = 0 if row_stop < 0 else np.ceil(row_stop)
+            col_start = 0 if col_start < 0 else np.floor(col_start)
+            col_stop = 0 if col_stop < 0 else np.ceil(col_stop)
+            row_slice = slice(int(row_start), int(row_stop))
+            col_slice = slice(int(col_start), int(col_stop))
+
+            window = Window.from_slices(
+                rows=row_slice,
+                cols=col_slice,
+                width=int(window.width),
+                height=int(window.height),
+            )
+        except ValueError as exc:
+            raise ValueError(
+                "Impossible to create a window on your dataset! Make sure the two are overlapping."
+            ) from exc
 
     return window