PVNet 5.0.23__tar.gz → 5.0.26__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (38) hide show
  1. {pvnet-5.0.23 → pvnet-5.0.26}/PKG-INFO +3 -2
  2. {pvnet-5.0.23 → pvnet-5.0.26}/PVNet.egg-info/PKG-INFO +3 -2
  3. {pvnet-5.0.23 → pvnet-5.0.26}/README.md +2 -1
  4. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/late_fusion.py +12 -6
  5. {pvnet-5.0.23 → pvnet-5.0.26}/LICENSE +0 -0
  6. {pvnet-5.0.23 → pvnet-5.0.26}/PVNet.egg-info/SOURCES.txt +0 -0
  7. {pvnet-5.0.23 → pvnet-5.0.26}/PVNet.egg-info/dependency_links.txt +0 -0
  8. {pvnet-5.0.23 → pvnet-5.0.26}/PVNet.egg-info/requires.txt +0 -0
  9. {pvnet-5.0.23 → pvnet-5.0.26}/PVNet.egg-info/top_level.txt +0 -0
  10. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/__init__.py +0 -0
  11. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/data/__init__.py +0 -0
  12. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/data/base_datamodule.py +0 -0
  13. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/data/site_datamodule.py +0 -0
  14. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/data/uk_regional_datamodule.py +0 -0
  15. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/load_model.py +0 -0
  16. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/__init__.py +0 -0
  17. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/base_model.py +0 -0
  18. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/ensemble.py +0 -0
  19. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/__init__.py +0 -0
  20. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/basic_blocks.py +0 -0
  21. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/encoders/__init__.py +0 -0
  22. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/encoders/basic_blocks.py +0 -0
  23. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/encoders/encoders3d.py +0 -0
  24. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/linear_networks/__init__.py +0 -0
  25. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/linear_networks/basic_blocks.py +0 -0
  26. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/linear_networks/networks.py +0 -0
  27. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/site_encoders/__init__.py +0 -0
  28. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/site_encoders/basic_blocks.py +0 -0
  29. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/models/late_fusion/site_encoders/encoders.py +0 -0
  30. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/optimizers.py +0 -0
  31. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/training/__init__.py +0 -0
  32. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/training/lightning_module.py +0 -0
  33. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/training/plots.py +0 -0
  34. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/training/train.py +0 -0
  35. {pvnet-5.0.23 → pvnet-5.0.26}/pvnet/utils.py +0 -0
  36. {pvnet-5.0.23 → pvnet-5.0.26}/pyproject.toml +0 -0
  37. {pvnet-5.0.23 → pvnet-5.0.26}/setup.cfg +0 -0
  38. {pvnet-5.0.23 → pvnet-5.0.26}/tests/test_end2end.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: PVNet
3
- Version: 5.0.23
3
+ Version: 5.0.26
4
4
  Summary: PVNet
5
5
  Author-email: Peter Dudfield <info@openclimatefix.org>
6
6
  Requires-Python: >=3.11
@@ -29,7 +29,7 @@ Dynamic: license-file
29
29
 
30
30
  # PVNet
31
31
  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
