PVNet 5.0.22__tar.gz → 5.3.1__tar.gz

{pvnet-5.0.22 → pvnet-5.3.1}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 5.0.22
+Version: 5.3.1
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
-Requires-Python: >=3.11
+Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf-data-sampler>=0.5.20
+Requires-Dist: ocf-data-sampler>=0.6.0
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: matplotlib
@@ -29,7 +29,7 @@ Dynamic: license-file
 
 # PVNet
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [![tags badge](https://img.shields.io/github/v/tag/openclimatefix/PVNet?include_prereleases&sort=semver&color=FFAC5F)](https://github.com/openclimatefix/PVNet/tags)
@@ -142,12 +142,6 @@ pip install -e <PATH-TO-ocf-data-sampler-REPO>
 If you install the local version of `ocf-data-sampler` that is more recent than the version 
 specified in `PVNet` it is not guarenteed to function properly with this library.
 
-## Streaming samples (no pre-save)
-
-PVNet now trains and validates directly from **streamed_samples** (i.e. no pre-saving to disk).
-
-Make sure you have copied example configs (as already stated above):
-cp -r configs.example configs
 
 ### Set up and config example for streaming
 
@@ -251,6 +245,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/markus-kreft"><img src="https://avatars.githubusercontent.com/u/129367085?v=4?s=100" width="100px;" alt="Markus Kreft"/><br /><sub><b>Markus Kreft</b></sub></a><br /><a href="https://github.com/openclimatefix/pvnet/commits?author=markus-kreft" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://jack-kelly.com"><img src="https://avatars.githubusercontent.com/u/460756?v=4?s=100" width="100px;" alt="Jack Kelly"/><br /><sub><b>Jack Kelly</b></sub></a><br /><a href="#ideas-JackKelly" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/zaryab-ali"><img src="https://avatars.githubusercontent.com/u/85732412?v=4?s=100" width="100px;" alt="zaryab-ali"/><br /><sub><b>zaryab-ali</b></sub></a><br /><a href="https://github.com/openclimatefix/pvnet/commits?author=zaryab-ali" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lex-Ashu"><img src="https://avatars.githubusercontent.com/u/181084934?v=4?s=100" width="100px;" alt="Lex-Ashu"/><br /><sub><b>Lex-Ashu</b></sub></a><br /><a href="https://github.com/openclimatefix/pvnet/commits?author=Lex-Ashu" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

{pvnet-5.0.22 → pvnet-5.3.1}/PVNet.egg-info/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: PVNet
-Version: 5.0.22
+Version: 5.3.1
 Summary: PVNet
 Author-email: Peter Dudfield <info@openclimatefix.org>
-Requires-Python: >=3.11
+Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: ocf-data-sampler>=0.5.20
+Requires-Dist: ocf-data-sampler>=0.6.0
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: matplotlib
@@ -29,7 +29,7 @@ Dynamic: license-file
 
 # PVNet
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [![tags badge](https://img.shields.io/github/v/tag/openclimatefix/PVNet?include_prereleases&sort=semver&color=FFAC5F)](https://github.com/openclimatefix/PVNet/tags)
@@ -142,12 +142,6 @@ pip install -e <PATH-TO-ocf-data-sampler-REPO>
 If you install the local version of `ocf-data-sampler` that is more recent than the version 
 specified in `PVNet` it is not guarenteed to function properly with this library.
 
-## Streaming samples (no pre-save)
-
-PVNet now trains and validates directly from **streamed_samples** (i.e. no pre-saving to disk).
-
-Make sure you have copied example configs (as already stated above):
-cp -r configs.example configs
 
 ### Set up and config example for streaming
 
@@ -251,6 +245,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/markus-kreft"><img src="https://avatars.githubusercontent.com/u/129367085?v=4?s=100" width="100px;" alt="Markus Kreft"/><br /><sub><b>Markus Kreft</b></sub></a><br /><a href="https://github.com/openclimatefix/pvnet/commits?author=markus-kreft" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://jack-kelly.com"><img src="https://avatars.githubusercontent.com/u/460756?v=4?s=100" width="100px;" alt="Jack Kelly"/><br /><sub><b>Jack Kelly</b></sub></a><br /><a href="#ideas-JackKelly" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/zaryab-ali"><img src="https://avatars.githubusercontent.com/u/85732412?v=4?s=100" width="100px;" alt="zaryab-ali"/><br /><sub><b>zaryab-ali</b></sub></a><br /><a href="https://github.com/openclimatefix/pvnet/commits?author=zaryab-ali" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lex-Ashu"><img src="https://avatars.githubusercontent.com/u/181084934?v=4?s=100" width="100px;" alt="Lex-Ashu"/><br /><sub><b>Lex-Ashu</b></sub></a><br /><a href="https://github.com/openclimatefix/pvnet/commits?author=Lex-Ashu" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

{pvnet-5.0.22 → pvnet-5.3.1}/PVNet.egg-info/SOURCES.txt

@@ -7,13 +7,10 @@ PVNet.egg-info/dependency_links.txt
 PVNet.egg-info/requires.txt
 PVNet.egg-info/top_level.txt
 pvnet/__init__.py
+pvnet/datamodule.py
 pvnet/load_model.py
 pvnet/optimizers.py
 pvnet/utils.py
-pvnet/data/__init__.py
-pvnet/data/base_datamodule.py
-pvnet/data/site_datamodule.py
-pvnet/data/uk_regional_datamodule.py
 pvnet/models/__init__.py
 pvnet/models/base_model.py
 pvnet/models/ensemble.py
@@ -33,4 +30,5 @@ pvnet/training/__init__.py
 pvnet/training/lightning_module.py
 pvnet/training/plots.py
 pvnet/training/train.py
+tests/test_datamodule.py
 tests/test_end2end.py

{pvnet-5.0.22 → pvnet-5.3.1}/PVNet.egg-info/requires.txt

@@ -1,4 +1,4 @@
-ocf-data-sampler>=0.5.20
+ocf-data-sampler>=0.6.0
 numpy
 pandas
 matplotlib

{pvnet-5.0.22 → pvnet-5.3.1}/README.md

@@ -1,6 +1,6 @@
 # PVNet
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [![tags badge](https://img.shields.io/github/v/tag/openclimatefix/PVNet?include_prereleases&sort=semver&color=FFAC5F)](https://github.com/openclimatefix/PVNet/tags)
@@ -113,12 +113,6 @@ pip install -e <PATH-TO-ocf-data-sampler-REPO>
 If you install the local version of `ocf-data-sampler` that is more recent than the version 
 specified in `PVNet` it is not guarenteed to function properly with this library.
 
-## Streaming samples (no pre-save)
-
-PVNet now trains and validates directly from **streamed_samples** (i.e. no pre-saving to disk).
-
-Make sure you have copied example configs (as already stated above):
-cp -r configs.example configs
 
 ### Set up and config example for streaming
 
@@ -222,6 +216,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/markus-kreft"><img src="https://avatars.githubusercontent.com/u/129367085?v=4?s=100" width="100px;" alt="Markus Kreft"/><br /><sub><b>Markus Kreft</b></sub></a><br /><a href="https://github.com/openclimatefix/pvnet/commits?author=markus-kreft" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://jack-kelly.com"><img src="https://avatars.githubusercontent.com/u/460756?v=4?s=100" width="100px;" alt="Jack Kelly"/><br /><sub><b>Jack Kelly</b></sub></a><br /><a href="#ideas-JackKelly" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/zaryab-ali"><img src="https://avatars.githubusercontent.com/u/85732412?v=4?s=100" width="100px;" alt="zaryab-ali"/><br /><sub><b>zaryab-ali</b></sub></a><br /><a href="https://github.com/openclimatefix/pvnet/commits?author=zaryab-ali" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lex-Ashu"><img src="https://avatars.githubusercontent.com/u/181084934?v=4?s=100" width="100px;" alt="Lex-Ashu"/><br /><sub><b>Lex-Ashu</b></sub></a><br /><a href="https://github.com/openclimatefix/pvnet/commits?author=Lex-Ashu" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

pvnet-5.0.22/pvnet/data/base_datamodule.py → pvnet-5.3.1/pvnet/datamodule.py

@@ -1,14 +1,14 @@
-""" Data module for pytorch lightning """
+"""Data module for pytorch lightning"""
 
 import os
-from glob import glob
 
 import numpy as np
 from lightning.pytorch import LightningDataModule
 from ocf_data_sampler.numpy_sample.collate import stack_np_samples_into_batch
 from ocf_data_sampler.numpy_sample.common_types import NumpySample, TensorBatch
-from ocf_data_sampler.torch_datasets.sample.base import SampleBase, batch_to_tensor
-from torch.utils.data import DataLoader, Dataset, Subset
+from ocf_data_sampler.torch_datasets.pvnet_dataset import PVNetDataset
+from ocf_data_sampler.torch_datasets.utils.torch_batch_utils import batch_to_tensor
+from torch.utils.data import DataLoader, Subset
 
 
 def collate_fn(samples: list[NumpySample]) -> TensorBatch:
@@ -16,87 +16,8 @@ def collate_fn(samples: list[NumpySample]) -> TensorBatch:
     return batch_to_tensor(stack_np_samples_into_batch(samples))
 
 
-class PresavedSamplesDataset(Dataset):
-    """Dataset of pre-saved samples
-
-    Args:
-        sample_dir: Path to the directory of pre-saved samples.
-        sample_class: sample class type to use for save/load/to_numpy
-    """
-
-    def __init__(self, sample_dir: str, sample_class: SampleBase):
-        """Initialise PresavedSamplesDataset"""
-        self.sample_paths = glob(f"{sample_dir}/*")
-        self.sample_class = sample_class
-
-    def __len__(self) -> int:
-        return len(self.sample_paths)
-
-    def __getitem__(self, idx) -> NumpySample:
-        sample = self.sample_class.load(self.sample_paths[idx])
-        return sample.to_numpy()
-
-
-class BasePresavedDataModule(LightningDataModule):
-    """Base Datamodule for loading pre-saved samples."""
-
-    def __init__(
-        self,
-        sample_dir: str,
-        batch_size: int = 16,
-        num_workers: int = 0,
-        prefetch_factor: int | None = None,
-        persistent_workers: bool = False,
-        pin_memory: bool = False,
-    ):
-        """Base Datamodule for loading pre-saved samples
-
-        Args:
-            sample_dir: Path to the directory of pre-saved samples.
-            batch_size: Batch size.
-            num_workers: Number of workers to use in multiprocess batch loading.
-            prefetch_factor: Number of batches loaded in advance by each worker.
-            persistent_workers: If True, the data loader will not shut down the worker processes 
-                after a dataset has been consumed once. This allows to maintain the workers Dataset 
-                instances alive.
-            pin_memory: If True, the data loader will copy Tensors into device/CUDA pinned memory 
-                before returning them.
-        """
-        super().__init__()
-
-        self.sample_dir = sample_dir
-
-        self._common_dataloader_kwargs = dict(
-            batch_size=batch_size,
-            sampler=None,
-            batch_sampler=None,
-            num_workers=num_workers,
-            collate_fn=collate_fn,
-            pin_memory=pin_memory,
-            drop_last=False,
-            timeout=0,
-            worker_init_fn=None,
-            prefetch_factor=prefetch_factor,
-            persistent_workers=persistent_workers,
-            multiprocessing_context="spawn" if num_workers>0 else None,
-        )
-
-    def _get_premade_samples_dataset(self, subdir: str) -> Dataset:
-        raise NotImplementedError
-
-    def train_dataloader(self) -> DataLoader:
-        """Construct train dataloader"""
-        dataset = self._get_premade_samples_dataset("train")
-        return DataLoader(dataset, shuffle=True, **self._common_dataloader_kwargs)
-
-    def val_dataloader(self) -> DataLoader:
-        """Construct val dataloader"""
-        dataset = self._get_premade_samples_dataset("val")
-        return DataLoader(dataset, shuffle=False, **self._common_dataloader_kwargs)
-
-
-class BaseStreamedDataModule(LightningDataModule):
-    """Base Datamodule which streams samples using a sampler for ocf-data-sampler."""
+class PVNetDataModule(LightningDataModule):
+    """Base Datamodule which streams samples using a sampler from ocf-data-sampler."""
 
     def __init__(
         self,
@@ -118,10 +39,10 @@ class BaseStreamedDataModule(LightningDataModule):
             batch_size: Batch size.
             num_workers: Number of workers to use in multiprocess batch loading.
             prefetch_factor: Number of batches loaded in advance by each worker.
-            persistent_workers: If True, the data loader will not shut down the worker processes 
-                after a dataset has been consumed once. This allows to maintain the workers Dataset 
+            persistent_workers: If True, the data loader will not shut down the worker processes
+                after a dataset has been consumed once. This allows to maintain the workers Dataset
                 instances alive.
-            pin_memory: If True, the data loader will copy Tensors into device/CUDA pinned memory 
+            pin_memory: If True, the data loader will copy Tensors into device/CUDA pinned memory
                 before returning them.
             train_period: Date range filter for train dataloader.
             val_period: Date range filter for val dataloader.
@@ -148,7 +69,7 @@ class BaseStreamedDataModule(LightningDataModule):
             worker_init_fn=None,
             prefetch_factor=prefetch_factor,
             persistent_workers=persistent_workers,
-            multiprocessing_context="spawn" if num_workers>0 else None,
+            multiprocessing_context="spawn" if num_workers > 0 else None,
         )
 
     def setup(self, stage: str | None = None):
@@ -157,16 +78,15 @@ class BaseStreamedDataModule(LightningDataModule):
         # This logic runs only once at the start of training, therefore the val dataset is only
         # shuffled once
         if stage == "fit":
-
             # Prepare the train dataset
-            self.train_dataset = self._get_streamed_samples_dataset(*self.train_period)
+            self.train_dataset = self._get_dataset(*self.train_period)
 
-            # Prepare and pre-shuffle the val dataset and set seed for reproducibility
-            val_dataset = self._get_streamed_samples_dataset(*self.val_period)
+            # Prepare and pre-shuffle the val dataset and set seed for reproducibility
+            val_dataset = self._get_dataset(*self.val_period)
 
             shuffled_indices = np.random.default_rng(seed=self.seed).permutation(len(val_dataset))
             self.val_dataset = Subset(val_dataset, shuffled_indices)
-        
+
             if self.dataset_pickle_dir is not None:
                 os.makedirs(self.dataset_pickle_dir, exist_ok=True)
                 train_dataset_path = f"{self.dataset_pickle_dir}/train_dataset.pkl"
@@ -194,12 +114,8 @@ class BaseStreamedDataModule(LightningDataModule):
                 if os.path.exists(filepath):
                     os.remove(filepath)
 
-    def _get_streamed_samples_dataset(
-        self,
-        start_time: str | None,
-        end_time: str | None
-    ) -> Dataset:
-        raise NotImplementedError
+    def _get_dataset(self, start_time: str | None, end_time: str | None) -> PVNetDataset:
+        return PVNetDataset(self.configuration, start_time=start_time, end_time=end_time)
 
     def train_dataloader(self) -> DataLoader:
         """Construct train dataloader"""

{pvnet-5.0.22 → pvnet-5.3.1}/pvnet/load_model.py

@@ -73,6 +73,8 @@ def get_model_from_checkpoints(
         else:
             raise FileNotFoundError(f"File {data_config} does not exist")
 
+        # TODO: This should be removed in a future release since no new models will be trained on 
+        # presaved samples
         # Check for datamodule config
         # This only exists if the model was trained with presaved samples
         datamodule_config = f"{path}/{DATAMODULE_CONFIG_NAME}"

{pvnet-5.0.22 → pvnet-5.3.1}/pvnet/models/base_model.py

@@ -1,4 +1,5 @@
 """Base model for all PVNet submodels"""
+
 import logging
 import os
 import shutil
@@ -32,7 +33,7 @@ def fill_config_paths_with_placeholder(config: dict, placeholder: str = "PLACEHO
     """
     input_config = config["input_data"]
 
-    for source in ["gsp", "satellite"]:
+    for source in ["generation", "satellite"]:
         if source in input_config:
             # If not empty - i.e. if used
             if input_config[source]["zarr_path"] != "":
@@ -78,8 +79,8 @@ def minimize_config_for_model(config: dict, model: "BaseModel") -> dict:
 
                     # Replace the interval_end_minutes minutes
                     nwp_config["interval_end_minutes"] = (
-                        nwp_config["interval_start_minutes"] +
-                        (model.nwp_encoders_dict[nwp_source].sequence_length - 1)
+                        nwp_config["interval_start_minutes"]
+                        + (model.nwp_encoders_dict[nwp_source].sequence_length - 1)
                         * nwp_config["time_resolution_minutes"]
                     )
 
@@ -96,20 +97,19 @@ def minimize_config_for_model(config: dict, model: "BaseModel") -> dict:
 
             # Replace the interval_end_minutes minutes
             sat_config["interval_end_minutes"] = (
-                sat_config["interval_start_minutes"] +
-                (model.sat_encoder.sequence_length - 1)
-                * sat_config["time_resolution_minutes"]
+                sat_config["interval_start_minutes"]
+                + (model.sat_encoder.sequence_length - 1) * sat_config["time_resolution_minutes"]
             )
 
     if "pv" in input_config:
         if not model.include_pv:
             del input_config["pv"]
 
-    if "gsp" in input_config:
-        gsp_config = input_config["gsp"]
+    if "generation" in input_config:
+        generation_config = input_config["generation"]
 
         # Replace the forecast minutes
-        gsp_config["interval_end_minutes"] = model.forecast_minutes
+        generation_config["interval_end_minutes"] = model.forecast_minutes
 
     if "solar_position" in input_config:
         solar_config = input_config["solar_position"]
@@ -138,9 +138,9 @@ def download_from_hf(
         force_download: Whether to force a new download
         max_retries: Maximum number of retry attempts
         wait_time: Wait time (in seconds) before retrying
-        token: 
+        token:
             HF authentication token. If True, the token is read from the HuggingFace config folder.
-            If a string, it is used as the authentication token. 
+            If a string, it is used as the authentication token.
 
     Returns:
         The local file path of the downloaded file(s)
@@ -160,7 +160,7 @@ def download_from_hf(
                 return [f"{save_dir}/{f}" for f in filename]
             else:
                 return f"{save_dir}/{filename}"
-        
+
         except Exception as e:
             if attempt == max_retries:
                 raise Exception(
@@ -205,7 +205,7 @@ class HuggingfaceMixin:
                 force_download=force_download,
                 max_retries=5,
                 wait_time=10,
-                token=token
+                token=token,
             )
 
         with open(config_file, "r") as f:
@@ -240,7 +240,7 @@ class HuggingfaceMixin:
                 force_download=force_download,
                 max_retries=5,
                 wait_time=10,
-                token=token
+                token=token,
             )
 
         return data_config_file
@@ -301,7 +301,7 @@ class HuggingfaceMixin:
         # Save cleaned version of input data configuration file
         with open(data_config_path) as cfg:
             config = yaml.load(cfg, Loader=yaml.FullLoader)
-        
+
         config = fill_config_paths_with_placeholder(config)
         config = minimize_config_for_model(config, self)
 
@@ -311,7 +311,7 @@ class HuggingfaceMixin:
         # Save the datamodule config
         if datamodule_config_path is not None:
             shutil.copyfile(datamodule_config_path, save_directory / DATAMODULE_CONFIG_NAME)
-        
+
         # Save the full experimental config
         if experiment_config_path is not None:
             shutil.copyfile(experiment_config_path, save_directory / FULL_CONFIG_NAME)
@@ -378,7 +378,6 @@ class HuggingfaceMixin:
         packages_to_display = ["pvnet", "ocf-data-sampler"]
         packages_and_versions = {package: version(package) for package in packages_to_display}
 
-
         package_versions_markdown = ""
         for package, v in packages_and_versions.items():
             package_versions_markdown += f" - {package}=={v}\n"
@@ -399,23 +398,19 @@ class BaseModel(torch.nn.Module, HuggingfaceMixin):
         history_minutes: int,
         forecast_minutes: int,
         output_quantiles: list[float] | None = None,
-        target_key: str = "gsp",
         interval_minutes: int = 30,
     ):
         """Abtstract base class for PVNet submodels.
 
         Args:
-            history_minutes (int): Length of the GSP history period in minutes
-            forecast_minutes (int): Length of the GSP forecast period in minutes
+            history_minutes (int): Length of the generation history period in minutes
+            forecast_minutes (int): Length of the generation forecast period in minutes
             output_quantiles: A list of float (0.0, 1.0) quantiles to predict values for. If set to
                 None the output is a single value.
-            target_key: The key of the target variable in the batch
             interval_minutes: The interval in minutes between each timestep in the data
         """
         super().__init__()
 
-        self._target_key = target_key
-
         self.history_minutes = history_minutes
         self.forecast_minutes = forecast_minutes
         self.output_quantiles = output_quantiles

{pvnet-5.0.22 → pvnet-5.3.1}/pvnet/models/ensemble.py

@@ -26,7 +26,6 @@ class Ensemble(BaseModel):
         output_quantiles = []
         history_minutes = []
         forecast_minutes = []
-        target_key = []
         interval_minutes = []
 
         # Get some model properties from each model
@@ -34,7 +33,6 @@ class Ensemble(BaseModel):
             output_quantiles.append(model.output_quantiles)
             history_minutes.append(model.history_minutes)
             forecast_minutes.append(model.forecast_minutes)
-            target_key.append(model._target_key)
             interval_minutes.append(model.interval_minutes)
 
         # Check these properties are all the same
@@ -42,7 +40,6 @@ class Ensemble(BaseModel):
             output_quantiles,
             history_minutes,
             forecast_minutes,
-            target_key,
             interval_minutes,
         ]:
             assert all([p == param_list[0] for p in param_list]), param_list
@@ -51,7 +48,6 @@ class Ensemble(BaseModel):
             history_minutes=history_minutes[0],
             forecast_minutes=forecast_minutes[0],
             output_quantiles=output_quantiles[0],
-            target_key=target_key[0],
             interval_minutes=interval_minutes[0],
         )