PVNet 4.1.26__tar.gz → 4.1.28__tar.gz

{pvnet-4.1.26 → pvnet-4.1.28}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 4.1.26
+Version: 4.1.28
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
@@ -33,11 +33,8 @@ Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
-Provides-Extra: all-models
-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"
+Requires-Dist: PVNet[dev]; extra == "all"
 Dynamic: license-file
 
 # PVNet 2.1

{pvnet-4.1.26 → pvnet-4.1.28}/PVNet.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 4.1.26
+Version: 4.1.28
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
 Description-Content-Type: text/markdown
@@ -33,11 +33,8 @@ Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
-Provides-Extra: all-models
-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"
+Requires-Dist: PVNet[dev]; extra == "all"
 Dynamic: license-file
 
 # PVNet 2.1

{pvnet-4.1.26 → pvnet-4.1.28}/PVNet.egg-info/SOURCES.txt

@@ -36,5 +36,4 @@ pvnet/models/multimodal/linear_networks/networks.py
 pvnet/models/multimodal/site_encoders/__init__.py
 pvnet/models/multimodal/site_encoders/basic_blocks.py
 pvnet/models/multimodal/site_encoders/encoders.py
-tests/test_end2end.py
-tests/test_utils.py
+tests/test_end2end.py

{pvnet-4.1.26 → pvnet-4.1.28}/PVNet.egg-info/requires.txt

@@ -21,11 +21,7 @@ rich
 einops
 
 [all]
-PVNet[all_models,dev]
-
-[all_models]
-pytorch-tabnet
-efficientnet_pytorch
+PVNet[dev]
 
 [dev]
 pvlive-api

pvnet-4.1.28/pvnet/__init__.py

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

{pvnet-4.1.26 → pvnet-4.1.28}/pvnet/load_model.py

@@ -10,6 +10,11 @@ from pyaml_env import parse_config
 
 from pvnet.models.ensemble import Ensemble
 from pvnet.models.multimodal.unimodal_teacher import Model as UMTModel
