ocf-data-sampler 0.5.25__py3-none-any.whl → 0.5.27__py3-none-any.whl

ocf_data_sampler/load/site.py

@@ -31,9 +31,10 @@ def open_site(generation_file_path: str, metadata_file_path: str) -> xr.DataArra
         capacity_kwp=("site_id", metadata_df["capacity_kwp"].values),
     )
 
-    # Sanity checks
-    if not np.isfinite(generation_ds.generation_kw.values).all():
-        raise ValueError("generation_kw contains non-finite values")
+    # Sanity checks, to prevent inf or negative values
+    # Note NaNs are allowed in generation_kw as can have non overlapping time periods for sites
+    if np.isinf(generation_ds.generation_kw.values).all():
+        raise ValueError("generation_kw contains infinite (+/- inf) values")
     if not (generation_ds.capacity_kwp.values > 0).all():
         raise ValueError("capacity_kwp contains non-positive values")
 
@@ -43,17 +44,21 @@ def open_site(generation_file_path: str, metadata_file_path: str) -> xr.DataArra
     if not np.issubdtype(site_da.dtype, np.floating):
         raise TypeError(f"Generation data should be float, not {site_da.dtype}")
 
+
     coord_dtypes = {
-        "time_utc": np.datetime64,
-        "site_id": np.integer,
-        "capacity_kwp": np.floating,
-        "latitude": np.floating,
-        "longitude": np.floating,
-    }
-
-    for coord, expected_dtype in coord_dtypes.items():
-        if not np.issubdtype(site_da.coords[coord].dtype, expected_dtype):
+    "time_utc": (np.datetime64,),
+    "site_id": (np.integer,),
+    "capacity_kwp": (np.integer, np.floating),
+    "latitude": (np.floating,),
+    "longitude": (np.floating,),
+}
+    for coord, expected_dtypes in coord_dtypes.items():
+        if not any(np.issubdtype(site_da.coords[coord].dtype, dt) for dt in expected_dtypes):
             dtype = site_da.coords[coord].dtype
-            raise TypeError(f"{coord} should be {expected_dtype.__name__}, not {dtype}")
+            allowed = ", ".join(dt.__name__ for dt in expected_dtypes)
+            raise TypeError(f"{coord} should be one of ({allowed}), not {dtype}")
 
-    return site_da
+    # Load the data eagerly into memory by calling compute
+    # this makes the dataset faster to sample from, but
+    # at the cost of a little extra memory usage
+    return site_da.compute()

ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py

@@ -267,10 +267,8 @@ class PVNetUKRegionalDataset(AbstractPVNetUKDataset):
 
     @override
     def __getitem__(self, idx: int) -> NumpySample:
-        # Get the coordinates of the sample
-
-        idx = int(idx)
 
+        # Get the coordinates of the sample
         if idx >= len(self):
             raise ValueError(f"Index {idx} out of range for dataset of length {len(self)}")
 

ocf_data_sampler/torch_datasets/datasets/site.py

@@ -262,8 +262,6 @@ class SitesDataset(PickleCacheMixin, Dataset):
     @override
     def __getitem__(self, idx: int) -> dict:
 
-        idx = int(idx)
-
         # Get the coordinates of the sample
         t0, site_id = self.valid_t0_and_site_ids.iloc[idx]
 

{ocf_data_sampler-0.5.25.dist-info → ocf_data_sampler-0.5.27.dist-info}/METADATA

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

{ocf_data_sampler-0.5.25.dist-info → ocf_data_sampler-0.5.27.dist-info}/RECORD

@@ -11,7 +11,7 @@ ocf_data_sampler/load/gsp.py,sha256=zsQ39dZBS45qd86lGfCZUjheLRTtMzIUozj-j8c87UQ,
 ocf_data_sampler/load/load_dataset.py,sha256=K8rWykjII-3g127If7WRRFivzHNx3SshCvZj4uQlf28,2089
 ocf_data_sampler/load/open_xarray_tensorstore.py,sha256=YglCBeKa4mSjUU5qlcMOLZXUtFrPFWVKDeKHLjs_YbA,6353
 ocf_data_sampler/load/satellite.py,sha256=5o5SfcplQfZFlm3JJq73j8_m_cWKpFtKk0tTKGjjCuE,1856
