PVNet 4.0.2__tar.gz → 4.0.4__tar.gz

{pvnet-4.0.2 → pvnet-4.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PVNet
-Version: 4.0.2
+Version: 4.0.4
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
@@ -34,9 +34,7 @@ Requires-Dist: rich
 Requires-Dist: gcsfs
 Provides-Extra: dev
 Requires-Dist: pvlive-api; extra == "dev"
-Requires-Dist: black; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: isort; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -46,6 +44,7 @@ Requires-Dist: pytorch-tabnet; extra == "all-models"
 Requires-Dist: efficientnet_pytorch; extra == "all-models"
 Provides-Extra: all
 Requires-Dist: PVNet[all_models,dev]; extra == "all"
+Dynamic: license-file
 
 # PVNet 2.1
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->

{pvnet-4.0.2 → pvnet-4.0.4}/PVNet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: PVNet
-Version: 4.0.2
+Version: 4.0.4
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
@@ -34,9 +34,7 @@ Requires-Dist: rich
 Requires-Dist: gcsfs
 Provides-Extra: dev
 Requires-Dist: pvlive-api; extra == "dev"
-Requires-Dist: black; extra == "dev"
-Requires-Dist: flake8; extra == "dev"
-Requires-Dist: isort; extra == "dev"
+Requires-Dist: ruff; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
@@ -46,6 +44,7 @@ Requires-Dist: pytorch-tabnet; extra == "all-models"
 Requires-Dist: efficientnet_pytorch; extra == "all-models"
 Provides-Extra: all
 Requires-Dist: PVNet[all_models,dev]; extra == "all"
+Dynamic: license-file
 
 # PVNet 2.1
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->

{pvnet-4.0.2 → pvnet-4.0.4}/PVNet.egg-info/requires.txt

@@ -35,9 +35,7 @@ efficientnet_pytorch
 
 [dev]
 pvlive-api
-black
-flake8
-isort
+ruff
 mypy
 pre-commit
 pytest

pvnet-4.0.4/pvnet/__init__.py

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

{pvnet-4.0.2 → pvnet-4.0.4}/pvnet/models/multimodal/multimodal_base.py

@@ -1,4 +1,6 @@
 """Base model class for multimodal model and unimodal teacher"""
+import copy
+
 from torchvision.transforms.functional import center_crop
 
 from pvnet.models.base_model import BaseModel
@@ -8,26 +10,29 @@ class MultimodalBaseModel(BaseModel):
     """Base model class for multimodal model and unimodal teacher"""
 
     def _adapt_batch(self, batch):
-        """Slice batches into appropriate shapes for model
+        """Slice batches into appropriate shapes for model.
 
+        Returns a new batch dictionary with adapted data, leaving the original batch unchanged.
         We make some specific assumptions about the original batch and the derived sliced batch:
         - We are only limiting the future projections. I.e. we are never shrinking the batch from
           the left hand side of the time axis, only slicing it from the right
         - We are only shrinking the spatial crop of the satellite and NWP data
 
         """
+        # Create a copy of the batch to avoid modifying the original
+        new_batch = {key: copy.deepcopy(value) for key, value in batch.items()}
 
-        if "gsp" in batch.keys():
+        if "gsp" in new_batch.keys():
             # Slice off the end of the GSP data
             gsp_len = self.forecast_len + self.history_len + 1
-            batch["gsp"] = batch["gsp"][:, :gsp_len]
-            batch["gsp_time_utc"] = batch["gsp_time_utc"][:, :gsp_len]
+            new_batch["gsp"] = new_batch["gsp"][:, :gsp_len]
+            new_batch["gsp_time_utc"] = new_batch["gsp_time_utc"][:, :gsp_len]
 
         if self.include_sat:
             # Slice off the end of the satellite data and spatially crop
             # Shape: batch_size, seq_length, channel, height, width
-            batch["satellite_actual"] = center_crop(
-                batch["satellite_actual"][:, : self.sat_sequence_len],
+            new_batch["satellite_actual"] = center_crop(
+                new_batch["satellite_actual"][:, : self.sat_sequence_len],
                 output_size=self.sat_encoder.image_size_pixels,
             )
 
@@ -35,8 +40,8 @@ class MultimodalBaseModel(BaseModel):
             # Slice off the end of the NWP data and spatially crop
             for nwp_source in self.nwp_encoders_dict:
                 # shape: batch_size, seq_len, n_chans, height, width
-                batch["nwp"][nwp_source]["nwp"] = center_crop(
-                    batch["nwp"][nwp_source]["nwp"],
+                new_batch["nwp"][nwp_source]["nwp"] = center_crop(
+                    new_batch["nwp"][nwp_source]["nwp"],
                     output_size=self.nwp_encoders_dict[nwp_source].image_size_pixels,
                 )[:, : self.nwp_encoders_dict[nwp_source].sequence_length]
 
@@ -44,8 +49,8 @@ class MultimodalBaseModel(BaseModel):
             # Slice off the end of the solar coords data
             for s in ["solar_azimuth", "solar_elevation"]:
                 key = f"{self._target_key}_{s}"
-                if key in batch.keys():
+                if key in new_batch.keys():
                     sun_len = self.forecast_len + self.history_len + 1
-                    batch[key] = batch[key][:, :sun_len]
+                    new_batch[key] = new_batch[key][:, :sun_len]
 
-        return batch
+        return new_batch

{pvnet-4.0.2 → pvnet-4.0.4}/pyproject.toml

@@ -45,9 +45,7 @@ readme = {file = "README.md", content-type = "text/markdown"}
 [project.optional-dependencies]
 dev=[
     "pvlive-api",
-    "black",
-    "flake8",
-    "isort",
+    "ruff",
     "mypy",
     "pre-commit",
     "pytest",
@@ -86,4 +84,53 @@ testpaths = [
 
 [tool.ruff]
 line-length = 100
-exclude = [".ipynb_checkpoints", "tests", "configs.example"]
+exclude = [
+    ".ipynb_checkpoints",
+    "configs.example",
+    ".bzr",
+    ".direnv",
+    ".eggs",
+    ".git",
+    ".hg",
+    ".mypy_cache",
+    ".nox",
+    ".pants.d",
+    ".pytype",
+    ".ruff_cache",
+    ".svn",
+    ".tox",
+    ".venv",
+    "__pypackages__",
+    "_build",
+    "buck-out",
+    "build",
+    "dist",
+    "node_modules",
+    "venv",
+    "tests",
+]
+
+# Assume Python 3.10.
+target-version = "py310"
+fix = false
+
+[tool.ruff.lint]
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+# Allow autofix for all enabled rules (when `--fix`) is provided.
+fixable = ["A", "B", "C", "D", "E", "F", "I"]
+unfixable = []
+select = ["E", "F", "D", "I"]
+ignore-init-module-imports = true
+# Enable pycodestyle (`E`) and Pyflakes (`F`) codes by default.
+ignore = ["D200","D202","D210","D212","D415","D105",]
+
+[tool.ruff.lint.mccabe]
+# Unlike Flake8, default to a complexity level of 10.
+max-complexity = 10
+
+[tool.ruff.lint.pydocstyle]
+# Use Google-style docstrings.
+convention = "google"
+
+[tool.ruff.lint.per-file-ignores]
+"__init__.py" = ["F401", "E402"]

pvnet-4.0.2/pvnet/__init__.py

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