Fix rebase

Author: lbesnard

aodn_cloud_optimised/lib/CommonHandler.py

@@ -327,7 +327,9 @@ def create_cluster(self):
             client,
             cluster,
             self.cluster_mode,
-        ) = self.cluster_manager.create_cluster()  # self.cluster_mode is overwritten if necessary
+        ) = (
+            self.cluster_manager.create_cluster()
+        )  # self.cluster_mode is overwritten if necessary
 
         return client, cluster
 

aodn_cloud_optimised/lib/DataQuery.py

@@ -2546,9 +2546,9 @@ def plot_gridded_variable(
         start_date_parsed = pd.to_datetime(date_start)
         end_date_parsed = pd.to_datetime(date_end) if date_end else None
 
-        assert actual_time_name in ds.dims, (
-            f"Dataset does not have a '{actual_time_name}' dimension"
-        )
+        assert (
+            actual_time_name in ds.dims
+        ), f"Dataset does not have a '{actual_time_name}' dimension"
 
         # Find the nearest date in the dataset to start_date_parsed
         try:
@@ -2614,9 +2614,7 @@ def plot_gridded_variable(
         # First pass: gather all data to find global vmin and vmax for consistent color scaling
         for date_obj in dates_to_plot:
             try:
-                data = ds[
-                    var_name
-                ].sel(
+                data = ds[var_name].sel(
                     {
                         actual_time_name: date_obj,  # Use exact match for already selected dates
                         actual_lon_name: slice(

aodn_cloud_optimised/lib/GenericZarrHandler.py

@@ -4,6 +4,7 @@
 import traceback
 import uuid
 import warnings
+from contextlib import nullcontext
 from functools import partial
 
 import numcodecs
@@ -12,6 +13,7 @@
 import xarray as xr
 import zarr
 from dask import array as da
+from dask.distributed import Lock
 from xarray.structure.merge import MergeError
 
 from aodn_cloud_optimised.lib.CommonHandler import CommonHandler
@@ -23,8 +25,6 @@
     split_s3_path,
 )
 from aodn_cloud_optimised.lib.schema import merge_schema_dict
-from contextlib import nullcontext
-from dask.distributed import Lock
 
 
 def check_variable_values_dask(

test_aodn_cloud_optimised/test_generic_zarr_handler.py

@@ -388,7 +388,9 @@ def test_zarr_nc_acorn_nwa_handler(self):
         ucur_selected = ds["UCUR"].isel({time_dim: matching_idx}).compute().values
 
         # Assert they are all NaN
-        assert not np.isnan(ucur_selected).all(), (
+        assert not np.isnan(
+            ucur_selected
+        ).all(), (
             f"UCUR for {filenames_acorn_nwa[1]} are already fully NaN. Not possible"
         )
 
@@ -408,9 +410,9 @@ def test_zarr_nc_acorn_nwa_handler(self):
         ucur_selected = ds["UCUR"].isel({time_dim: matching_idx}).compute().values
 
         # Assert they are all NaN
-        assert np.isnan(ucur_selected).all(), (
-            f"UCUR for {filenames_acorn_nwa[1]} not fully NaN"
-        )
+        assert np.isnan(
+            ucur_selected
+        ).all(), f"UCUR for {filenames_acorn_nwa[1]} not fully NaN"
 
 
 if __name__ == "__main__":