PVNet 3.0.27__tar.gz → 3.0.29__tar.gz

{pvnet-3.0.27 → pvnet-3.0.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 3.0.27
+Version: 3.0.29
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org

{pvnet-3.0.27 → pvnet-3.0.29}/PVNet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PVNet
-Version: 3.0.27
+Version: 3.0.29
 Summary: PVNet
 Author: Peter Dudfield
 Author-email: info@openclimatefix.org

pvnet-3.0.29/pvnet/__init__.py

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

{pvnet-3.0.27 → pvnet-3.0.29}/pvnet/data/pv_site_datamodule.py

@@ -2,7 +2,12 @@
 import glob
 
 from ocf_datapipes.batch import BatchKey, batch_to_tensor, stack_np_examples_into_batch
-from ocf_datapipes.training.pvnet_site import pvnet_site_netcdf_datapipe
+from ocf_datapipes.training.pvnet_site import (
+    pvnet_site_datapipe,
+    pvnet_site_netcdf_datapipe,
+    split_dataset_dict_dp,
+    uncombine_from_single_dataset,
+)
 
 from pvnet.data.base import BaseDataModule
 
@@ -11,9 +16,13 @@ class PVSiteDataModule(BaseDataModule):
     """Datamodule for training pvnet site and using pvnet site pipeline in `ocf_datapipes`."""
 
     def _get_datapipe(self, start_time, end_time):
-        data_pipeline = pvnet_site_netcdf_datapipe(
-            keys=["pv", "nwp"],
+        data_pipeline = pvnet_site_datapipe(
+            self.configuration,
+            start_time=start_time,
+            end_time=end_time,
         )
+        data_pipeline = data_pipeline.map(uncombine_from_single_dataset).map(split_dataset_dict_dp)
+        data_pipeline = data_pipeline.pvnet_site_convert_to_numpy_batch()
 
         data_pipeline = (
             data_pipeline.batch(self.batch_size)

{pvnet-3.0.27 → pvnet-3.0.29}/pvnet/models/base_model.py

@@ -506,7 +506,11 @@ class BaseModel(pl.LightningModule, PVNetModelHubMixin):
 
         plot_name = f"val_forecast_samples/batch_idx_{accum_batch_num}_{plot_suffix}"
 
-        self.logger.experiment.log({plot_name: wandb.Image(fig)})
+        try:
+            self.logger.experiment.log({plot_name: wandb.Image(fig)})
+        except Exception as e:
+            print(f"Failed to log {plot_name} to wandb")
+            print(e)
         plt.close(fig)
 
     def validation_step(self, batch: dict, batch_idx):
@@ -580,15 +584,18 @@ class BaseModel(pl.LightningModule, PVNetModelHubMixin):
         # Create the horizon accuracy curve
         if isinstance(self.logger, pl.loggers.WandbLogger):
             per_step_losses = [[i, horizon_maes_dict[i]] for i in range(self.forecast_len)]
-
-            table = wandb.Table(data=per_step_losses, columns=["horizon_step", "MAE"])
-            wandb.log(
-                {
-                    "horizon_loss_curve": wandb.plot.line(
-                        table, "horizon_step", "MAE", title="Horizon loss curve"
-                    )
-                },
-            )
+            try:
+                table = wandb.Table(data=per_step_losses, columns=["horizon_step", "MAE"])
+                wandb.log(
+                    {
+                        "horizon_loss_curve": wandb.plot.line(
+                            table, "horizon_step", "MAE", title="Horizon loss curve"
+                        )
+                    },
+                )
+            except Exception as e:
+                print("Failed to log horizon_loss_curve to wandb")
+                print(e)
 
     def test_step(self, batch, batch_idx):
         """Run test step"""

pvnet-3.0.27/pvnet/__init__.py

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