ocf-data-sampler 0.0.18__tar.gz → 0.0.19__tar.gz

{ocf_data_sampler-0.0.18/ocf_data_sampler.egg-info → ocf_data_sampler-0.0.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocf_data_sampler
-Version: 0.0.18
+Version: 0.0.19
 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

{ocf_data_sampler-0.0.18 → ocf_data_sampler-0.0.19}/ocf_data_sampler/torch_datasets/pvnet_uk_regional.py

@@ -451,8 +451,12 @@ def compute(xarray_dict: dict) -> dict:
     return xarray_dict
 
 
-def get_gsp_locations() -> list[Location]:
+def get_gsp_locations(gsp_ids: list[int] | None = None) -> list[Location]:
     """Get list of locations of all GSPs"""
+    
+    if gsp_ids is None:
+        gsp_ids = [i for i in range(1, 318)]
+    
     locations = []
 
     # Load UK GSP locations
@@ -461,7 +465,7 @@ def get_gsp_locations() -> list[Location]:
         index_col="gsp_id",
     )
 
-    for gsp_id in np.arange(1, 318):
+    for gsp_id in gsp_ids:
         locations.append(
             Location(
                 coordinate_system = "osgb",
@@ -480,6 +484,7 @@ class PVNetUKRegionalDataset(Dataset):
         config_filename: str, 
         start_time: str | None = None,
         end_time: str| None = None,
+        gsp_ids: list[int] | None = None,
     ):
         """A torch Dataset for creating PVNet UK GSP samples
 
@@ -487,6 +492,7 @@ class PVNetUKRegionalDataset(Dataset):
             config_filename: Path to the configuration file
             start_time: Limit the init-times to be after this
             end_time: Limit the init-times to be before this
+            gsp_ids: List of GSP IDs to create samples for. Defaults to all
         """
         
         config = load_yaml_configuration(config_filename)
@@ -504,7 +510,7 @@ class PVNetUKRegionalDataset(Dataset):
             valid_t0_times = valid_t0_times[valid_t0_times<=pd.Timestamp(end_time)]
 
         # Construct list of locations to sample from
-        locations = get_gsp_locations()
+        locations = get_gsp_locations(gsp_ids)
 
         # Construct a lookup for locations - useful for users to construct sample by GSP ID
         location_lookup = {loc.id: loc for loc in locations}

{ocf_data_sampler-0.0.18 → ocf_data_sampler-0.0.19/ocf_data_sampler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocf_data_sampler
-Version: 0.0.18
+Version: 0.0.19
 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

{ocf_data_sampler-0.0.18 → ocf_data_sampler-0.0.19}/setup.py

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