-ocf_data_sampler/load/site.py,sha256=WtOy20VMHJIY0IwEemCdcecSDUGcVaLUown-4ixJw90,2147
+ocf_data_sampler/load/site.py,sha256=bpFABjpvlstn6yJ6OPVlPZms-CjJdxNwCkQafpnj0Ik,2539
 ocf_data_sampler/load/utils.py,sha256=AGL0aOOQPrgqNBTjlBtR7Qg1PyQov3DFJo-y198u8pY,2044
 ocf_data_sampler/load/nwp/__init__.py,sha256=SmcrnbygO5xtCKmGR4wtHrj-HI7nOAvnAtfuvRufBGQ,25
 ocf_data_sampler/load/nwp/nwp.py,sha256=0E9shei3Mq1N7F-fBlEKY5Hm0_kI7ysY_rffnWIshvk,3612
@@ -42,8 +42,8 @@ ocf_data_sampler/select/select_spatial_slice.py,sha256=NB6NtZBc_Mb5zPCItzBIEa_Nr
 ocf_data_sampler/select/select_time_slice.py,sha256=cpkdovJMvcjxSGfq9G0OJK5aDAeCXg7exWYrJnR4N2w,4116
 ocf_data_sampler/torch_datasets/datasets/__init__.py,sha256=o0SsEXXZ6k9iL__5_RN1Sf60lw_eqK91P3UFEHAD2k0,102
 ocf_data_sampler/torch_datasets/datasets/picklecache.py,sha256=b8T5lgKfiPXLwuVQuFpCQBlU-HNBrA-Z-eSwYICKvsQ,1350
-ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py,sha256=n0NYbhrMR_LtGz4EiryljeQG-tI4fWfJLifKclMThcU,12367
-ocf_data_sampler/torch_datasets/datasets/site.py,sha256=UYixlQ4xuHG6FUGpgUWWWi6cmw8ZJ2qIvd07i3vp2AY,15879
+ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py,sha256=C4bQBBjfpuBPFVaOg2v2icn1x0HTxwkgOXJk1FvUK5g,12343
+ocf_data_sampler/torch_datasets/datasets/site.py,sha256=WmRDY99D-2Chf0aoKE-m2bfqk0b9wRtKwMeE10l5r2w,15855
 ocf_data_sampler/torch_datasets/sample/__init__.py,sha256=GL84vdZl_SjHDGVyh9Uekx2XhPYuZ0dnO3l6f6KXnHI,100
 ocf_data_sampler/torch_datasets/sample/base.py,sha256=cQ1oIyhdmlotejZK8B3Cw6MNvpdnBPD8G_o2h7Ye4Vc,2206
 ocf_data_sampler/torch_datasets/sample/site.py,sha256=40NwNTqjL1WVhPdwe02zDHHfDLG2u_bvCfRCtGAtFc0,1466
@@ -59,7 +59,7 @@ ocf_data_sampler/torch_datasets/utils/valid_time_periods.py,sha256=xcy75cVxl0Wrg
 ocf_data_sampler/torch_datasets/utils/validation_utils.py,sha256=YqmT-lExWlI8_ul3l0EP73Ik002fStr_bhsZh9mQqEU,4735
 scripts/download_gsp_location_data.py,sha256=rRDXMoqX-RYY4jPdxhdlxJGhWdl6r245F5UARgKV6P4,3121
 scripts/refactor_site.py,sha256=skzvsPP0Cn9yTKndzkilyNcGz4DZ88ctvCJ0XrBdc2A,3135
-ocf_data_sampler-0.5.25.dist-info/METADATA,sha256=9JPhGShknN0Rr_r09f-UqymH1i_DIssLHR2Q8N1bfSE,13541
-ocf_data_sampler-0.5.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ocf_data_sampler-0.5.25.dist-info/top_level.txt,sha256=deUxqmsONNAGZDNbsntbXH7BRA1MqWaUeAJrCo6q_xA,25
-ocf_data_sampler-0.5.25.dist-info/RECORD,,
+ocf_data_sampler-0.5.27.dist-info/METADATA,sha256=gv6YJ9Sp4vCadQFNDFxZl-b9UC4G4iHC6TZQ4L5I2P4,13541
+ocf_data_sampler-0.5.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ocf_data_sampler-0.5.27.dist-info/top_level.txt,sha256=deUxqmsONNAGZDNbsntbXH7BRA1MqWaUeAJrCo6q_xA,25
+ocf_data_sampler-0.5.27.dist-info/RECORD,,