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

pvnet/utils.py

@@ -102,53 +102,43 @@ 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:
-        if "satellite_actual" not in batch:
-            raise ValueError(
-                "Model uses satellite data but 'satellite_actual' missing from batch."
-            )
+        if (sat_data := batch.get("satellite_actual")) is None:
+            raise ValueError("Model uses sat data but 'satellite_actual' missing from batch.")
 
         enc = model.sat_encoder
-        expected_channels = enc.in_channels - int(model.add_image_embedding_channel)
-
-        expected_shape = (
-            batch["satellite_actual"].shape[0],
-            enc.sequence_length,
-            expected_channels,
-            enc.image_size_pixels,
-            enc.image_size_pixels,
-        )
-        actual_shape = tuple(batch["satellite_actual"].shape)
-        if actual_shape != expected_shape:
-            raise ValueError(
-                f"Satellite shape mismatch: expected {expected_shape}, got {actual_shape}"
+        exp_ch = enc.in_channels - int(model.add_image_embedding_channel)
+        _, actual_seq, actual_ch, h, w = sat_data.shape
+
+        if actual_ch != exp_ch or h != enc.image_size_pixels or w != enc.image_size_pixels:
+            msg = (
+                f"Sat mismatch: Exp {exp_ch}ch, {enc.image_size_pixels}px. "
+                f"Got {actual_ch}ch, {h}x{w}px"
             )
+            raise ValueError(msg)
+
+        if actual_seq < enc.sequence_length:
+            raise ValueError(f"Sat too short: exp {enc.sequence_length}, got {actual_seq}")
 
     key = "generation"
     if key in batch:

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

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

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

@@ -2,7 +2,7 @@ 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=aVcalRAUO7TIa6AepRGmt0zPx9e1h2Xed34uCF_yg50,5887
+pvnet/utils.py,sha256=lalHiFzqsJyje3pJp0_rhRJ7w3e5av6W8dYn9I5O7oc,5765
 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
@@ -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.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,,
+pvnet-5.3.8.dist-info/licenses/LICENSE,sha256=tKUnlSmcLBWMJWkHx3UjZGdrjs9LidGwLo0jsBUBAwU,1077
+pvnet-5.3.8.dist-info/METADATA,sha256=dbj7rAWRN7ZAdNvPr2prEHGwGpA5wNA66UvFrAAJKI4,16479
+pvnet-5.3.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pvnet-5.3.8.dist-info/top_level.txt,sha256=4mg6WjeW05SR7pg3-Q4JRE2yAoutHYpspOsiUzYVNv0,6
+pvnet-5.3.8.dist-info/RECORD,,

{pvnet-5.3.6.dist-info → pvnet-5.3.8.dist-info}/WHEEL

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