ocf-data-sampler 0.0.11__tar.gz → 0.0.12__tar.gz

{ocf_data_sampler-0.0.11/ocf_data_sampler.egg-info → ocf_data_sampler-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocf_data_sampler
-Version: 0.0.11
+Version: 0.0.12
 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.11 → ocf_data_sampler-0.0.12}/ocf_data_sampler/torch_datasets/pvnet_uk_regional.py

@@ -114,7 +114,7 @@ def find_valid_t0_times(
 
     assert set(datasets_dict.keys()).issubset({"nwp", "sat", "gsp"})
 
-    contiguous_time_periods = []  # Used to store contiguous time periods from each data source
+    contiguous_time_periods: dict[str: pd.DataFrame] = {}  # Used to store contiguous time periods from each data source
 
     if "nwp" in datasets_dict:
         for nwp_key, nwp_config in config.input_data.nwp.items():
@@ -158,7 +158,7 @@ def find_valid_t0_times(
                 max_dropout=max_dropout,
             )
 
-            contiguous_time_periods.append(time_periods)
+            contiguous_time_periods[f'nwp_{nwp_key}'] = time_periods
 
     if "sat" in datasets_dict:
         sat_config = config.input_data.satellite
@@ -170,7 +170,7 @@ def find_valid_t0_times(
             forecast_duration=minutes(sat_config.forecast_minutes),
         )
 
-        contiguous_time_periods.append(time_periods)
+        contiguous_time_periods['sat'] = time_periods
 
     # GSP always assumed to be in data
     gsp_config = config.input_data.gsp
@@ -182,15 +182,22 @@ def find_valid_t0_times(
         forecast_duration=minutes(gsp_config.forecast_minutes),
     )
 
-    contiguous_time_periods.append(time_periods)
+    contiguous_time_periods['gsp'] = time_periods
+
+    # just get the values (no the keys)
+    contiguous_time_periods_values = list(contiguous_time_periods.values())
 
     # Find joint overlapping contiguous time periods
-    if len(contiguous_time_periods) > 1:
+    if len(contiguous_time_periods_values) > 1:
         valid_time_periods = intersection_of_multiple_dataframes_of_periods(
-            contiguous_time_periods
+            contiguous_time_periods_values
         )
     else:
-        valid_time_periods = contiguous_time_periods[0]
+        valid_time_periods = contiguous_time_periods_values[0]
+
+    # check there are some valid time periods
+    if len(valid_time_periods.keys()) == 0:
+        raise ValueError(f"No valid time periods found, {contiguous_time_periods=}")
 
     # Fill out the contiguous time periods to get the t0 times
     valid_t0_times = fill_time_periods(

{ocf_data_sampler-0.0.11 → ocf_data_sampler-0.0.12/ocf_data_sampler.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocf_data_sampler
-Version: 0.0.11
+Version: 0.0.12
 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.11 → ocf_data_sampler-0.0.12}/setup.py

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