Merge conflict resolve

.all-contributorsrc

@@ -0,0 +1,89 @@
+{
+  "files": [
+    "README.md"
+  ],
+  "imageSize": 100,
+  "commit": false,
+  "commitType": "docs",
+  "commitConvention": "angular",
+  "contributors": [
+    {
+      "login": "felix-e-h-p",
+      "name": "Felix",
+      "avatar_url": "https://avatars.githubusercontent.com/u/137530077?v=4",
+      "profile": "https://github.com/felix-e-h-p",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Sukh-P",
+      "name": "Sukhil Patel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/42407101?v=4",
+      "profile": "https://github.com/Sukh-P",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "dfulu",
+      "name": "James Fulton",
+      "avatar_url": "https://avatars.githubusercontent.com/u/41546094?v=4",
+      "profile": "https://github.com/dfulu",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AUdaltsova",
+      "name": "Alexandra Udaltsova",
+      "avatar_url": "https://avatars.githubusercontent.com/u/43303448?v=4",
+      "profile": "https://github.com/AUdaltsova",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "zakwatts",
+      "name": "Megawattz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/47150349?v=4",
+      "profile": "https://github.com/zakwatts",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "peterdudfield",
+      "name": "Peter Dudfield",
+      "avatar_url": "https://avatars.githubusercontent.com/u/34686298?v=4",
+      "profile": "https://github.com/peterdudfield",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mahdilamb",
+      "name": "Mahdi Lamb",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4696915?v=4",
+      "profile": "https://github.com/mahdilamb",
+      "contributions": [
+        "infra"
+      ]
+    },
+    {
+      "login": "jacobbieker",
+      "name": "Jacob Prince-Bieker",
+      "avatar_url": "https://avatars.githubusercontent.com/u/7170359?v=4",
+      "profile": "https://www.jacobbieker.com",
+      "contributions": [
+        "code"
+      ]
+    }
+  ],
+  "contributorsPerLine": 7,
+  "skipCi": true,
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "projectName": "PVNet",
+  "projectOwner": "openclimatefix"
+}

MANIFEST.in

@@ -1 +1,2 @@
 include *.txt
+recursive-include pvnet/models/model_cards *.md

README.md

@@ -1,4 +1,7 @@
 # PVNet 2.1
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
 
  [![Python Bump Version & release](https://github.com/openclimatefix/PVNet/actions/workflows/release.yml/badge.svg)](https://github.com/openclimatefix/PVNet/actions/workflows/release.yml) [![ease of contribution: hard](https://img.shields.io/badge/ease%20of%20contribution:%20hard-bb2629)](https://github.com/openclimatefix/ocf-meta-repo?tab=readme-ov-file#overview-of-ocfs-nowcasting-repositories)
 
@@ -231,3 +234,34 @@ If you have successfully trained a PVNet model and have a saved model checkpoint
 ## Testing
 
 You can use `python -m pytest tests` to run tests
+
+## Contributors ✨
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/felix-e-h-p"><img src="https://avatars.githubusercontent.com/u/137530077?v=4?s=100" width="100px;" alt="Felix"/><br /><sub><b>Felix</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=felix-e-h-p" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Sukh-P"><img src="https://avatars.githubusercontent.com/u/42407101?v=4?s=100" width="100px;" alt="Sukhil Patel"/><br /><sub><b>Sukhil Patel</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=Sukh-P" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dfulu"><img src="https://avatars.githubusercontent.com/u/41546094?v=4?s=100" width="100px;" alt="James Fulton"/><br /><sub><b>James Fulton</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=dfulu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/AUdaltsova"><img src="https://avatars.githubusercontent.com/u/43303448?v=4?s=100" width="100px;" alt="Alexandra Udaltsova"/><br /><sub><b>Alexandra Udaltsova</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=AUdaltsova" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zakwatts"><img src="https://avatars.githubusercontent.com/u/47150349?v=4?s=100" width="100px;" alt="Megawattz"/><br /><sub><b>Megawattz</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=zakwatts" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/peterdudfield"><img src="https://avatars.githubusercontent.com/u/34686298?v=4?s=100" width="100px;" alt="Peter Dudfield"/><br /><sub><b>Peter Dudfield</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=peterdudfield" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mahdilamb"><img src="https://avatars.githubusercontent.com/u/4696915?v=4?s=100" width="100px;" alt="Mahdi Lamb"/><br /><sub><b>Mahdi Lamb</b></sub></a><br /><a href="#infra-mahdilamb" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://www.jacobbieker.com"><img src="https://avatars.githubusercontent.com/u/7170359?v=4?s=100" width="100px;" alt="Jacob Prince-Bieker"/><br /><sub><b>Jacob Prince-Bieker</b></sub></a><br /><a href="https://github.com/openclimatefix/PVNet/commits?author=jacobbieker" title="Code">💻</a></td>
+    </tr>
+  </tbody>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

experiments/mae_analysis.py

@@ -7,11 +7,26 @@
 
 import argparse
 
+import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
 import pandas as pd
 import wandb
 
+matplotlib.rcParams["axes.prop_cycle"] = matplotlib.cycler(
+    color=[
+        "FFD053",  # yellow
+        "7BCDF3",  # blue
+        "63BCAF",  # teal
+        "086788",  # dark blue
+        "FF9736",  # dark orange
+        "E4E4E4",  # grey
+        "14120E",  # black
+        "FFAC5F",  # orange
+        "4C9A8E",  # dark teal
+    ]
+)
+
 
 def main(project: str, runs: list[str], run_names: list[str]) -> None:
     """

pyproject.toml

@@ -6,7 +6,7 @@ dynamic = ["version", "readme"]
 license={file="LICENCE"}
 
 dependencies = [
-    "ocf_data_sampler==0.1.7",
+    "ocf_data_sampler==0.1.2",
     "ocf_datapipes>=3.3.34",
     "ocf_ml_metrics>=0.0.11",
     "numpy",