ocf-data-sampler 0.2.23__py3-none-any.whl → 0.2.25__py3-none-any.whl

ocf_data_sampler/config/model.py

@@ -291,6 +291,8 @@ class GSP(TimeWindowMixin, DropoutMixin):
         description="Version of the GSP boundaries to use. Options are '20220314' or '20250109'.",
     )
 
+    public: bool = Field(False, description="Whether the NWP data is public or private")
+
 
 class Site(TimeWindowMixin, DropoutMixin):
     """Site configuration model."""

ocf_data_sampler/load/gsp.py

@@ -26,13 +26,17 @@ def get_gsp_boundaries(version: str) -> pd.DataFrame:
     )
 
 
-def open_gsp(zarr_path: str, boundaries_version: str = "20220314") -> xr.DataArray:
+def open_gsp(zarr_path: str,
+             boundaries_version: str = "20220314",
+             public: bool = False,
+    ) -> xr.DataArray:
     """Open the GSP data.
 
     Args:
         zarr_path: Path to the GSP zarr data
         boundaries_version: Version of the GSP boundaries to use. Options are "20220314" or
         "20250109".
+        public: Whether the data is public or private.
 
     Returns:
         xr.DataArray: The opened GSP data
@@ -40,12 +44,18 @@ def open_gsp(zarr_path: str, boundaries_version: str = "20220314") -> xr.DataArr
     # Load UK GSP locations
     df_gsp_loc = get_gsp_boundaries(boundaries_version)
 
+    backend_kwargs ={}
     # Open the GSP generation data
+    if public:
+        backend_kwargs ={"storage_options":{"anon": True}}
+        # Currently only compatible with S3 bucket.
+
     ds = (
-        xr.open_zarr(zarr_path)
+        xr.open_dataset(zarr_path,engine="zarr",backend_kwargs=backend_kwargs)
         .rename({"datetime_gmt": "time_utc"})
     )
 
+
     if not (ds.gsp_id.isin(df_gsp_loc.index)).all():
         raise ValueError(
             "Some GSP IDs in the GSP generation data are not available in the locations file.",

ocf_data_sampler/load/load_dataset.py

@@ -24,6 +24,7 @@ def get_dataset_dict(
         da_gsp = open_gsp(
             zarr_path=input_config.gsp.zarr_path,
             boundaries_version=input_config.gsp.boundaries_version,
+            public=input_config.gsp.public,
         ).compute()
 
         if gsp_ids is None:

ocf_data_sampler/select/select_spatial_slice.py

@@ -239,8 +239,19 @@ def select_spatial_slice_pixels(
         if allow_partial_slice:
             da = _select_padded_slice(da, left_idx, right_idx, bottom_idx, top_idx, x_dim, y_dim)
         else:
+            issues = []
+            if left_idx < 0:
+                issues.append(f"left_idx ({left_idx}) < 0")
+            if right_idx > data_width_pixels:
+                issues.append(f"right_idx ({right_idx}) > data_width_pixels ({data_width_pixels})")
+            if bottom_idx < 0:
+                issues.append(f"bottom_idx ({bottom_idx}) < 0")
+            if top_idx > data_height_pixels:
+                issues.append(f"top_idx ({top_idx}) > data_height_pixels ({data_height_pixels})")
+            issue_details = "\n".join(issues)
             raise ValueError(
-                f"Window for location {location} not available.  Padding required. "
+                f"Window for location {location} not available.  Padding required due to: \n"
+                f"{issue_details}\n"
                 "You may wish to set `allow_partial_slice=True`",
             )
     else:

{ocf_data_sampler-0.2.23.dist-info → ocf_data_sampler-0.2.25.dist-info}/METADATA

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

{ocf_data_sampler-0.2.23.dist-info → ocf_data_sampler-0.2.25.dist-info}/RECORD

@@ -2,13 +2,13 @@ ocf_data_sampler/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,
 ocf_data_sampler/utils.py,sha256=DjuneGGisl08ENvPZV_lrcX4b2NCKJC1ZpXgIpxuQi4,290
 ocf_data_sampler/config/__init__.py,sha256=O29mbH0XG2gIY1g3BaveGCnpBO2SFqdu-qzJ7a6evl0,223
 ocf_data_sampler/config/load.py,sha256=LL-7wemI8o4KPkx35j-wQ3HjsMvDgqXr7G46IcASfnU,632
-ocf_data_sampler/config/model.py,sha256=L0-ZLeO9JHsorgbJdX4NvoFOU4lVW58DgXEgupBBuko,10533
+ocf_data_sampler/config/model.py,sha256=UwVQOjRBthbwhAWR5Rcs5cSXG3imLZ5pnd8vBeFseLE,10623
 ocf_data_sampler/config/save.py,sha256=m8SPw5rXjkMm1rByjh3pK5StdBi4e8ysnn3jQopdRaI,1064
 ocf_data_sampler/data/uk_gsp_locations_20220314.csv,sha256=RSh7DRh55E3n8lVAaWXGTaXXHevZZtI58td4d4DhGos,10415772
 ocf_data_sampler/data/uk_gsp_locations_20250109.csv,sha256=XZISFatnbpO9j8LwaxNKFzQSjs6hcHFsV8a9uDDpy2E,9055334
 ocf_data_sampler/load/__init__.py,sha256=-vQP9g0UOWdVbjEGyVX_ipa7R1btmiETIKAf6aw4d78,201
-ocf_data_sampler/load/gsp.py,sha256=YsIlj-LBUbREHNi78JMppOM1NbSkOe4kvtIrTwDx_JQ,1888
-ocf_data_sampler/load/load_dataset.py,sha256=wSXPUQKgGRM6HC-yBXQ2IcDBQDckOSllmbGnhqikFMQ,2055
+ocf_data_sampler/load/gsp.py,sha256=winSW3ibFbpsOr0ZRIjYUlqSW5C6SUb0dxkRZm3E8GI,2195
+ocf_data_sampler/load/load_dataset.py,sha256=WjB3DvHbDQQYYnPmDFOWg_TQPgARZ5pu8fiRZSGtIg0,2099
 ocf_data_sampler/load/satellite.py,sha256=E7Ln7Y60Qr1RTV-_R71YoxXQM-Ca7Y1faIo3oKB2eFk,2292
 ocf_data_sampler/load/site.py,sha256=zOzlWk6pYZBB5daqG8URGksmDXWKrkutUvN8uALAIh8,1468
 ocf_data_sampler/load/utils.py,sha256=sZ0-zzconcLkVQwAkCYrqKDo98Hrh5ChdiQJv5Bh91g,2040
@@ -36,7 +36,7 @@ ocf_data_sampler/select/fill_time_periods.py,sha256=TlGxp1xiAqnhdWfLy0pv3FuZc00d
 ocf_data_sampler/select/find_contiguous_time_periods.py,sha256=8lkWsV5i7iLCVGqQ-PGZbvWxsz3wBvLO70GSf6WeR0k,11363
 ocf_data_sampler/select/geospatial.py,sha256=CDExkl36eZOKmdJPzUr_K0Wn3axHqv5nYo-EkSiINcc,5032
 ocf_data_sampler/select/location.py,sha256=AZvGR8y62opiW7zACGXjoOtBEWRfSLOZIA73O5Deu0c,1037
-ocf_data_sampler/select/select_spatial_slice.py,sha256=liAqIa-Amj58pOqx5r16i99HURj9oQ41j7gnPgRDQP4,8201
+ocf_data_sampler/select/select_spatial_slice.py,sha256=Hd4jGRUfIZRoWCirOQZeoLpaUnStB6KyFSTPX69wZLw,8790
 ocf_data_sampler/select/select_time_slice.py,sha256=HeHbwZ0CP03x0-LaJtpbSdtpLufwVTR73p6wH6O_PS8,5513
 ocf_data_sampler/torch_datasets/datasets/__init__.py,sha256=jfJSFcR0eO1AqeH7S3KnGjsBqVZT5w3oyi784PUR6Q0,146
 ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py,sha256=cd4IyzYu8rMFgLHRXqYpnOIAZe4Yl21YdLmDQw45F7o,12545
@@ -55,7 +55,7 @@ ocf_data_sampler/torch_datasets/utils/validation_utils.py,sha256=YqmT-lExWlI8_ul
 scripts/download_gsp_location_data.py,sha256=rRDXMoqX-RYY4jPdxhdlxJGhWdl6r245F5UARgKV6P4,3121
 scripts/refactor_site.py,sha256=skzvsPP0Cn9yTKndzkilyNcGz4DZ88ctvCJ0XrBdc2A,3135
 utils/compute_icon_mean_stddev.py,sha256=a1oWMRMnny39rV-dvu8rcx85sb4bXzPFrR1gkUr4Jpg,2296
-ocf_data_sampler-0.2.23.dist-info/METADATA,sha256=eQH416SngTjkM7gtOazOOZ0UA-Yluh7hHnsrZPben18,11581
-ocf_data_sampler-0.2.23.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-ocf_data_sampler-0.2.23.dist-info/top_level.txt,sha256=LEFU4Uk-PEo72QGLAfnVZIUEm37Q8mKuMeg_Xk-p33g,31
-ocf_data_sampler-0.2.23.dist-info/RECORD,,
+ocf_data_sampler-0.2.25.dist-info/METADATA,sha256=u6j_F7UrIXRRxT9Xj4U0ylvFCik4scyCEjeaSDmUIQ8,11581
+ocf_data_sampler-0.2.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ocf_data_sampler-0.2.25.dist-info/top_level.txt,sha256=LEFU4Uk-PEo72QGLAfnVZIUEm37Q8mKuMeg_Xk-p33g,31
+ocf_data_sampler-0.2.25.dist-info/RECORD,,

{ocf_data_sampler-0.2.23.dist-info → ocf_data_sampler-0.2.25.dist-info}/WHEEL

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