ocf-data-sampler 0.0.11__py3-none-any.whl → 0.0.13__py3-none-any.whl

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) == 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.dist-info → ocf_data_sampler-0.0.13.dist-info}/METADATA

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

@@ -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=XuksC9N03c5rV9OeWtxjGuoGyeJJGy4JMJe3w7m6oaw,6654
 ocf_data_sampler/torch_datasets/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-ocf_data_sampler/torch_datasets/pvnet_uk_regional.py,sha256=rVKFfoHqSfm4C-eOXiqi5GwBJdMewRMIikvpjEJXi1s,17477
+ocf_data_sampler/torch_datasets/pvnet_uk_regional.py,sha256=1jo-5KhGhFv6mb5C9HHTn_fiTHgaFgnuifA_cLt4JYs,17823
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=OcArgF60paroZQqoP7xExRBF34nEyMuXd7dS7hD6p3w,5393
-ocf_data_sampler-0.0.11.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
-ocf_data_sampler-0.0.11.dist-info/METADATA,sha256=UygNspgLmps-YBxZwJd9wWq1ATU9mPtvRZ4b3-Qbr24,588
-ocf_data_sampler-0.0.11.dist-info/WHEEL,sha256=HiCZjzuy6Dw0hdX5R3LCFPDmFS4BWl8H-8W39XfmgX4,91
-ocf_data_sampler-0.0.11.dist-info/top_level.txt,sha256=KaQn5qzkJGJP6hKWqsVAc9t0cMLjVvSTk8-kTrW79SA,23
-ocf_data_sampler-0.0.11.dist-info/RECORD,,
+ocf_data_sampler-0.0.13.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
+ocf_data_sampler-0.0.13.dist-info/METADATA,sha256=8G8qD019wgJTz9M2594c5Zm19aIDWxqvl1smiTgEJT4,588
+ocf_data_sampler-0.0.13.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
+ocf_data_sampler-0.0.13.dist-info/top_level.txt,sha256=KaQn5qzkJGJP6hKWqsVAc9t0cMLjVvSTk8-kTrW79SA,23
+ocf_data_sampler-0.0.13.dist-info/RECORD,,

{ocf_data_sampler-0.0.11.dist-info → ocf_data_sampler-0.0.13.dist-info}/WHEEL

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