PVNet 5.3.20__tar.gz → 5.3.22__tar.gz

{pvnet-5.3.20 → pvnet-5.3.22}/PKG-INFO

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

{pvnet-5.3.20 → pvnet-5.3.22}/PVNet.egg-info/PKG-INFO

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

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/datamodule.py

@@ -60,18 +60,18 @@ class PVNetDataModule(LightningDataModule):
         self.seed = seed
         self.dataset_pickle_dir = dataset_pickle_dir
 
-        self._common_dataloader_kwargs = dict(
-            batch_size=batch_size,
-            batch_sampler=None,
-            num_workers=num_workers,
-            collate_fn=collate_fn,
-            pin_memory=pin_memory,
-            timeout=0,
-            worker_init_fn=None,
-            prefetch_factor=prefetch_factor,
-            persistent_workers=persistent_workers,
-            multiprocessing_context="spawn" if num_workers > 0 else None,
-        )
+        self._common_dataloader_kwargs = {
+            "batch_size": batch_size,
+            "batch_sampler": None,
+            "num_workers": num_workers,
+            "collate_fn": collate_fn,
+            "pin_memory": pin_memory,
+            "timeout": 0,
+            "worker_init_fn": None,
+            "prefetch_factor": prefetch_factor,
+            "persistent_workers": persistent_workers,
+            "multiprocessing_context": "spawn" if num_workers > 0 else None,
+        }
 
     def setup(self, stage: str | None = None):
         """Called once to prepare the datasets."""

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/models/base_model.py

@@ -23,6 +23,7 @@ from pvnet.utils import (
     PYTORCH_WEIGHTS_NAME,
 )
 
