earthengine-api 1.5.13rc0__py3-none-any.whl → 1.7.4__py3-none-any.whl

ee/filter.py

@@ -12,8 +12,6 @@ Example usage:
 
 from __future__ import annotations
 
-from typing import Optional
-
 from ee import _arg_types
 from ee import _utils
 from ee import apifunction
@@ -110,7 +108,7 @@ class Filter(computedobject.ComputedObject):
     These are implicitly ANDed.
 
     Args:
-      new_filter: The filter to append to this one.  Possible types are:
+      new_filter: The filter to append to this one. Possible types are:
           1) another fully constructed Filter,
           2) a JSON representation of a filter,
           3) an array of 1 or 2.
@@ -143,7 +141,7 @@ class Filter(computedobject.ComputedObject):
     Returns:
       The new filter.
 
-    Deprecated.  Use ee.Filter.eq(), ee.Filter.gte(), etc.'
+    Deprecated. Use ee.Filter.eq(), ee.Filter.gte(), etc.'
     """
     operator = operator.lower()
 
@@ -178,8 +176,8 @@ class Filter(computedobject.ComputedObject):
       min: _arg_types.Number,  # pylint: disable=redefined-builtin
       max: _arg_types.Number,  # pylint: disable=redefined-builtin
       # pylint: disable=invalid-name
-      maxError: Optional[_arg_types.ErrorMargin] = None,
-      geometrySelector: Optional[_arg_types.String] = None,
+      maxError: _arg_types.ErrorMargin | None = None,
+      geometrySelector: _arg_types.String | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns an area filter of the geometry.
@@ -202,10 +200,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def dateRangeContains(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if a date range contains a date.
@@ -233,7 +231,7 @@ class Filter(computedobject.ComputedObject):
   def bounds(
       geometry: _arg_types.Geometry,
       # pylint: disable-next=invalid-name
-      errorMargin: Optional[_arg_types.ErrorMargin] = None,
+      errorMargin: _arg_types.ErrorMargin | None = None,
   ) -> Filter:
     """Returns a filter on intersection with geometry.
 
@@ -256,8 +254,8 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def calendarRange(
       start: _arg_types.Integer,
-      end: Optional[_arg_types.Integer] = None,
-      field: Optional[_arg_types.String] = None,
+      end: _arg_types.Integer | None = None,
+      field: _arg_types.String | None = None,
   ) -> Filter:
     """Returns a filter that passes if a timestamp is in a range.
 
@@ -284,11 +282,11 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def contains(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
-      maxError: Optional[_arg_types.ErrorMargin] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
+      maxError: _arg_types.ErrorMargin | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if the left contains the right geometry.
@@ -321,7 +319,7 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   @_utils.accept_opt_prefix('opt_end')
   def date(
-      start: _arg_types.Date, end: Optional[_arg_types.Date] = None
+      start: _arg_types.Date, end: _arg_types.Date | None = None
   ) -> Filter:
     """Filter images by date.
 
