Renamed testfile to match implementation, ruff formatting

Author: Hneuschmidt

efast/constants.py

@@ -6,11 +6,13 @@ class S3L2SYNCloudFlags(Flag):
     Flag meanings are described in the SYNERGY Product Data Format Specification [1]
     Table 23
     """
+
     CLOUD = 1
     CLOUD_AMBIGUOUS = 1 << 1
     CLOUD_MARGIN = 1 << 2
     SNOW_ICE = 1 << 3
 
+
 class S3L2SYNClassificationAerosolFlags(Flag):
     """
     Flag meanings are described in the SYNERGY Product Data Format Specification [1]
@@ -19,12 +21,14 @@ class S3L2SYNClassificationAerosolFlags(Flag):
 
     [1] https://sentinels.copernicus.eu/documents/247904/1872824/S3IPF+PDS+006+-+i1r15+-+Product+Data+Format+Specification+-+SYNERGY_20221208.pdf/48f4eb8c-ca08-eca1-f8dd-bf00c438ea52?t=1683308328839
     """
+
     SYN_AOT_climato = 1 << 3
     SYN_land = 1 << 4
     SYN_no_olc = 1 << 5
-    SYN_no_sln = 1 
+    SYN_no_sln = 1
     # TODO ...
 
+
 class S2L2ASCFlags(Enum):
     NO_DATA = 0
     SATURATED_OR_DEFECTIVE = 1
@@ -38,4 +42,3 @@ class S2L2ASCFlags(Enum):
     CLOUD_HIGH_PROBABILITY = 9
     THIN_CIRRUS = 10
     SNOW_ICE = 11
-    

efast/openeo/preprocessing/s2.py

@@ -18,7 +18,7 @@ def extract_cloud_mask(cube: openeo.DataCube) -> openeo.DataCube:
             ]
         },
         operations={
-            ("SCL", 7): operator.gt, # consider flags higher than 7 as clouds
+            ("SCL", 7): operator.gt,  # consider flags higher than 7 as clouds
         },
     )
 

efast/openeo/preprocessing/s3.py

@@ -1,6 +1,8 @@
 from datetime import datetime
+
 import openeo
-from openeo import processes, UDF
+
+from openeo import UDF, processes
 
 from efast.constants import S3L2SYNClassificationAerosolFlags, S3L2SYNCloudFlags
 from efast.openeo.preprocessing.general import _extract_bit_mask

tests/test_temporal_score_udf.py …sts/test_compute_s3_composite_weights.pytests/test_temporal_score_udf.py renamed to tests/test_compute_s3_composite_weights.py tests/test_temporal_score_udf.py renamed to tests/test_compute_s3_composite_weights.py

@@ -65,6 +65,3 @@ def test_time_difference_score():
     res = execute_local_udf(udf, data, fmt="netcdf")
 
     return True
-
-
-

tests/test_preprocessing_openeo.py

@@ -1,31 +1,30 @@
-from collections.abc import Generator
 import shutil
 import time
-import pytest
 
+from collections.abc import Generator
 from contextlib import contextmanager
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
 import numpy as np
 import openeo
-import rasterio
-import xarray as xr
 import pyproj
+import pytest
+import rasterio
 import shapely
-from shapely import wkt
-from enhancement_tools.time_measurement import Timer
+import xarray as xr
 
+from enhancement_tools.time_measurement import Timer
 from openeo.udf import execute_local_udf
+from shapely import wkt
 
-from efast.constants import S3L2SYNClassificationAerosolFlags
+from efast import s2_processing, s3_processing
 from efast.openeo import preprocessing
+
 # TODO this should live somewhere else
 from efast.openeo.preprocessing import connect
-from efast import s2_processing, s3_processing
 from efast.openeo.preprocessing.s3 import extract_clear_land_mask
 
-
 TEST_DATA_ROOT = Path(__file__).parent.parent / "test_data"
 TEST_DATA_S2 = TEST_DATA_ROOT / "S2"
 
@@ -46,6 +45,7 @@
 
 VISUAL_OUTPUT_PATH = Path(__file__).parent.parent / "visual_test_results"
 
+
 @contextmanager
 def create_temp_dir_and_copy_files(
     source, sub=".", pattern: str | None = "*"
@@ -116,7 +116,7 @@ def test_distance_to_cloud():
 
         print("openEO execution")
         before = time.perf_counter()
-        #dtc.download(download_path)
+        # dtc.download(download_path)
         elapsed = time.perf_counter() - before
         print(f"executed and downloaded in {elapsed:.2f}s")
 
@@ -125,11 +125,10 @@ def test_distance_to_cloud():
             BASE_DIR.mkdir(exist_ok=True)
             print("downloading input")  # TMP
             (dtc_input * 1.0).download(BASE_DIR / "dtc_input.tif")
-            #shutil.copy(download_path, BASE_DIR)
-        print("downloading result") # TMP
-        dtc.download(download_path) # TMP
-        shutil.copy(download_path, BASE_DIR) # TMP
-
+            # shutil.copy(download_path, BASE_DIR)
+        print("downloading result")  # TMP
+        dtc.download(download_path)  # TMP
+        shutil.copy(download_path, BASE_DIR)  # TMP
 
         with rasterio.open(download_path, "r") as ds:
             dtc_openeo = ds.read(1)
@@ -152,8 +151,10 @@ def test_distance_to_cloud_synthetic_cube():
         .mean(1)
     ) < tolerance
     cube = xr.DataArray(cube, dims=["x", "y"])
-    #cube = cube.add_dimension(name="bands", label="mask", type="bands")
-    cube_resampled = xr.DataArray(cube_resampled[np.newaxis, np.newaxis], dims=["bands", "t", "x", "y"])
+    # cube = cube.add_dimension(name="bands", label="mask", type="bands")
+    cube_resampled = xr.DataArray(
+        cube_resampled[np.newaxis, np.newaxis], dims=["bands", "t", "x", "y"]
+    )
 
     udf = openeo.UDF.from_file("efast/distance_transform_udf.py")
     dtc_local_udf = (
@@ -194,8 +195,10 @@ def extract_epsg_code_from_rasterio_crs(crs: rasterio.CRS) -> int:
 
 def test_data_acquisition_s3():
     with create_temp_dir_and_copy_files(
-        TEST_DATA_S3, sub="raw/", pattern=f"raw/*SY_2_SYN____2022061*"
-        #TEST_DATA_S3, sub="raw/", pattern=f"raw/*SY_2_SYN____*"
+        TEST_DATA_S3,
+        sub="raw/",
+        pattern=f"raw/*SY_2_SYN____2022061*",
+        # TEST_DATA_S3, sub="raw/", pattern=f"raw/*SY_2_SYN____*"
     ) as tmp:
         inner_data_acquisition_s3(tmp)
 
@@ -309,6 +312,7 @@ def transform_bounds_to_wkt(bounds: dict):
     )
     return wkt.dumps(bbox)
 
+
 METADATA_UDF = openeo.UDF("""
 import numpy as np
 import xarray as xr
@@ -320,6 +324,7 @@ def apply_datacube(cube: XarrayDataCube, context: dict) -> XarrayDataCube:
     return XarrayDataCube(xr.DataArray(array, dims=["bands", "x", "y"]))
 """)
 
+
 def test_extract_clear_land_mask_s3():
     out_path = VISUAL_OUTPUT_PATH / "extract_clear_land_mask"
     out_path.mkdir(exist_ok=True, parents=True)
@@ -347,9 +352,8 @@ def test_extract_clear_land_mask_s3():
     )
     cube = test_area.get_s3_cube(conn)
 
-
     print("Downloading input")
-    #cube.download(out_path / "input.nc")
+    # cube.download(out_path / "input.nc")
     mask = extract_clear_land_mask(cube)
     print("Downloading mask")
     mask.download(out_path / "mask.nc")