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

ee/classifier.py

@@ -1,8 +1,6 @@
 """A wrapper for Classifiers."""
 from __future__ import annotations
 
-from typing import Optional
-
 from ee import _arg_types
 from ee import apifunction
 from ee import computedobject
@@ -59,34 +57,34 @@ class Classifier(computedobject.ComputedObject):
 
   def amnhMaxent(
       # pylint: disable=invalid-name
-      categoricalNames: Optional[_arg_types.List] = None,
-      outputFormat: Optional[_arg_types.String] = None,
-      autoFeature: Optional[_arg_types.Bool] = None,
+      categoricalNames: _arg_types.List | None = None,
+      outputFormat: _arg_types.String | None = None,
+      autoFeature: _arg_types.Bool | None = None,
       # pylint: enable=invalid-name
-      linear: Optional[_arg_types.Bool] = None,
-      quadratic: Optional[_arg_types.Bool] = None,
-      product: Optional[_arg_types.Bool] = None,
-      threshold: Optional[_arg_types.Bool] = None,
-      hinge: Optional[_arg_types.Bool] = None,
+      linear: _arg_types.Bool | None = None,
+      quadratic: _arg_types.Bool | None = None,
+      product: _arg_types.Bool | None = None,
+      threshold: _arg_types.Bool | None = None,
+      hinge: _arg_types.Bool | None = None,
       # pylint: disable=invalid-name
-      hingeThreshold: Optional[_arg_types.Integer] = None,
-      l2lqThreshold: Optional[_arg_types.Integer] = None,
-      lq2lqptThreshold: Optional[_arg_types.Integer] = None,
-      addSamplesToBackground: Optional[_arg_types.Bool] = None,
-      addAllSamplesToBackground: Optional[_arg_types.Bool] = None,
-      betaMultiplier: Optional[_arg_types.Number] = None,
-      betaHinge: Optional[_arg_types.Number] = None,
-      betaLqp: Optional[_arg_types.Number] = None,
-      betaCategorical: Optional[_arg_types.Number] = None,
-      betaThreshold: Optional[_arg_types.Number] = None,
+      hingeThreshold: _arg_types.Integer | None = None,
+      l2lqThreshold: _arg_types.Integer | None = None,
+      lq2lqptThreshold: _arg_types.Integer | None = None,
+      addSamplesToBackground: _arg_types.Bool | None = None,
+      addAllSamplesToBackground: _arg_types.Bool | None = None,
+      betaMultiplier: _arg_types.Number | None = None,
+      betaHinge: _arg_types.Number | None = None,
+      betaLqp: _arg_types.Number | None = None,
+      betaCategorical: _arg_types.Number | None = None,
+      betaThreshold: _arg_types.Number | None = None,
       # pylint: enable=invalid-name
-      extrapolate: Optional[_arg_types.Bool] = None,
+      extrapolate: _arg_types.Bool | None = None,
       # pylint: disable=invalid-name
-      doClamp: Optional[_arg_types.Bool] = None,
-      writeClampGrid: Optional[_arg_types.Bool] = None,
-      randomTestPoints: Optional[_arg_types.Integer] = None,
+      doClamp: _arg_types.Bool | None = None,
+      writeClampGrid: _arg_types.Bool | None = None,
+      randomTestPoints: _arg_types.Integer | None = None,
       # pylint: enable=invalid-name
-      seed: Optional[_arg_types.Integer] = None,
+      seed: _arg_types.Integer | None = None,
   ) -> Classifier:
     """Returns a Maximum Entropy classifier.
 
@@ -229,20 +227,20 @@ class Classifier(computedobject.ComputedObject):
   @staticmethod
   def libsvm(
       # pylint: disable=invalid-name
-      decisionProcedure: Optional[_arg_types.String] = None,
-      svmType: Optional[_arg_types.String] = None,
-      kernelType: Optional[_arg_types.String] = None,
+      decisionProcedure: _arg_types.String | None = None,
+      svmType: _arg_types.String | None = None,
+      kernelType: _arg_types.String | None = None,
       # pylint: enable=invalid-name
-      shrinking: Optional[_arg_types.Bool] = None,
-      degree: Optional[_arg_types.Integer] = None,
-      gamma: Optional[_arg_types.Number] = None,
-      coef0: Optional[_arg_types.Number] = None,
-      cost: Optional[_arg_types.Number] = None,
-      nu: Optional[_arg_types.Number] = None,
+      shrinking: _arg_types.Bool | None = None,
+      degree: _arg_types.Integer | None = None,
+      gamma: _arg_types.Number | None = None,
+      coef0: _arg_types.Number | None = None,
+      cost: _arg_types.Number | None = None,
+      nu: _arg_types.Number | None = None,
       # pylint: disable=invalid-name
-      terminationEpsilon: Optional[_arg_types.Number] = None,
-      lossEpsilon: Optional[_arg_types.Number] = None,
-      oneClass: Optional[_arg_types.Integer] = None,
+      terminationEpsilon: _arg_types.Number | None = None,
+      lossEpsilon: _arg_types.Number | None = None,
+      oneClass: _arg_types.Integer | None = None,
       # pylint: enable=invalid-name
   ) -> Classifier:
     """Returns an empty Support Vector Machine classifier.
