ocf-data-sampler 0.1.4__tar.gz → 0.1.5__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.

Potentially problematic release.

This version of ocf-data-sampler might be problematic. Click here for more details.

Files changed (85) hide show
  1. {ocf_data_sampler-0.1.4/ocf_data_sampler.egg-info → ocf_data_sampler-0.1.5}/PKG-INFO +1 -1
  2. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py +8 -10
  3. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5/ocf_data_sampler.egg-info}/PKG-INFO +1 -1
  4. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/pyproject.toml +1 -1
  5. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/torch_datasets/test_pvnet_uk.py +1 -0
  6. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/LICENSE +0 -0
  7. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/MANIFEST.in +0 -0
  8. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/README.md +0 -0
  9. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/__init__.py +0 -0
  10. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/config/__init__.py +0 -0
  11. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/config/load.py +0 -0
  12. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/config/model.py +0 -0
  13. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/config/save.py +0 -0
  14. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/constants.py +0 -0
  15. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/data/uk_gsp_locations.csv +0 -0
  16. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/__init__.py +0 -0
  17. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/gsp.py +0 -0
  18. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/load_dataset.py +0 -0
  19. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/nwp/__init__.py +0 -0
  20. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/nwp/nwp.py +0 -0
  21. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/nwp/providers/__init__.py +0 -0
  22. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/nwp/providers/ecmwf.py +0 -0
  23. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/nwp/providers/ukv.py +0 -0
  24. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/nwp/providers/utils.py +0 -0
  25. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/satellite.py +0 -0
  26. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/site.py +0 -0
  27. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/load/utils.py +0 -0
  28. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/numpy_sample/__init__.py +0 -0
  29. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/numpy_sample/collate.py +0 -0
  30. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/numpy_sample/datetime_features.py +0 -0
  31. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/numpy_sample/gsp.py +0 -0
  32. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/numpy_sample/nwp.py +0 -0
  33. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/numpy_sample/satellite.py +0 -0
  34. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/numpy_sample/site.py +0 -0
  35. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/numpy_sample/sun_position.py +0 -0
  36. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/sample/__init__.py +0 -0
  37. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/sample/base.py +0 -0
  38. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/sample/site.py +0 -0
  39. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/sample/uk_regional.py +0 -0
  40. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/__init__.py +0 -0
  41. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/dropout.py +0 -0
  42. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/fill_time_periods.py +0 -0
  43. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/find_contiguous_time_periods.py +0 -0
  44. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/geospatial.py +0 -0
  45. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/location.py +0 -0
  46. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/select_spatial_slice.py +0 -0
  47. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/select_time_slice.py +0 -0
  48. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/spatial_slice_for_dataset.py +0 -0
  49. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/select/time_slice_for_dataset.py +0 -0
  50. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/torch_datasets/datasets/__init__.py +0 -0
  51. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/torch_datasets/datasets/site.py +0 -0
  52. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/torch_datasets/utils/merge_and_fill_utils.py +0 -0
  53. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/torch_datasets/utils/valid_time_periods.py +0 -0
  54. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/utils.py +0 -0
  55. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler.egg-info/SOURCES.txt +0 -0
  56. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler.egg-info/dependency_links.txt +0 -0
  57. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler.egg-info/requires.txt +0 -0
  58. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler.egg-info/top_level.txt +0 -0
  59. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/scripts/refactor_site.py +0 -0
  60. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/setup.cfg +0 -0
  61. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/__init__.py +0 -0
  62. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/config/test_config.py +0 -0
  63. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/config/test_save.py +0 -0
  64. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/conftest.py +0 -0
  65. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/load/test_load_gsp.py +0 -0
  66. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/load/test_load_nwp.py +0 -0
  67. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/load/test_load_satellite.py +0 -0
  68. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/load/test_load_sites.py +0 -0
  69. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/numpy_sample/test_collate.py +0 -0
  70. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/numpy_sample/test_datetime_features.py +0 -0
  71. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/numpy_sample/test_gsp.py +0 -0
  72. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/numpy_sample/test_nwp.py +0 -0
  73. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/numpy_sample/test_satellite.py +0 -0
  74. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/numpy_sample/test_sun_position.py +0 -0
  75. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/select/test_dropout.py +0 -0
  76. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/select/test_fill_time_periods.py +0 -0
  77. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/select/test_find_contiguous_time_periods.py +0 -0
  78. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/select/test_location.py +0 -0
  79. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/select/test_select_spatial_slice.py +0 -0
  80. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/select/test_select_time_slice.py +0 -0
  81. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/test_sample/test_base.py +0 -0
  82. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/test_sample/test_site_sample.py +0 -0
  83. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/test_sample/test_uk_regional_sample.py +0 -0
  84. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/torch_datasets/test_merge_and_fill_utils.py +0 -0
  85. {ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/torch_datasets/test_site.py +0 -0
{ocf_data_sampler-0.1.4/ocf_data_sampler.egg-info → ocf_data_sampler-0.1.5}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: ocf_data_sampler
3
- Version: 0.1.4
3
+ Version: 0.1.5
4
4
  Summary: Sample from weather data for renewable energy prediction
5
5
  Author: James Fulton, Peter Dudfield, and the Open Climate Fix team
6
6
  Author-email: info@openclimatefix.org
{ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py RENAMED
@@ -84,16 +84,6 @@ def process_and_combine_datasets(
84
84
  )
85
85
  )
86
86
 
87
- # Add coordinate data
88
- # TODO: Do we need all of these?
89
- numpy_modalities.append(
90
- {
91
- GSPSampleKey.gsp_id: location.id,
92
- GSPSampleKey.x_osgb: location.x,
93
- GSPSampleKey.y_osgb: location.y,
94
- }
95
- )
96
-
97
87
  if target_key == 'gsp':
98
88
  # Make sun coords NumpySample
99
89
  datetimes = pd.date_range(
@@ -104,6 +94,14 @@ def process_and_combine_datasets(
104
94
 
105
95
  lon, lat = osgb_to_lon_lat(location.x, location.y)
106
96
 
97
+ numpy_modalities.append(
98
+ {
99
+ GSPSampleKey.gsp_id: location.id,
100
+ GSPSampleKey.x_osgb: location.x,
101
+ GSPSampleKey.y_osgb: location.y,
102
+ }
103
+ )
104
+
107
105
  numpy_modalities.append(
108
106
  make_sun_position_numpy_sample(datetimes, lon, lat, key_prefix=target_key)
109
107
  )
{ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5/ocf_data_sampler.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.2
2
2
  Name: ocf_data_sampler
3
- Version: 0.1.4
3
+ Version: 0.1.5
4
4
  Summary: Sample from weather data for renewable energy prediction
5
5
  Author: James Fulton, Peter Dudfield, and the Open Climate Fix team
6
6
  Author-email: info@openclimatefix.org
{ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/pyproject.toml RENAMED
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "ocf_data_sampler"
7
- version = "0.1.4"
7
+ version = "0.1.5"
8
8
  license = { file = "LICENSE" }
9
9
  readme = "README.md"
10
10
  description = "Sample from weather data for renewable energy prediction"
{ocf_data_sampler-0.1.4 → ocf_data_sampler-0.1.5}/tests/torch_datasets/test_pvnet_uk.py RENAMED
@@ -55,6 +55,7 @@ def test_process_and_combine_datasets(pvnet_config_filename):
55
55
  assert "nwp" in sample
56
56
  assert sample["satellite_actual"].shape == (7, 1, 2, 2)
57
57
  assert sample["nwp"]["ukv"]["nwp"].shape == (4, 1, 2, 2)
58
+ assert "gsp_id" in sample
58
59
 
59
60
 
60
61
  def test_compute():