Use sertit.types.make_iterable

CI/SCRIPTS_WEEKLY/test_all_sat_end_to_end_on_disk.py

@@ -7,7 +7,7 @@
 
 import xarray as xr
 from lxml import etree
-from sertit import AnyPath, ci, path
+from sertit import AnyPath, ci, path, types
 
 from CI.scripts_utils import (
     CI_EOREADER_S3,
@@ -166,8 +166,7 @@ def _test_core(
 
     with xr.set_options(warn_for_unclosed_files=debug):
         # DATA paths
-        if not isinstance(prod_dirs, list):
-            prod_dirs = [prod_dirs]
+        prod_dirs = types.make_interable(prod_dirs)
 
         pattern_paths = []
         for prod_dir in prod_dirs:

eoreader/bands/__init__.py

@@ -460,8 +460,8 @@ def convert_to_band(tc) -> BandNames:
 
     if as_list:
         band_list = []
-        if not types.is_iterable(to_convert):
-            to_convert = [to_convert]
+        to_convert = types.make_interable(to_convert)
+
         for tc in to_convert:
             tc_band = convert_to_band(tc=tc)
             band_list.append(tc_band)
@@ -492,8 +492,7 @@ def to_str(
         list: str bands
     """
     if as_list:
-        if not types.is_iterable(to_convert):
-            to_convert = [to_convert]
+        to_convert = types.make_interable(to_convert)
 
         bands_str = []
         for tc in to_convert:

eoreader/bands/band_names.py

@@ -25,8 +25,8 @@ def from_list(cls, name_list: Union[list, str]) -> list:
         Returns:
             list: List of enums
         """
-        if not types.is_iterable(name_list):
-            name_list = [name_list]
+        name_list = types.make_interable(name_list)
+
         try:
             band_names = [cls(name) for name in name_list]
         except ValueError as ex:

eoreader/products/custom_product.py

@@ -423,8 +423,7 @@ def _load_bands(
             return {}
 
         # Get band paths
-        if not types.is_iterable(bands):
-            bands = [bands]
+        bands = types.make_interable(bands)
 
         if pixel_size is None and size is not None:
             pixel_size = self._pixel_size_from_img_size(size)

eoreader/products/optical/hls_product.py

@@ -873,8 +873,7 @@ def _load_bands(
             return {}
 
         # Get band paths
-        if not types.is_iterable(bands):
-            bands = [bands]
+        bands = types.make_interable(bands)
 
         if pixel_size is None and size is not None:
             pixel_size = self._pixel_size_from_img_size(size)

eoreader/products/optical/landsat_product.py

@@ -1430,8 +1430,7 @@ def _load_bands(
             return {}
 
         # Get band paths
-        if not types.is_iterable(bands):
-            bands = [bands]
+        bands = types.make_interable(bands)
 
         if pixel_size is None and size is not None:
             pixel_size = self._pixel_size_from_img_size(size)

eoreader/products/optical/planet_product.py

@@ -1004,8 +1004,8 @@ def _get_path(
             Union[list, str]: Paths(s)
 
         """
-        if invalid_lookahead is not None and not types.is_iterable(invalid_lookahead):
-            invalid_lookahead = [invalid_lookahead]
+        if invalid_lookahead is not None:
+            invalid_lookahead = types.make_interable(invalid_lookahead)
 
         ok_paths = []
         try:

eoreader/products/optical/s2_e84_product.py

@@ -310,8 +310,7 @@ def _load_bands(
             return {}
 
         # Get band paths
-        if not types.is_iterable(bands):
-            bands = [bands]
+        bands = types.make_interable(bands)
 
         if pixel_size is None and size is not None:
             pixel_size = self._pixel_size_from_img_size(size)

eoreader/products/optical/s2_theia_product.py

@@ -820,8 +820,7 @@ def _create_mask(
             xr.DataArray: Mask masked array
 
         """
-        if not types.is_iterable(bit_ids):
-            bit_ids = [bit_ids]
+        bit_ids = types.make_interable(bit_ids)
         conds = rasters.read_bit_array(bit_array.astype(np.uint8), bit_ids)
         cond = reduce(lambda x, y: x | y, conds)  # Use every condition (bitwise or)
 

eoreader/products/optical/s3_product.py

@@ -555,8 +555,7 @@ def _load_bands(
             return {}
 
         # Get band paths
-        if not types.is_iterable(bands):
-            bands = [bands]
+        bands = types.make_interable(bands)
 
         if pixel_size is None and size is not None:
             pixel_size = self._pixel_size_from_img_size(size)

eoreader/products/optical/s3_slstr_product.py

@@ -1098,8 +1098,7 @@ def _create_mask(
             xr.DataArray: Mask masked array
 
         """
-        if not types.is_iterable(bit_ids):
-            bit_ids = [bit_ids]
+        bit_ids = types.make_interable(bit_ids)
         conds = rasters.read_bit_array(bit_array, bit_ids)
         cond = reduce(lambda x, y: x | y, conds)  # Use every condition (bitwise or)
 

eoreader/products/product.py

@@ -1239,9 +1239,7 @@ def has_bands(self, bands: Union[list, BandNames, str]) -> bool:
         Returns:
             bool: True if the products has the specified band
         """
-        if not types.is_iterable(bands):
-            bands = [bands]
-
+        bands = types.make_interable(bands)
         return all([self.has_band(band) for band in set(bands)])
 
     @abstractmethod
@@ -1715,8 +1713,7 @@ def _update_attrs(
         # Are we sure of that ?
         xarr.attrs = {}
 
-        if not types.is_iterable(bands):
-            bands = [bands]
+        bands = types.make_interable(bands)
         long_name = to_str(bands)
         xr_name = "_".join(long_name)
         attr_name = " ".join(long_name)
@@ -2032,8 +2029,7 @@ def to_band(self, raw_bands: Union[list, BandNames, str, int]) -> list:
         Returns:
             list: Mapped bands
         """
-        if not types.is_iterable(raw_bands):
-            raw_bands = [raw_bands]
+        raw_bands = types.make_interable(raw_bands)
 
         bands = []
         for raw_band in raw_bands:

eoreader/products/sar/sar_product.py

@@ -633,8 +633,7 @@ def _load_bands(
             return {}
 
         # Get band paths
-        if not types.is_iterable(bands):
-            bands = [bands]
+        bands = types.make_interable(bands)
 
         if pixel_size is None and size is not None:
             pixel_size = self._pixel_size_from_img_size(size)