@@ -305,9 +303,9 @@ class Classifier(computedobject.ComputedObject):
 
   @staticmethod
   def minimumDistance(
-      metric: Optional[_arg_types.String] = None,
+      metric: _arg_types.String | None = None,
       # pylint: disable-next=invalid-name
-      kNearest: Optional[_arg_types.Integer] = None,
+      kNearest: _arg_types.Integer | None = None,
   ) -> Classifier:
     # pyformat: disable
     """Returns a minimum distance classifier for the given distance metric.
@@ -383,8 +381,8 @@ class Classifier(computedobject.ComputedObject):
   @staticmethod
   def smileCart(
       # pylint: disable=invalid-name
-      maxNodes: Optional[_arg_types.Integer] = None,
-      minLeafPopulation: Optional[_arg_types.Integer] = None,
+      maxNodes: _arg_types.Integer | None = None,
+      minLeafPopulation: _arg_types.Integer | None = None,
       # pylint: enable=invalid-name
   ) -> Classifier:
     """Returns an empty CART classifier.
@@ -406,13 +404,13 @@ class Classifier(computedobject.ComputedObject):
   @staticmethod
   def smileGradientTreeBoost(
       numberOfTrees: _arg_types.Integer,  # pylint: disable=invalid-name
-      shrinkage: Optional[_arg_types.Number] = None,
+      shrinkage: _arg_types.Number | None = None,
       # pylint: disable=invalid-name
-      samplingRate: Optional[_arg_types.Number] = None,
-      maxNodes: Optional[_arg_types.Integer] = None,
+      samplingRate: _arg_types.Number | None = None,
+      maxNodes: _arg_types.Integer | None = None,
       # pylint: enable=invalid-name
-      loss: Optional[_arg_types.String] = None,
-      seed: Optional[_arg_types.Integer] = None,
+      loss: _arg_types.String | None = None,
+      seed: _arg_types.Integer | None = None,
   ) -> Classifier:
     """Returns an empty Gradient Tree Boost classifier.
 
@@ -440,10 +438,10 @@ class Classifier(computedobject.ComputedObject):
 
   @staticmethod
   def smileKNN(
-      k: Optional[_arg_types.Integer] = None,
+      k: _arg_types.Integer | None = None,
       # pylint: disable-next=invalid-name
-      searchMethod: Optional[_arg_types.String] = None,
-      metric: Optional[_arg_types.String] = None,
+      searchMethod: _arg_types.String | None = None,
+      metric: _arg_types.String | None = None,
   ) -> Classifier:
     # pyformat: disable
     """Returns an empty k-NN classifier.
@@ -476,7 +474,7 @@ class Classifier(computedobject.ComputedObject):
 
   @staticmethod
   def smileNaiveBayes(
-      lambda_: Optional[_arg_types.Number] = None, **kwargs
+      lambda_: _arg_types.Number | None = None, **kwargs
   ) -> Classifier:
     # pylint: disable=g-doc-args
     """Returns an empty Naive Bayes classifier.
@@ -503,12 +501,12 @@ class Classifier(computedobject.ComputedObject):
   def smileRandomForest(
       # pylint: disable=invalid-name
       numberOfTrees: _arg_types.Integer,
-      variablesPerSplit: Optional[_arg_types.Integer] = None,
-      minLeafPopulation: Optional[_arg_types.Integer] = None,
-      bagFraction: Optional[_arg_types.Number] = None,
-      maxNodes: Optional[_arg_types.Integer] = None,
+      variablesPerSplit: _arg_types.Integer | None = None,
+      minLeafPopulation: _arg_types.Integer | None = None,
+      bagFraction: _arg_types.Number | None = None,
+      maxNodes: _arg_types.Integer | None = None,
       # pylint: enable=invalid-name
-      seed: Optional[_arg_types.Integer] = None,
+      seed: _arg_types.Integer | None = None,
   ) -> Classifier:
     """Returns an empty Random Forest classifier.
 
