earthengine-api 1.5.24__py3-none-any.whl → 1.6.0__py3-none-any.whl

ee/image_converter.py

@@ -1,7 +1,7 @@
 """Converters used in the image data fetching methods."""
 
 import io
-from typing import Any, Optional, Type, Union
+from typing import Any, Optional, Union
 
 
 class ImageConverter:
@@ -43,7 +43,7 @@ class NumPyConverter(ImageConverter):
     return numpy.load(io.BytesIO(data))
 
 
-_PIXEL_DATA_CONVERTERS: dict[str, Type[ImageConverter]] = {
+_PIXEL_DATA_CONVERTERS: dict[str, type[ImageConverter]] = {
     'NUMPY_NDARRAY': NumPyConverter
 }
 

ee/imagecollection.py

@@ -2,7 +2,8 @@
 
 from __future__ import annotations
 
-from typing import Any, Callable, Optional, Sequence
+from collections.abc import Sequence
+from typing import Any, Callable
 
 from ee import _arg_types
 from ee import _utils
@@ -87,7 +88,7 @@ class ImageCollection(collection.Collection):
     apifunction.ApiFunction.clearApi(cls)
     cls._initialized = False
 
-  def getMapId(self, vis_params: Optional[Any] = None) -> dict[str, Any]:
+  def getMapId(self, vis_params: Any | None = None) -> dict[str, Any]:
     """Fetch and return a Map ID.
 
     This mosaics the collection to a single image and return a map ID suitable
@@ -105,7 +106,7 @@ class ImageCollection(collection.Collection):
   @_utils.accept_opt_prefix('opt_names')
   # pylint: disable-next=keyword-arg-before-vararg
   def select(
-      self, selectors: Any, names: Optional[Any] = None, *args
+      self, selectors: Any, names: Any | None = None, *args
   ) -> ImageCollection:
     """Select bands from each image in a collection.
 
@@ -125,10 +126,10 @@ class ImageCollection(collection.Collection):
   # pylint: disable=unused-argument,g-bad-name
   def linkCollection(
       self,
-      imageCollection: 'ImageCollection',
-      linkedBands: Optional[Sequence[str]] = None,
-      linkedProperties: Optional[Sequence[str]] = None,
-      matchPropertyName: Optional[str] = None,
+      imageCollection: ImageCollection,
+      linkedBands: Sequence[str] | None = None,
+      linkedProperties: Sequence[str] | None = None,
+      matchPropertyName: str | None = None,
   ) -> ImageCollection:
     """Links images in this collection to matching images from imageCollection.
 
@@ -170,6 +171,7 @@ class ImageCollection(collection.Collection):
           'Image.linkCollection', {'input': img, **kwargs})
 
     return self.map(_linkCollection)
+
   # pylint: enable=g-bad-name,unused-argument
 
   def first(self) -> image.Image:
@@ -188,7 +190,7 @@ class ImageCollection(collection.Collection):
   def elementType():
     return image.Image
 
-  def getVideoThumbURL(self, params: Optional[dict[str, Any]] = None) -> str:
+  def getVideoThumbURL(self, params: dict[str, Any] | None = None) -> str:
     """Get the URL for an animated video thumbnail of the given collection.
 
     Note: Videos can only be created when the image visualization
@@ -221,7 +223,7 @@ class ImageCollection(collection.Collection):
     """
     return self._getThumbURL(['gif'], params, thumbType='video')
 
-  def getFilmstripThumbURL(self, params: Optional[Any] = None) -> str:
+  def getFilmstripThumbURL(self, params: Any | None = None) -> str:
     """Get the URL for a "filmstrip" thumbnail of the given collection.
 
     Args:
@@ -253,8 +255,8 @@ class ImageCollection(collection.Collection):
       self,
       valid_formats: Sequence[str],
       # TODO(user): Need to drop the default None and use dict[str, Any]]
-      params: Optional[Any] = None,
-      thumbType: Optional[str] = None,  # pylint: disable=g-bad-name
+      params: Any | None = None,
+      thumbType: str | None = None,  # pylint: disable=g-bad-name
   ) -> str:
     """Get the URL for a thumbnail of this collection.
 
@@ -397,7 +399,7 @@ class ImageCollection(collection.Collection):
   def combine(
       self,
       secondary: _arg_types.ImageCollection,
-      overwrite: Optional[_arg_types.Bool] = None,
+      overwrite: _arg_types.Bool | None = None,
   ) -> ImageCollection:
     """Returns a collection adding all the bands from the image in secondary.
 
