refactor: fix all the mypy and linting issues

Author: 12rambau

geetools/_deprecated_algorithms.py

@@ -19,11 +19,7 @@ def distanceToMask(
     normalize=False,
 ):
     """Compute the distance to the mask in meters."""
-    return (
-        ee.Image(image)
-        .geetools.distanceToMask(mask, radius=radius, band_name=band_name)
-        .select(band_name)
-    )
+    return ee.Image(image).geetools.distanceToMask(mask, radius=radius, band_name=band_name).select(band_name)
 
 
 @deprecated(version="1.5.0", reason="Use ee.Image.geetools.maskCover instead.")

geetools/_deprecated_composite.py

@@ -44,9 +44,7 @@ def compositeRegularIntervals(
 
 
 @deprecated(version="1.5.0", reason="Use ee.ImageCollection.geetools.reduceInterval instead")
-def compositeByMonth(
-    collection, composite_function=None, composite_args=None, composite_kwargs=None
-):
+def compositeByMonth(collection, composite_function=None, composite_args=None, composite_kwargs=None):
     """Make a composite at regular intervals parsing a composite."""
     return ee.ImageCollection(collection).geetools.reduceInterval(unit="month")
 

geetools/ee_asset.py

@@ -463,9 +463,7 @@ def iterdir(self, recursive: bool = False) -> list:
         """
         # sanity check on variables
         if not (self.is_project() or self.is_folder() or self.is_image_collection()):
-            raise ValueError(
-                f"Asset {self.as_posix()} is not a container and cannot contain other assets."
-            )
+            raise ValueError(f"Asset {self.as_posix()} is not a container and cannot contain other assets.")
 
         # no need for recursion if recursive is false we directly return the result of th API call
         if recursive is False:

geetools/ee_dictionary.py

@@ -87,9 +87,7 @@ def getMany(self, list: list | ee.List) -> ee.List:
         """
         return ee.List(list).map(lambda key: self._obj.get(key))
 
-    def toTable(
-        self, valueType: Literal["dict", "list", "value"] = "value"
-    ) -> ee.FeatureCollection:
+    def toTable(self, valueType: Literal["dict", "list", "value"] = "value") -> ee.FeatureCollection:
         """Convert a :py:class:`ee.Dictionary` to a :py:class:`ee.FeatureCollection` with no geometries (table).
 
         There are 3 different type of values handled by this method:

geetools/ee_feature_collection.py

@@ -127,19 +127,15 @@ def toDictionary(
                 print(json.dumps(countries.getInfo(), indent=2))
         """
         uniqueIds = self._obj.aggregate_array(keyColumn)
-        selectors = (
-            ee.List(selectors) if selectors is not None else self._obj.first().propertyNames()
-        )
+        selectors = ee.List(selectors) if selectors is not None else self._obj.first().propertyNames()
         keyColumn = ee.String(keyColumn)
 
         features = self._obj.toList(self._obj.size())
         values = features.map(lambda feat: ee.Feature(feat).toDictionary(selectors))
         keys = uniqueIds.map(lambda uid: ee.String(ee.Algorithms.String(uid)))
         return ee.Dictionary.fromLists(keys, values)
 
-    def addId(
-        self, name: str | ee.String = "id", start: int | ee.Number = 1
-    ) -> ee.FeatureCollection:
+    def addId(self, name: str | ee.String = "id", start: int | ee.Number = 1) -> ee.FeatureCollection:
         """Add a unique numeric identifier, starting from parameter ``start``.
 
         Args:
@@ -318,18 +314,14 @@ def byProperties(
         """
         # get all the id values, they must be string so we are forced to cast them manually
         # the default casting is broken from Python side: https://issuetracker.google.com/issues/329106322
-        features = self._obj.aggregate_array(featureId)
+        feats = self._obj.aggregate_array(featureId)
         isString = lambda i: ee.Algorithms.ObjectType(i).compareTo("String").eq(0)  # noqa: E731
-        features = features.map(lambda i: ee.Algorithms.If(isString(i), i, ee.Number(i).format()))
+        feats = feats.map(lambda i: ee.Algorithms.If(isString(i), i, ee.Number(i).format()))
 
         # retrieve properties for each feature
-        properties = (
-            ee.List(properties) if properties is not None else self._obj.first().propertyNames()
-        )
-        properties = properties.remove(featureId)
-        values = properties.map(
-            lambda p: ee.Dictionary.fromLists(features, self._obj.aggregate_array(p))
-        )
+        eeProps = self._obj.first().propertyNames() if properties is None else ee.List(properties)
+        eeProps = eeProps.remove(featureId)
+        values = eeProps.map(lambda p: ee.Dictionary.fromLists(feats, self._obj.aggregate_array(p)))
 
         # get the label to use in the dictionary if requested
         labels = ee.List(labels) if labels is not None else properties
@@ -459,11 +451,7 @@ def plot_by_features(
                     label.set_rotation(45)
         """
         # Get the features and properties
-        props = (
-            ee.List(properties)
-            if properties is not None
-            else self._obj.first().propertyNames().getInfo()
-        )
+        props = ee.List(properties) if properties is not None else self._obj.first().propertyNames().getInfo()
         props = props.remove(featureId)
 
         # get the data from server

geetools/ee_image.py

@@ -71,9 +71,7 @@ def addDate(self, format: str | ee.String = "") -> ee.Image:
 
         return self._obj.addBands(dateBand)
 
-    def addSuffix(
-        self, suffix: str | ee.String, bands: list[str] | ee.List | None = None
-    ) -> ee.Image:
+    def addSuffix(self, suffix: str | ee.String, bands: list[str] | ee.List | None = None) -> ee.Image:
         """Add a suffix to the image selected band.
 
         Add a suffix to the selected band. If no band is specified, the suffix is added to all bands.
@@ -97,16 +95,12 @@ def addSuffix(
                 print(image.bandNames().getInfo())
         """
         suffix = ee.String(suffix)
-        bands = ee.List(bands) if bands is not None else self._obj.bandNames()
-        bandNames = bands.iterate(
-            lambda b, n: ee.List(n).replace(b, ee.String(b).cat(suffix)),
-            self._obj.bandNames(),
-        )
+        srcBands = self._obj.bandNames()
+        eeBands = srcBands if bands is None else ee.List(bands)
+        bandNames = eeBands.iterate(lambda b, n: ee.List(n).replace(b, ee.String(b).cat(suffix)), srcBands)
         return self._obj.rename(bandNames)
 
-    def addPrefix(
-        self, prefix: str | ee.String, bands: list[str] | ee.List | None = None
-    ) -> ee.Image:
+    def addPrefix(self, prefix: str | ee.String, bands: list[str] | ee.List | None = None) -> ee.Image:
         """Add a prefix to the image selected band.
 
         Add a prefix to the selected band. If no band is specified, the prefix is added to all bands.
@@ -130,11 +124,9 @@ def addPrefix(
                 print(image.bandNames().getInfo())
         """
         prefix = ee.String(prefix)
-        bands = ee.List(bands) if bands is not None else self._obj.bandNames()
-        bandNames = bands.iterate(
-            lambda b, n: ee.List(n).replace(b, prefix.cat(ee.String(b))),
-            self._obj.bandNames(),
-        )
+        srcBands = self._obj.bandNames()
+        eeBands = srcBands if bands is None else ee.List(bands)
+        bandNames = eeBands.iterate(lambda b, n: ee.List(n).replace(b, prefix.cat(ee.String(b))), srcBands)
         return self._obj.rename(bandNames)
 
     def rename(self, names: dict | ee.Dictionary) -> ee.Image:
@@ -162,9 +154,7 @@ def rename(self, names: dict | ee.Dictionary) -> ee.Image:
                 print(image.bandNames().getInfo())
         """
         names = ee.Dictionary(names)
-        bands = names.keys().iterate(
-            lambda b, n: ee.List(n).replace(b, names.get(b)), self._obj.bandNames()
-        )
+        bands = names.keys().iterate(lambda b, n: ee.List(n).replace(b, names.get(b)), self._obj.bandNames())
         return self._obj.rename(bands)
 
     def remove(self, bands: list[str] | ee.List) -> ee.Image:
@@ -228,9 +218,7 @@ def doyToDate(
 
         doyList = ee.List.sequence(0, 365)
         remapList = doyList.map(
-            lambda d: ee.Number.parse(
-                ee.Date.fromYMD(year, 1, 1).advance(d, "day").format(dateFormat)
-            )
+            lambda d: ee.Number.parse(ee.Date.fromYMD(year, 1, 1).advance(d, "day").format(dateFormat))
         )
         return self._obj.remap(doyList, remapList, bandName=band).rename(band)
 
@@ -361,9 +349,7 @@ def toGrid(
         index = ee.List.sequence(0, lat.size().subtract(2))
         squares = index.map(
             lambda i: (
-                ee.Geometry.Point([lon.get(i), lat.get(i)])
-                .buffer(size.divide(2))
-                .bounds(0.01, projection)
+                ee.Geometry.Point([lon.get(i), lat.get(i)]).buffer(size.divide(2)).bounds(0.01, projection)
             )
         )
 
@@ -402,9 +388,7 @@ def clipOnCollection(
 
         def fcClip(feat):
             image = self._obj.clip(feat.geometry())
-            return ee.Algorithms.If(
-                ee.Number(keepProperties).toInt(), image.copyProperties(feat), image
-            )
+            return ee.Algorithms.If(ee.Number(keepProperties).toInt(), image.copyProperties(feat), image)
 
         return ee.ImageCollection(fc.map(fcClip))
 
@@ -469,18 +453,18 @@ def full(
                 image = ee.Image.geetools.full([1, 2, 3], ['a', 'b', 'c'])
                 print(image.bandNames().getInfo())
         """
-        values = ee.List(values) if values is not None else ee.List([0])
-        names = ee.List(names) if names is not None else ee.List(["constant"])
+        eeValues = ee.List([0]) if values is None else ee.List(values)
+        eeNames = ee.List(["constant"]) if names is None else ee.List(names)
 
         # resize value to the same length as names
-        values = ee.List(
+        eeValues = ee.List(
             ee.Algorithms.If(
-                values.size().eq(1),
-                ee.List.repeat(ee.Number(values.get(0)), names.size()),
-                values,
+                eeValues.size().eq(1),
+                ee.List.repeat(ee.Number(eeValues.get(0)), eeNames.size()),
+                eeValues,
             )
         )
-        return ee.Image.constant(values).rename(names)
+        return ee.Image.constant(eeValues).rename(eeNames)
 
     def fullLike(
         self,
@@ -574,12 +558,12 @@ def reduceBands(
         if not isinstance(reducer, str):
             raise TypeError("reducer must be a Python string")
 
-        bands = ee.List(bands) if bands is not None else ee.List([])
+        eeBands = ee.List(bands) if bands is not None else ee.List([])
         name = ee.String(name)
-        bands = ee.Algorithms.If(bands.size().eq(0), self._obj.bandNames(), bands)
+        eeBands = ee.Algorithms.If(eeBands.size().eq(0), self._obj.bandNames(), eeBands)
         name = ee.Algorithms.If(name.equals(ee.String("")), reducer, name)
         red = getattr(ee.Reducer, reducer)() if isinstance(reducer, str) else reducer
-        reduceImage = self._obj.select(ee.List(bands)).reduce(red).rename([name])
+        reduceImage = self._obj.select(ee.List(eeBands)).reduce(red).rename([name])
         return self._obj.addBands(reduceImage)
 
     def negativeClip(self, geometry: ee.Geometry | ee.Feature | ee.FeatureCollection) -> ee.Image:
@@ -827,9 +811,7 @@ def isletMask(self, offset: float | int | ee.Number) -> ee.Image:
         scale = self._obj.projection().nominalScale()
         pixelsLimit = offset.multiply(2).sqrt().divide(scale).max(ee.Number(2)).toInt()
         area = ee.Image.pixelArea().rename("area")
-        isletArea = (
-            self._obj.select(0).mask().toInt().connectedPixelCount(pixelsLimit).multiply(area)
-        )
+        isletArea = self._obj.select(0).mask().toInt().connectedPixelCount(pixelsLimit).multiply(area)
         return isletArea.lt(offset).rename("mask").selfMask()
 
     # -- ee-extra wrapper ------------------------------------------------------

geetools/ee_image_collection.py

@@ -107,9 +107,7 @@ def maskClouds(
         #     cdi,
         # )
 
-    def closest(
-        self, date: ee.Date | str, tolerance: int = 1, unit: str = "month"
-    ) -> ee.ImageCollection:
+    def closest(self, date: ee.Date | str, tolerance: int = 1, unit: str = "month") -> ee.ImageCollection:
         """Gets the closest image (or set of images if the collection intersects a region that requires multiple scenes) to the specified date.
 
         Parameters:
@@ -403,7 +401,9 @@ def getDOI(self) -> str:
                 ee.ImageCollection('NASA/GPM_L3/IMERG_V06').geetools.getDOI()
         """
         stac = self.getSTAC()
-        error_msg = "The DOI is not available for this collection. Please check the STAC for more information."
+        error_msg = (
+            "The DOI is not available for this collection. Please check the STAC for more information."
+        )
         return stac.get("sci:doi", error_msg)
 
     def getCitation(self) -> str:
@@ -885,9 +885,7 @@ def containsBandNames(
         # apply this filter and remove the temporary property. Exclude parameter is additive so
         # we do a blank multiplication to remove all the properties beforehand
         ic = ee.ImageCollection(self._obj.filter(filterCombination))
-        ic = ic.map(
-            lambda i: ee.Image(i.multiply(1).copyProperties(i, exclude=[bandNamesProperty]))
-        )
+        ic = ic.map(lambda i: ee.Image(i.multiply(1).copyProperties(i, exclude=[bandNamesProperty])))
 
         return ee.ImageCollection(ic)
 
@@ -1040,9 +1038,7 @@ def delete_size_property(ic):
             return ee.ImageCollection(ic.copyProperties(ic, properties=toCopy))
 
         imageCollectionList = (
-            imageCollectionList.map(add_size)
-            .filter(ee.Filter.gt(sizeName, 0))
-            .map(delete_size_property)
+            imageCollectionList.map(add_size).filter(ee.Filter.gt(sizeName, 0)).map(delete_size_property)
         )
 
         return ee.List(imageCollectionList)
@@ -1242,8 +1238,8 @@ def sortMany(
             ascending: the list of order. If not passed all properties will be sorted ascending
         """
         properties = ee.List(properties)
-        ascending = ee.List(ascending or properties.map(lambda p: True))
-        order_dict = ee.Dictionary.fromLists(properties.slice(0, ascending.size()), ascending)
+        asc = ee.List(ascending or properties.map(lambda p: True))
+        order_dict = ee.Dictionary.fromLists(properties.slice(0, asc.size()), asc)
         # position order of each prop will be converted to string using this format
         length = self._obj.size().toInt().format().length()
         format = ee.String("%0").cat(length.format()).cat("d")
@@ -1546,9 +1542,7 @@ def filter_doy(d: ee.Number) -> ee.ImageCollection:
 
         # reduce every sub ImageCollection in the list into images (it's the temporal reduction)
         # and aggregate the result as a single ImageCollection
-        timeRed = (
-            getattr(ee.Reducer, timeReducer)() if isinstance(timeReducer, str) else timeReducer
-        )
+        timeRed = getattr(ee.Reducer, timeReducer)() if isinstance(timeReducer, str) else timeReducer
 
         def timeReduce(c: ee.ImageCollection) -> ee.image:
             c = ee.ImageCollection(c)
@@ -1561,9 +1555,7 @@ def timeReduce(c: ee.ImageCollection) -> ee.image:
         # spatially reduce the generated imagecollection over the region for each band
         doyList = ic.aggregate_array(doy_metadata).map(lambda d: ee.Number(d).int().format())
         spatialRed = (
-            getattr(ee.Reducer, spatialReducer)()
-            if isinstance(spatialReducer, str)
-            else spatialReducer
+            getattr(ee.Reducer, spatialReducer)() if isinstance(spatialReducer, str) else spatialReducer
         )
 
         def spatialReduce(label: ee.String) -> ee.Dictionary:
@@ -1652,9 +1644,7 @@ def filter_doy(d: ee.Number) -> ee.ImageCollection:
 
         # reduce every sub ImageCollection in the list into images (it's the temporal reduction)
         # and aggregate the result as a single ImageCollection
-        timeRed = (
-            getattr(ee.Reducer, timeReducer)() if isinstance(timeReducer, str) else timeReducer
-        )
+        timeRed = getattr(ee.Reducer, timeReducer)() if isinstance(timeReducer, str) else timeReducer
 
         def timeReduce(c: ee.ImageCollection) -> ee.image:
             c = ee.ImageCollection(c)
@@ -1667,9 +1657,7 @@ def timeReduce(c: ee.ImageCollection) -> ee.image:
         # reduce the data for each region
         doyList = ic.aggregate_array(doy_metadata).map(lambda d: ee.Number(d).int().format())
         spatialRed = (
-            getattr(ee.Reducer, spatialReducer)()
-            if isinstance(spatialReducer, str)
-            else spatialReducer
+            getattr(ee.Reducer, spatialReducer)() if isinstance(spatialReducer, str) else spatialReducer
         )
         image = ic.toBands().rename(doyList)
         reduced = image.reduceRegions(
@@ -2769,9 +2757,7 @@ def splitFeatures(f: ee.Feature) -> ee.List:
             def splitId(loc_id: ee.String) -> ee.Feature:
                 loc_id = ee.String(loc_id)
                 loc_f = ee.Feature(f).select([loc_id.cat("_.*")])
-                oldNames = loc_f.propertyNames().filter(
-                    ee.Filter.stringStartsWith("item", "system:").Not()
-                )
+                oldNames = loc_f.propertyNames().filter(ee.Filter.stringStartsWith("item", "system:").Not())
                 newNames = oldNames.map(lambda n: ee.String(n).replace(loc_id.cat("_"), ""))
                 loc_f = ee.Feature(ee.Feature(loc_f).select(oldNames, newNames))
                 loc_f = ee.Feature(loc_f.copyProperties(f, properties=originalProps))

geetools/ee_list.py

@@ -40,9 +40,7 @@ def product(self, other: list | ee.List) -> ee.List:
         """
         l1 = ee.List(self._obj).map(lambda e: ee.String(e))
         l2 = ee.List(other).map(lambda e: ee.String(e))
-        product = l1.map(
-            lambda e: l2.map(lambda f: ee.Algorithms.String(e).cat(ee.Algorithms.String(f)))
-        )
+        product = l1.map(lambda e: l2.map(lambda f: ee.Algorithms.String(e).cat(ee.Algorithms.String(f))))
         return product.flatten()
 
     def complement(self, other: list | ee.List) -> ee.List:

geetools/ee_number.py

@@ -38,9 +38,7 @@ def truncate(self, nbDecimals: int | ee.Number = 2) -> ee.Number:
         factor = ee.Number(10).pow(nbDecimals)
         return self._obj.multiply(factor).toInt().divide(factor)
 
-    def isClose(
-        self, other: int | float | ee.Number, tol: int | float | ee.Number = 1e-9
-    ) -> ee.Number:
+    def isClose(self, other: int | float | ee.Number, tol: int | float | ee.Number = 1e-9) -> ee.Number:
         """Check if a number is close to another number.
 
         Args:

geetools/tools/_deprecated_imagecollection.py

@@ -20,9 +20,7 @@ def mosaicSameDay(collection, qualityBand=""):
 
 
 @deprecated(version="1.5.0", reason="Use ee.ImageCollection.geetools.reduceInterval instead.")
-def reduceEqualInterval(
-    collection, interval=30, unit="day", reducer=None, start_date=None, end_date=None
-):
+def reduceEqualInterval(collection, interval=30, unit="day", reducer=None, start_date=None, end_date=None):
     """Reduce an ImageCollection into a new one that has one image per reduced interval."""
     return ee.ImageCollection(collection).geetools.reduceInterval(reducer, unit, interval)