ocf-data-sampler 0.0.23__py3-none-any.whl → 0.0.24__py3-none-any.whl

ocf_data_sampler/numpy_batch/__init__.py

@@ -1,7 +1,7 @@
 """Conversion from Xarray to NumpyBatch"""
 
-from .gsp import convert_gsp_to_numpy_batch
-from .nwp import convert_nwp_to_numpy_batch
-from .satellite import convert_satellite_to_numpy_batch
+from .gsp import convert_gsp_to_numpy_batch, GSPBatchKey
+from .nwp import convert_nwp_to_numpy_batch, NWPBatchKey
+from .satellite import convert_satellite_to_numpy_batch, SatelliteBatchKey
 from .sun_position import make_sun_position_numpy_batch
 

ocf_data_sampler/numpy_batch/gsp.py

@@ -6,15 +6,15 @@ import xarray as xr
 class GSPBatchKey:
 
     gsp = 'gsp'
-    gsp_nominal_capacity_mwp = 'gsp_nominal_capacity_mwp'
-    gsp_effective_capacity_mwp = 'gsp_effective_capacity_mwp'
-    gsp_time_utc = 'gsp_time_utc'
-    gsp_t0_idx = 'gsp_t0_idx'
-    gsp_solar_azimuth = 'gsp_solar_azimuth'
-    gsp_solar_elevation = 'gsp_solar_elevation'
+    nominal_capacity_mwp = 'gsp_nominal_capacity_mwp'
+    effective_capacity_mwp = 'gsp_effective_capacity_mwp'
+    time_utc = 'gsp_time_utc'
+    t0_idx = 'gsp_t0_idx'
+    solar_azimuth = 'gsp_solar_azimuth'
+    solar_elevation = 'gsp_solar_elevation'
     gsp_id = 'gsp_id'
-    gsp_x_osgb = 'gsp_x_osgb'
-    gsp_y_osgb = 'gsp_y_osgb'
+    x_osgb = 'gsp_x_osgb'
+    y_osgb = 'gsp_y_osgb'
 
 
 def convert_gsp_to_numpy_batch(da: xr.DataArray, t0_idx: int | None = None) -> dict:
@@ -22,12 +22,12 @@ def convert_gsp_to_numpy_batch(da: xr.DataArray, t0_idx: int | None = None) -> d
 
     example = {
         GSPBatchKey.gsp: da.values,
-        GSPBatchKey.gsp_nominal_capacity_mwp: da.isel(time_utc=0)["nominal_capacity_mwp"].values,
-        GSPBatchKey.gsp_effective_capacity_mwp: da.isel(time_utc=0)["effective_capacity_mwp"].values,
-        GSPBatchKey.gsp_time_utc: da["time_utc"].values.astype(float),
+        GSPBatchKey.nominal_capacity_mwp: da.isel(time_utc=0)["nominal_capacity_mwp"].values,
+        GSPBatchKey.effective_capacity_mwp: da.isel(time_utc=0)["effective_capacity_mwp"].values,
+        GSPBatchKey.time_utc: da["time_utc"].values.astype(float),
     }
 
     if t0_idx is not None:
-        example[GSPBatchKey.gsp_t0_idx] = t0_idx
+        example[GSPBatchKey.t0_idx] = t0_idx
 
     return example

ocf_data_sampler/numpy_batch/nwp.py

@@ -7,13 +7,13 @@ import xarray as xr
 class NWPBatchKey:
 
     nwp = 'nwp'
-    nwp_channel_names = 'nwp_channel_names'
-    nwp_init_time_utc = 'nwp_init_time_utc'
-    nwp_step = 'nwp_step'
-    nwp_target_time_utc = 'nwp_target_time_utc'
-    nwp_t0_idx = 'nwp_t0_idx'
-    nwp_y_osgb = 'nwp_y_osgb'
-    nwp_x_osgb = 'nwp_x_osgb'
+    channel_names = 'nwp_channel_names'
+    init_time_utc = 'nwp_init_time_utc'
+    step = 'nwp_step'
+    target_time_utc = 'nwp_target_time_utc'
+    t0_idx = 'nwp_t0_idx'
+    y_osgb = 'nwp_y_osgb'
+    x_osgb = 'nwp_x_osgb'
 
 
 def convert_nwp_to_numpy_batch(da: xr.DataArray, t0_idx: int | None = None) -> dict:
