PyPI - ocf-data-sampler - Versions diffs - 0.5.11__tar.gz → 0.5.13__tar.gz - Mend

@@ -23,15 +23,18 @@ def compute(xarray_dict: dict) -> dict:
     return xarray_dict
-def tensorstore_compute(xarray_dict: dict) -> dict:
-    """Eagerly read and load a nested dictionary of xarray-tensorstore DataArrays."""
+def tensorstore_read(xarray_dict: dict) -> dict:
+    """Start reading a nested dictionary of xarray-tensorstore DataArrays."""
     # Kick off the tensorstore async reading
     for k, v in xarray_dict.items():
         if isinstance(v, dict):
-            xarray_dict[k] = tensorstore_compute(v)
+            xarray_dict[k] = tensorstore_read(v)
         else:
             xarray_dict[k] = read(v)
+    return xarray_dict
-    # Running the compute function will wait until all arrays have been read
-    return compute(xarray_dict)
+def tensorstore_compute(xarray_dict: dict) -> dict:
+    """Eagerly read and load a nested dictionary of xarray-tensorstore DataArrays."""
+    return compute(tensorstore_read(xarray_dict))

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ocf-data-sampler
-Version: 0.5.11
+Version: 0.5.13
 Author: James Fulton, Peter Dudfield
 Author-email: Open Climate Fix team <info@openclimatefix.org>
 License: MIT License

@@ -25,13 +25,13 @@ def _get_pixel_index_location(da: xr.DataArray, location: Location) -> tuple[int
     x, y = location.in_coord_system(target_coords)
     # Check that requested point lies within the data
-    if not (da[x_dim].min() < x < da[x_dim].max()):
+    if not (da[x_dim].values[0] < x < da[x_dim].values[-1]):
         raise ValueError(
-            f"{x} is not in the interval {da[x_dim].min().values}: {da[x_dim].max().values}",
+            f"{x} is not in the interval {da[x_dim].values[0]}: {da[x_dim].values[-1]}",
         )
-    if not (da[y_dim].min() < y < da[y_dim].max()):
+    if not (da[y_dim].values[0] < y < da[y_dim].values[-1]):
         raise ValueError(
-            f"{y} is not in the interval {da[y_dim].min().values}: {da[y_dim].max().values}",
+            f"{y} is not in the interval {da[y_dim].values[0]}: {da[y_dim].values[-1]}",
         )
     x_index = da.get_index(x_dim)

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ocf-data-sampler
-Version: 0.5.11
+Version: 0.5.13
 Author: James Fulton, Peter Dudfield
 Author-email: Open Climate Fix team <info@openclimatefix.org>
 License: MIT License

ocf-data-sampler 0.5.11tar.gz → 0.5.13tar.gz