PVNet 5.3.7__tar.gz → 5.3.9__tar.gz

{pvnet-5.3.7 → pvnet-5.3.9}/PKG-INFO

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

{pvnet-5.3.7 → pvnet-5.3.9}/PVNet.egg-info/PKG-INFO

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

{pvnet-5.3.7 → pvnet-5.3.9}/pvnet/utils.py

@@ -102,30 +102,24 @@ def validate_batch_against_config(
 
     # NWP validation
     if model.include_nwp:
-        if "nwp" not in batch:
+        if (nwp_dict := batch.get("nwp")) is None:
             raise ValueError("Model uses NWP data but 'nwp' missing from batch.")
 
-        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']."
-                )
+        for source, enc in model.nwp_encoders_dict.items():
+            if (src_data := nwp_dict.get(source)) is None:
+                raise ValueError(f"NWP source '{source}' 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}"
+            nwp_tensor = src_data["nwp"]
+            exp_ch = enc.in_channels - int(model.add_image_embedding_channel)
+            _, actual_seq, actual_ch, h, w = nwp_tensor.shape
+
+            if (actual_seq != enc.sequence_length or actual_ch != exp_ch or 
+                h != enc.image_size_pixels or w != enc.image_size_pixels):
+                msg = (
+                    f"NWP.{source} mismatch: Exp {enc.sequence_length}seq, {exp_ch}ch. "
+                    f"Got {actual_seq}seq, {actual_ch}ch"
                 )
+                raise ValueError(msg)
 
     # Satellite validation
     if model.include_sat: