ocf-data-sampler 0.0.15__tar.gz → 0.0.17__tar.gz

{ocf_data_sampler-0.0.15/ocf_data_sampler.egg-info → ocf_data_sampler-0.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocf_data_sampler
-Version: 0.0.15
+Version: 0.0.17
 Summary: Sample from weather data for renewable energy prediction
 Author: James Fulton, Peter Dudfield, and the Open Climate Fix team
 Author-email: info@openclimatefix.org
@@ -17,4 +17,6 @@ Requires-Dist: ocf_datapipes==3.3.39
 Requires-Dist: pvlib
 
 # OCF Data Sampler
+[![ease of contribution: easy](https://img.shields.io/badge/ease%20of%20contribution:%20easy-32bd50)](https://github.com/openclimatefix/ocf-meta-repo?tab=readme-ov-file#overview-of-ocfs-nowcasting-repositories) 
+
 A repo for sampling from weather data for renewable energy prediction

ocf_data_sampler-0.0.17/README.md

@@ -0,0 +1,4 @@
+# OCF Data Sampler
+[![ease of contribution: easy](https://img.shields.io/badge/ease%20of%20contribution:%20easy-32bd50)](https://github.com/openclimatefix/ocf-meta-repo?tab=readme-ov-file#overview-of-ocfs-nowcasting-repositories) 
+
+A repo for sampling from weather data for renewable energy prediction

{ocf_data_sampler-0.0.15 → ocf_data_sampler-0.0.17}/ocf_data_sampler/load/nwp/providers/ecmwf.py

@@ -2,7 +2,12 @@
 from pathlib import Path
 import xarray as xr
 from ocf_data_sampler.load.nwp.providers.utils import open_zarr_paths
-from ocf_data_sampler.load.utils import check_time_unique_increasing, make_spatial_coords_increasing
+from ocf_data_sampler.load.utils import (
+    check_time_unique_increasing,
+    make_spatial_coords_increasing,
+    get_xr_data_array_from_xr_dataset
+)
+
 
 
 def open_ifs(zarr_path: Path | str | list[Path] | list[str]) -> xr.DataArray:
@@ -35,4 +40,4 @@ def open_ifs(zarr_path: Path | str | list[Path] | list[str]) -> xr.DataArray:
     ds = ds.transpose("init_time_utc", "step", "channel", "longitude", "latitude")
     
     # TODO: should we control the dtype of the DataArray?
-    return ds.ECMWF_UK
+    return get_xr_data_array_from_xr_dataset(ds)

{ocf_data_sampler-0.0.15 → ocf_data_sampler-0.0.17}/ocf_data_sampler/load/nwp/providers/ukv.py

@@ -5,7 +5,11 @@ import xarray as xr
 from pathlib import Path
 
 from ocf_data_sampler.load.nwp.providers.utils import open_zarr_paths
-from ocf_data_sampler.load.utils import check_time_unique_increasing, make_spatial_coords_increasing
+from ocf_data_sampler.load.utils import (
+    check_time_unique_increasing,
+    make_spatial_coords_increasing,
+    get_xr_data_array_from_xr_dataset
+)
 
 
 def open_ukv(zarr_path: Path | str | list[Path] | list[str]) -> xr.DataArray:
@@ -40,6 +44,6 @@ def open_ukv(zarr_path: Path | str | list[Path] | list[str]) -> xr.DataArray:
     ds = ds.transpose("init_time_utc", "step", "channel", "x_osgb", "y_osgb")
 
     # TODO: should we control the dtype of the DataArray?
-    return ds.UKV
+    return get_xr_data_array_from_xr_dataset(ds)
 
 

{ocf_data_sampler-0.0.15 → ocf_data_sampler-0.0.17}/ocf_data_sampler/load/satellite.py

@@ -4,7 +4,11 @@ import subprocess
 from pathlib import Path
 
 import xarray as xr
-from ocf_data_sampler.load.utils import check_time_unique_increasing, make_spatial_coords_increasing
+from ocf_data_sampler.load.utils import (
+    check_time_unique_increasing,
+    make_spatial_coords_increasing,
+    get_xr_data_array_from_xr_dataset
+)
 
 
 def _get_single_sat_data(zarr_path: Path | str) -> xr.Dataset:
@@ -97,4 +101,4 @@ def open_sat_data(zarr_path: Path | str | list[Path] | list[str]) -> xr.DataArra
     ds = ds.transpose("time_utc", "channel", "x_geostationary", "y_geostationary")
 
     # TODO: should we control the dtype of the DataArray?
-    return ds.data
+    return get_xr_data_array_from_xr_dataset(ds)

{ocf_data_sampler-0.0.15 → ocf_data_sampler-0.0.17}/ocf_data_sampler/load/utils.py

@@ -27,4 +27,17 @@ def make_spatial_coords_increasing(ds: xr.Dataset, x_coord: str, y_coord: str) -
     assert (ds[x_coord].diff(dim=x_coord) > 0).all()
     assert (ds[y_coord].diff(dim=y_coord) > 0).all()
 
-    return ds
+    return ds
+
+
+def get_xr_data_array_from_xr_dataset(ds: xr.Dataset) -> xr.DataArray:
+    """Return underlying xr.DataArray from passed xr.Dataset. 
+    Checks only one variable is present and returns it as an xr.DataArray.
+
+    Args:
+        ds: xr.Dataset to extract xr.DataArray from
+    """
+
+    datavars = list(ds.var())
+    assert len(datavars) == 1, "Cannot open as xr.DataArray: dataset contains multiple variables"
+    return ds[datavars[0]]

{ocf_data_sampler-0.0.15 → ocf_data_sampler-0.0.17/ocf_data_sampler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocf_data_sampler
-Version: 0.0.15
+Version: 0.0.17
 Summary: Sample from weather data for renewable energy prediction
 Author: James Fulton, Peter Dudfield, and the Open Climate Fix team
 Author-email: info@openclimatefix.org
@@ -17,4 +17,6 @@ Requires-Dist: ocf_datapipes==3.3.39
 Requires-Dist: pvlib
 
 # OCF Data Sampler
+[![ease of contribution: easy](https://img.shields.io/badge/ease%20of%20contribution:%20easy-32bd50)](https://github.com/openclimatefix/ocf-meta-repo?tab=readme-ov-file#overview-of-ocfs-nowcasting-repositories) 
+
 A repo for sampling from weather data for renewable energy prediction

{ocf_data_sampler-0.0.15 → ocf_data_sampler-0.0.17}/setup.py

@@ -10,7 +10,7 @@ install_requires = (this_directory / "requirements.txt").read_text().splitlines(
 
 setup(
     name="ocf_data_sampler",
-    version="0.0.15",
+    version="0.0.17",
     license="MIT",
     description="Sample from weather data for renewable energy prediction",
     author="James Fulton, Peter Dudfield, and the Open Climate Fix team",

ocf_data_sampler-0.0.15/README.md

@@ -1,2 +0,0 @@
-# OCF Data Sampler
-A repo for sampling from weather data for renewable energy prediction