PVNet 5.3.4__py3-none-any.whl → 5.3.6__py3-none-any.whl

pvnet/models/late_fusion/late_fusion.py

@@ -46,6 +46,7 @@ class LateFusionModel(BaseModel):
         include_generation_history: bool = False,
         include_sun: bool = True,
         include_time: bool = False,
+        t0_embedding_dim: int = 0,
         location_id_mapping: dict[Any, int] | None = None,
         embedding_dim: int = 16,
         forecast_minutes: int = 30,
@@ -85,6 +86,8 @@ class LateFusionModel(BaseModel):
             include_generation_history: Include generation yield data.
             include_sun: Include sun azimuth and altitude data.
             include_time: Include sine and cosine of dates and times.
+            t0_embedding_dim: Shape of the embedding of the init-time (t0) of the forecast. Not used
+                if set to 0.
             location_id_mapping: A dictionary mapping the location ID to an integer. ID embedding is
                 not used if this is not provided.
             embedding_dim: Number of embedding dimensions to use for location ID.
@@ -119,6 +122,7 @@ class LateFusionModel(BaseModel):
         self.include_pv = pv_encoder is not None
         self.include_sun = include_sun
         self.include_time = include_time
+        self.t0_embedding_dim = t0_embedding_dim
         self.location_id_mapping = location_id_mapping
         self.embedding_dim = embedding_dim
         self.add_image_embedding_channel = add_image_embedding_channel
@@ -246,6 +250,8 @@ class LateFusionModel(BaseModel):
             # Update num features
             fusion_input_features += 32
 
+        fusion_input_features += self.t0_embedding_dim
+
         if include_generation_history:
             # Update num features
             fusion_input_features += self.history_len + 1
@@ -321,6 +327,9 @@ class LateFusionModel(BaseModel):
             time = self.time_fc1(time)
             modes["time"] = time
 
+        if self.t0_embedding_dim>0:
+            modes["t0_embed"] = x["t0_embedding"]
+
         out = self.output_network(modes)
 
         if self.use_quantile_regression:

pvnet/utils.py