@@ -536,7 +534,7 @@ class Classifier(computedobject.ComputedObject):
 
   @staticmethod
   def spectralRegion(
-      coordinates: _arg_types.List, schema: Optional[_arg_types.List] = None
+      coordinates: _arg_types.List, schema: _arg_types.List | None = None
   ) -> Classifier:
     """Returns a spectral region classifier.
 
@@ -569,11 +567,11 @@ class Classifier(computedobject.ComputedObject):
       features: _arg_types.FeatureCollection,
       # pylint: disable=invalid-name
       classProperty: _arg_types.String,
-      inputProperties: Optional[_arg_types.List] = None,
+      inputProperties: _arg_types.List | None = None,
       # pylint: enable=invalid-name
-      subsampling: Optional[_arg_types.Number] = None,
+      subsampling: _arg_types.Number | None = None,
       # pylint: disable-next=invalid-name
-      subsamplingSeed: Optional[_arg_types.Integer] = None,
+      subsamplingSeed: _arg_types.Integer | None = None,
   ) -> Classifier:
     """Returns a trained classifier.
 

ee/cli/commands.py

@@ -8,6 +8,7 @@ the actions to be taken when the command is executed.
 import argparse
 import calendar
 import collections
+from collections.abc import Sequence
 import datetime
 import json
 import logging
@@ -16,7 +17,7 @@ import re
 import shutil
 import sys
 import tempfile
-from typing import Any, Sequence, Type, Union
+from typing import Any, Union
 import urllib.parse
 
 # Prevent TensorFlow from logging anything at the native level.
@@ -1088,7 +1089,7 @@ class RmCommand:
       return ee.data.getInfo(asset_id)
     except ee.EEException as e:
       if verbose:
-        print('Failed to get info for %s. %s' % (asset_id, e))
+        print(f'Failed to get info for {asset_id}. {e}')
       return None
 
   def _delete_asset(self, asset_id, recursive, verbose, dry_run):
@@ -1108,7 +1109,7 @@ class RmCommand:
       try:
         ee.data.deleteAsset(asset_id)
       except ee.EEException as e:
-        print('Failed to delete %s. %s' % (asset_id, e))
+        print(f'Failed to delete {asset_id}. {e}')
 
 
 class TaskCancelCommand:
@@ -1141,7 +1142,7 @@ class TaskCancelCommand:
         print('Canceling task "%s"' % task_id)
         ee.data.cancelTask(task_id)
       elif not cancel_all:
-        print('Task "%s" already in state "%s".' % (status['id'], state))
+        print('Task "{}" already in state "{}".'.format(status['id'], state))
 
 
 class TaskInfoCommand:
@@ -1862,8 +1863,7 @@ def _make_rpc_friendly(model_dir, tag, in_map, out_map, vars_path):
 
   # Create new input placeholders to receive RPC TensorProto payloads
   in_op_map = {
-      k: tf.placeholder(
-          tf.string, shape=[None], name='earthengine_in_{}'.format(i))
+      k: tf.placeholder(tf.string, shape=[None], name=f'earthengine_in_{i}')
       for (i, k) in enumerate(input_new_keys)
   }
 
@@ -1888,7 +1888,9 @@ def _make_rpc_friendly(model_dir, tag, in_map, out_map, vars_path):
     out_tensor = saved_model_utils.build_tensor_info(
         _encode_op(
             tf.get_default_graph().get_tensor_by_name(k),
-            name='earthengine_out_{}'.format(index)))
+            name=f'earthengine_out_{index}',
+        )
+    )
 
     sig_out[_strip_index(v)] = out_tensor
 

ee/cli/utils.py

