PVNet 5.0.22__py3-none-any.whl → 5.0.24__py3-none-any.whl

pvnet/models/late_fusion/late_fusion.py

@@ -154,7 +154,7 @@ class LateFusionModel(BaseModel):
 
         if self.include_sat:
             # Param checks
-            assert sat_history_minutes is not None
+            assert sat_history_minutes is not None, "sat_history_minutes is not present in config"
 
             self.sat_sequence_len = (
                 sat_history_minutes - min_sat_delay_minutes
@@ -174,12 +174,18 @@ class LateFusionModel(BaseModel):
 
         if self.include_nwp:
             # Param checks
-            assert nwp_forecast_minutes is not None
-            assert nwp_history_minutes is not None
+            assert nwp_forecast_minutes is not None, "nwp_forecast_minutes is not present in config"
+            assert nwp_history_minutes is not None, "nwp_history_minutes is not present in config"
 
             # For each NWP encoder the forecast and history minutes must be set
-            assert set(nwp_encoders_dict.keys()) == set(nwp_forecast_minutes.keys())
-            assert set(nwp_encoders_dict.keys()) == set(nwp_history_minutes.keys())
+            assert set(nwp_encoders_dict.keys()) == set(nwp_forecast_minutes.keys()), (
+                f"nwp encoder keys {set(nwp_encoders_dict.keys())} do not match "
+                f"nwp_forecast_minutes keys {set(nwp_forecast_minutes.keys())}"
+            )
+            assert set(nwp_encoders_dict.keys()) == set(nwp_history_minutes.keys()), (
+                f"nwp encoder keys {set(nwp_encoders_dict.keys())} do not match "
+                f"nwp_history_minutes keys {set(nwp_history_minutes.keys())}"
+            )
 
             if nwp_interval_minutes is None:
                 nwp_interval_minutes = dict.fromkeys(nwp_encoders_dict.keys(), 60)
@@ -213,7 +219,7 @@ class LateFusionModel(BaseModel):
                 fusion_input_features += self.nwp_encoders_dict[nwp_source].out_features
 
         if self.include_pv:
-            assert pv_history_minutes is not None
+            assert pv_history_minutes is not None, "pv_history_minutes is not present in config"
 
             self.pv_encoder = pv_encoder(
                 sequence_length=pv_history_minutes // pv_interval_minutes + 1,

pvnet/training/lightning_module.py

@@ -152,13 +152,13 @@ class PVNetLightningModule(pl.LightningModule):
     def _store_val_predictions(self, batch: TensorBatch, y_hat: torch.Tensor) -> None:
         """Internally store the validation predictions"""
         
-        taregt_key = self.model._target_key
+        target_key = self.model._target_key
 
-        y = batch[taregt_key][:, -self.model.forecast_len :].cpu().numpy()
+        y = batch[target_key][:, -self.model.forecast_len :].cpu().numpy()
         y_hat = y_hat.cpu().numpy() 
-        ids = batch[f"{taregt_key}_id"].cpu().numpy()
+        ids = batch[f"{target_key}_id"].cpu().numpy()
         init_times_utc = pd.to_datetime(
-            batch[f"{taregt_key}_time_utc"][:, self.model.history_len+1]
+            batch[f"{target_key}_time_utc"][:, self.model.history_len+1]
             .cpu().numpy().astype("datetime64[ns]")
         )
 

{pvnet-5.0.22.dist-info → pvnet-5.0.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 5.0.22
+Version: 5.0.24
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Requires-Python: >=3.11

{pvnet-5.0.22.dist-info → pvnet-5.0.24.dist-info}/RECORD

@@ -11,7 +11,7 @@ pvnet/models/base_model.py,sha256=CnQaaf2kAdOcXqo1319nWa120mHfLQiwOQ639m4OzPk,16
 pvnet/models/ensemble.py,sha256=1mFUEsl33kWcLL5d7zfDm9ypWxgAxBHgBiJLt0vwTeg,2363
 pvnet/models/late_fusion/__init__.py,sha256=Jf0B-E0_5IvSBFoj1wvnPtwYDxs4pRIFm5qHv--Bbps,26
 pvnet/models/late_fusion/basic_blocks.py,sha256=_cYGVyAIyEJS4wd-DEAXQXu0br66guZJn3ugoebWqZ0,1479
-pvnet/models/late_fusion/late_fusion.py,sha256=VpP1aY646iO-JBlYkyoBlj0Z-gzsqaHnMgpNzjTqAIo,15735
+pvnet/models/late_fusion/late_fusion.py,sha256=7uQPo_OlNXrJOE9nYHTEvwJx2POKg4drJfdnPxwiaJU,16283
 pvnet/models/late_fusion/encoders/__init__.py,sha256=bLBQdnCeLYhwISW0t88ZZBz-ebS94m7ZwBcsofWMHR4,51
 pvnet/models/late_fusion/encoders/basic_blocks.py,sha256=DGkFFIZv4S4FLTaAIOrAngAFBpgZQHfkGM4dzezZLk4,3044
 pvnet/models/late_fusion/encoders/encoders3d.py,sha256=9fmqVHO73F-jN62w065cgEQI_icNFC2nQH6ZEGvTHxU,7116
@@ -22,11 +22,11 @@ pvnet/models/late_fusion/site_encoders/__init__.py,sha256=QoUiiWWFf12vEpdkw0gO4T
 pvnet/models/late_fusion/site_encoders/basic_blocks.py,sha256=iEB_N7ZL5HMQ1hZM6H32A71GCwP7YbErUx0oQF21PQM,1042
 pvnet/models/late_fusion/site_encoders/encoders.py,sha256=k4z690cfcP6J4pm2KtDujHN-W3uOl7QY0WvBIu1tM8c,11703
 pvnet/training/__init__.py,sha256=FKxmPZ59Vuj5_mXomN4saJ3En5M-aDMxSs6OttTQOcg,49
-pvnet/training/lightning_module.py,sha256=Hoqy_Csulfu-aUGOo9aqPYs7gHmbHqQTE8XaVI0ieVI,12954
+pvnet/training/lightning_module.py,sha256=RFp0kOmRW0cYU__i7SRCJUIvlp57s5cZ_H3hy2JnBxE,12954
 pvnet/training/plots.py,sha256=4xID7TBA4IazaARaCN5AoG5fFPJF1wIprn0y6I0C31c,2469
 pvnet/training/train.py,sha256=1tDA34ianCRfilS0yEeIpR9nsQWaJiiZfTD2qRUmgEc,5214
-pvnet-5.0.22.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
-pvnet-5.0.22.dist-info/METADATA,sha256=4C-v2KoK7y5AaaCJ13jmSE8iDg_-Shv6fUwdSAMHEOY,16371
-pvnet-5.0.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pvnet-5.0.22.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
-pvnet-5.0.22.dist-info/RECORD,,
+pvnet-5.0.24.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
+pvnet-5.0.24.dist-info/METADATA,sha256=z5HMQ9aNzK8j1Wz1wdHRHyA91_bIzQ2bkPepLLuFEGM,16371
+pvnet-5.0.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pvnet-5.0.24.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
+pvnet-5.0.24.dist-info/RECORD,,