ocf-data-sampler 0.1.4__py3-none-any.whl → 0.1.5__py3-none-any.whl

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 (7) hide show
  1. ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py +8 -10
  2. {ocf_data_sampler-0.1.4.dist-info → ocf_data_sampler-0.1.5.dist-info}/METADATA +1 -1
  3. {ocf_data_sampler-0.1.4.dist-info → ocf_data_sampler-0.1.5.dist-info}/RECORD +7 -7
  4. tests/torch_datasets/test_pvnet_uk.py +1 -0
  5. {ocf_data_sampler-0.1.4.dist-info → ocf_data_sampler-0.1.5.dist-info}/LICENSE +0 -0
  6. {ocf_data_sampler-0.1.4.dist-info → ocf_data_sampler-0.1.5.dist-info}/WHEEL +0 -0
  7. {ocf_data_sampler-0.1.4.dist-info → ocf_data_sampler-0.1.5.dist-info}/top_level.txt +0 -0
ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py CHANGED
@@ -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.dist-info → ocf_data_sampler-0.1.5.dist-info}/METADATA 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.dist-info → ocf_data_sampler-0.1.5.dist-info}/RECORD RENAMED
@@ -41,7 +41,7 @@ ocf_data_sampler/select/select_time_slice.py,sha256=9M-yvDv9K77XfEys_OIR31_aVB56
41
41
  ocf_data_sampler/select/spatial_slice_for_dataset.py,sha256=3tRrMBXr7s4CnClbVSIq7hpls3H4Y3qYTDwswcxCCCE,1763
42
42
  ocf_data_sampler/select/time_slice_for_dataset.py,sha256=Z7pOiilSHScxmBKZNG18K5J-S4ifdXXAYGZoHRHD3AY,4324
43
43
  ocf_data_sampler/torch_datasets/datasets/__init__.py,sha256=jfJSFcR0eO1AqeH7S3KnGjsBqVZT5w3oyi784PUR6Q0,146
44
- ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py,sha256=rodvVSR4sh8qZ2hLdI8qAc3lyxq5U7cVGfS4rRKCzbs,11944
44
+ ocf_data_sampler/torch_datasets/datasets/pvnet_uk.py,sha256=4lqniFbUNt1qWSct4ISavXg9C7FM5cdVu48JHd7A9Pk,11873
45
45
  ocf_data_sampler/torch_datasets/datasets/site.py,sha256=5T8nkTMUHHFidZRuFOunYeKAqNuyZ8V7sikBoBOBwwA,16033
46
46
  ocf_data_sampler/torch_datasets/utils/merge_and_fill_utils.py,sha256=hIbekql64eXsNDFIoEc--GWxwdVWrh2qKegdOi70Bow,874
47
47
  ocf_data_sampler/torch_datasets/utils/valid_time_periods.py,sha256=Qo65qUHtle_bW5tLTYr7empHTRv-lpjvfx_6GNJj3Xg,4371
@@ -70,10 +70,10 @@ tests/test_sample/test_base.py,sha256=ljtB38MmscTGN6OvUgclBceNnfx6m7AN8iHYDml9XW
70
70
  tests/test_sample/test_site_sample.py,sha256=Gln-Or060cUWvA7Q7c1vsthgCttOAM2z9yBI9zUIrDw,6238
71
71
  tests/test_sample/test_uk_regional_sample.py,sha256=gkeQWC2wC757jKJz_QBmDMFQjn3R54q_tEo948yyxCY,4840
72
72
  tests/torch_datasets/test_merge_and_fill_utils.py,sha256=GtuQg82BM1eHQjT7Ik1x1zaVcuc7KJO4_NC9stXsd4s,1123
73
- tests/torch_datasets/test_pvnet_uk.py,sha256=OzT9ArdnWPa3iJKggxc2-7npkDqWmZyS5pzM4M08NZU,5566
73
+ tests/torch_datasets/test_pvnet_uk.py,sha256=loueo7PUUYJVda3-vBn3bQIC_zgrTAThfx-GTDcBOZg,5596
74
74
  tests/torch_datasets/test_site.py,sha256=5MH5zkHFJXekwpnV6nHuSxt_sRNu9_mxiUjfWqmEhr0,6966
75
- ocf_data_sampler-0.1.4.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
76
- ocf_data_sampler-0.1.4.dist-info/METADATA,sha256=hsPFFitpSgAL9VsZXEgLOihY8XZsC82NBmdf7E9Ty-I,12173
77
- ocf_data_sampler-0.1.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
78
- ocf_data_sampler-0.1.4.dist-info/top_level.txt,sha256=Faob6N6cFdPc5eUpCTYcXgCaNhi4XLLteUL5W5ayYmg,31
79
- ocf_data_sampler-0.1.4.dist-info/RECORD,,
75
+ ocf_data_sampler-0.1.5.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
76
+ ocf_data_sampler-0.1.5.dist-info/METADATA,sha256=PetECVCNM6jys05FuPsOVmntGurbxTuW3n1_j7CYCLE,12173
77
+ ocf_data_sampler-0.1.5.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
78
+ ocf_data_sampler-0.1.5.dist-info/top_level.txt,sha256=Faob6N6cFdPc5eUpCTYcXgCaNhi4XLLteUL5W5ayYmg,31
79
+ ocf_data_sampler-0.1.5.dist-info/RECORD,,
tests/torch_datasets/test_pvnet_uk.py CHANGED
@@ -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():