Merge branch 'refactor' of https://github.com/openclimatefix/ocf_datapipes into refactor

Author: dfulu

ocf_datapipes/select/__init__.py

@@ -1,5 +1,4 @@
 """Selection datapipes"""
-from .select_gsp_ids import SelectGSPIDsIterDataPipe as SelectGSPIDs
 from .drop_pv_sys_generating_overnight import (
     DropPvSysGeneratingOvernightIterDataPipe as DropPvSysGeneratingOvernight,
 )
@@ -9,6 +8,7 @@
 from .location_picker import LocationPickerIterDataPipe as LocationPicker
 from .number_of_location import NumberOfLocationsrIterDataPipe as NumberOfLocations
 from .select_channels import SelectChannelsIterDataPipe as SelectChannels
+from .select_gsp_ids import SelectGSPIDsIterDataPipe as SelectGSPIDs
 from .select_id import SelectIDIterDataPipe as SelectID
 from .select_live_t0_time import SelectLiveT0TimeIterDataPipe as SelectLiveT0Time
 from .select_live_time_slice import SelectLiveTimeSliceIterDataPipe as SelectLiveTimeSlice

ocf_datapipes/training/metnet/metnet_gsp_national.py

@@ -8,7 +8,7 @@
 from torch.utils.data.datapipes.datapipe import IterDataPipe
 
 from ocf_datapipes.convert import ConvertGSPToNumpy
-from ocf_datapipes.select import SelectGSPIDs, LocationPicker
+from ocf_datapipes.select import LocationPicker, SelectGSPIDs
 from ocf_datapipes.training.common import (
     add_selected_time_slices_from_datapipes,
     get_and_return_overlapping_time_periods_and_t0,

ocf_datapipes/training/metnet/metnet_national.py

@@ -18,7 +18,7 @@
     OpenSatellite,
     OpenTopography,
 )
-from ocf_datapipes.select import SelectGSPIDs, LocationPicker
+from ocf_datapipes.select import LocationPicker, SelectGSPIDs
 from ocf_datapipes.transform.xarray import PreProcessMetNet
 from ocf_datapipes.utils.consts import RSS_MEAN, RSS_STD, UKV_MEAN, UKV_STD
 

ocf_datapipes/training/metnet/metnet_national_class.py

@@ -18,7 +18,7 @@
     OpenSatellite,
     OpenTopography,
 )
-from ocf_datapipes.select import SelectGSPIDs, LocationPicker
+from ocf_datapipes.select import LocationPicker, SelectGSPIDs
 from ocf_datapipes.transform.xarray import PreProcessMetNet
 from ocf_datapipes.utils.consts import RSS_MEAN, RSS_STD, UKV_MEAN, UKV_STD
 

ocf_datapipes/training/metnet/metnet_pv_national.py

@@ -18,7 +18,7 @@
     OpenSatellite,
     OpenTopography,
 )
-from ocf_datapipes.select import SelectGSPIDs, LocationPicker
+from ocf_datapipes.select import LocationPicker, SelectGSPIDs
 from ocf_datapipes.transform.xarray import PreProcessMetNet
 from ocf_datapipes.utils.consts import RSS_MEAN, RSS_STD, UKV_MEAN, UKV_STD