ocf-data-sampler 0.2.31__tar.gz → 0.2.33__tar.gz

{ocf_data_sampler-0.2.31 → ocf_data_sampler-0.2.33}/PKG-INFO

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

{ocf_data_sampler-0.2.31 → ocf_data_sampler-0.2.33}/ocf_data_sampler/config/model.py

@@ -214,6 +214,17 @@ class NWP(TimeWindowMixin, DropoutMixin, SpatialWindowMixin, NormalisationConsta
     )
     public: bool = Field(False, description="Whether the NWP data is public or private")
 
+    @model_validator(mode="after")
+    def validate_accum_channels_subset(self) -> "NWP":
+        """Validate accum_channels is subset of channels."""
+        invalid_channels = set(self.accum_channels) - set(self.channels)
+        if invalid_channels:
+            raise ValueError(
+                f"NWP provider '{self.provider}': all values in 'accum_channels' should "
+                f"be present in 'channels'. Extra values found: {invalid_channels}",
+            )
+        return self
+
     @field_validator("provider")
     def validate_provider(cls, v: str) -> str:
         """Validator for 'provider'."""

{ocf_data_sampler-0.2.31 → ocf_data_sampler-0.2.33}/ocf_data_sampler/numpy_sample/nwp.py

@@ -1,6 +1,5 @@
 """Convert NWP to NumpySample."""
 
-import pandas as pd
 import xarray as xr
 
 from ocf_data_sampler.numpy_sample.common_types import NumpySample
@@ -28,7 +27,7 @@ def convert_nwp_to_numpy_sample(da: xr.DataArray, t0_idx: int | None = None) ->
         NWPSampleKey.nwp: da.values,
         NWPSampleKey.channel_names: da.channel.values,
         NWPSampleKey.init_time_utc: da.init_time_utc.values.astype(float),
-        NWPSampleKey.step: (da.step.values / pd.Timedelta("1h")).astype(int),
+        NWPSampleKey.step: (da.step.values / 3600).astype(int),
         NWPSampleKey.target_time_utc: da.target_time_utc.values.astype(float),
     }
 

{ocf_data_sampler-0.2.31 → ocf_data_sampler-0.2.33}/ocf_data_sampler/torch_datasets/sample/site.py

@@ -31,7 +31,7 @@ class SiteSample(SampleBase):
     @override
     def load(cls, path: str) -> "SiteSample":
         # Loads from NetCDF
-        return cls(xr.open_dataset(path))
+        return cls(xr.open_dataset(path, decode_timedelta=False))
 
     @override
     def plot(self) -> None:

{ocf_data_sampler-0.2.31 → ocf_data_sampler-0.2.33}/ocf_data_sampler.egg-info/PKG-INFO

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