@@ -6,6 +6,7 @@ the classes for configuration and runtime context management.
 """
 
 import collections
+from collections.abc import Iterable
 import datetime
 import json
 import os
@@ -13,7 +14,7 @@ import re
 import tempfile
 import threading
 import time
-from typing import Any, AnyStr, Iterable, Optional, Union
+from typing import Any, AnyStr, Optional, Union
 import urllib.parse
 
 from google.cloud import storage
@@ -152,7 +153,7 @@ class CommandLineConfig:
 def _split_gcs_path(path):
   m = re.search('gs://([a-z0-9-_.]*)/(.*)', path, re.IGNORECASE)
   if not m:
-    raise ValueError('\'{}\' is not a valid GCS path'.format(path))
+    raise ValueError(f"'{path}' is not a valid GCS path")
 
   return m.groups()
 
@@ -182,7 +183,7 @@ class GcsHelper:
         raise ValueError('Size of files in \'{}\' exceeds allowed size: '
                          '{} > {}.'.format(path, total_bytes, max_bytes))
     if total_bytes == 0:
-      raise ValueError('No files found at \'{}\'.'.format(path))
+      raise ValueError(f"No files found at '{path}'.")
 
   def download_dir_to_temp(self, path: str) -> str:
     """Downloads recursively the contents at a GCS path to a temp directory."""
@@ -252,7 +253,7 @@ def wait_for_task(
 ) -> None:
   """Waits for the specified task to finish, or a timeout to occur."""
   start = time.time()
-  elapsed = 0
+  elapsed: float
   last_check = 0
   while True:
     elapsed = time.time() - start
@@ -274,7 +275,9 @@ def wait_for_task(
       time.sleep(min(10, remaining))
     else:
       break
-  print('Wait for task %s timed out after %.2f seconds' % (task_id, elapsed))
+  print(
+      f'Wait for task {task_id} timed out after {elapsed:.2f} seconds'
+  )
 
 
 def wait_for_tasks(
@@ -385,9 +388,10 @@ def _gcs_ls(bucket: str, prefix: str = '') -> Iterable[str]:
       raise ee.ee_exception.EEException('Unexpected HTTP error: %s' % str(e))
 
     if response.status < 100 or response.status >= 300:
-      raise ee.ee_exception.EEException(('Error retrieving bucket %s;'
-                                         ' Server returned HTTP code: %d' %
-                                         (bucket, response.status)))
+      raise ee.ee_exception.EEException(
+          'Error retrieving bucket %s; Server returned HTTP code: %d'
+          % (bucket, response.status)
+      )
 
     json_content = json.loads(content)
     if 'error' in json_content:
@@ -402,7 +406,7 @@ def _gcs_ls(bucket: str, prefix: str = '') -> Iterable[str]:
     object_names = [str(gc_object['name']) for gc_object in objects]
 
     for name in object_names:
-      yield 'gs://%s/%s' % (bucket, name)
+      yield f'gs://{bucket}/{name}'
 
     # GCS indicates no more results
     if 'nextPageToken' not in json_content:

ee/clusterer.py

@@ -1,8 +1,6 @@
 """A wrapper for Clusterers."""
 from __future__ import annotations
 
-from typing import Optional
-
 from ee import _arg_types
 from ee import apifunction
 from ee import computedobject
@@ -72,7 +70,7 @@ class Clusterer(computedobject.ComputedObject):
 
   # TODO: The Optional is suspect. The return from schema is
   # never None, but the .getInfo() of the result can be None.
-  def schema(self) -> Optional[ee_list.List]:
+  def schema(self) -> ee_list.List | None:
     """Returns the names of the inputs used by this Clusterer.
 
     Or None if this Clusterer has not had any training data added yet.
@@ -84,10 +82,10 @@ class Clusterer(computedobject.ComputedObject):
       self,
       features: _arg_types.FeatureCollection,
       # pylint: disable-next=invalid-name
-      inputProperties: Optional[_arg_types.List] = None,
-      subsampling: Optional[_arg_types.Number] = None,
+      inputProperties: _arg_types.List | None = None,
+      subsampling: _arg_types.Number | None = None,
       # pylint: disable-next=invalid-name
-      subsamplingSeed: Optional[_arg_types.Integer] = None,
+      subsamplingSeed: _arg_types.Integer | None = None,
   ) -> Clusterer:
     """Returns a trained Clusterer.
 
@@ -117,15 +115,15 @@ class Clusterer(computedobject.ComputedObject):
   @staticmethod
   def wekaCascadeKMeans(
       # pylint: disable=invalid-name
-      minClusters: Optional[_arg_types.Integer] = None,
-      maxClusters: Optional[_arg_types.Integer] = None,
+      minClusters: _arg_types.Integer | None = None,
+      maxClusters: _arg_types.Integer | None = None,
       # pylint: disable-next=invalid-name
-      restarts: Optional[_arg_types.Integer] = None,
-      manual: Optional[_arg_types.Bool] = None,
-      init: Optional[_arg_types.Bool] = None,
+      restarts: _arg_types.Integer | None = None,
+      manual: _arg_types.Bool | None = None,
+      init: _arg_types.Bool | None = None,
       # pylint: disable=invalid-name
-      distanceFunction: Optional[_arg_types.String] = None,
-      maxIterations: Optional[_arg_types.Integer] = None,
+      distanceFunction: _arg_types.String | None = None,
+      maxIterations: _arg_types.Integer | None = None,
       # pylint: disable-next=invalid-name
   ) -> Clusterer:
     """Returns a weka Cascade K-Means Clusterer.