32
- [![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)
32
+ [![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors-)
33
33
  <!-- ALL-CONTRIBUTORS-BADGE:END -->
34
34
 
35
35
  [![tags badge](https://img.shields.io/github/v/tag/openclimatefix/PVNet?include_prereleases&sort=semver&color=FFAC5F)](https://github.com/openclimatefix/PVNet/tags)
@@ -251,6 +251,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
251
251
  <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>
252
252
  <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>
253
253
  <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>
254
+ <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>
254
255
  </tr>
255
256
  </tbody>
256
257
  </table>
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: PVNet
3
- Version: 5.0.23
3
+ Version: 5.0.26
4
4
  Summary: PVNet
5
5
  Author-email: Peter Dudfield <info@openclimatefix.org>
6
6
  Requires-Python: >=3.11
@@ -29,7 +29,7 @@ Dynamic: license-file
29
29
 
30
30
  # PVNet
31
31
  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
32
- [![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)
32
+ [![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors-)
33
33
  <!-- ALL-CONTRIBUTORS-BADGE:END -->
34
34
 
35
35
  [![tags badge](https://img.shields.io/github/v/tag/openclimatefix/PVNet?include_prereleases&sort=semver&color=FFAC5F)](https://github.com/openclimatefix/PVNet/tags)
@@ -251,6 +251,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
251
251
  <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>
252
252
  <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>
253
253
  <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>
254
+ <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>
254
255
  </tr>
255
256
  </tbody>
256
257
  </table>
@@ -1,6 +1,6 @@
1
1
  # PVNet
2
2
  <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
3
- [![All Contributors](https://img.shields.io/badge/all_contributors-20-orange.svg?style=flat-square)](#contributors-)
3
+ [![All Contributors](https://img.shields.io/badge/all_contributors-21-orange.svg?style=flat-square)](#contributors-)
4
4
  <!-- ALL-CONTRIBUTORS-BADGE:END -->
5
5
 
6
6
  [![tags badge](https://img.shields.io/github/v/tag/openclimatefix/PVNet?include_prereleases&sort=semver&color=FFAC5F)](https://github.com/openclimatefix/PVNet/tags)
@@ -222,6 +222,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
222
222
  <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>
223
223
  <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>
224
224
  <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>
225
+ <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>
225
226
  </tr>
226
227
  </tbody>
227
228
  </table>
@@ -154,7 +154,7 @@ class LateFusionModel(BaseModel):
154
154
 
155
155
  if self.include_sat:
156
156
  # Param checks
157
- assert sat_history_minutes is not None
157
+ assert sat_history_minutes is not None, "sat_history_minutes is not present in config"
158
158
 
159
159
  self.sat_sequence_len = (
160
160
  sat_history_minutes - min_sat_delay_minutes
@@ -174,12 +174,18 @@ class LateFusionModel(BaseModel):
174
174
 
175
175
  if self.include_nwp:
176
176
  # Param checks
177
- assert nwp_forecast_minutes is not None
178
- assert nwp_history_minutes is not None
177
+ assert nwp_forecast_minutes is not None, "nwp_forecast_minutes is not present in config"
178
+ assert nwp_history_minutes is not None, "nwp_history_minutes is not present in config"
179
179
 
180
180
  # For each NWP encoder the forecast and history minutes must be set
181
- assert set(nwp_encoders_dict.keys()) == set(nwp_forecast_minutes.keys())
182
- assert set(nwp_encoders_dict.keys()) == set(nwp_history_minutes.keys())
181
+ assert set(nwp_encoders_dict.keys()) == set(nwp_forecast_minutes.keys()), (
182
+ f"nwp encoder keys {set(nwp_encoders_dict.keys())} do not match "
183
+ f"nwp_forecast_minutes keys {set(nwp_forecast_minutes.keys())}"
184
+ )
185
+ assert set(nwp_encoders_dict.keys()) == set(nwp_history_minutes.keys()), (
186
+ f"nwp encoder keys {set(nwp_encoders_dict.keys())} do not match "
187
+ f"nwp_history_minutes keys {set(nwp_history_minutes.keys())}"
188
+ )
183
189
 
184
190
  if nwp_interval_minutes is None:
185
191
  nwp_interval_minutes = dict.fromkeys(nwp_encoders_dict.keys(), 60)
@@ -213,7 +219,7 @@ class LateFusionModel(BaseModel):
213
219
  fusion_input_features += self.nwp_encoders_dict[nwp_source].out_features
214
220
 
215
221
  if self.include_pv:
216
- assert pv_history_minutes is not None
222
+ assert pv_history_minutes is not None, "pv_history_minutes is not present in config"
217
223
 
218
224
  self.pv_encoder = pv_encoder(
219
225
  sequence_length=pv_history_minutes // pv_interval_minutes + 1,
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes