From 97e05577b3a640a2c1a56662f691e74462bcb5ea Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:20:00 +0000 Subject: [PATCH 1/2] [pre-commit.ci] pre-commit autoupdate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit updates: - [github.com/pre-commit/pre-commit-hooks: v4.4.0 → v5.0.0](https://github.com/pre-commit/pre-commit-hooks/compare/v4.4.0...v5.0.0) - [github.com/astral-sh/ruff-pre-commit: v0.0.286 → v0.9.7](https://github.com/astral-sh/ruff-pre-commit/compare/v0.0.286...v0.9.7) - [github.com/psf/black: 23.7.0 → 25.1.0](https://github.com/psf/black/compare/23.7.0...25.1.0) - [github.com/pre-commit/mirrors-prettier: v3.0.2 → v4.0.0-alpha.8](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.2...v4.0.0-alpha.8) --- .pre-commit-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index e191b290..8e3d76d6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -3,7 +3,7 @@ default_language_version: repos: - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.4.0 + rev: v5.0.0 hooks: # list of supported hooks: https://pre-commit.com/hooks.html - id: trailing-whitespace @@ -14,18 +14,18 @@ repos: # python code formatting/linting - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. - rev: "v0.0.286" + rev: "v0.9.7" hooks: - id: ruff args: [--fix] - repo: https://github.com/psf/black - rev: 23.7.0 + rev: 25.1.0 hooks: - id: black args: [--line-length, "100"] # yaml formatting - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.2 + rev: v4.0.0-alpha.8 hooks: - id: prettier types: [yaml] From 6b0ae0892a3aef536690e899132082e9045c9779 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:20:12 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- experiments/india/004_n_training_samples/log-plot.py | 2 +- pvnet/__init__.py | 1 + pvnet/callbacks.py | 4 ++-- pvnet/data/__init__.py | 1 + pvnet/data/base_datamodule.py | 2 +- pvnet/data/site_datamodule.py | 2 +- pvnet/data/uk_regional_datamodule.py | 2 +- pvnet/load_model.py | 3 ++- pvnet/models/base_model.py | 1 + pvnet/models/baseline/last_value.py | 1 - pvnet/models/baseline/single_value.py | 1 + pvnet/models/ensemble.py | 1 + pvnet/models/multimodal/encoders/basic_blocks.py | 1 + pvnet/models/multimodal/encoders/encoders3d.py | 4 ++-- pvnet/models/multimodal/encoders/encodersRNN.py | 3 +-- pvnet/models/multimodal/linear_networks/basic_blocks.py | 1 + pvnet/models/multimodal/linear_networks/networks.py | 1 + pvnet/models/multimodal/multimodal_base.py | 1 + pvnet/models/multimodal/site_encoders/basic_blocks.py | 1 + pvnet/models/multimodal/site_encoders/encoders.py | 4 +--- pvnet/optimizers.py | 3 +-- pvnet/training.py | 1 + pvnet/utils.py | 1 + run.py | 3 +-- scripts/save_concurrent_samples.py | 1 + 25 files changed, 27 insertions(+), 19 deletions(-) diff --git a/experiments/india/004_n_training_samples/log-plot.py b/experiments/india/004_n_training_samples/log-plot.py index e876384a..04b74a45 100644 --- a/experiments/india/004_n_training_samples/log-plot.py +++ b/experiments/india/004_n_training_samples/log-plot.py @@ -1,4 +1,4 @@ -""" Small script to make MAE vs number of batches plot""" +"""Small script to make MAE vs number of batches plot""" import pandas as df import plotly.graph_objects as go diff --git a/pvnet/__init__.py b/pvnet/__init__.py index fa79c0ec..2638ef6a 100644 --- a/pvnet/__init__.py +++ b/pvnet/__init__.py @@ -1,2 +1,3 @@ """PVNet""" + __version__ = "4.0.1" diff --git a/pvnet/callbacks.py b/pvnet/callbacks.py index 0455d774..43254924 100644 --- a/pvnet/callbacks.py +++ b/pvnet/callbacks.py @@ -1,5 +1,5 @@ -"""Custom callbacks -""" +"""Custom callbacks""" + from lightning.pytorch import Trainer from lightning.pytorch.callbacks import BaseFinetuning, EarlyStopping, LearningRateFinder from lightning.pytorch.trainer.states import TrainerFn diff --git a/pvnet/data/__init__.py b/pvnet/data/__init__.py index dac616d3..7610fc55 100644 --- a/pvnet/data/__init__.py +++ b/pvnet/data/__init__.py @@ -1,3 +1,4 @@ """Data parts""" + from .site_datamodule import SiteDataModule from .uk_regional_datamodule import DataModule diff --git a/pvnet/data/base_datamodule.py b/pvnet/data/base_datamodule.py index 1e12629f..5007ed36 100644 --- a/pvnet/data/base_datamodule.py +++ b/pvnet/data/base_datamodule.py @@ -1,4 +1,4 @@ -""" Data module for pytorch lightning """ +"""Data module for pytorch lightning""" from glob import glob diff --git a/pvnet/data/site_datamodule.py b/pvnet/data/site_datamodule.py index 674528c5..9a300ba6 100644 --- a/pvnet/data/site_datamodule.py +++ b/pvnet/data/site_datamodule.py @@ -1,4 +1,4 @@ -""" Data module for pytorch lightning """ +"""Data module for pytorch lightning""" from ocf_data_sampler.sample.site import SiteSample from ocf_data_sampler.torch_datasets.datasets.site import SitesDataset diff --git a/pvnet/data/uk_regional_datamodule.py b/pvnet/data/uk_regional_datamodule.py index af485d7f..56626371 100644 --- a/pvnet/data/uk_regional_datamodule.py +++ b/pvnet/data/uk_regional_datamodule.py @@ -1,4 +1,4 @@ -""" Data module for pytorch lightning """ +"""Data module for pytorch lightning""" from ocf_data_sampler.sample.uk_regional import UKRegionalSample from ocf_data_sampler.torch_datasets.datasets.pvnet_uk import PVNetUKRegionalDataset diff --git a/pvnet/load_model.py b/pvnet/load_model.py index ba6de363..d916db8c 100644 --- a/pvnet/load_model.py +++ b/pvnet/load_model.py @@ -1,4 +1,5 @@ -""" Load a model from its checkpoint directory """ +"""Load a model from its checkpoint directory""" + import glob import os diff --git a/pvnet/models/base_model.py b/pvnet/models/base_model.py index 388d3b83..4ec0d52f 100644 --- a/pvnet/models/base_model.py +++ b/pvnet/models/base_model.py @@ -1,4 +1,5 @@ """Base model for all PVNet submodels""" + import json import logging import os diff --git a/pvnet/models/baseline/last_value.py b/pvnet/models/baseline/last_value.py index 454b5831..e7a14eb0 100644 --- a/pvnet/models/baseline/last_value.py +++ b/pvnet/models/baseline/last_value.py @@ -1,6 +1,5 @@ """Persistence model""" - import pvnet from pvnet.models.base_model import BaseModel from pvnet.optimizers import AbstractOptimizer diff --git a/pvnet/models/baseline/single_value.py b/pvnet/models/baseline/single_value.py index c24aebdc..23e45143 100644 --- a/pvnet/models/baseline/single_value.py +++ b/pvnet/models/baseline/single_value.py @@ -1,4 +1,5 @@ """Average value model""" + import torch from torch import nn diff --git a/pvnet/models/ensemble.py b/pvnet/models/ensemble.py index 6dab2b90..c842fe03 100644 --- a/pvnet/models/ensemble.py +++ b/pvnet/models/ensemble.py @@ -1,4 +1,5 @@ """Model which uses mutliple prediction heads""" + from typing import Optional import torch diff --git a/pvnet/models/multimodal/encoders/basic_blocks.py b/pvnet/models/multimodal/encoders/basic_blocks.py index 2173267e..db641e6c 100644 --- a/pvnet/models/multimodal/encoders/basic_blocks.py +++ b/pvnet/models/multimodal/encoders/basic_blocks.py @@ -1,4 +1,5 @@ """Basic blocks for image sequence encoders""" + from abc import ABCMeta, abstractmethod import torch diff --git a/pvnet/models/multimodal/encoders/encoders3d.py b/pvnet/models/multimodal/encoders/encoders3d.py index b0df28ab..a04ddaa4 100644 --- a/pvnet/models/multimodal/encoders/encoders3d.py +++ b/pvnet/models/multimodal/encoders/encoders3d.py @@ -1,5 +1,5 @@ -"""Encoder modules for the satellite/NWP data based on 3D concolutions. -""" +"""Encoder modules for the satellite/NWP data based on 3D concolutions.""" + from typing import List, Union import torch diff --git a/pvnet/models/multimodal/encoders/encodersRNN.py b/pvnet/models/multimodal/encoders/encodersRNN.py index 37f7cef6..a37a0a58 100644 --- a/pvnet/models/multimodal/encoders/encodersRNN.py +++ b/pvnet/models/multimodal/encoders/encodersRNN.py @@ -1,5 +1,4 @@ -"""Encoder modules for the satellite/NWP data based on recursive and 2D convolutional layers. -""" +"""Encoder modules for the satellite/NWP data based on recursive and 2D convolutional layers.""" import torch from torch import nn diff --git a/pvnet/models/multimodal/linear_networks/basic_blocks.py b/pvnet/models/multimodal/linear_networks/basic_blocks.py index c115c9fb..084b585a 100644 --- a/pvnet/models/multimodal/linear_networks/basic_blocks.py +++ b/pvnet/models/multimodal/linear_networks/basic_blocks.py @@ -1,4 +1,5 @@ """Basic blocks for the lienar networks""" + from abc import ABCMeta, abstractmethod from collections import OrderedDict diff --git a/pvnet/models/multimodal/linear_networks/networks.py b/pvnet/models/multimodal/linear_networks/networks.py index 69c21d82..486a7a28 100644 --- a/pvnet/models/multimodal/linear_networks/networks.py +++ b/pvnet/models/multimodal/linear_networks/networks.py @@ -1,4 +1,5 @@ """Linear networks used for the fusion model""" + from torch import nn, rand from pvnet.models.multimodal.linear_networks.basic_blocks import ( diff --git a/pvnet/models/multimodal/multimodal_base.py b/pvnet/models/multimodal/multimodal_base.py index 0a710ebf..79c230db 100644 --- a/pvnet/models/multimodal/multimodal_base.py +++ b/pvnet/models/multimodal/multimodal_base.py @@ -1,4 +1,5 @@ """Base model class for multimodal model and unimodal teacher""" + from torchvision.transforms.functional import center_crop from pvnet.models.base_model import BaseModel diff --git a/pvnet/models/multimodal/site_encoders/basic_blocks.py b/pvnet/models/multimodal/site_encoders/basic_blocks.py index 525ba74a..083ae4fd 100644 --- a/pvnet/models/multimodal/site_encoders/basic_blocks.py +++ b/pvnet/models/multimodal/site_encoders/basic_blocks.py @@ -1,4 +1,5 @@ """Basic blocks for PV-site encoders""" + from abc import ABCMeta, abstractmethod from torch import nn diff --git a/pvnet/models/multimodal/site_encoders/encoders.py b/pvnet/models/multimodal/site_encoders/encoders.py index 06176145..80ffc837 100644 --- a/pvnet/models/multimodal/site_encoders/encoders.py +++ b/pvnet/models/multimodal/site_encoders/encoders.py @@ -1,6 +1,4 @@ -"""Encoder modules for the site-level PV data. - -""" +"""Encoder modules for the site-level PV data.""" import einops import torch diff --git a/pvnet/optimizers.py b/pvnet/optimizers.py index 704f5889..26c826ea 100644 --- a/pvnet/optimizers.py +++ b/pvnet/optimizers.py @@ -1,5 +1,4 @@ -"""Optimizer factory-function classes. -""" +"""Optimizer factory-function classes.""" from abc import ABC, abstractmethod diff --git a/pvnet/training.py b/pvnet/training.py index ea8535e8..486f648a 100644 --- a/pvnet/training.py +++ b/pvnet/training.py @@ -1,4 +1,5 @@ """Training""" + import os import shutil from typing import Optional diff --git a/pvnet/utils.py b/pvnet/utils.py index 833cbc36..1150ed3f 100644 --- a/pvnet/utils.py +++ b/pvnet/utils.py @@ -1,4 +1,5 @@ """Utils""" + import logging import warnings from collections.abc import Sequence diff --git a/run.py b/run.py index eb770895..64d4f938 100644 --- a/run.py +++ b/run.py @@ -1,5 +1,4 @@ -"""Run training -""" +"""Run training""" import os diff --git a/scripts/save_concurrent_samples.py b/scripts/save_concurrent_samples.py index 53eeda0e..a83cb5f7 100644 --- a/scripts/save_concurrent_samples.py +++ b/scripts/save_concurrent_samples.py @@ -15,6 +15,7 @@ ``` """ + # Ensure this block of code runs only in the main process to avoid issues with worker processes. if __name__ == "__main__": import torch.multiprocessing as mp