+from pvnet.utils import (
+    DATA_CONFIG_NAME,
+    DATAMODULE_CONFIG_NAME,
+    MODEL_CONFIG_NAME,
+)
 
 
 def get_model_from_checkpoints(
@@ -35,7 +40,7 @@ def get_model_from_checkpoints(
 
     for path in checkpoint_dir_paths:
         # Load the model
-        model_config = parse_config(f"{path}/model_config.yaml")
+        model_config = parse_config(f"{path}/{MODEL_CONFIG_NAME}")
 
         model = hydra.utils.instantiate(model_config)
 
@@ -60,7 +65,7 @@ def get_model_from_checkpoints(
         models.append(model)
 
         # Check for data config
-        data_config = f"{path}/data_config.yaml"
+        data_config = f"{path}/{DATA_CONFIG_NAME}"
 
         if os.path.isfile(data_config):
             data_configs.append(data_config)
@@ -68,7 +73,7 @@ def get_model_from_checkpoints(
             data_configs.append(None)
 
         # check for datamodule config
-        datamodule_config = f"{path}/datamodule_config.yaml"
+        datamodule_config = f"{path}/{DATAMODULE_CONFIG_NAME}"
         if os.path.isfile(datamodule_config):
             datamodule_configs.append(datamodule_config)
         else:

{pvnet-4.1.26 → pvnet-4.1.28}/pvnet/models/base_model.py

@@ -5,7 +5,6 @@ import os
 import tempfile
 import time
 from pathlib import Path
-from typing import Dict, Optional, Union
 
 import hydra
 import lightning.pytorch as pl
@@ -16,25 +15,22 @@ import torch
 import torch.nn.functional as F
 import wandb
 import yaml
-from huggingface_hub import ModelCard, ModelCardData, PyTorchModelHubMixin
-from huggingface_hub.constants import PYTORCH_WEIGHTS_NAME
+from huggingface_hub import ModelCard, ModelCardData
 from huggingface_hub.file_download import hf_hub_download
 from huggingface_hub.hf_api import HfApi
 from ocf_data_sampler.torch_datasets.sample.base import copy_batch_to_device
 from torchvision.transforms.functional import center_crop
 
-from pvnet.models.utils import (
-    BatchAccumulator,
-    MetricAccumulator,
-    PredAccumulator,
-)
+from pvnet.models.utils import BatchAccumulator, MetricAccumulator, PredAccumulator
 from pvnet.optimizers import AbstractOptimizer
-from pvnet.utils import plot_batch_forecasts
-
-DATA_CONFIG_NAME = "data_config.yaml"
-MODEL_CONFIG_NAME = "model_config.yaml"
-DATAMODULE_CONFIG_NAME = "datamodule_config.yaml"
-
+from pvnet.utils import (
+    DATA_CONFIG_NAME,
+    DATAMODULE_CONFIG_NAME,
+    MODEL_CARD_NAME,
+    MODEL_CONFIG_NAME,
+    PYTORCH_WEIGHTS_NAME,
+    plot_batch_forecasts,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -57,7 +53,7 @@ def make_clean_data_config(input_path, output_path, placeholder="PLACEHOLDER"):
     config["general"]["description"] = "Config for training the saved PVNet model"
     config["general"]["name"] = "PVNet current"
 
-    for source in ["gsp", "satellite", "hrvsatellite"]:
+    for source in ["gsp", "satellite"]:
         if source in config["input_data"]:
             # If not empty - i.e. if used
             if config["input_data"][source]["zarr_path"] != "":
@@ -73,11 +69,6 @@ def make_clean_data_config(input_path, output_path, placeholder="PLACEHOLDER"):
             d["pv_filename"] = f"{placeholder}.netcdf"
             d["pv_metadata_filename"] = f"{placeholder}.csv"
 
-    if "sensor" in config["input_data"]:
-        # If not empty - i.e. if used
-        if config["input_data"][source][f"{source}_filename"] != "":
-            config["input_data"][source][f"{source}_filename"] = f"{placeholder}.nc"
-
     with open(output_path, "w") as outfile:
         yaml.dump(config, outfile, default_flow_style=False)
 
@@ -211,7 +202,7 @@ def download_hf_hub_with_retries(
             time.sleep(wait_time)
 
 
-class PVNetModelHubMixin(PyTorchModelHubMixin):
+class PVNetModelHubMixin:
     """
     Implementation of [`PyTorchModelHubMixin`] to provide model Hub upload/download capabilities.
     """
@@ -222,12 +213,12 @@ class PVNetModelHubMixin(PyTorchModelHubMixin):
         *,
         model_id: str,
         revision: str,
-        cache_dir: Optional[Union[str, Path]] = None,
+        cache_dir: str | None = None,
         force_download: bool = False,
-        proxies: Optional[Dict] = None,
-        resume_download: Optional[bool] = None,
+        proxies: dict | None = None,
+        resume_download: bool | None  = None,
         local_files_only: bool = False,
-        token: Union[str, bool, None] = None,
+        token: str | bool | None = None,
         map_location: str = "cpu",
         strict: bool = False,
     ):
@@ -284,12 +275,12 @@ class PVNetModelHubMixin(PyTorchModelHubMixin):
         cls,
         model_id: str,
         revision: str,
-        cache_dir: Optional[Union[str, Path]] = None,
+        cache_dir: str | None = None,
         force_download: bool = False,
-        proxies: Optional[Dict] = None,
+        proxies: dict | None = None,
         resume_download: bool = False,
         local_files_only: bool = False,
-        token: Optional[Union[str, bool]] = None,
+        token: str | bool | None = None,
     ):
         """Load data config file."""
         if os.path.isdir(model_id):
@@ -312,37 +303,35 @@ class PVNetModelHubMixin(PyTorchModelHubMixin):
 
         return data_config_file
 
-    def _save_pretrained(self, save_directory: Path) -> None:
+    def _save_model_weights(self, save_directory: str) -> None:
         """Save weights from a Pytorch model to a local directory."""
-        model_to_save = self.module if hasattr(self, "module") else self  # type: ignore
-        torch.save(model_to_save.state_dict(), save_directory / PYTORCH_WEIGHTS_NAME)
+        torch.save(self.state_dict(), f"{save_directory}/{PYTORCH_WEIGHTS_NAME}")
 
     def save_pretrained(
         self,
-        save_directory: Union[str, Path],
-        config: dict,
-        data_config: Optional[Union[str, Path]],
-        datamodule_config: Optional[Union[str, Path]] = None,
-        repo_id: Optional[str] = None,
+        save_directory: str,
+        model_config: dict,
+        data_config_path: str,
+        wandb_repo: str,
+        wandb_ids: list[str] | str,
+        card_template_path: str,
+        datamodule_config_path: str | None = None,
+        hf_repo_id: str | None = None,
         push_to_hub: bool = False,
-        wandb_repo: Optional[str] = None,
-        wandb_ids: Optional[Union[list[str], str]] = None,
-        card_template_path: Optional[Path] = None,
-        **kwargs,
-    ) -> Optional[str]:
+    ) -> None:
         """
         Save weights in local directory.
 
         Args:
-            save_directory (`str` or `Path`):
+            save_directory:
                 Path to directory in which the model weights and configuration will be saved.
-            config (`dict`):
+            model_config (`dict`):
                 Model configuration specified as a key/value dictionary.
-            data_config (`str` or `Path`):
+            data_config_path:
                 The path to the data config.
-            datamodule_config (`str` or `Path`):
+            datamodule_config_path:
                 The path to the datamodule config.
-            repo_id (`str`, *optional*):
+            hf_repo_id:
                 ID of your repository on the Hub. Used only if `push_to_hub=True`. Will default to
                 the folder name if not provided.
             push_to_hub (`bool`, *optional*, defaults to `False`):
@@ -351,57 +340,42 @@ class PVNetModelHubMixin(PyTorchModelHubMixin):
             wandb_ids: Identifier(s) of the model on wandb.
             card_template_path: Path to the HuggingFace model card template. Defaults to card in
                 PVNet library if set to None.
-            kwargs:
-                Additional key word arguments passed along to the
-                [`~ModelHubMixin._from_pretrained`] method.
         """
 
         save_directory = Path(save_directory)
         save_directory.mkdir(parents=True, exist_ok=True)
 
-        # saving model weights/files
-        self._save_pretrained(save_directory)
+        # Save model weights/files
+        self._save_model_weights(save_directory)
 
-        # saving model and data config
-        if isinstance(config, dict):
+        # Save the model config and data config
+        if isinstance(model_config, dict):
             with open(save_directory / MODEL_CONFIG_NAME, "w") as f:
-                yaml.dump(config, f, sort_keys=False, default_flow_style=False)
+                yaml.dump(model_config, f, sort_keys=False, default_flow_style=False)
 
-        # Save cleaned configuration file
-        if data_config is not None:
-            new_data_config_path = save_directory / DATA_CONFIG_NAME
+        # Save cleaned input data configuration file
+        new_data_config_path = save_directory / DATA_CONFIG_NAME
+        make_clean_data_config(data_config_path, new_data_config_path)
+        minimize_data_config(new_data_config_path, new_data_config_path, self)
 
-            # Replace the input filenames with place holders
-            make_clean_data_config(data_config, new_data_config_path)
-
-            # Taylor the data config to the model being saved
-            minimize_data_config(new_data_config_path, new_data_config_path, self)
-
-        if datamodule_config is not None:
-            with open(datamodule_config) as dm_cfg:
+        if datamodule_config_path is not None:
+            with open(datamodule_config_path) as dm_cfg:
                 datamodule_config = yaml.load(dm_cfg, Loader=yaml.FullLoader)
 
-            new_datamodule_config_path = save_directory / DATAMODULE_CONFIG_NAME
-            with open(new_datamodule_config_path, "w") as outfile:
+            with open(save_directory / DATAMODULE_CONFIG_NAME, "w") as outfile:
                 yaml.dump(datamodule_config, outfile, default_flow_style=False, sort_keys=False)
 
-        card = self.create_hugging_face_model_card(
-            repo_id, wandb_repo, wandb_ids, card_template_path
-        )
+        card = self.create_hugging_face_model_card(card_template_path, wandb_repo, wandb_ids)
 
-        (save_directory / "README.md").write_text(str(card))
+        (save_directory / MODEL_CARD_NAME).write_text(str(card))
 
         if push_to_hub:
             api = HfApi()
 
-            api.upload_folder(
-                repo_id=repo_id,
-                repo_type="model",
-                folder_path=save_directory,
-            )
+            api.upload_folder(repo_id=hf_repo_id, repo_type="model", folder_path=save_directory)
 
             # Print the most recent commit hash
-            c = api.list_repo_commits(repo_id=repo_id, repo_type="model")[0]
+            c = api.list_repo_commits(repo_id=hf_repo_id, repo_type="model")[0]
 
             message = (
                 f"The latest commit is now: \n"
@@ -413,46 +387,28 @@ class PVNetModelHubMixin(PyTorchModelHubMixin):
 
             print(message)
 
-        return None
+        return
 
     @staticmethod
     def create_hugging_face_model_card(
-        repo_id: Optional[str] = None,
-        wandb_repo: Optional[str] = None,
-        wandb_ids: Optional[Union[list[str], str]] = None,
-        card_template_path: Optional[Path] = None,
+        card_template_path: str,
+        wandb_repo: str,
+        wandb_ids: list[str] | str,
     ) -> ModelCard:
         """
         Creates Hugging Face model card
 
         Args:
-            repo_id (`str`, *optional*):
-                ID of your repository on the Hub. Used only if `push_to_hub=True`. Will default to
-                the folder name if not provided.
+            card_template_path: Path to the HuggingFace model card template
             wandb_repo: Identifier of the repo on wandb.
             wandb_ids: Identifier(s) of the model on wandb.
-            card_template_path: Path to the HuggingFace model card template. Defaults to card in
-                PVNet library if set to None.
 
         Returns:
             card: ModelCard - Hugging Face model card object
         """
 
-        # Get appropriate model card
-        model_name = repo_id.split("/")[1]
-        if model_name == "windnet_india":
-            model_card = "wind_india_model_card_template.md"
-        elif model_name == "pvnet_india":
-            model_card = "pv_india_model_card_template.md"
-        else:
-            model_card = "pv_uk_regional_model_card_template.md"
-
         # Creating and saving model card.
         card_data = ModelCardData(language="en", license="mit", library_name="pytorch")
-        if card_template_path is None:
-            card_template_path = (
-                f"{os.path.dirname(os.path.abspath(__file__))}/model_cards/{model_card}"
-            )
 
         if isinstance(wandb_ids, str):
             wandb_ids = [wandb_ids]
@@ -477,7 +433,7 @@ class PVNetModelHubMixin(PyTorchModelHubMixin):
             card_data,
             template_path=card_template_path,
             wandb_links=wandb_links,
-            package_versions=package_versions_markdown
+            package_versions=package_versions_markdown,
         )
 
 
@@ -489,12 +445,12 @@ class BaseModel(pl.LightningModule, PVNetModelHubMixin):
         history_minutes: int,
         forecast_minutes: int,
         optimizer: AbstractOptimizer,
-        output_quantiles: Optional[list[float]] = None,
+        output_quantiles: list[float] | None = None,
         target_key: str = "gsp",
         interval_minutes: int = 30,
-        timestep_intervals_to_plot: Optional[list[int]] = None,
-        forecast_minutes_ignore: Optional[int] = 0,
-        save_validation_results_csv: Optional[bool] = False,
+        timestep_intervals_to_plot: list[int] | None = None,
+        forecast_minutes_ignore: int = 0,
+        save_validation_results_csv: bool = False,
     ):
         """Abtstract base class for PVNet submodels.
 

{pvnet-4.1.26 → pvnet-4.1.28}/pvnet/models/multimodal/multimodal.py

@@ -45,7 +45,6 @@ class Model(BaseModel):
         nwp_encoders_dict: Optional[dict[AbstractNWPSatelliteEncoder]] = None,
         sat_encoder: Optional[AbstractNWPSatelliteEncoder] = None,
         pv_encoder: Optional[AbstractSitesEncoder] = None,
-        sensor_encoder: Optional[AbstractSitesEncoder] = None,
         add_image_embedding_channel: bool = False,
         include_gsp_yield_history: bool = True,
         include_site_yield_history: Optional[bool] = False,
@@ -60,15 +59,12 @@ class Model(BaseModel):
         nwp_forecast_minutes: Optional[DictConfig] = None,
         nwp_history_minutes: Optional[DictConfig] = None,
         pv_history_minutes: Optional[int] = None,
-        sensor_history_minutes: Optional[int] = None,
-        sensor_forecast_minutes: Optional[int] = None,
         optimizer: AbstractOptimizer = pvnet.optimizers.Adam(),
         target_key: str = "gsp",
         interval_minutes: int = 30,
         nwp_interval_minutes: Optional[DictConfig] = None,
         pv_interval_minutes: int = 5,
         sat_interval_minutes: int = 5,
-        sensor_interval_minutes: int = 30,
         timestep_intervals_to_plot: Optional[list[int]] = None,
         adapt_batches: Optional[bool] = False,
         forecast_minutes_ignore: Optional[int] = 0,
@@ -122,12 +118,8 @@ class Model(BaseModel):
                 data for each source
             pv_interval_minutes: The interval between each sample of the PV data
             sat_interval_minutes: The interval between each sample of the satellite data
-            sensor_interval_minutes: The interval between each sample of the sensor data
             timestep_intervals_to_plot: Intervals, in timesteps, to plot in
             addition to the full forecast
-            sensor_encoder: Encoder for sensor data
-            sensor_history_minutes: Length of recent sensor data used as input.
-            sensor_forecast_minutes: Length of forecast sensor data used as input.
             adapt_batches: If set to true, we attempt to slice the batches to the expected shape for
                 the model to use. This allows us to overprepare batches and slice from them for the
                 data we need for a model run.
@@ -143,7 +135,6 @@ class Model(BaseModel):
         self.include_pv = pv_encoder is not None
         self.include_sun = include_sun
         self.include_time = include_time
-        self.include_sensor = sensor_encoder is not None
         self.location_id_mapping = location_id_mapping
         self.embedding_dim = embedding_dim
         self.add_image_embedding_channel = add_image_embedding_channel
@@ -254,23 +245,6 @@ class Model(BaseModel):
             # Update num features
             fusion_input_features += self.pv_encoder.out_features
 
-        if self.include_sensor:
-            if sensor_history_minutes is None:
-                sensor_history_minutes = history_minutes
-            if sensor_forecast_minutes is None:
-                sensor_forecast_minutes = forecast_minutes
-
-            self.sensor_encoder = sensor_encoder(
-                sequence_length=sensor_history_minutes // sensor_interval_minutes
-                + sensor_forecast_minutes // sensor_interval_minutes
-                + 1,
-                target_key_to_use=self._target_key,
-                input_key_to_use="sensor",
-            )
-
-            # Update num features
-            fusion_input_features += self.sensor_encoder.out_features
-
         if self.use_id_embedding:
             self.embed = nn.Embedding(num_embeddings=num_embeddings, embedding_dim=embedding_dim)
 

{pvnet-4.1.26 → pvnet-4.1.28}/pvnet/models/multimodal/site_encoders/encoders.py

@@ -150,13 +150,11 @@ class SingleAttentionNetwork(AbstractSitesEncoder):
             target_id_dim: The number of unique IDs.
             target_key_to_use: The key to use for the target in the attention layer.
             input_key_to_use: The key to use for the input in the attention layer.
-            num_channels: Number of channels in the input data. For single site generation,
-                this will be 1, as there is not channel dimension, for Sensors,
-                 this will probably be higher than that
+            num_channels: Number of channels in the input data
             num_sites_in_inference: Number of sites to use in inference.
                 This is used to determine the number of sites to use in the
-                 attention layer, for a single site, 1 works, while for multiple sites
-                (such as multiple sensors), this would be higher than that
+                attention layer, for a single site, 1 works, while for multiple sites
+                this would be higher than that
 
         """
         super().__init__(sequence_length, num_sites, out_features)

{pvnet-4.1.26 → pvnet-4.1.28}/pvnet/models/utils.py

@@ -7,8 +7,6 @@ import torch
 
 logger = logging.getLogger(__name__)
 
-logger = logging.getLogger(__name__)
-
 
 class PredAccumulator:
     """A class for accumulating y-predictions using grad accumulation and small batch size.

{pvnet-4.1.26 → pvnet-4.1.28}/pvnet/utils.py

@@ -9,12 +9,16 @@ import pandas as pd
 import pylab
 import rich.syntax
 import rich.tree
-import xarray as xr
 from lightning.pytorch.loggers import Logger
 from lightning.pytorch.utilities import rank_zero_only
-from ocf_data_sampler.select.location import Location
 from omegaconf import DictConfig, OmegaConf
 
+PYTORCH_WEIGHTS_NAME = "pytorch_model.bin"
+MODEL_CONFIG_NAME = "model_config.yaml"
+DATA_CONFIG_NAME = "data_config.yaml"
+DATAMODULE_CONFIG_NAME = "datamodule_config.yaml"
+MODEL_CARD_NAME = "README.md"
+
 
 def get_logger(name=__name__, level=logging.INFO) -> logging.Logger:
     """Initializes multi-GPU-friendly python logger."""
@@ -38,61 +42,6 @@ def get_logger(name=__name__, level=logging.INFO) -> logging.Logger:
     return logger
 
 
-class GSPLocationLookup:
-    """Query object for GSP location from GSP ID"""
-
-    def __init__(self, x_osgb: xr.DataArray, y_osgb: xr.DataArray):
-        """Query object for GSP location from GSP ID
-
-        Args:
-            x_osgb: DataArray of the OSGB x-coordinate for any given GSP ID
-            y_osgb: DataArray of the OSGB y-coordinate for any given GSP ID
-
-        """
-        self.x_osgb = x_osgb
-        self.y_osgb = y_osgb
-
-    def __call__(self, gsp_id: int) -> Location:
-        """Returns the locations for the input GSP IDs.
-
-        Args:
-            gsp_id: Integer ID of the GSP
-        """
-        return Location(
-            x=self.x_osgb.sel(gsp_id=gsp_id).item(),
-            y=self.y_osgb.sel(gsp_id=gsp_id).item(),
-            id=gsp_id,
-        )
-
-
-class SiteLocationLookup:
-    """Query object for site location from site ID"""
-
-    def __init__(self, long: xr.DataArray, lat: xr.DataArray):
-        """Query object for site location from site ID
-
-        Args:
-            long: DataArray of the longitude coordinates for any given site ID
-            lat: DataArray of the latitude coordinates for any given site ID
-
-        """
-        self.longitude = long
-        self.latitude = lat
-
-    def __call__(self, site_id: int) -> Location:
-        """Returns the locations for the input site IDs.
-
-        Args:
-            site_id: Integer ID of the site
-        """
-        return Location(
-            coordinate_system="lon_lat",
-            x=self.longitude.sel(pv_system_id=site_id).item(),
-            y=self.latitude.sel(pv_system_id=site_id).item(),
-            id=site_id,
-        )
-
-
 def extras(config: DictConfig) -> None:
     """A couple of optional utilities.
 

{pvnet-4.1.26 → pvnet-4.1.28}/pyproject.toml

@@ -45,11 +45,7 @@ dev=[
     "pytest",
     "pytest-cov",
 ]
-all_models=[
-    "pytorch-tabnet",
-    "efficientnet_pytorch"
-]
-all=["PVNet[dev,all_models]"]
+all=["PVNet[dev]"]
 
 [tool.mypy]
 exclude = [
@@ -114,7 +110,6 @@ dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
 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",]
 

pvnet-4.1.26/pvnet/__init__.py

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

pvnet-4.1.26/tests/test_utils.py

@@ -1,38 +0,0 @@
-from ocf_data_sampler.select.location import Location
-from pvnet.utils import SiteLocationLookup
-import xarray as xr
-import pytest
-
-
-@pytest.mark.parametrize(
-    "lookup_site_id, expected_x, expected_y, expected_id",
-    [
-        (1, -1.99106, 48.709865, 1),
-        (0, 0.30693, 51.509865, 0),
-        (2, -1.56106, 56.203865, 2),
-    ],
-)
-def test_site_location_lookup(lookup_site_id, expected_x, expected_y, expected_id):
-    # setup
-    site_ids = [0, 1, 2]
-    longs = [0.30693, -1.99106, -1.56106]
-    lats = [51.509865, 48.709865, 56.203865]
-    da_long = xr.DataArray(
-        data=longs,
-        dims="pv_system_id",
-        coords=dict(site_id=(["pv_system_id"], site_ids), long=(["pv_system_id"], longs)),
-    )
-    da_lat = xr.DataArray(
-        data=lats,
-        dims="pv_system_id",
-        coords=dict(site_id=(["pv_system_id"], site_ids), long=(["pv_system_id"], lats)),
-    )
-    # Actual testing part
-    site_lookup = SiteLocationLookup(long=da_long, lat=da_lat)
-
-    # retrieve location of site 1
-    site_location: Location = site_lookup(lookup_site_id)
-
-    assert site_location.x == expected_x
-    assert site_location.y == expected_y
-    assert site_location.id == expected_id