@@ -101,66 +101,64 @@ def validate_batch_against_config(
     logger.info("Performing batch shape validation against model config.")
 
     # NWP validation
-    if hasattr(model, "nwp_encoders_dict"):
+    if model.include_nwp:
         if "nwp" not in batch:
-            raise ValueError(
-                "Model configured with 'nwp_encoders_dict' but 'nwp' data missing from batch."
-            )
+            raise ValueError("Model uses NWP data but 'nwp' missing from batch.")
 
-        for source, nwp_data in batch["nwp"].items():
-            if source in model.nwp_encoders_dict:
-                enc = model.nwp_encoders_dict[source]
-                expected_channels = enc.in_channels
-                if model.add_image_embedding_channel:
-                    expected_channels -= 1
-
-                expected = (
-                    nwp_data["nwp"].shape[0],
-                    enc.sequence_length,
-                    expected_channels,
-                    enc.image_size_pixels,
-                    enc.image_size_pixels,
+        for source in model.nwp_encoders_dict:
+            if source not in batch["nwp"]:
+                raise ValueError(
+                    f"Model uses NWP source '{source}' but it is missing from batch['nwp']."
+                )
+
+            enc = model.nwp_encoders_dict[source]
+            expected_channels = enc.in_channels - int(model.add_image_embedding_channel)
+            
+            expected_shape = (
+                batch["nwp"][source]["nwp"].shape[0],
+                enc.sequence_length,
+                expected_channels,
+                enc.image_size_pixels,
+                enc.image_size_pixels,
+            )
+            actual_shape = tuple(batch["nwp"][source]["nwp"].shape)
+            if actual_shape != expected_shape:
+                raise ValueError(
+                    f"NWP.{source} shape mismatch: expected {expected_shape}, got {actual_shape}"
                 )
-                if tuple(nwp_data["nwp"].shape) != expected:
-                    actual_shape = tuple(nwp_data["nwp"].shape)
-                    raise ValueError(
-                        f"NWP.{source} shape mismatch: expected {expected}, got {actual_shape}"
-                    )
 
     # Satellite validation
-    if hasattr(model, "sat_encoder"):
+    if model.include_sat:
         if "satellite_actual" not in batch:
             raise ValueError(
-                "Model configured with 'sat_encoder' but 'satellite_actual' missing from batch."
+                "Model uses satellite data but 'satellite_actual' missing from batch."
             )
 
         enc = model.sat_encoder
-        expected_channels = enc.in_channels
-        if model.add_image_embedding_channel:
-            expected_channels -= 1
+        expected_channels = enc.in_channels - int(model.add_image_embedding_channel)
 
-        expected = (
+        expected_shape = (
             batch["satellite_actual"].shape[0],
             enc.sequence_length,
             expected_channels,
             enc.image_size_pixels,
             enc.image_size_pixels,
         )
-        if tuple(batch["satellite_actual"].shape) != expected:
-            actual_shape = tuple(batch["satellite_actual"].shape)
-            raise ValueError(f"Satellite shape mismatch: expected {expected}, got {actual_shape}")
+        actual_shape = tuple(batch["satellite_actual"].shape)
+        if actual_shape != expected_shape:
+            raise ValueError(
+                f"Satellite shape mismatch: expected {expected_shape}, got {actual_shape}"
+            )
 
-    # generation validation
     key = "generation"
     if key in batch:
         total_minutes = model.history_minutes + model.forecast_minutes
-        interval = model.interval_minutes
-        expected_len = total_minutes // interval + 1
-        expected = (batch[key].shape[0], expected_len)
-        if tuple(batch[key].shape) != expected:
-            actual_shape = tuple(batch[key].shape)
+        expected_len = total_minutes // model.interval_minutes + 1
+        expected_shape = (batch[key].shape[0], expected_len)
+        actual_shape = tuple(batch[key].shape)
+        if actual_shape != expected_shape:
             raise ValueError(
-                f"{key.upper()} shape mismatch: expected {expected}, got {actual_shape}"
+                f"Generation data shape mismatch: expected {expected_shape}, got {actual_shape}"
             )
 
     logger.info("Batch shape validation successful!")

{pvnet-5.3.4.dist-info → pvnet-5.3.6.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 5.3.4
+Version: 5.3.6
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf-data-sampler>=0.6.0
+Requires-Dist: ocf-data-sampler>=1.0.9
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: matplotlib

{pvnet-5.3.4.dist-info → pvnet-5.3.6.dist-info}/RECORD

@@ -2,13 +2,13 @@ pvnet/__init__.py,sha256=TAZm88TJ5ieL1XjEyRg1LciIGuSScEucdAruQLfM92I,25
 pvnet/datamodule.py,sha256=wc1RQfFhgW9Hxyw7vrpFERhOd2FmjDsO1x49J2erOYk,5750
 pvnet/load_model.py,sha256=P1QODX_mJRnKZ_kIll9BlOjK_A1W4YM3QG-mZd-2Mcc,3852
 pvnet/optimizers.py,sha256=DZ74KcFQV226zwu7-qAzofTMTYeIyScox4Kqbq30WWY,6440
-pvnet/utils.py,sha256=L3MDF5m1Ez_btAZZ8t-T5wXLzFmyj7UZtorA91DEpFw,6003
+pvnet/utils.py,sha256=aVcalRAUO7TIa6AepRGmt0zPx9e1h2Xed34uCF_yg50,5887
 pvnet/models/__init__.py,sha256=owzZ9xkD0DRTT51mT2Dx_p96oJjwDz57xo_MaMIEosk,145
 pvnet/models/base_model.py,sha256=V-vBqtzZc_c8Ho5hVo_ikq2wzZ7hsAIM7I4vhzGDfNc,16051
 pvnet/models/ensemble.py,sha256=USpNQ0O5eiffapLPE9T6gR-uK9f_3E4pX3DK7Lmkn2U,2228
 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=kQUnyqMykmwc0GdoFhNXYStJPrjr3hFSvUNe8FumVx4,15260
+pvnet/models/late_fusion/late_fusion.py,sha256=r05RJvw2-ZQgWJobOGq1g4rlMJQjGM0UzG3syA4T0qo,15617
 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,8 +22,8 @@ pvnet/training/__init__.py,sha256=FKxmPZ59Vuj5_mXomN4saJ3En5M-aDMxSs6OttTQOcg,49
 pvnet/training/lightning_module.py,sha256=hmvne9DQauWpG61sRK-t8MTZRVwdywaEFCs0VFVRuMs,13522
 pvnet/training/plots.py,sha256=7JtjA9zIotuoKZ2l0fbS-FZDB48TcIk_-XLA2EWVMv4,2448
 pvnet/training/train.py,sha256=Sry2wYgggUmtIB-k_umFts7xMr2roEL76NCu9ySbLUY,4107
-pvnet-5.3.4.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
-pvnet-5.3.4.dist-info/METADATA,sha256=9t2g_zlRqOHNgwvHm1IFoJh_Z458Waxkt2Ge1q-1IWc,16479
-pvnet-5.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pvnet-5.3.4.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
-pvnet-5.3.4.dist-info/RECORD,,
+pvnet-5.3.6.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
+pvnet-5.3.6.dist-info/METADATA,sha256=emx0MAvTIzqiocttPDRoQp-7QTScaKD5ANzC95wWkKo,16479
+pvnet-5.3.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pvnet-5.3.6.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
+pvnet-5.3.6.dist-info/RECORD,,