@@ -421,9 +423,9 @@ class ImageCollection(collection.Collection):
 
   def formaTrend(
       self,
-      covariates: Optional[_arg_types.ImageCollection] = None,
+      covariates: _arg_types.ImageCollection | None = None,
       # pylint: disable-next=invalid-name
-      windowSize: Optional[_arg_types.Integer] = None,
+      windowSize: _arg_types.Integer | None = None,
   ) -> image.Image:
     """Returns an image with the forma trend of the collection.
 
@@ -457,10 +459,10 @@ class ImageCollection(collection.Collection):
   def getRegion(
       self,
       geometry: _arg_types.Geometry,
-      scale: Optional[_arg_types.Number] = None,
-      crs: Optional[_arg_types.Projection] = None,
+      scale: _arg_types.Number | None = None,
+      crs: _arg_types.Projection | None = None,
       # pylint: disable-next=invalid-name
-      crsTransform: Optional[_arg_types.List] = None,
+      crsTransform: _arg_types.List | None = None,
   ) -> ee_list.List:
     """Returns a list of values for each [pixel, band, image] tuple.
 
@@ -488,7 +490,8 @@ class ImageCollection(collection.Collection):
   @staticmethod
   def load(
       # pylint: disable-next=redefined-builtin
-      id: _arg_types.String, version: Optional[_arg_types.Integer] = None
+      id: _arg_types.String,
+      version: _arg_types.Integer | None = None,
   ) -> ImageCollection:
     """Returns the image collection given its ID.
 
@@ -537,7 +540,7 @@ class ImageCollection(collection.Collection):
       self,
       reducer: _arg_types.Reducer,
       # pylint: disable-next=invalid-name
-      parallelScale: Optional[_arg_types.Number] = None,
+      parallelScale: _arg_types.Number | None = None,
   ) -> image.Image:
     """Returns a reduced image from the collection.
 
@@ -576,7 +579,7 @@ class ImageCollection(collection.Collection):
     return apifunction.ApiFunction.call_(self.name() + '.toArray', self)
 
   def toArrayPerBand(
-      self, axis: Optional[_arg_types.Integer] = None
+      self, axis: _arg_types.Integer | None = None
   ) -> image.Image:
     """Returns an image of an image collection converted into 2D arrays.
 

ee/join.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Optional
-
 from ee import _arg_types
 from ee import apifunction
 from ee import computedobject
@@ -91,9 +89,9 @@ class Join(computedobject.ComputedObject):
   @staticmethod
   def inner(
       # pylint: disable=invalid-name
-      primaryKey: Optional[_arg_types.String] = None,
-      secondaryKey: Optional[_arg_types.String] = None,
-      measureKey: Optional[_arg_types.String] = None,
+      primaryKey: _arg_types.String | None = None,
+      secondaryKey: _arg_types.String | None = None,
+      measureKey: _arg_types.String | None = None,
       # pylint: enable=invalid-name
   ) -> Join:
     """Returns a join with matching pairs of elements.
@@ -131,12 +129,12 @@ class Join(computedobject.ComputedObject):
   @staticmethod
   def saveAll(
       # pylint: disable-next=invalid-name
-      matchesKey: Optional[_arg_types.String] = None,
-      ordering: Optional[_arg_types.String] = None,
-      ascending: Optional[_arg_types.Bool] = None,
+      matchesKey: _arg_types.String | None = None,
+      ordering: _arg_types.String | None = None,
+      ascending: _arg_types.Bool | None = None,
       # pylint: disable-next=invalid-name
-      measureKey: Optional[_arg_types.String] = None,
-      outer: Optional[_arg_types.Bool] = None,
+      measureKey: _arg_types.String | None = None,
+      outer: _arg_types.Bool | None = None,
   ) -> Join:
     """Returns a join that returns all pairs of elements.
 
@@ -166,7 +164,7 @@ class Join(computedobject.ComputedObject):
   def saveBest(
       matchKey: _arg_types.String,  # pylint: disable=invalid-name
       measureKey: _arg_types.String,  # pylint: disable=invalid-name
-      outer: Optional[_arg_types.Bool] = None,
+      outer: _arg_types.Bool | None = None,
   ) -> Join:
     """Returns a join that returns the best match pairs.
 