@@ -21,23 +21,23 @@ def convert_nwp_to_numpy_batch(da: xr.DataArray, t0_idx: int | None = None) -> d
 
     example = {
         NWPBatchKey.nwp: da.values,
-        NWPBatchKey.nwp_channel_names: da.channel.values,
-        NWPBatchKey.nwp_init_time_utc: da.init_time_utc.values.astype(float),
-        NWPBatchKey.nwp_step: (da.step.values / pd.Timedelta("1h")).astype(int),
+        NWPBatchKey.channel_names: da.channel.values,
+        NWPBatchKey.init_time_utc: da.init_time_utc.values.astype(float),
+        NWPBatchKey.step: (da.step.values / pd.Timedelta("1h")).astype(int),
     }
 
     if "target_time_utc" in da.coords:
-        example[NWPBatchKey.nwp_target_time_utc] = da.target_time_utc.values.astype(float)
+        example[NWPBatchKey.target_time_utc] = da.target_time_utc.values.astype(float)
 
     # TODO: Do we need this at all? Especially since it is only present in UKV data
     for batch_key, dataset_key in (
-        (NWPBatchKey.nwp_y_osgb, "y_osgb"),
-        (NWPBatchKey.nwp_x_osgb, "x_osgb"),
+        (NWPBatchKey.y_osgb, "y_osgb"),
+        (NWPBatchKey.x_osgb, "x_osgb"),
     ):
         if dataset_key in da.coords:
             example[batch_key] = da[dataset_key].values
 
     if t0_idx is not None:
-        example[NWPBatchKey.nwp_t0_idx] = t0_idx
+        example[NWPBatchKey.t0_idx] = t0_idx
 
     return example

ocf_data_sampler/numpy_batch/satellite.py

@@ -5,26 +5,26 @@ import xarray as xr
 class SatelliteBatchKey:
 
     satellite_actual = 'satellite_actual'
-    satellite_time_utc = 'satellite_time_utc'
-    satellite_x_geostationary = 'satellite_x_geostationary'
-    satellite_y_geostationary = 'satellite_y_geostationary'
-    satellite_t0_idx = 'satellite_t0_idx'
+    time_utc = 'satellite_time_utc'
+    x_geostationary = 'satellite_x_geostationary'
+    y_geostationary = 'satellite_y_geostationary'
+    t0_idx = 'satellite_t0_idx'
 
 
 def convert_satellite_to_numpy_batch(da: xr.DataArray, t0_idx: int | None = None) -> dict:
     """Convert from Xarray to NumpyBatch"""
     example = {
         SatelliteBatchKey.satellite_actual: da.values,
-        SatelliteBatchKey.satellite_time_utc: da.time_utc.values.astype(float),
+        SatelliteBatchKey.time_utc: da.time_utc.values.astype(float),
     }
 
     for batch_key, dataset_key in (
-         (SatelliteBatchKey.satellite_x_geostationary, "x_geostationary"),
-        (SatelliteBatchKey.satellite_y_geostationary, "y_geostationary"),
+         (SatelliteBatchKey.x_geostationary, "x_geostationary"),
+        (SatelliteBatchKey.y_geostationary, "y_geostationary"),
     ):
         example[batch_key] = da[dataset_key].values
 
     if t0_idx is not None:
-        example[SatelliteBatchKey.satellite_t0_idx] = t0_idx
+        example[SatelliteBatchKey.t0_idx] = t0_idx
 
     return example

ocf_data_sampler/torch_datasets/pvnet_uk_regional.py

@@ -24,12 +24,12 @@ from ocf_data_sampler.numpy_batch import (
     convert_nwp_to_numpy_batch,
     convert_satellite_to_numpy_batch,
     make_sun_position_numpy_batch,
+    NWPBatchKey,
+    GSPBatchKey,
 )
 
 
 from ocf_data_sampler.config import Configuration, load_yaml_configuration
-from ocf_data_sampler.numpy_batch.nwp import NWPBatchKey
-from ocf_data_sampler.numpy_batch.gsp import GSPBatchKey
 
 from ocf_data_sampler.select.location import Location
 from ocf_data_sampler.select.geospatial import osgb_to_lon_lat
