PVNet 4.0.7__tar.gz → 4.0.9__tar.gz

{pvnet-4.0.7 → pvnet-4.0.9}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 4.0.7
+Version: 4.0.9
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf_data_sampler==0.1.11
+Requires-Dist: ocf-data-sampler==0.1.16
 Requires-Dist: ocf_datapipes>=3.3.34
 Requires-Dist: ocf_ml_metrics>=0.0.11
 Requires-Dist: numpy

{pvnet-4.0.7 → pvnet-4.0.9}/PVNet.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 4.0.7
+Version: 4.0.9
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf_data_sampler==0.1.11
+Requires-Dist: ocf-data-sampler==0.1.16
 Requires-Dist: ocf_datapipes>=3.3.34
 Requires-Dist: ocf_ml_metrics>=0.0.11
 Requires-Dist: numpy

{pvnet-4.0.7 → pvnet-4.0.9}/PVNet.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ocf_data_sampler==0.1.11
+ocf-data-sampler==0.1.16
 ocf_datapipes>=3.3.34
 ocf_ml_metrics>=0.0.11
 numpy

pvnet-4.0.9/pvnet/__init__.py

@@ -0,0 +1,2 @@
+"""PVNet"""
+__version__ = "4.0.9"

{pvnet-4.0.7 → pvnet-4.0.9}/pvnet/models/multimodal/multimodal.py

@@ -345,10 +345,11 @@ class Model(MultimodalBaseModel):
             modes["id"] = id_embedding
 
         if self.include_sun:
+            # Use only new direct keys
             sun = torch.cat(
                 (
-                    x[f"{self._target_key}_solar_azimuth"],
-                    x[f"{self._target_key}_solar_elevation"],
+                    x["solar_azimuth"],
+                    x["solar_elevation"],
                 ),
                 dim=1,
             ).float()

{pvnet-4.0.7 → pvnet-4.0.9}/pvnet/models/multimodal/multimodal_base.py

@@ -46,11 +46,10 @@ class MultimodalBaseModel(BaseModel):
                 )[:, : self.nwp_encoders_dict[nwp_source].sequence_length]
 
         if self.include_sun:
-            # Slice off the end of the solar coords data
+            sun_len = self.forecast_len + self.history_len + 1
+            # Slice off end of solar coords
             for s in ["solar_azimuth", "solar_elevation"]:
-                key = f"{self._target_key}_{s}"
-                if key in new_batch.keys():
-                    sun_len = self.forecast_len + self.history_len + 1
-                    new_batch[key] = new_batch[key][:, :sun_len]
+                if s in new_batch.keys():
+                    new_batch[s] = new_batch[s][:, :sun_len]
 
         return new_batch

{pvnet-4.0.7 → pvnet-4.0.9}/pvnet/models/multimodal/site_encoders/encoders.py

@@ -4,7 +4,6 @@
 
 import einops
 import torch
-from ocf_datapipes.batch import BatchKey
 from torch import nn
 
 from pvnet.models.multimodal.linear_networks.networks import ResFCNet2
@@ -75,13 +74,13 @@ class SimpleLearnedAggregator(AbstractSitesEncoder):
         )
 
     def _calculate_attention(self, x):
-        gsp_ids = x[BatchKey.gsp_id].squeeze().int()
+        gsp_ids = x["gsp_id"].squeeze().int()
         attention = self._attention_network(gsp_ids)
         return attention
 
     def _encode_value(self, x):
         # Shape: [batch size, sequence length, PV site]
-        pv_site_seqs = x[BatchKey.pv].float()
+        pv_site_seqs = x["pv"].float()
         batch_size = pv_site_seqs.shape[0]
 
         pv_site_seqs = pv_site_seqs.swapaxes(1, 2).flatten(0, 1)

{pvnet-4.0.7 → pvnet-4.0.9}/pvnet/models/multimodal/unimodal_teacher.py

@@ -305,10 +305,11 @@ class Model(MultimodalBaseModel):
             modes["id"] = id_embedding
 
         if self.include_sun:
+            # Use only new direct keys
             sun = torch.cat(
                 (
-                    x["gsp_solar_azimuth"],
-                    x["gsp_solar_elevation"],
+                    x["solar_azimuth"],
+                    x["solar_elevation"],
                 ),
                 dim=1,
             ).float()

{pvnet-4.0.7 → pvnet-4.0.9}/pyproject.toml

@@ -6,7 +6,7 @@ dynamic = ["version", "readme"]
 license={file="LICENCE"}
 
 dependencies = [
-    "ocf_data_sampler==0.1.11",
+    "ocf-data-sampler==0.1.16",
     "ocf_datapipes>=3.3.34",
     "ocf_ml_metrics>=0.0.11",
     "numpy",

{pvnet-4.0.7 → pvnet-4.0.9}/tests/test_end2end.py

@@ -1,9 +1,13 @@
 import lightning
 
-
 def test_model_trainer_fit(multimodal_model, sample_train_val_datamodule):
+    """Test end-to-end training."""
+    # Get a sample batch for testing
     batch = next(iter(sample_train_val_datamodule.train_dataloader()))
+
+    # Run a forward pass to verify the model works with the data
     y = multimodal_model(batch)
 
+    # Train the model for one batch
     trainer = lightning.pytorch.trainer.trainer.Trainer(fast_dev_run=True, accelerator="cpu")
     trainer.fit(model=multimodal_model, datamodule=sample_train_val_datamodule)

pvnet-4.0.7/pvnet/__init__.py

@@ -1,2 +0,0 @@
-"""PVNet"""
-__version__ = "4.0.7"