ocf-data-sampler 0.5.16__tar.gz → 0.5.18__tar.gz

{ocf_data_sampler-0.5.16 → ocf_data_sampler-0.5.18}/PKG-INFO

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

{ocf_data_sampler-0.5.16 → ocf_data_sampler-0.5.18}/ocf_data_sampler/select/select_spatial_slice.py

@@ -24,20 +24,21 @@ def _get_pixel_index_location(da: xr.DataArray, location: Location) -> tuple[int
 
     x, y = location.in_coord_system(target_coords)
 
+    x_vals = da[x_dim].values
+    y_vals = da[y_dim].values
+
     # Check that requested point lies within the data
-    if not (da[x_dim].values[0] < x < da[x_dim].values[-1]):
+    if not (x_vals[0] < x < x_vals[-1]):
         raise ValueError(
-            f"{x} is not in the interval {da[x_dim].values[0]}: {da[x_dim].values[-1]}",
+            f"{x} is not in the interval {x_vals[0]}: {x_vals[-1]}",
         )
-    if not (da[y_dim].values[0] < y < da[y_dim].values[-1]):
+    if not (y_vals[0] < y < y_vals[-1]):
         raise ValueError(
-            f"{y} is not in the interval {da[y_dim].values[0]}: {da[y_dim].values[-1]}",
+            f"{y} is not in the interval {y_vals[0]}: {y_vals[-1]}",
         )
 
-    x_index = da.get_index(x_dim)
-    y_index = da.get_index(y_dim)
-    closest_x = x_index.get_indexer([x], method="nearest")[0]
-    closest_y = y_index.get_indexer([y], method="nearest")[0]
+    closest_x = np.argmin(np.abs(x_vals - x))
+    closest_y = np.argmin(np.abs(y_vals - y))
 
     return closest_x, closest_y
 

{ocf_data_sampler-0.5.16 → ocf_data_sampler-0.5.18}/ocf_data_sampler/utils.py

@@ -15,7 +15,16 @@ def minutes(minutes: int | list[float]) -> pd.Timedelta | pd.TimedeltaIndex:
 
 def compute(xarray_dict: dict) -> dict:
     """Eagerly load a nested dictionary of xarray DataArrays."""
-    for k, v in xarray_dict.items():
+    # Load these keys first because they don't use tensorstore
+    priority_keys = ["gsp", "site"]
+    for key in priority_keys:
+        if key in xarray_dict:
+            xarray_dict[key] = xarray_dict[key].compute()
+
+    # Load the rest
+    keys = [k for k in xarray_dict if k not in priority_keys]
+    for k in keys:
+        v = xarray_dict[k]
         if isinstance(v, dict):
             xarray_dict[k] = compute(v)
         else:

{ocf_data_sampler-0.5.16 → ocf_data_sampler-0.5.18}/ocf_data_sampler.egg-info/PKG-INFO

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