@@ -360,11 +358,11 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def disjoint(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
-      maxError: Optional[_arg_types.ErrorMargin] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
+      maxError: _arg_types.ErrorMargin | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter.
@@ -402,10 +400,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def equals(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if the two operands are equals.
@@ -442,7 +440,7 @@ class Filter(computedobject.ComputedObject):
   def geometry(
       geometry: _arg_types.Geometry,
       # pylint: disable-next=invalid-name
-      errorMargin: Optional[_arg_types.ErrorMargin] = None,
+      errorMargin: _arg_types.ErrorMargin | None = None,
   ):
     """Filter on intersection with geometry.
 
@@ -470,10 +468,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def greaterThan(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if value is greater than the right operand.
@@ -496,10 +494,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def greaterThanOrEquals(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns filter that passes if value is greater than the right operand.
@@ -536,10 +534,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def hasType(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if the left has the type.
@@ -568,11 +566,11 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def intersects(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
-      maxError: Optional[_arg_types.ErrorMargin] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
+      maxError: _arg_types.ErrorMargin | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if left intersects the right geometry.
@@ -602,11 +600,11 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def isContained(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
-      maxError: Optional[_arg_types.ErrorMargin] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
+      maxError: _arg_types.ErrorMargin | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns filter that passes if the right geometry contains the geometry.
@@ -641,10 +639,10 @@ class Filter(computedobject.ComputedObject):
   )
   def inList(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Filter on metadata contained in a list.
@@ -678,10 +676,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def lessThan(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns filter that passes if the value is less than the right operand.
@@ -704,10 +702,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def lessThanOrEquals(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns filter that passes if the value is less than the right operand.
@@ -730,10 +728,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def listContains(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns filter that passes if the left, contains the right.
@@ -770,10 +768,10 @@ class Filter(computedobject.ComputedObject):
   def maxDifference(
       difference: _arg_types.Number,
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if the fields are within a given difference.
@@ -813,10 +811,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def notEquals(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes unless the two operands are equal.
@@ -881,10 +879,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def stringContains(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if it contains the right string.
@@ -910,10 +908,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def stringEndsWith(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if the string ends with the right string.
@@ -939,10 +937,10 @@ class Filter(computedobject.ComputedObject):
   @staticmethod
   def stringStartsWith(
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if the string starts with the right string.
@@ -969,11 +967,11 @@ class Filter(computedobject.ComputedObject):
   def withinDistance(
       distance: _arg_types.Number,
       # pylint: disable=invalid-name
-      leftField: Optional[_arg_types.String] = None,
-      rightValue: Optional[_arg_types.Any] = None,
-      rightField: Optional[_arg_types.String] = None,
-      leftValue: Optional[_arg_types.Any] = None,
-      maxError: Optional[_arg_types.ErrorMargin] = None,
+      leftField: _arg_types.String | None = None,
+      rightValue: _arg_types.Any | None = None,
+      rightField: _arg_types.String | None = None,
+      leftValue: _arg_types.Any | None = None,
+      maxError: _arg_types.ErrorMargin | None = None,
       # pylint: enable=invalid-name
   ) -> Filter:
     """Returns a filter that passes if the geometry is within a distance.

ee/function.py

@@ -1,7 +1,7 @@
 """A base class for EE Functions."""
 
 import textwrap
-from typing import Any, Dict, Set
+from typing import Any
 
 from ee import computedobject
 from ee import ee_exception
@@ -31,7 +31,7 @@ class Function(encodable.EncodableFunction):
     """
     Function._promoter = staticmethod(promoter)
 
-  def getSignature(self) -> Dict[str, Any]:
+  def getSignature(self) -> dict[str, Any]:
     """Returns a description of the interface provided by this function.
 
     Returns:
@@ -75,7 +75,7 @@ class Function(encodable.EncodableFunction):
     result = computedobject.ComputedObject(self, self.promoteArgs(named_args))
     return Function._promoter(result, self.getReturnType())
 
-  def promoteArgs(self, args: Dict[str, Any]) -> Dict[str, Any]:
+  def promoteArgs(self, args: dict[str, Any]) -> dict[str, Any]:
     """Promotes arguments to their types based on the function's signature.
 
     Verifies that all required arguments are provided and no unknown arguments
@@ -95,8 +95,8 @@ class Function(encodable.EncodableFunction):
     arg_specs = signature['args']
 
     # Promote all recognized args.
-    promoted_args: Dict[str, Any] = {}
-    known: Set[str] = set()
+    promoted_args: dict[str, Any] = {}
+    known: set[str] = set()
     for arg_spec in arg_specs:
       name = arg_spec['name']
       if name in args:
@@ -142,9 +142,9 @@ class Function(encodable.EncodableFunction):
           'Too many (%d) arguments to function: %s'
           % (len(args), signature.get('name'))
       )
-    named_args = dict(
-        [(arg_spec['name'], value) for arg_spec, value in zip(arg_specs, args)]
-    )
+    named_args = {
+        arg_spec['name']: value for arg_spec, value in zip(arg_specs, args)
+    }
 
     # Handle keyword arguments.
     if extra_keyword_args: