earthengine-api 1.5.24__tar.gz → 1.6.0__tar.gz

{earthengine_api-1.5.24/earthengine_api.egg-info → earthengine_api-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: earthengine-api
-Version: 1.5.24
+Version: 1.6.0
 Summary: Earth Engine Python API
 Author-email: Google LLC <noreply@google.com>
 License: Apache-2.0

{earthengine_api-1.5.24 → earthengine_api-1.6.0/earthengine_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: earthengine-api
-Version: 1.5.24
+Version: 1.6.0
 Summary: Earth Engine Python API
 Author-email: Google LLC <noreply@google.com>
 License: Apache-2.0

{earthengine_api-1.5.24 → earthengine_api-1.6.0}/ee/__init__.py

@@ -1,16 +1,17 @@
 """The EE Python library."""
 
-__version__ = '1.5.24'
+__version__ = '1.6.0'
 
 # Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name
 
 import collections
+from collections.abc import Hashable, Sequence
 import datetime
 import inspect
 import os
 import re
-from typing import Any, Hashable, Optional, Sequence, Type, Union
+from typing import Any, Optional, Type, Union
 
 from google.oauth2 import service_account
 
@@ -311,7 +312,7 @@ def _Promote(arg: Optional[Any], a_class: str) -> Optional[Any]:
       return Element(arg.func, arg.args, arg.varName)
     else:
       # No way to convert.
-      raise EEException('Cannot convert {0} to Element.'.format(arg))
+      raise EEException(f'Cannot convert {arg} to Element.')
   elif a_class == 'Geometry':
     if isinstance(arg, Collection):
       return ApiFunction.call_('Collection.geometry', arg)
@@ -340,7 +341,7 @@ def _Promote(arg: Optional[Any], a_class: str) -> Optional[Any]:
       # Image.parseExpression().
       return arg
     else:
-      raise EEException('Argument is not a function: {0}'.format(arg))
+      raise EEException(f'Argument is not a function: {arg}')
   elif a_class == 'Dictionary':
     if isinstance(arg, dict):
       return arg
@@ -372,7 +373,7 @@ def _Promote(arg: Optional[Any], a_class: str) -> Optional[Any]:
         # arg is the name of a method in a_class.
         return getattr(cls, arg)()
       else:
-        raise EEException('Unknown algorithm: {0}.{1}'.format(a_class, arg))
+        raise EEException(f'Unknown algorithm: {a_class}.{arg}')
     else:
       # Client-side cast.
       return cls(arg)
@@ -419,9 +420,9 @@ def _InitializeGeneratedClasses() -> None:
   """Generate classes for extra types that appear in the web API."""
   signatures = ApiFunction.allSignatures()
   # Collect the first part of all function names.
-  names = set([name.split('.')[0] for name in signatures])
+  names = {name.split('.')[0] for name in signatures}
   # Collect the return types of all functions.
-  returns = set([signatures[sig]['returns'] for sig in signatures])
+  returns = {signatures[sig]['returns'] for sig in signatures}
 
   want = [name for name in names.intersection(returns) if name not in globals()]
 
@@ -435,7 +436,7 @@ def _InitializeGeneratedClasses() -> None:
   types._registerClasses(globals())     # pylint: disable=protected-access
 
 
-def _MakeClass(name: str) -> Type[Any]:
+def _MakeClass(name: str) -> type[Any]:
   """Generates a dynamic API class for a given name."""
 
   def init(self, *args, **kwargs):
@@ -480,11 +481,11 @@ def _MakeClass(name: str) -> Type[Any]:
         if not onlyOneArg:
           # We don't know what to do with multiple args.
           raise EEException(
-              'Too many arguments for ee.{0}(): {1}'.format(name, args))
+              f'Too many arguments for ee.{name}(): {args}')
         elif firstArgIsPrimitive:
           # Can't cast a primitive.
           raise EEException(
-              'Invalid argument for ee.{0}(): {1}.  '
+              'Invalid argument for ee.{}(): {}.  '
               'Must be a ComputedObject.'.format(name, args))
 
         result = args[0]

{earthengine_api-1.5.24 → earthengine_api-1.6.0}/ee/_arg_types.py

@@ -1,8 +1,9 @@
 """Internal types used to represent arguments to the API."""
 from __future__ import annotations
 
+from collections.abc import Sequence
 import datetime
-from typing import Any as AnyType, Sequence, Union
+from typing import Any as AnyType, Union
 
 from ee import classifier
 from ee import clusterer

{earthengine_api-1.5.24 → earthengine_api-1.6.0}/ee/_cloud_api_utils.py

@@ -6,12 +6,13 @@ parameters and result values.
 """
 
 import calendar
+from collections.abc import Sequence
 import copy
 import datetime
 import json
 import os
 import re
-from typing import Any, Callable, Optional, Sequence, Type, Union
+from typing import Any, Callable, Optional, Type, Union
 import warnings
 
 import google_auth_httplib2
@@ -56,7 +57,7 @@ class _Http:
       body: Optional[str] = None,
       headers: Optional[dict[str, str]] = None,
       redirections: Optional[int] = None,
-      connection_type: Optional[Type[Any]] = None,
+      connection_type: Optional[type[Any]] = None,
   ) -> tuple[httplib2.Response, Any]:
     """Makes an HTTP request using httplib2 semantics."""
     del connection_type  # Ignored
@@ -434,7 +435,7 @@ def _convert_list_images_filter_params_to_list_assets_params(params) -> str:
     # query in a set of double quotes. We trivially avoid doubly-escaping the
     # quotes by replacing double quotes with single quotes.
     region = region.replace('"', "'")
-    query_strings.append('intersects("{}")'.format(region))
+    query_strings.append(f'intersects("{region}")')
     del params['region']
   if 'properties' in params:
     if isinstance(params['properties'], list) and any(
@@ -534,9 +535,9 @@ def convert_asset_id_to_asset_name(asset_id: str) -> str:
   if re.match(ASSET_NAME_PATTERN, asset_id) or is_asset_root(asset_id):
     return asset_id
   elif asset_id.split('/')[0] in ['users', 'projects']:
-    return 'projects/earthengine-legacy/assets/{}'.format(asset_id)
+    return f'projects/earthengine-legacy/assets/{asset_id}'
   else:
-    return 'projects/earthengine-public/assets/{}'.format(asset_id)
+    return f'projects/earthengine-public/assets/{asset_id}'
 
 
 def split_asset_name(asset_name: str) -> tuple[str, str]:
@@ -561,7 +562,7 @@ def convert_operation_name_to_task_id(operation_name: str) -> str:
 
 def convert_task_id_to_operation_name(task_id: str) -> str:
   """Converts a task ID to an Operation name."""
-  return 'projects/{}/operations/{}'.format(_cloud_api_user_project, task_id)
+  return f'projects/{_cloud_api_user_project}/operations/{task_id}'
 
 
 def convert_params_to_image_manifest(params: dict[str, Any]) -> dict[str, Any]:

{earthengine_api-1.5.24 → earthengine_api-1.6.0}/ee/_helpers.py

@@ -7,10 +7,11 @@ referenced from there (e.g., "ee.profilePrinting").
 # Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name
 
+from collections.abc import Iterator
 import contextlib
 import json
 import sys
-from typing import Any, Iterator, Optional, TextIO, Union
+from typing import Any, Optional, TextIO, Union
 
 from google.auth import crypt
 from google.oauth2 import service_account
@@ -59,7 +60,7 @@ def ServiceAccountCredentials(
 
   # Probably a PEM key - just read the file into 'key_data'.
   if key_file:
-    with open(key_file, 'r') as file_:
+    with open(key_file) as file_:
       key_data = file_.read()
 
   # Raw PEM key.

{earthengine_api-1.5.24 → earthengine_api-1.6.0}/ee/apifunction.py

@@ -18,7 +18,7 @@ from __future__ import annotations
 import copy
 import keyword
 import re
-from typing import Any, Optional, Type
+from typing import Any
 
 from ee import _utils
 from ee import computedobject
@@ -41,7 +41,7 @@ class ApiFunction(function.Function):
   _bound_signatures: set[str] = set()
 
   @_utils.accept_opt_prefix('opt_signature')
-  def __init__(self, name: str, signature: Optional[dict[str, Any]] = None):
+  def __init__(self, name: str, signature: dict[str, Any] | None = None):
     """Creates a function defined by the EE API.
 
     Args:
@@ -113,15 +113,17 @@ class ApiFunction(function.Function):
   def allSignatures(cls) -> dict[str, dict[str, Any]]:
     """Returns a map from the name to signature for all API functions."""
     cls.initialize()
-    return dict([(name, func.getSignature())
-                 for name, func in cls._api.items()])
+    return {name: func.getSignature() for name, func in cls._api.items()}
 
   @classmethod
   def unboundFunctions(cls) -> dict[str, Any]:
     """Returns the functions that have not been bound using importApi() yet."""
     cls.initialize()
-    return dict([(name, func) for name, func in cls._api.items()
-                 if name not in cls._bound_signatures])
+    return {
+        name: func
+        for name, func in cls._api.items()
+        if name not in cls._bound_signatures
+    }
 
   # TODO(user): Any -> ApiFunction for the return type.
   @classmethod
@@ -142,7 +144,7 @@ class ApiFunction(function.Function):
     return result
 
   @classmethod
-  def lookupInternal(cls, name: str) -> Optional[ApiFunction]:
+  def lookupInternal(cls, name: str) -> ApiFunction | None:
     """Looks up an API function by name.
 
     Args:
@@ -181,7 +183,7 @@ class ApiFunction(function.Function):
       target: Any,
       prefix: str,
       type_name: str,
-      prepend: Optional[str] = None,
+      prepend: str | None = None,
   ) -> None:
     """Adds all API functions that begin with a given prefix to a target class.
 
@@ -248,7 +250,7 @@ class ApiFunction(function.Function):
         setattr(target, fname, bound_function)
 
   @staticmethod
-  def clearApi(target: Type[Any]) -> None:
+  def clearApi(target: type[Any]) -> None:
     """Removes all methods added by importApi() from a target class.
 
     Args:

{earthengine_api-1.5.24 → earthengine_api-1.6.0}/ee/apitestcase.py

@@ -1,9 +1,10 @@
 """A TestCase that initializes the library with standard API methods."""
 
+from collections.abc import Iterable
 import contextlib
 import json
 import os
-from typing import Any, Iterable, Optional
+from typing import Any, Optional
 
 from googleapiclient import discovery
 

{earthengine_api-1.5.24 → earthengine_api-1.6.0}/ee/batch.py

@@ -9,10 +9,11 @@ The public function styling uses camelCase to match the JavaScript names.
 
 from __future__ import annotations
 
+from collections.abc import Sequence
 import enum
 import json
 import re
-from typing import Any, Optional, Sequence, Union
+from typing import Any
 
 from ee import _cloud_api_utils
 from ee import data
@@ -54,14 +55,14 @@ class Task:
     CANCELLED = 'CANCELLED'
 
     @classmethod
-    def active(cls, state: Union[str, Task.State]) -> bool:
+    def active(cls, state: str | Task.State) -> bool:
       """Returns True if the given state is an active one."""
       if isinstance(state, str):
         state = cls(state)
       return state in (cls.READY, cls.RUNNING, cls.CANCEL_REQUESTED)
 
     @classmethod
-    def success(cls, state: Union[str, Task.State]) -> bool:
+    def success(cls, state: str | Task.State) -> bool:
       """Returns True if the given state indicates a completed task."""
       if isinstance(state, str):
         state = cls(state)
@@ -74,22 +75,22 @@ class Task:
     FEATURE_VIEW = 'FEATURE_VIEW'
     BIGQUERY = 'BIGQUERY'
 
-  config: Optional[dict[str, Any]]
-  id: Optional[str]
-  name: Optional[str]
+  config: dict[str, Any] | None
+  id: str | None
+  name: str | None
   state: State
   task_type: Type
-  workload_tag: Optional[Union[int, str]]
+  workload_tag: int | str | None
 
-  _request_id: Optional[str]
+  _request_id: str | None
 
   def __init__(
       self,
-      task_id: Optional[str],
+      task_id: str | None,
       task_type: Type,
       state: State,
-      config: Optional[dict[str, Any]] = None,
-      name: Optional[str] = None,
+      config: dict[str, Any] | None = None,
+      name: str | None = None,
   ):
     """Creates a Task with the given ID and configuration.
 
@@ -121,7 +122,7 @@ class Task:
     self.name = name
 
   @property
-  def operation_name(self) -> Optional[str]:
+  def operation_name(self) -> str | None:
     if self.name:
       return self.name
     if self.id:
@@ -152,8 +153,7 @@ class Task:
     elif self.task_type == Task.Type.EXPORT_CLASSIFIER:
       result = data.exportClassifier(self._request_id, self.config)
     else:
-      raise ee_exception.EEException(
-          'Unknown Task type "{}"'.format(self.task_type))
+      raise ee_exception.EEException(f'Unknown Task type "{self.task_type}"')
     if not self.id:
       self.id = _cloud_api_utils.convert_operation_name_to_task_id(
           result['name'])
@@ -204,11 +204,13 @@ class Task:
   def __repr__(self) -> str:
     """Returns a string representation of the task."""
     if self.config and self.id:
-      return '<Task %s %s: %s (%s)>' % (self.id, self.task_type,
-                                        self.config['description'], self.state)
+      return '<Task {} {}: {} ({})>'.format(
+          self.id, self.task_type, self.config['description'], self.state
+      )
     elif self.config:
-      return '<Task %s: %s (%s)>' % (self.task_type, self.config['description'],
-                                     self.state)
+      return '<Task {}: {} ({})>'.format(
+          self.task_type, self.config['description'], self.state
+      )
     else:
       return '<Task "%s">' % self.id
 
@@ -231,7 +233,7 @@ class Export:
         cls,
         image: Any,
         description: str = 'myExportImageTask',
-        config: Optional[dict[str, Any]] = None,
+        config: dict[str, Any] | None = None,
     ):
       """Creates a task to export an EE Image to Google Drive or Cloud Storage.
 
@@ -1231,8 +1233,7 @@ def _prepare_image_export_config(
   if config:
     if 'skipEmptyTiles' in config:
       raise ValueError('skipEmptyTiles is only supported for GeoTIFF exports.')
-    raise ee_exception.EEException(
-        'Unknown configuration options: {}.'.format(config))
+    raise ee_exception.EEException(f'Unknown configuration options: {config}.')
 
   return request
 
@@ -1279,8 +1280,7 @@ def _prepare_map_export_config(
     # for JSON encoding.
     request['priority'] = {'value': int(config.pop('priority'))}
   if config:
-    raise ee_exception.EEException(
-        'Unknown configuration options: {}.'.format(config))
+    raise ee_exception.EEException(f'Unknown configuration options: {config}.')
   return request
 
 
@@ -1351,8 +1351,7 @@ def _prepare_table_export_config(
     request['priority'] = {'value': int(config.pop('priority'))}
 
   if config:
-    raise ee_exception.EEException(
-        'Unknown configuration options: {}.'.format(config))
+    raise ee_exception.EEException(f'Unknown configuration options: {config}.')
   return request
 
 
@@ -1394,8 +1393,7 @@ def _prepare_video_export_config(
     request['priority'] = {'value': int(config.pop('priority'))}
 
   if config:
-    raise ee_exception.EEException(
-        'Unknown configuration options: {}.'.format(config))
+    raise ee_exception.EEException(f'Unknown configuration options: {config}.')
   return request
 
 
@@ -1427,7 +1425,8 @@ def _build_image_file_export_options(
             config)
   else:
     raise ee_exception.EEException(
-        '"{}" is not a valid export destination'.format(export_destination))
+        f'"{export_destination}" is not a valid export destination'
+    )
 
   file_format_options = config.pop(IMAGE_FORMAT_OPTIONS_FIELD, {})
 
@@ -1499,7 +1498,8 @@ def _build_image_file_export_options(
 
   if file_format_options:
     raise ee_exception.EEException(
-        'Unknown file format options: {}.'.format(file_format_options))
+        f'Unknown file format options: {file_format_options}.'
+    )
 
   return file_export_options
 
@@ -1531,7 +1531,8 @@ def _build_table_file_export_options(
             config)
   else:
     raise ee_exception.EEException(
-        '"{}" is not a valid export destination'.format(export_destination))
+        f'"{export_destination}" is not a valid export destination'
+    )
   return file_export_options
 
 
@@ -1584,7 +1585,8 @@ def _build_video_file_export_options(
             config)
   else:
     raise ee_exception.EEException(
-        '"{}" is not a valid export destination'.format(export_destination))
+        f'"{export_destination}" is not a valid export destination'
+    )
   return file_export_options
 
 
@@ -1773,10 +1775,11 @@ def _get_rank_by_one_thing_rule(rule_str: str) -> dict[str, Any]:
   matches = re.findall(r'^([\S]+.*)\s+(ASC|DESC)$', rule_str.strip())
   if not matches:
     raise ee_exception.EEException(
-        ('Ranking rule format is invalid. Each rule should be defined by a '
-         'rule type and a direction (ASC or DESC), separated by a space. '
-         'Valid rule types are: .geometryType, .minZoomLevel, or a feature '
-         'property name.'))
+        'Ranking rule format is invalid. Each rule should be defined by a '
+        'rule type and a direction (ASC or DESC), separated by a space. '
+        'Valid rule types are: .geometryType, .minZoomLevel, or a feature '
+        'property name.'
+    )
 
   output = {}
   rule_type, rule_dir = matches[0]
@@ -1796,8 +1799,8 @@ def _get_rank_by_one_thing_rule(rule_str: str) -> dict[str, Any]:
 
 
 def _get_ranking_rule(
-    rules: Optional[Union[str, list[str]]]
-) -> Optional[dict[str, list[dict[str, Any]]]]:
+    rules: str | list[str] | None,
+) -> dict[str, list[dict[str, Any]]] | None:
   """Returns a RankingRule dict created from the rank-by-one-thing rules.
 
   Args:
@@ -1819,11 +1822,12 @@ def _get_ranking_rule(
     return {'rankByOneThingRule': rank_by_one_thing_rules}
 
   raise ee_exception.EEException(
-      ('Unable to build ranking rule from rules. Rules should '
-       'either be a comma-separated string or list of strings.'))
+      'Unable to build ranking rule from rules. Rules should '
+      'either be a comma-separated string or list of strings.'
+  )
 
 
-def _build_thinning_options(config: dict[str, Any]) -> Optional[dict[str, Any]]:
+def _build_thinning_options(config: dict[str, Any]) -> dict[str, Any] | None:
   """Returns a ThinningOptions dict created from the config.
 
   Args:
@@ -1843,7 +1847,7 @@ def _build_thinning_options(config: dict[str, Any]) -> Optional[dict[str, Any]]:
   return output
 
 
-def _build_ranking_options(config: dict[str, Any]) -> Optional[dict[str, Any]]:
+def _build_ranking_options(config: dict[str, Any]) -> dict[str, Any] | None:
   """Returns a RankingOptions dict created from the config.
 
   Args:
@@ -2027,7 +2031,7 @@ def _canonicalize_parameters(config, destination):
 
 
 def _canonicalize_region(
-    region: Union[str, geometry.Geometry, Any]
+    region: str | geometry.Geometry | Any,
 ) -> geometry.Geometry:
   """Converts a region parameter to a form appropriate for export."""
   region_error = ee_exception.EEException(

{earthengine_api-1.5.24 → earthengine_api-1.6.0}/ee/blob.py

@@ -1,7 +1,7 @@
 """A wrapper for Blobs."""
 from __future__ import annotations
 
-from typing import Any, Optional
+from typing import Any
 
 from ee import _arg_types
 from ee import apifunction
@@ -84,7 +84,7 @@ class Blob(computedobject.ComputedObject):
     return 'Blob'
 
   def string(
-      self, encoding: Optional[_arg_types.String] = None
+      self, encoding: _arg_types.String | None = None
   ) -> ee_string.String:
     """Returns the contents of the blob as a String.