@@ -191,11 +189,11 @@ class Join(computedobject.ComputedObject):
   @staticmethod
   def saveFirst(
       matchKey: _arg_types.String,  # pylint: disable=invalid-name
-      ordering: Optional[_arg_types.String] = None,
-      ascending: Optional[_arg_types.Bool] = None,
+      ordering: _arg_types.String | None = None,
+      ascending: _arg_types.Bool | None = None,
       # pylint: disable-next=invalid-name
-      measureKey: Optional[_arg_types.String] = None,
-      outer: Optional[_arg_types.Bool] = None,
+      measureKey: _arg_types.String | None = None,
+      outer: _arg_types.Bool | None = None,
   ) -> Join:
     """Returns a join that returns the first match pairs.
 

ee/kernel.py

@@ -1,8 +1,6 @@
 """A wrapper for Kernels."""
 from __future__ import annotations
 
-from typing import Optional
-
 from ee import _arg_types
 from ee import apifunction
 from ee import computedobject
@@ -58,7 +56,7 @@ class Kernel(computedobject.ComputedObject):
   def add(
       self,
       kernel2: _arg_types.Kernel,
-      normalize: Optional[_arg_types.Bool] = None,
+      normalize: _arg_types.Bool | None = None,
   ) -> Kernel:
     """Returns the addition of two kernels.
 
