ocf-data-sampler 0.0.16__py3-none-any.whl → 0.0.18__py3-none-any.whl

ocf_data_sampler/numpy_batch/gsp.py

@@ -9,12 +9,9 @@ def convert_gsp_to_numpy_batch(da: xr.DataArray, t0_idx: int | None = None) -> N
 
     example: NumpyBatch = {
         BatchKey.gsp: da.values,
-        BatchKey.gsp_id: da.gsp_id.values,
         BatchKey.gsp_nominal_capacity_mwp: da.isel(time_utc=0)["nominal_capacity_mwp"].values,
         BatchKey.gsp_effective_capacity_mwp: da.isel(time_utc=0)["effective_capacity_mwp"].values,
         BatchKey.gsp_time_utc: da["time_utc"].values.astype(float),
-        BatchKey.gsp_x_osgb: da.x_osgb.item(),
-        BatchKey.gsp_y_osgb: da.y_osgb.item(),
     }
 
     if t0_idx is not None:

ocf_data_sampler/torch_datasets/pvnet_uk_regional.py

@@ -69,7 +69,7 @@ def get_dataset_dict(config: Configuration) -> dict[xr.DataArray, dict[xr.DataAr
 
     # Load GSP data unless the path is None
     if in_config.gsp.gsp_zarr_path:
-        da_gsp = open_gsp(zarr_path=in_config.gsp.gsp_zarr_path)
+        da_gsp = open_gsp(zarr_path=in_config.gsp.gsp_zarr_path).compute()
 
         # Remove national GSP
         datasets_dict["gsp"] = da_gsp.sel(gsp_id=slice(1, None))
@@ -344,6 +344,24 @@ def slice_datasets_by_time(
     return sliced_datasets_dict
 
 
+def fill_nans_in_arrays(batch: NumpyBatch) -> NumpyBatch:
+    """Fills all NaN values in each np.ndarray in the batch dictionary with zeros.
+
+    Operation is performed in-place on the batch.
+    """
+    for k, v in batch.items():
+        if isinstance(v, np.ndarray) and np.issubdtype(v.dtype, np.number):
+            if np.isnan(v).any():
+                batch[k] = np.nan_to_num(v, copy=False, nan=0.0)
+
+        # Recursion is included to reach NWP arrays in subdict
+        elif isinstance(v, dict):
+            fill_nans_in_arrays(v)
+
+    return batch
+
+
+
 def merge_dicts(list_of_dicts: list[dict]) -> dict:
     """Merge a list of dictionaries into a single dictionary"""
     # TODO: This doesn't account for duplicate keys, which will be overwritten
@@ -385,6 +403,7 @@ def process_and_combine_datasets(
         numpy_modalities.append(convert_satellite_to_numpy_batch(da_sat))
 
     gsp_config = config.input_data.gsp
+    
     if "gsp" in dataset_dict:
         da_gsp = concat_xr_time_utc([dataset_dict["gsp"], dataset_dict["gsp_future"]])
         da_gsp = normalize_gsp(da_gsp)
@@ -406,9 +425,18 @@ def process_and_combine_datasets(
     lon, lat = osgb_to_lon_lat(location.x, location.y)
 
     numpy_modalities.append(make_sun_position_numpy_batch(datetimes, lon, lat))
-
-    # Combine all the modalities
+    
+    # Add coordinate data
+    # TODO: Do we need all of these?
+    numpy_modalities.append({
+        BatchKey.gsp_id: location.id,
+        BatchKey.gsp_x_osgb: location.x,
+        BatchKey.gsp_y_osgb: location.y,
+    })
+
+    # Combine all the modalities and fill NaNs
     combined_sample = merge_dicts(numpy_modalities)
+    combined_sample = fill_nans_in_arrays(combined_sample)
 
     return combined_sample
 
@@ -423,22 +451,6 @@ def compute(xarray_dict: dict) -> dict:
     return xarray_dict
 
 
-def get_locations(ga_gsp: xr.DataArray) -> list[Location]:
-    """Get list of locations of GSP"""
-    locations = []
-    for gsp_id in ga_gsp.gsp_id.values:
-        da = ga_gsp.sel(gsp_id=gsp_id)
-        locations.append(
-            Location(
-                coordinate_system = "osgb",
-                x=da.x_osgb.item(),
-                y=da.y_osgb.item(),
-                id=gsp_id,
-            )
-        )
-    return locations
-
-
 def get_gsp_locations() -> list[Location]:
     """Get list of locations of all GSPs"""
     locations = []

{ocf_data_sampler-0.0.16.dist-info → ocf_data_sampler-0.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocf_data_sampler
-Version: 0.0.16
+Version: 0.0.18
 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.16.dist-info → ocf_data_sampler-0.0.18.dist-info}/RECORD

@@ -11,7 +11,7 @@ ocf_data_sampler/load/nwp/providers/ecmwf.py,sha256=vW-p3vCyQ-CofKo555-gE7VDi5hl
 ocf_data_sampler/load/nwp/providers/ukv.py,sha256=79Bm7q-K_GJPYMy62SUIZbRWRF4-tIaB1dYPEgLD9vo,1207
 ocf_data_sampler/load/nwp/providers/utils.py,sha256=Sy2exG1wpXLLhMXYdsfR-DZMR3txG1_bBmBdchlc-yA,848
 ocf_data_sampler/numpy_batch/__init__.py,sha256=mrtqwbGik5Zc9MYP5byfCTBm08wMtS2XnTsypC4fPMo,245
-ocf_data_sampler/numpy_batch/gsp.py,sha256=EL0_cJJNyvkQQcOat9vFA61pF4lema3BP_vB4ZS788U,805
+ocf_data_sampler/numpy_batch/gsp.py,sha256=3gwSj0k29JyA8_09zovB8f8Pr-dVhCuMSO1-k4QKAOg,668
 ocf_data_sampler/numpy_batch/nwp.py,sha256=Rv0yfDj902Z2oCwdlRjOs3Kh-F5Fgxjjylh99-lQ9ws,1105
 ocf_data_sampler/numpy_batch/satellite.py,sha256=e6eoNmiiHtzZbDVtBolFzDuE3qwhHN6bL9H86emAUsk,732
 ocf_data_sampler/numpy_batch/sun_position.py,sha256=UW6-WtjrKdCkcguolHUDSLhYFfarknQzzjlCX8YdEOM,1700
@@ -22,11 +22,11 @@ ocf_data_sampler/select/find_contiguous_time_periods.py,sha256=6ioB8LeFpFNBMgKDx
 ocf_data_sampler/select/select_spatial_slice.py,sha256=7BSzOFPMSBWpBWXSajWTfI8luUVsSgh4zN-rkr-AuUs,11470
 ocf_data_sampler/select/select_time_slice.py,sha256=41cch1fQr59fZgv7UHsNGc3OvoynrixT3bmr3_1d7cU,6628
 ocf_data_sampler/torch_datasets/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-ocf_data_sampler/torch_datasets/pvnet_uk_regional.py,sha256=haljV4FAZI4-Qf-65nq-JIJOIQNhR6YRncjTBWMYkY4,18502
+ocf_data_sampler/torch_datasets/pvnet_uk_regional.py,sha256=W8AfmfkLywRjMJlPSJ6u3ZhB7ShwtiQuM4BZs5de_LA,18941
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=OcArgF60paroZQqoP7xExRBF34nEyMuXd7dS7hD6p3w,5393
-ocf_data_sampler-0.0.16.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
-ocf_data_sampler-0.0.16.dist-info/METADATA,sha256=lV0PmJljbd63TmlSErEOXN8zSn5031q4WHItd5mJGs4,588
-ocf_data_sampler-0.0.16.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
-ocf_data_sampler-0.0.16.dist-info/top_level.txt,sha256=KaQn5qzkJGJP6hKWqsVAc9t0cMLjVvSTk8-kTrW79SA,23
-ocf_data_sampler-0.0.16.dist-info/RECORD,,
+ocf_data_sampler-0.0.18.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
+ocf_data_sampler-0.0.18.dist-info/METADATA,sha256=EJKObEAl-_R7a_1xgtXZQ-eXvg1Ljsgbl5QNG1mb1m4,801
+ocf_data_sampler-0.0.18.dist-info/WHEEL,sha256=5Mi1sN9lKoFv_gxcPtisEVrJZihrm_beibeg5R6xb4I,91
+ocf_data_sampler-0.0.18.dist-info/top_level.txt,sha256=KaQn5qzkJGJP6hKWqsVAc9t0cMLjVvSTk8-kTrW79SA,23
+ocf_data_sampler-0.0.18.dist-info/RECORD,,

{ocf_data_sampler-0.0.16.dist-info → ocf_data_sampler-0.0.18.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (75.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any