@@ -426,8 +426,8 @@ def process_and_combine_datasets(
     # TODO: Do we need all of these?
     numpy_modalities.append({
         GSPBatchKey.gsp_id: location.id,
-        GSPBatchKey.gsp_x_osgb: location.x,
-        GSPBatchKey.gsp_y_osgb: location.y,
+        GSPBatchKey.x_osgb: location.x,
+        GSPBatchKey.y_osgb: location.y,
     })
 
     # Combine all the modalities and fill NaNs

{ocf_data_sampler-0.0.23.dist-info → ocf_data_sampler-0.0.24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ocf_data_sampler
-Version: 0.0.23
+Version: 0.0.24
 Summary: Sample from weather data for renewable energy prediction
 Author: James Fulton, Peter Dudfield, and the Open Climate Fix team
 Author-email: info@openclimatefix.org

{ocf_data_sampler-0.0.23.dist-info → ocf_data_sampler-0.0.24.dist-info}/RECORD

@@ -15,10 +15,10 @@ ocf_data_sampler/load/nwp/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQ
 ocf_data_sampler/load/nwp/providers/ecmwf.py,sha256=vW-p3vCyQ-CofKo555-gE7VDi5hlpjtjTLfHqWF0HEE,1175
 ocf_data_sampler/load/nwp/providers/ukv.py,sha256=79Bm7q-K_GJPYMy62SUIZbRWRF4-tIaB1dYPEgLD9vo,1207
 ocf_data_sampler/load/nwp/providers/utils.py,sha256=Sy2exG1wpXLLhMXYdsfR-DZMR3txG1_bBmBdchlc-yA,848
-ocf_data_sampler/numpy_batch/__init__.py,sha256=mrtqwbGik5Zc9MYP5byfCTBm08wMtS2XnTsypC4fPMo,245
-ocf_data_sampler/numpy_batch/gsp.py,sha256=FQg5infqOZ8QAsRCXq00HPplN8XnsbKoWUeV3N7TGK8,1008
-ocf_data_sampler/numpy_batch/nwp.py,sha256=dt4gXZonrdkyoVmMnwkKyJ_xFnJ4M5xscr-pdNoRsc4,1311
-ocf_data_sampler/numpy_batch/satellite.py,sha256=yWYmq6hEvX4LTJ95K_e0BRJJkBmRurQT2mI2KibmwCI,983
+ocf_data_sampler/numpy_batch/__init__.py,sha256=M9b7L7kSgoZt2FKENDe-uFI_Qzs-fDecw-5qyrhnTm4,290
+ocf_data_sampler/numpy_batch/gsp.py,sha256=QjQ25JmtufvdiSsxUkBTPhxouYGWPnnWze8pXr_aBno,960
+ocf_data_sampler/numpy_batch/nwp.py,sha256=dAehfRo5DL2Yb20ifHHl5cU1QOrm3ZOpQmN39fSUOw8,1255
+ocf_data_sampler/numpy_batch/satellite.py,sha256=3NoE_ElzMHwO60apqJeFAwI6J7eIxD0OWTyAVl-uJi8,903
 ocf_data_sampler/numpy_batch/sun_position.py,sha256=zw2bjtcjsm_tvKk0r_MZmgfYUJLHuLjLly2sMjwP3XI,1606
 ocf_data_sampler/select/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 ocf_data_sampler/select/dropout.py,sha256=zDpVLMjGb70RRyYKN-WI2Kp3x9SznstT4cMcZ4dsvJg,1066
@@ -29,26 +29,26 @@ ocf_data_sampler/select/location.py,sha256=26Y5ZjfFngShBwXieuWSoOA-RLaRzci4TTmcD
 ocf_data_sampler/select/select_spatial_slice.py,sha256=hWIJe4_VzuQ2iiiQh7V17AXwTILT5kIkUvzG458J_Gw,11220
 ocf_data_sampler/select/select_time_slice.py,sha256=41cch1fQr59fZgv7UHsNGc3OvoynrixT3bmr3_1d7cU,6628
 ocf_data_sampler/torch_datasets/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-ocf_data_sampler/torch_datasets/pvnet_uk_regional.py,sha256=5AV_eFtQ842-E7kNeQPLvEvcmV4LDkJKYbV2rvU_wkE,19113
+ocf_data_sampler/torch_datasets/pvnet_uk_regional.py,sha256=Mlz_uyt8c8-uN0uaEiJV2DgF5WAqtWlsINFgA925CZI,19025
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=O77dmow8mGpGPbZ6Pz7ma7cLaiV1k8mxW1eYg37Avrw,5585
 tests/config/test_config.py,sha256=G_PD_pXib0zdRBPUIn0jjwJ9VyoKaO_TanLN1Mh5Ca4,5055
 tests/load/test_load_gsp.py,sha256=aT_nqaSXmUTcdHzuTT7AmXJr3R31k4OEN-Fv3eLxlQE,424
 tests/load/test_load_nwp.py,sha256=3qyyDkB1q9t3tyAwogfotNrxqUOpXXimco1CImoEWGg,753
 tests/load/test_load_satellite.py,sha256=STX5AqqmOAgUgE9R1xyq_sM3P1b8NKdGjO-hDhayfxM,524
-tests/numpy_batch/test_gsp.py,sha256=ke4CsFn9ZKRgrciT5-OHS8jmd8nu9gGKKr0T2WzZK6M,592
-tests/numpy_batch/test_nwp.py,sha256=7ELnpQc6kAWPTQoPejTnXIxCPgjFVmzmdsa8E0ZEBGY,1490
-tests/numpy_batch/test_satellite.py,sha256=DIVnVq7JYgoC6Y6xMtLCNUnk3ADzakCi0bZ44QTdPgQ,1230
-tests/numpy_batch/test_sun_position.py,sha256=zw7ErTKARkW8NrpXJ9MeGp-dkNBJsCscxQx0dnZHg2c,2513
+tests/numpy_batch/test_gsp.py,sha256=VANXV32K8aLX4dCdhCUnDorJmyNN-Bjc7Wc1N-RzWEk,548
+tests/numpy_batch/test_nwp.py,sha256=Fnj7cR-VR2Z0kMu8SrgnIayjxWnPWrYFjWSjMmnrh4Y,1445
+tests/numpy_batch/test_satellite.py,sha256=8a4ZwMLpsOmYKmwI1oW_su_hwkCNYMEJAEfa0dbsx1k,1179
+tests/numpy_batch/test_sun_position.py,sha256=FYQ7KtlN0V5LlEjgI-cKjTMtGHUCxiMvxkRYTdMAgEE,2485
 tests/select/test_dropout.py,sha256=kiycl7RxAQYMCZJlokmx6Da5h_oBpSs8Is8pmSW4gOU,2413
 tests/select/test_fill_time_periods.py,sha256=o59f2YRe5b0vJrG3B0aYZkYeHnpNk4s6EJxdXZluNQg,907
 tests/select/test_find_contiguous_time_periods.py,sha256=G6tJRJd0DMfH9EdfzlKWsmfTbtMwOf3w-2filjJzuIQ,5998
 tests/select/test_location.py,sha256=_WZk2FPYeJ-nIfCJS6Sp_yaVEEo7m31DmMFoZzgyCts,2712
 tests/select/test_select_spatial_slice.py,sha256=7EX9b6g-pMdACQx3yefjs5do2s-Rho2UmKevV4oglsU,5147
 tests/select/test_select_time_slice.py,sha256=XC1J3DBBDnt81jcba5u-Hnd0yKv8GIQErLm-OECV6rs,10147
-tests/torch_datasets/test_pvnet_uk_regional.py,sha256=r1SHtwaXQrOYU3EOH1OEp_Bamo338IMv-9Q_gKsUOa4,2789
-ocf_data_sampler-0.0.23.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
-ocf_data_sampler-0.0.23.dist-info/METADATA,sha256=mQrWfafPPHVh3Bq40lCEq2_qNcmCj2_8piukA2yqLAg,5269
-ocf_data_sampler-0.0.23.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-ocf_data_sampler-0.0.23.dist-info/top_level.txt,sha256=KaQn5qzkJGJP6hKWqsVAc9t0cMLjVvSTk8-kTrW79SA,23
-ocf_data_sampler-0.0.23.dist-info/RECORD,,
+tests/torch_datasets/test_pvnet_uk_regional.py,sha256=u3taw6p3oozM0_7cEEhCYbImAQPRldRhpruqSyV08Vg,2675
+ocf_data_sampler-0.0.24.dist-info/LICENSE,sha256=F-Q3UFCR-BECSocV55BFDpn4YKxve9PKrm-lTt6o_Tg,1073
+ocf_data_sampler-0.0.24.dist-info/METADATA,sha256=wwIltvHOvOd-L2KaOF3jsLOMx-QuY6yP6sNR0QddCdk,5269
+ocf_data_sampler-0.0.24.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+ocf_data_sampler-0.0.24.dist-info/top_level.txt,sha256=KaQn5qzkJGJP6hKWqsVAc9t0cMLjVvSTk8-kTrW79SA,23
+ocf_data_sampler-0.0.24.dist-info/RECORD,,

tests/numpy_batch/test_gsp.py

@@ -1,7 +1,6 @@
 from ocf_data_sampler.load.gsp import open_gsp
 
-from ocf_data_sampler.numpy_batch import convert_gsp_to_numpy_batch
-from ocf_data_sampler.numpy_batch.gsp import GSPBatchKey
+from ocf_data_sampler.numpy_batch import convert_gsp_to_numpy_batch, GSPBatchKey
 
 def test_convert_gsp_to_numpy_batch(uk_gsp_zarr_path):
 

tests/numpy_batch/test_nwp.py

@@ -4,9 +4,7 @@ import xarray as xr
 
 import pytest
 
-from ocf_data_sampler.numpy_batch import convert_nwp_to_numpy_batch
-
-from ocf_data_sampler.numpy_batch.nwp import NWPBatchKey
+from ocf_data_sampler.numpy_batch import convert_nwp_to_numpy_batch, NWPBatchKey
 
 @pytest.fixture(scope="module")
 def da_nwp_like():

tests/numpy_batch/test_satellite.py

@@ -5,9 +5,7 @@ import xarray as xr
 
 import pytest
 
-from ocf_data_sampler.numpy_batch import convert_satellite_to_numpy_batch
-
-from ocf_data_sampler.numpy_batch.satellite import SatelliteBatchKey
+from ocf_data_sampler.numpy_batch import convert_satellite_to_numpy_batch, SatelliteBatchKey
 
 
 @pytest.fixture(scope="module")

tests/numpy_batch/test_sun_position.py

@@ -6,7 +6,7 @@ from ocf_data_sampler.numpy_batch.sun_position import (
     calculate_azimuth_and_elevation, make_sun_position_numpy_batch
 )
 
-from ocf_data_sampler.numpy_batch.gsp import GSPBatchKey
+from ocf_data_sampler.numpy_batch import GSPBatchKey
 
 
 @pytest.mark.parametrize("lat", [0, 5, 10, 23.5])
@@ -71,11 +71,11 @@ def test_make_sun_position_numpy_batch():
 
     batch = make_sun_position_numpy_batch(datetimes, lon, lat, key_prefix="gsp")
 
-    assert GSPBatchKey.gsp_solar_elevation in batch
-    assert GSPBatchKey.gsp_solar_azimuth in batch
+    assert GSPBatchKey.solar_elevation in batch
+    assert GSPBatchKey.solar_azimuth in batch
 
     # The solar coords are normalised in the function
-    assert (batch[GSPBatchKey.gsp_solar_elevation]>=0).all()
-    assert (batch[GSPBatchKey.gsp_solar_elevation]<=1).all()
-    assert (batch[GSPBatchKey.gsp_solar_azimuth]>=0).all()
-    assert (batch[GSPBatchKey.gsp_solar_azimuth]<=1).all()
+    assert (batch[GSPBatchKey.solar_elevation]>=0).all()
+    assert (batch[GSPBatchKey.solar_elevation]<=1).all()
+    assert (batch[GSPBatchKey.solar_azimuth]>=0).all()
+    assert (batch[GSPBatchKey.solar_azimuth]<=1).all()

tests/torch_datasets/test_pvnet_uk_regional.py

@@ -3,9 +3,7 @@ import tempfile
 
 from ocf_data_sampler.torch_datasets.pvnet_uk_regional import PVNetUKRegionalDataset
 from ocf_data_sampler.config import load_yaml_configuration, save_yaml_configuration
-from ocf_data_sampler.numpy_batch.nwp import NWPBatchKey
-from ocf_data_sampler.numpy_batch.gsp import GSPBatchKey
-from ocf_data_sampler.numpy_batch.satellite import SatelliteBatchKey
+from ocf_data_sampler.numpy_batch import NWPBatchKey, GSPBatchKey, SatelliteBatchKey
 
 
 @pytest.fixture()
@@ -39,7 +37,7 @@ def test_pvnet(pvnet_config_filename):
 
     for key in [
         NWPBatchKey.nwp, SatelliteBatchKey.satellite_actual, GSPBatchKey.gsp,
-        GSPBatchKey.gsp_solar_azimuth, GSPBatchKey.gsp_solar_elevation,
+        GSPBatchKey.solar_azimuth, GSPBatchKey.solar_elevation,
     ]:
         assert key in sample
     
@@ -54,8 +52,8 @@ def test_pvnet(pvnet_config_filename):
     # 3 hours of 30 minute data (inclusive)
     assert sample[GSPBatchKey.gsp].shape == (7,)
     # Solar angles have same shape as GSP data
-    assert sample[GSPBatchKey.gsp_solar_azimuth].shape == (7,)
-    assert sample[GSPBatchKey.gsp_solar_elevation].shape == (7,)
+    assert sample[GSPBatchKey.solar_azimuth].shape == (7,)
+    assert sample[GSPBatchKey.solar_elevation].shape == (7,)
 
 def test_pvnet_no_gsp(pvnet_config_filename):