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

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

Author: pre-commit-ci[bot]

environment.yml

@@ -14,4 +14,4 @@ dependencies:
   - zarr
 pip:
   - einops
-  - pathy
+  - pathy

ocf_datapipes/batch/merge_batchml.py

@@ -1,2 +1,2 @@
-from torchdata.datapipes.iter import IterDataPipe
 from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe

ocf_datapipes/config/model.py

@@ -20,8 +20,6 @@
 import numpy as np
 import pandas as pd
 from nowcasting_datamodel.models.pv import providers, pv_output, solar_sheffield_passiv
-from pathy import Pathy
-from pydantic import BaseModel, Field, root_validator, validator
 
 # nowcasting_dataset imports
 from nowcasting_dataset.consts import (
@@ -31,6 +29,8 @@
     SAT_VARIABLE_NAMES,
 )
 from nowcasting_dataset.dataset.split import split
+from pathy import Pathy
+from pydantic import BaseModel, Field, root_validator, validator
 
 IMAGE_SIZE_PIXELS = 64
 IMAGE_SIZE_PIXELS_FIELD = Field(

ocf_datapipes/load/__init__.py

@@ -1,11 +1,12 @@
+from .gsp import OpenGSPIterDataPipe as OpenGSP
+from .nwp import OpenNWPIterDataPipe as OpenNWP
 from .pv import OpenPVFromDBIterDataPipe as OpenPVFromDB
 from .pv import OpenPVFromNetCDFIterDataPipe as OpenPVFromNetCDF
 from .satellite import OpenSatelliteDataPipe as OpenSatellite
-from .nwp import OpenNWPIterDataPipe as OpenNWP
-from .gsp import OpenGSPIterDataPipe as OpenGSP
 
 try:
     import rioxarray  # Rioxarray is sometimes a pain to install, so only load this if its installed
+
     from .topographic import OpenTopographyIterDataPipe as OpenTopography
 except ImportError:
     print("Rioxarray is not installed, so not importing OpenTopography")

ocf_datapipes/load/configuration.py

@@ -1,9 +1,8 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-
 import fsspec
 from pathy import Pathy
 from pyaml_env import parse_config
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
 
 
 @functional_datapipe("open_config")

ocf_datapipes/load/gsp.py

@@ -1,10 +1,11 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
 import datetime
+
 import geopandas as gpd
-import xarray as xr
-import pandas as pd
 import numpy as np
+import pandas as pd
+import xarray as xr
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
 
 
 @functional_datapipe("open_gsp")

ocf_datapipes/load/nwp.py

@@ -1,12 +1,13 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-import xarray as xr
-from typing import Union
-from pathlib import Path
 import logging
-import numpy as np
+from pathlib import Path
+from typing import Union
+
 import dask
+import numpy as np
 import pandas as pd
+import xarray as xr
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
 
 _log = logging.getLogger(__name__)
 

ocf_datapipes/load/pv.py

@@ -1,16 +1,14 @@
 import datetime
-
+import logging
 from pathlib import Path
 from typing import Optional, Union
 
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-import logging
-
 import fsspec
 import numpy as np
 import pandas as pd
 import xarray as xr
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
 
 _log = logging.getLogger(__name__)
 

ocf_datapipes/load/satellite.py

@@ -1,12 +1,13 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-import xarray as xr
-from typing import Union
-from pathlib import Path
 import logging
-import numpy as np
+from pathlib import Path
+from typing import Union
+
 import dask
+import numpy as np
 import pandas as pd
+import xarray as xr
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
 
 _log = logging.getLogger(__name__)
 

ocf_datapipes/load/topographic.py

@@ -1,8 +1,9 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-from typing import Union
 from pathlib import Path
+from typing import Union
+
 import rioxarray
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
 
 
 @functional_datapipe("open_topography")

ocf_datapipes/select/location_picker.py

@@ -1,6 +1,7 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
 import numpy as np
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
+
 
 @functional_datapipe("location_picker")
 class LocationPickerIterDataPipe(IterDataPipe):

ocf_datapipes/select/offset_t0.py

@@ -1,11 +1,18 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-import numpy as np
 from typing import Union
 
+import numpy as np
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
+
+
 @functional_datapipe("offset_t0")
 class OffsetT0IterDataPipe(IterDataPipe):
-    def __init__(self, source_dp: IterDataPipe, max_t0_offset_minutes: Union[float, int], min_t0_offset_minutes: Union[float, int] = 0.0):
+    def __init__(
+        self,
+        source_dp: IterDataPipe,
+        max_t0_offset_minutes: Union[float, int],
+        min_t0_offset_minutes: Union[float, int] = 0.0,
+    ):
         self.source_dp = source_dp
         self.max_t0_offset_minutes = max_t0_offset_minutes
         self.min_t0_offset_minutes = min_t0_offset_minutes

ocf_datapipes/select/select_overlapping_time_slices.py

@@ -1,6 +1,7 @@
-from torchdata.datapipes.iter import IterDataPipe, Zipper
+from typing import Iterable, Union
+
 from torchdata.datapipes import functional_datapipe
-from typing import Union, Iterable
+from torchdata.datapipes.iter import IterDataPipe, Zipper
 
 
 @functional_datapipe("select_overlapping_time_slice")

ocf_datapipes/select/select_time_periods.py

@@ -1,9 +1,10 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-import xarray as xr
-import pandas as pd
 from typing import Union
 
+import pandas as pd
+import xarray as xr
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
+
 
 @functional_datapipe("select_time_periods")
 class SelectTimePeriodsIterDataPipe(IterDataPipe):

ocf_datapipes/transform/numpy/add_topographic_data.py

@@ -1,9 +1,11 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-import xarray as xr
 import numpy as np
-from ocf_datapipes.utils import NumpyBatch
+import xarray as xr
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
+
 from ocf_datapipes.consts import BatchKey
+from ocf_datapipes.utils import NumpyBatch
+
 
 @functional_datapipe("add_topographic_data")
 class AddTopographicDataIterDataPipe(IterDataPipe):

ocf_datapipes/transform/numpy/align_gsp_to_5_min.py

@@ -1,11 +1,10 @@
-from torchdata.datapipes.iter import IterDataPipe
+import numpy as np
+import pandas as pd
 from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
 
-from ocf_datapipes.utils import NumpyBatch, datetime64_to_float, stack_np_examples_into_batch
 from ocf_datapipes.consts import BatchKey
-
-import numpy as np
-import pandas as pd
+from ocf_datapipes.utils import NumpyBatch, datetime64_to_float, stack_np_examples_into_batch
 
 
 @functional_datapipe("align_gsp_to_5_min")

ocf_datapipes/transform/numpy/encode_space_time.py

@@ -1,13 +1,12 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-from numbers import Number
-
-from ocf_datapipes.utils import NumpyBatch
-from ocf_datapipes.consts import BatchKey
-
 import warnings
+from numbers import Number
 
 import numpy as np
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
+
+from ocf_datapipes.consts import BatchKey
+from ocf_datapipes.utils import NumpyBatch
 
 
 @functional_datapipe("encode_space_time")

ocf_datapipes/transform/numpy/sun_position.py

@@ -1,9 +1,11 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
+import warnings
+
 import numpy as np
 import pandas as pd
 import pvlib
-import warnings
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
+
 from ocf_datapipes.consts import BatchKey
 from ocf_datapipes.geospatial import osgb_to_lat_lon
 
@@ -12,6 +14,7 @@
 AZIMUTH_MEAN = 177.7
 AZIMUTH_STD = 41.7
 
+
 @functional_datapipe("add_sun_position")
 class AddSunPositionIterDataPipe(IterDataPipe):
     def __init__(self, source_dp: IterDataPipe, modality_name: str):
@@ -63,7 +66,7 @@ def __iter__(self):
             for example_idx, (lat, lon) in enumerate(zip(lats, lons)):
                 if not np.isfinite([lat, lon]).all():
                     assert (
-                            self.modality_name == "pv"
+                        self.modality_name == "pv"
                     ), f"{self.modality_name} lat and lon must be finite! But {lat=} {lon=}!"
                     # This is PV data, for a location which has no PV systems.
                     must_be_finite = False

ocf_datapipes/transform/xarray/__init__.py

@@ -1,2 +1,4 @@
 from .reduce_num_pv_systems import ReduceNumPVSystemsIterDataPipe as ReduceNumPVSystems
-from .select_pv_systems_within_region import SelectPVSystemsWithinRegionIterDataPipe as SelectPVSystemsWithinRegion
+from .select_pv_systems_within_region import (
+    SelectPVSystemsWithinRegionIterDataPipe as SelectPVSystemsWithinRegion,
+)

ocf_datapipes/transform/xarray/reduce_num_pv_systems.py

@@ -1,7 +1,6 @@
-from torchdata.datapipes.iter import IterDataPipe
-
 import numpy as np
 import xarray as xr
+from torchdata.datapipes.iter import IterDataPipe
 
 
 class ReduceNumPVSystemsIterDataPipe(IterDataPipe):

ocf_datapipes/transform/xarray/select_pv_systems_within_region.py

@@ -1,15 +1,23 @@
-from torchdata.datapipes.iter import IterDataPipe
-from torchdata.datapipes import functional_datapipe
-import xarray as xr
+import logging
+
 import numpy as np
 import pandas as pd
-import logging
+import xarray as xr
+from torchdata.datapipes import functional_datapipe
+from torchdata.datapipes.iter import IterDataPipe
 
 _log = logging.getLogger(__name__)
 
+
 @functional_datapipe("select_pv_systems_within_region")
 class SelectPVSystemsWithinRegionIterDataPipe(IterDataPipe):
-    def __init__(self, source_dp: IterDataPipe, location_dp: IterDataPipe, roi_width_km: float, roi_height_km: float):
+    def __init__(
+        self,
+        source_dp: IterDataPipe,
+        location_dp: IterDataPipe,
+        roi_width_km: float,
+        roi_height_km: float,
+    ):
         self.source_dp = source_dp
         self.location_dp = location_dp
         self.roi_width_km = roi_width_km

requirements.txt

@@ -7,4 +7,4 @@ numpy
 pandas
 rioxarray
 pathy
-pyaml_env
+pyaml_env