@@ -161,9 +159,9 @@ class Clusterer(computedobject.ComputedObject):
 
   @staticmethod
   def wekaCobweb(
-      acuity: Optional[_arg_types.Number] = None,
-      cutoff: Optional[_arg_types.Number] = None,
-      seed: Optional[_arg_types.Integer] = None,
+      acuity: _arg_types.Number | None = None,
+      cutoff: _arg_types.Number | None = None,
+      seed: _arg_types.Integer | None = None,
   ) -> Clusterer:
     """Returns a weka Cobweb Clusterer.
 
@@ -186,22 +184,22 @@ class Clusterer(computedobject.ComputedObject):
   @staticmethod
   def wekaKMeans(
       nClusters: _arg_types.Integer,  # pylint: disable=invalid-name
-      init: Optional[_arg_types.Integer] = None,
-      canopies: Optional[_arg_types.Bool] = None,
+      init: _arg_types.Integer | None = None,
+      canopies: _arg_types.Bool | None = None,
       # pylint: disable=invalid-name
-      maxCandidates: Optional[_arg_types.Integer] = None,
-      periodicPruning: Optional[_arg_types.Integer] = None,
-      minDensity: Optional[_arg_types.Integer] = None,
+      maxCandidates: _arg_types.Integer | None = None,
+      periodicPruning: _arg_types.Integer | None = None,
+      minDensity: _arg_types.Integer | None = None,
       # pylint: enable=invalid-name
-      t1: Optional[_arg_types.Number] = None,
-      t2: Optional[_arg_types.Number] = None,
+      t1: _arg_types.Number | None = None,
+      t2: _arg_types.Number | None = None,
       # pylint: disable=invalid-name
-      distanceFunction: Optional[_arg_types.String] = None,
-      maxIterations: Optional[_arg_types.Integer] = None,
-      preserveOrder: Optional[_arg_types.Bool] = None,
+      distanceFunction: _arg_types.String | None = None,
+      maxIterations: _arg_types.Integer | None = None,
+      preserveOrder: _arg_types.Bool | None = None,
       # pylint: enable=invalid-name
-      fast: Optional[_arg_types.Bool] = None,
-      seed: Optional[_arg_types.Integer] = None,
+      fast: _arg_types.Bool | None = None,
+      seed: _arg_types.Integer | None = None,
   ) -> Clusterer:
     """Returns a weka K-Means Clusterer.
 
@@ -260,12 +258,12 @@ class Clusterer(computedobject.ComputedObject):
   @staticmethod
   def wekaLVQ(
       # pylint: disable=invalid-name
-      numClusters: Optional[_arg_types.Integer] = None,
-      learningRate: Optional[_arg_types.Number] = None,
+      numClusters: _arg_types.Integer | None = None,
+      learningRate: _arg_types.Number | None = None,
       # pylint: enable=invalid-name
-      epochs: Optional[_arg_types.Integer] = None,
+      epochs: _arg_types.Integer | None = None,
       # pylint: disable-next=invalid-name
-      normalizeInput: Optional[_arg_types.Bool] = None,
+      normalizeInput: _arg_types.Bool | None = None,
   ) -> Clusterer:
     """Returns a weka Learning Vector Quantization (LVQ) Clusterer.
 
@@ -290,16 +288,16 @@ class Clusterer(computedobject.ComputedObject):
   @staticmethod
   def wekaXMeans(
       # pylint: disable=invalid-name
-      minClusters: Optional[_arg_types.Integer] = None,
-      maxClusters: Optional[_arg_types.Integer] = None,
-      maxIterations: Optional[_arg_types.Integer] = None,
-      maxKMeans: Optional[_arg_types.Integer] = None,
-      maxForChildren: Optional[_arg_types.Integer] = None,
-      useKD: Optional[_arg_types.Bool] = None,
-      cutoffFactor: Optional[_arg_types.Number] = None,
-      distanceFunction: Optional[_arg_types.String] = None,
+      minClusters: _arg_types.Integer | None = None,
+      maxClusters: _arg_types.Integer | None = None,
+      maxIterations: _arg_types.Integer | None = None,
+      maxKMeans: _arg_types.Integer | None = None,
+      maxForChildren: _arg_types.Integer | None = None,
+      useKD: _arg_types.Bool | None = None,
+      cutoffFactor: _arg_types.Number | None = None,
+      distanceFunction: _arg_types.String | None = None,
       # pylint: enable=invalid-name
-      seed: Optional[_arg_types.Integer] = None,
+      seed: _arg_types.Integer | None = None,
   ) -> Clusterer:
     """Returns a weka X-Means Clusterer.