+logger = logging.getLogger(__name__)
 
 def fill_config_paths_with_placeholder(config: dict, placeholder: str = "PLACEHOLDER") -> dict:
     """Modify the config in place to fill data paths with placeholder strings.
@@ -34,10 +35,9 @@ def fill_config_paths_with_placeholder(config: dict, placeholder: str = "PLACEHO
     input_config = config["input_data"]
 
     for source in ["generation", "satellite"]:
-        if source in input_config:
-            # If not empty - i.e. if used
-            if input_config[source]["zarr_path"] != "":
-                input_config[source]["zarr_path"] = f"{placeholder}.zarr"
+        # If source present but path not empty
+        if (source in input_config) and (input_config[source]["zarr_path"] != ""):
+            input_config[source]["zarr_path"] = f"{placeholder}.zarr"
 
     if "nwp" in input_config:
         for source in input_config["nwp"]:
@@ -101,8 +101,7 @@ def minimize_config_for_model(config: dict, model: "BaseModel") -> dict:
                 + (model.sat_encoder.sequence_length - 1) * sat_config["time_resolution_minutes"]
             )
 
-    if "pv" in input_config:
-        if not model.include_pv:
+    if ("pv" in input_config) and (not model.include_pv):
             del input_config["pv"]
 
     if "generation" in input_config:
@@ -166,11 +165,11 @@ def download_from_hf(
                 raise Exception(
                     f"Failed to download {filename} from {repo_id} after {max_retries} attempts."
                 ) from e
-            logging.warning(
-                (
+            logger.warning(
+                
                     f"Attempt {attempt}/{max_retries} failed to download {filename} "
                     f"from {repo_id}. Retrying in {wait_time} seconds..."
-                )
+                
             )
             time.sleep(wait_time)
 
@@ -343,7 +342,6 @@ class HuggingfaceMixin:
 
             print(message)
 
-        return
 
     @staticmethod
     def create_hugging_face_model_card(

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/models/ensemble.py

@@ -42,7 +42,7 @@ class Ensemble(BaseModel):
             forecast_minutes,
             interval_minutes,
         ]:
-            assert all([p == param_list[0] for p in param_list]), param_list
+            assert all(p == param_list[0] for p in param_list), param_list
 
         super().__init__(
             history_minutes=history_minutes[0],

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/models/late_fusion/encoders/basic_blocks.py

@@ -36,7 +36,6 @@ class AbstractNWPSatelliteEncoder(nn.Module, metaclass=ABCMeta):
     @abstractmethod
     def forward(self):
         """Run model forward"""
-        pass
 
 
 class ResidualConv3dBlock(nn.Module):

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/models/late_fusion/encoders/encoders3d.py

@@ -84,7 +84,7 @@ class DefaultPVNet(AbstractNWPSatelliteEncoder):
             ),
             nn.ELU(),
         ]
-        for _ in range(0, number_of_conv3d_layers - 1):
+        for _ in range(number_of_conv3d_layers - 1):
             conv_layers += [
                 nn.Conv3d(
                     in_channels=conv3d_channels,

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/models/late_fusion/late_fusion.py

@@ -191,7 +191,7 @@ class LateFusionModel(BaseModel):
             if add_image_embedding_channel:
                 self.nwp_embed_dict = torch.nn.ModuleDict()
 
-            for nwp_source in nwp_encoders_dict.keys():
+            for nwp_source in nwp_encoders_dict:
                 nwp_sequence_len = (
                     nwp_history_minutes[nwp_source] // nwp_interval_minutes[nwp_source]
                     + nwp_forecast_minutes[nwp_source] // nwp_interval_minutes[nwp_source]

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/models/late_fusion/linear_networks/basic_blocks.py

@@ -29,12 +29,11 @@ class AbstractLinearNetwork(nn.Module, metaclass=ABCMeta):
         elif isinstance(x, torch.Tensor):
             return x
         else:
-            raise ValueError(f"Input of unexpected type {type(x)}")
+            raise TypeError(f"Input of unexpected type {type(x)}")
 
     @abstractmethod
     def forward(self, x: OrderedDict[str, torch.Tensor] | torch.Tensor) -> torch.Tensor:
         """Run model forward"""
-        pass
 
 
 class ResidualLinearBlock(nn.Module):

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/models/late_fusion/site_encoders/basic_blocks.py

@@ -33,4 +33,3 @@ class AbstractSitesEncoder(nn.Module, metaclass=ABCMeta):
     @abstractmethod
     def forward(self) -> torch.Tensor:
         """Run model forward"""
-        pass

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/optimizers.py

@@ -67,7 +67,6 @@ class AbstractOptimizer(ABC):
     @abstractmethod
     def __call__(self, model: Module):
         """Abstract call"""
-        pass
 
 
 class Adam(AbstractOptimizer):
@@ -166,7 +165,7 @@ class AdamWReduceLROnPlateau(AbstractOptimizer):
 
         group_args = []
 
-        for key in self.lr.keys():
+        for key in self.lr:
             if key == "default":
                 continue
 

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/training/lightning_module.py

@@ -153,7 +153,9 @@ class PVNetLightningModule(pl.LightningModule):
         """Internally store the validation predictions"""
 
         y = batch["generation"][:, -self.model.forecast_len :].cpu().numpy()
-        y_hat = y_hat.cpu().numpy()
+        # .float() as numpy has no bfloat16 dtype
+        # Fails under precision="bf16-mixed"
+        y_hat = y_hat.float().cpu().numpy()
         ids = batch["location_id"].cpu().numpy()
         init_times_utc = pd.to_datetime(
             batch["time_utc"][:, self.model.history_len + 1].cpu().numpy().astype("datetime64[ns]")
@@ -166,15 +168,15 @@ class PVNetLightningModule(pl.LightningModule):
             y_hat = y_hat[..., None]
 
         ds_preds_batch = xr.Dataset(
-            data_vars=dict(
-                y_hat=(["sample_num", "forecast_step", "p_level"], y_hat),
-                y=(["sample_num", "forecast_step"], y),
-            ),
-            coords=dict(
-                ids=("sample_num", ids),
-                init_times_utc=("sample_num", init_times_utc),
-                p_level=p_levels,
-            ),
+            data_vars={
+                "y_hat": (["sample_num", "forecast_step", "p_level"], y_hat),
+                "y": (["sample_num", "forecast_step"], y),
+            },
+            coords={
+                "ids": ("sample_num", ids),
+                "init_times_utc": ("sample_num", init_times_utc),
+                "p_level": p_levels,
+            },
         )
         self.all_val_results.append(ds_preds_batch)
 

{pvnet-5.3.20 → pvnet-5.3.22}/pvnet/training/train.py

@@ -64,13 +64,13 @@ def train(config: DictConfig) -> None:
     # Init lightning loggers
     loggers: list[Logger] = []
     if "logger" in config:
-        for _, lg_conf in config.logger.items():
+        for lg_conf in config.logger.values():
             loggers.append(hydra.utils.instantiate(lg_conf))
 
     # Init lightning callbacks
     callbacks: list[Callback] = []
     if "callbacks" in config:
-        for _, cb_conf in config.callbacks.items():
+        for cb_conf in config.callbacks.values():
             callbacks.append(hydra.utils.instantiate(cb_conf))
 
     # Align the wandb id with the checkpoint path

{pvnet-5.3.20 → pvnet-5.3.22}/pyproject.toml

@@ -80,7 +80,10 @@ target-version = "py310"
 
 [tool.ruff.lint]
 extend-select = ["E", "D", "I"]
-ignore = ["D200","D202","D210","D212","D415","D105"]
+ignore = ["D200","D202","D210","D212","D415","D105",
+    "TRY002", # Create your own exception
+    "B008", # Do not perform function call typer.Argument
+    ]
 
 [tool.ruff.lint.mccabe]
 # Unlike Flake8, default to a complexity level of 10.