@@ -79,9 +77,9 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def chebyshev(
       radius: _arg_types.Number,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a Chebyshev kernel.
 
@@ -104,9 +102,9 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def circle(
       radius: _arg_types.Number,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a circle-shaped boolean kernel.
 
@@ -125,8 +123,8 @@ class Kernel(computedobject.ComputedObject):
 
   @staticmethod
   def compass(
-      magnitude: Optional[_arg_types.Number] = None,
-      normalize: Optional[_arg_types.Bool] = None,
+      magnitude: _arg_types.Number | None = None,
+      normalize: _arg_types.Bool | None = None,
   ) -> Kernel:
     """Returns a 3x3 Prewitt's Compass edge-detection kernel.
 
@@ -140,9 +138,9 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def cross(
       radius: _arg_types.Number,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a cross-shaped boolean kernel.
 
@@ -162,9 +160,9 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def diamond(
       radius: _arg_types.Number,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a diamond-shaped boolean kernel.
 
@@ -184,9 +182,9 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def euclidean(
       radius: _arg_types.Number,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a distance kernel based on Euclidean (straight-line) distance.
 
@@ -206,12 +204,12 @@ class Kernel(computedobject.ComputedObject):
   # TODO: Test missing weights.
   @staticmethod
   def fixed(
-      width: Optional[_arg_types.Integer] = None,
-      height: Optional[_arg_types.Integer] = None,
-      weights: Optional[_arg_types.List] = None,
-      x: Optional[_arg_types.Integer] = None,
-      y: Optional[_arg_types.Integer] = None,
-      normalize: Optional[_arg_types.Bool] = None,
+      width: _arg_types.Integer | None = None,
+      height: _arg_types.Integer | None = None,
+      weights: _arg_types.List | None = None,
+      x: _arg_types.Integer | None = None,
+      y: _arg_types.Integer | None = None,
+      normalize: _arg_types.Bool | None = None,
   ) -> Kernel:
     """Returns a kernel with the given weights.
 
@@ -234,10 +232,10 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def gaussian(
       radius: _arg_types.Number,
-      sigma: Optional[_arg_types.Number] = None,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      sigma: _arg_types.Number | None = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a Gaussian kernel from a sampled continuous Gaussian.
 
@@ -265,8 +263,8 @@ class Kernel(computedobject.ComputedObject):
 
   @staticmethod
   def kirsch(
-      magnitude: Optional[_arg_types.Number] = None,
-      normalize: Optional[_arg_types.Bool] = None,
+      magnitude: _arg_types.Number | None = None,
+      normalize: _arg_types.Bool | None = None,
   ) -> Kernel:
     """Returns a 3x3 Kirsch's Compass edge-detection kernel.
 
@@ -279,8 +277,8 @@ class Kernel(computedobject.ComputedObject):
 
   @staticmethod
   def laplacian4(
-      magnitude: Optional[_arg_types.Number] = None,
-      normalize: Optional[_arg_types.Bool] = None,
+      magnitude: _arg_types.Number | None = None,
+      normalize: _arg_types.Bool | None = None,
   ) -> Kernel:
     """Returns a 3x3 Laplacian-4 edge-detection kernel.
 
@@ -295,8 +293,8 @@ class Kernel(computedobject.ComputedObject):
 
   @staticmethod
   def laplacian8(
-      magnitude: Optional[_arg_types.Number] = None,
-      normalize: Optional[_arg_types.Bool] = None,
+      magnitude: _arg_types.Number | None = None,
+      normalize: _arg_types.Bool | None = None,
   ) -> Kernel:
     """Returns a 3x3 Laplacian-8 edge-detection kernel.
 
@@ -312,9 +310,9 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def manhattan(
       radius: _arg_types.Number,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a distance kernel based on rectilinear (city-block) distance.
 
@@ -334,9 +332,9 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def octagon(
       radius: _arg_types.Number,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns an octagon-shaped boolean kernel.
 
@@ -356,9 +354,9 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def plus(
       radius: _arg_types.Number,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a plus-shaped boolean kernel.
 
@@ -377,8 +375,8 @@ class Kernel(computedobject.ComputedObject):
 
   @staticmethod
   def prewitt(
-      magnitude: Optional[_arg_types.Number] = None,
-      normalize: Optional[_arg_types.Bool] = None,
+      magnitude: _arg_types.Number | None = None,
+      normalize: _arg_types.Bool | None = None,
   ) -> Kernel:
     """Returns a 3x3 Prewitt edge-detection kernel.
 
@@ -393,9 +391,9 @@ class Kernel(computedobject.ComputedObject):
   def rectangle(
       xRadius: _arg_types.Number,  # pylint: disable=invalid-name
       yRadius: _arg_types.Number,  # pylint: disable=invalid-name
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a rectangular-shaped kernel.
 
@@ -415,8 +413,8 @@ class Kernel(computedobject.ComputedObject):
 
   @staticmethod
   def roberts(
-      magnitude: Optional[_arg_types.Number] = None,
-      normalize: Optional[_arg_types.Bool] = None,
+      magnitude: _arg_types.Number | None = None,
+      normalize: _arg_types.Bool | None = None,
   ) -> Kernel:
     """Returns a 2x2 Roberts edge-detection kernel.
 
@@ -441,8 +439,8 @@ class Kernel(computedobject.ComputedObject):
 
   @staticmethod
   def sobel(
-      magnitude: Optional[_arg_types.Number] = None,
-      normalize: Optional[_arg_types.Bool] = None,
+      magnitude: _arg_types.Number | None = None,
+      normalize: _arg_types.Bool | None = None,
   ) -> Kernel:
     """Returns a 3x3 Sobel edge-detection kernel.
 
@@ -456,9 +454,9 @@ class Kernel(computedobject.ComputedObject):
   @staticmethod
   def square(
       radius: _arg_types.Number,
-      units: Optional[_arg_types.String] = None,
-      normalize: Optional[_arg_types.Bool] = None,
-      magnitude: Optional[_arg_types.Number] = None,
+      units: _arg_types.String | None = None,
+      normalize: _arg_types.Bool | None = None,
+      magnitude: _arg_types.Number | None = None,
   ) -> Kernel:
     """Returns a square-shaped boolean kernel.
 

ee/oauth.py

@@ -17,7 +17,8 @@ import os
 import shutil
 import subprocess
 import sys
-from typing import Any, Optional, Sequence, Union
+from typing import Any, Optional, Union
+from collections.abc import Sequence
 import urllib.error
 import urllib.parse
 import urllib.request
@@ -200,7 +201,7 @@ def write_private_json(json_path: str, info_dict: dict[str, Any]) -> None:
   except OSError as e:
     if e.errno != errno.EEXIST:
       # pylint:disable=broad-exception-raised,raise-missing-from
-      raise Exception('Error creating directory %s: %s' % (dirname, e))
+      raise Exception('Error creating directory {}: {}'.format(dirname, e))
       # pylint:enable=broad-exception-raised,raise-missing-from
 
   file_content = json.dumps(info_dict)
@@ -292,30 +293,35 @@ def _display_auth_instructions_for_noninteractive(
   else:
     code_verifier_str = code_verifier
 
-  print('Paste the following address into a web browser:\n'
-        '\n'
-        '    {0}\n'
-        '\n'
-        'On the web page, please authorize access to your '
-        'Earth Engine account and copy the authentication code. '
-        'Next authenticate with the following command:\n'
-        '\n'
-        '    earthengine authenticate --code-verifier={1} '
-        '--authorization-code=PLACE_AUTH_CODE_HERE\n'.format(
-            auth_url, code_verifier_str))
+  print(
+      'Paste the following address into a web browser:\n'
+      '\n'
+      '    {}\n'
+      '\n'
+      'On the web page, please authorize access to your '
+      'Earth Engine account and copy the authentication code. '
+      'Next authenticate with the following command:\n'
+      '\n'
+      '    earthengine authenticate --code-verifier={} '
+      '--authorization-code=PLACE_AUTH_CODE_HERE\n'.format(
+          auth_url, code_verifier_str
+      )
+  )
 
 
 def _display_auth_instructions_with_print(
     auth_url: str, coda: Optional[str] = None
 ) -> None:
   """Displays instructions for authenticating using a print statement."""
-  print('To authorize access needed by Earth Engine, open the following '
-        'URL in a web browser and follow the instructions. If the web '
-        'browser does not start automatically, please manually browse the '
-        'URL below.\n'
-        '\n'
-        '    {0}\n'
-        '\n{1}'.format(auth_url, coda or PASTE_CODA))
+  print(
+      'To authorize access needed by Earth Engine, open the following '
+      'URL in a web browser and follow the instructions. If the web '
+      'browser does not start automatically, please manually browse the '
+      'URL below.\n'
+      '\n'
+      '    {}\n'
+      '\n{}'.format(auth_url, coda or PASTE_CODA)
+  )
 
 
 def _display_auth_instructions_with_html(

ee/pixeltype.py

@@ -1,7 +1,7 @@
 """A wrapper for PixelTypes."""
 from __future__ import annotations
 
-from typing import Any, Optional, Union
+from typing import Any
 
 from ee import _arg_types
 from ee import apifunction
@@ -52,12 +52,12 @@ class PixelType(computedobject.ComputedObject):
 
   def __init__(
       self,
-      precision: Union[_arg_types.String],
+      precision: _arg_types.String,
       # pylint: disable=invalid-name
-      minValue: Optional[_arg_types.Number] = None,
-      maxValue: Optional[_arg_types.Number] = None,
+      minValue: _arg_types.Number | None = None,
+      maxValue: _arg_types.Number | None = None,
       # pylint: enable=invalid-name
-      dimensions: Optional[_arg_types.Integer] = None,
+      dimensions: _arg_types.Integer | None = None,
   ):
     """Creates a PixelType wrapper.
 

ee/projection.py

@@ -1,7 +1,8 @@
 """A wrapper for Projections."""
 from __future__ import annotations
 
-from typing import Any, Optional, Sequence, Union
+from collections.abc import Sequence
+from typing import Any, Union
 
 from ee import _arg_types
 from ee import apifunction
@@ -45,9 +46,9 @@ class Projection(computedobject.ComputedObject):
   def __init__(
       self,
       crs: _arg_types.String,
-      transform: Optional[_NumberSequenceType] = None,
+      transform: _NumberSequenceType | None = None,
       # pylint: disable-next=invalid-name
-      transformWkt: Optional[_arg_types.String] = None,
+      transformWkt: _arg_types.String | None = None,
   ):
     """Creates a Projection wrapper.