[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

.github/workflows/workflows.yaml

@@ -14,5 +14,5 @@ jobs:
       pytest_cov_dir: "ocf_datapipes"
       # extra things to install
       sudo_apt_install: "libgeos++-dev libproj-dev proj-data proj-bin"
-#      brew_install: "proj geos librttopo"
-      os_list:   '["ubuntu-latest"]'
+      #      brew_install: "proj geos librttopo"
+      os_list: '["ubuntu-latest"]'

ocf_datapipes/load/configuration.py

@@ -1,6 +1,7 @@
+import logging
+
 import fsspec
 from pathy import Pathy
-import logging
 from pyaml_env import parse_config
 from torchdata.datapipes import functional_datapipe
 from torchdata.datapipes.iter import IterDataPipe

ocf_datapipes/transform/xarray/add_t0idx_and_sample_period_duration.py

@@ -1,9 +1,9 @@
+from datetime import timedelta
 from typing import Union
 
 import xarray as xr
 from torchdata.datapipes import functional_datapipe
 from torchdata.datapipes.iter import IterDataPipe
-from datetime import timedelta
 
 
 @functional_datapipe("add_t0_idx_and_sample_period_duration")

ocf_datapipes/transform/xarray/convert_to_nwp_target_times.py

@@ -1,5 +1,5 @@
-from typing import Union
 from datetime import timedelta
+from typing import Union
 
 import pandas as pd
 import xarray as xr

ocf_datapipes/transform/xarray/get_contiguous_time_periods.py

@@ -1,8 +1,9 @@
-import pandas as pd
+from datetime import timedelta
+
 import numpy as np
+import pandas as pd
 from torchdata.datapipes import functional_datapipe
 from torchdata.datapipes.iter import IterDataPipe
-from datetime import timedelta
 
 
 @functional_datapipe("add_contiguous_time_periods")

ocf_datapipes/transform/xarray/normalize.py

@@ -1,6 +1,7 @@
-import xarray as xr
+from typing import Callable, Optional, Union
+
 import numpy as np
-from typing import Optional, Union, Callable
+import xarray as xr
 from torchdata.datapipes import functional_datapipe
 from torchdata.datapipes.iter import IterDataPipe
 

tests/convert/test_gsp.py

@@ -1,8 +1,8 @@
+from datetime import timedelta
+
 from ocf_datapipes.convert import ConvertGSPToNumpyBatch
 from ocf_datapipes.transform.xarray import AddT0IdxAndSamplePeriodDuration
 
-from datetime import timedelta
-
 
 def test_convert_gsp_to_numpy_batch(gsp_dp):
     gsp_dp = AddT0IdxAndSamplePeriodDuration(

tests/convert/test_nwp.py

@@ -1,8 +1,8 @@
+from datetime import timedelta
+
 from ocf_datapipes.convert import ConvertNWPToNumpyBatch
-from ocf_datapipes.transform.xarray import AddT0IdxAndSamplePeriodDuration, ConvertToNWPTargetTime
 from ocf_datapipes.select import SelectLiveT0Time
-
-from datetime import timedelta
+from ocf_datapipes.transform.xarray import AddT0IdxAndSamplePeriodDuration, ConvertToNWPTargetTime
 
 
 def test_convert_nwp_to_numpy_batch(nwp_dp):

tests/convert/test_pv.py

@@ -1,8 +1,8 @@
+from datetime import timedelta
+
 from ocf_datapipes.convert import ConvertPVToNumpyBatch
 from ocf_datapipes.transform.xarray import AddT0IdxAndSamplePeriodDuration
 
-from datetime import timedelta
-
 
 def test_convert_passiv_to_numpy_batch(passiv_dp):
     passiv_dp = AddT0IdxAndSamplePeriodDuration(

tests/convert/test_satellite.py

@@ -1,8 +1,8 @@
+from datetime import timedelta
+
 from ocf_datapipes.convert import ConvertSatelliteToNumpyBatch
 from ocf_datapipes.transform.xarray import AddT0IdxAndSamplePeriodDuration
 
-from datetime import timedelta
-
 
 def test_convert_satellite_to_numpy_batch(sat_dp):
 

tests/end2end/test_power_perceiver_production.py

@@ -17,6 +17,7 @@
     ConvertSatelliteToNumpyBatch,
 )
 from ocf_datapipes.experimental import EnsureNNWPVariables, SetSystemIDsToOne
+from ocf_datapipes.production.power_perceiver import GSPIterator
 from ocf_datapipes.select import (
     LocationPicker,
     SelectLiveT0Time,
@@ -43,7 +44,6 @@
     ReprojectTopography,
 )
 from ocf_datapipes.utils.consts import NWP_MEAN, NWP_STD, SAT_MEAN, SAT_STD, BatchKey
-from ocf_datapipes.production.power_perceiver import GSPIterator
 
 
 def test_power_perceiver_production(sat_hrv_dp, passiv_dp, topo_dp, gsp_dp, nwp_dp):

tests/production/test_pp_production.py

@@ -1,10 +1,11 @@
-from ocf_datapipes.production.power_perceiver import power_perceiver_production_datapipe
-from ocf_datapipes.utils.consts import BatchKey
-
-import ocf_datapipes
 import os
+
 import pytest
 
+import ocf_datapipes
+from ocf_datapipes.production.power_perceiver import power_perceiver_production_datapipe
+from ocf_datapipes.utils.consts import BatchKey
+
 
 @pytest.mark.skip("Need to set up laod PV from database first")
 def test_pp_production_datapipe():

tests/select/test_select_live_time_slice.py

@@ -7,7 +7,9 @@
 def test_select_hrv(sat_hrv_dp):
     time_len = len(next(iter(sat_hrv_dp)).time_utc.values)
     t0_dp = SelectLiveT0Time(sat_hrv_dp, dim_name="time_utc")
-    sat_hrv_dp = SelectLiveTimeSlice(sat_hrv_dp, history_duration=timedelta(minutes=60), t0_datapipe=t0_dp)
+    sat_hrv_dp = SelectLiveTimeSlice(
+        sat_hrv_dp, history_duration=timedelta(minutes=60), t0_datapipe=t0_dp
+    )
     data = next(iter(sat_hrv_dp))
     assert len(data.time_utc.values) == 13
     assert len(data.time_utc.values) < time_len
@@ -33,10 +35,10 @@ def test_select_nwp(nwp_dp):
     )
     time_len = len(next(iter(nwp_dp)).target_time_utc.values)
     nwp_dp = SelectLiveTimeSlice(
-         nwp_dp,
-         t0_datapipe=t0_dp,
-         history_duration=timedelta(minutes=120),
-         dim_name="target_time_utc",
+        nwp_dp,
+        t0_datapipe=t0_dp,
+        history_duration=timedelta(minutes=120),
+        dim_name="target_time_utc",
     )
     data = next(iter(nwp_dp))
     assert len(data.target_time_utc.values) == 3
@@ -46,7 +48,9 @@ def test_select_nwp(nwp_dp):
 def test_select_passiv(passiv_dp):
     time_len = len(next(iter(passiv_dp)).time_utc.values)
     t0_dp = SelectLiveT0Time(passiv_dp, dim_name="time_utc")
-    passiv_dp = SelectLiveTimeSlice(passiv_dp, history_duration=timedelta(minutes=60), t0_datapipe=t0_dp)
+    passiv_dp = SelectLiveTimeSlice(
+        passiv_dp, history_duration=timedelta(minutes=60), t0_datapipe=t0_dp
+    )
     data = next(iter(passiv_dp))
     assert len(data.time_utc.values) == 13
     assert len(data.time_utc.values) < time_len
@@ -55,7 +59,9 @@ def test_select_passiv(passiv_dp):
 def test_select_pvoutput(pvoutput_dp):
     time_len = len(next(iter(pvoutput_dp)).time_utc.values)
     t0_dp = SelectLiveT0Time(pvoutput_dp, dim_name="time_utc")
-    pvoutput_dp = SelectLiveTimeSlice(pvoutput_dp, history_duration=timedelta(minutes=60), t0_datapipe=t0_dp)
+    pvoutput_dp = SelectLiveTimeSlice(
+        pvoutput_dp, history_duration=timedelta(minutes=60), t0_datapipe=t0_dp
+    )
     data = next(iter(pvoutput_dp))
     assert len(data.time_utc.values) == 13
     assert len(data.time_utc.values) < time_len

tests/transform/xarray/test_add_nwp_target_time.py

@@ -1,7 +1,8 @@
-from ocf_datapipes.transform.xarray import ConvertToNWPTargetTime
-from ocf_datapipes.select import SelectLiveT0Time
 from datetime import timedelta
 
+from ocf_datapipes.select import SelectLiveT0Time
+from ocf_datapipes.transform.xarray import ConvertToNWPTargetTime
+
 
 def test_add_nwp_target_time(nwp_dp):
     t0_dp = SelectLiveT0Time(nwp_dp, dim_name="init_time_utc")

tests/transform/xarray/test_normalize.py

@@ -1,6 +1,7 @@
+import numpy as np
+
 from ocf_datapipes.transform.xarray import Normalize
 from ocf_datapipes.utils.consts import NWP_MEAN, NWP_STD, SAT_MEAN, SAT_STD
-import numpy as np
 
 
 def test_normalize_sat(sat_dp):