earthengine-api 1.6.11__tar.gz → 1.6.12__tar.gz

{earthengine_api-1.6.11/earthengine_api.egg-info → earthengine_api-1.6.12}/PKG-INFO

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

{earthengine_api-1.6.11 → earthengine_api-1.6.12/earthengine_api.egg-info}/PKG-INFO

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

{earthengine_api-1.6.11 → earthengine_api-1.6.12}/earthengine_api.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ ee/__init__.py
 ee/_arg_types.py
 ee/_cloud_api_utils.py
 ee/_helpers.py
+ee/_state.py
 ee/_utils.py
 ee/apifunction.py
 ee/apitestcase.py
@@ -65,6 +66,7 @@ ee/cli/eecli_wrapper.py
 ee/cli/utils.py
 ee/tests/_cloud_api_utils_test.py
 ee/tests/_helpers_test.py
+ee/tests/_state_test.py
 ee/tests/_utils_test.py
 ee/tests/algorithms.json
 ee/tests/apifunction_test.py

{earthengine_api-1.6.11 → earthengine_api-1.6.12}/ee/__init__.py

@@ -1,6 +1,6 @@
 """The EE Python library."""
 
-__version__ = '1.6.11'
+__version__ = '1.6.12'
 
 # Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name
@@ -171,12 +171,12 @@ def Initialize(
   """Initialize the EE library.
 
   If this hasn't been called by the time any object constructor is used,
-  it will be called then.  If this is called a second time with a different
+  it will be called then. If this is called a second time with a different
   URL, this doesn't do an un-initialization of, e.g., the previously loaded
   Algorithms, but will overwrite them and let point at alternate servers.
 
   Args:
-    credentials: OAuth2 credentials.  'persistent' (default) means use
+    credentials: OAuth2 credentials. 'persistent' (default) means use
       credentials already stored in the filesystem, or raise an explanatory
       exception guiding the user to create those credentials.
     url: The base url for the EarthEngine REST API to connect to.
@@ -443,7 +443,7 @@ def _MakeClass(name: str) -> type[Any]:
     """Initializer for dynamically created classes.
 
     Args:
-      self: The instance of this class.  Listed to make the linter hush.
+      self: The instance of this class. Listed to make the linter hush.
       *args: Either a ComputedObject to be promoted to this type, or
              arguments to an algorithm with the same name as this class.
       **kwargs: Any kwargs passed to this class constructor.
@@ -485,7 +485,7 @@ def _MakeClass(name: str) -> type[Any]:
         elif firstArgIsPrimitive:
           # Can't cast a primitive.
           raise EEException(
-              'Invalid argument for ee.{}(): {}.  '
+              'Invalid argument for ee.{}(): {}. '
               'Must be a ComputedObject.'.format(name, args))
 
         result = args[0]

{earthengine_api-1.6.11 → earthengine_api-1.6.12}/ee/_cloud_api_utils.py

@@ -35,6 +35,16 @@ ASSET_NAME_PATTERN = (r'^projects/((?:\w+(?:[\w\-]+\.[\w\-]+)*?\.\w+\:)?'
 ASSET_ROOT_PATTERN = (r'^projects/((?:\w+(?:[\w\-]+\.[\w\-]+)*?\.\w+\:)?'
                       r'[a-z][a-z0-9\-]{4,28}[a-z0-9])/assets/?$')
 
+# Conversion from task state to operation state.
+TASK_TO_OPERATION_STATE = {
+    'READY': 'PENDING',
+    'RUNNING': 'RUNNING',
+    'CANCEL_REQUESTED': 'CANCELLING',
+    'COMPLETED': 'SUCCEEDED',
+    'CANCELLED': 'CANCELLED',
+    'FAILED': 'FAILED',
+}
+
 
 class _Http:
   """A httplib2.Http-like object based on requests."""
@@ -280,7 +290,7 @@ def _convert_dict(
       not contain these keys.
     key_warnings: Whether to print warnings for input keys that are not mapped
       to anything in the output.
-    retain_keys: Whether or not to retain the state of dict.  If false, any keys
+    retain_keys: Whether or not to retain the state of dict. If false, any keys
       that don't show up in the conversions dict will be dropped from result.
 
   Returns:
@@ -853,16 +863,29 @@ def convert_operation_to_task(operation: dict[str, Any]) -> dict[str, Any]:
 
 
 def _convert_operation_state_to_task_state(state: str) -> str:
-  """Converts a state string from an Operation to the Task equivalent."""
+  """Converts an Operation state to a Task state."""
   return _convert_value(
-      state, {
-          'PENDING': 'READY',
-          'RUNNING': 'RUNNING',
-          'CANCELLING': 'CANCEL_REQUESTED',
-          'SUCCEEDED': 'COMPLETED',
-          'CANCELLED': 'CANCELLED',
-          'FAILED': 'FAILED'
-      }, 'UNKNOWN')
+      state,
+      {value: key for key, value in TASK_TO_OPERATION_STATE.items()},
+      'UNKNOWN',
+  )
+
+
+def _convert_task_state_to_operation_state(state: str) -> str:
+  """Converts a Task state to an Operation state."""
+  return _convert_value(state, TASK_TO_OPERATION_STATE, 'UNKNOWN')
+
+
+def convert_to_operation_state(state: str) -> str:
+  """Converts a Task state or an Operation state to an Operation state."""
+  # First, try converting the state assuming it's a task state.
+  operation_state = _convert_task_state_to_operation_state(state)
+  if operation_state != 'UNKNOWN':
+    return operation_state
+
+  # If it wasn't a task state, check if the input is a valid operation state.
+  valid_operation_states = set(TASK_TO_OPERATION_STATE.values())
+  return state if state in valid_operation_states else 'UNKNOWN'
 
 
 def convert_iam_policy_to_acl(policy: dict[str, Any])  -> dict[str, Any]:

earthengine_api-1.6.12/ee/_state.py

@@ -0,0 +1,105 @@
+"""Stores the current state of the EE library."""
+
+from __future__ import annotations
+
+import dataclasses
+import re
+from typing import Any
+
+# Rename to avoid redefined-outer-name warning.
+from google.oauth2 import credentials as credentials_lib
+import requests
+
+
+# The default project to use for Cloud API calls.
+DEFAULT_CLOUD_API_USER_PROJECT = 'earthengine-legacy'
+
+
+@dataclasses.dataclass()
+class _WorkloadTag:
+  """A helper class to manage the workload tag."""
+
+  _tag: str
+  _default: str
+
+  def __init__(self):
+    self._tag = ''
+    self._default = ''
+
+  def get(self) -> str:
+    return self._tag
+
+  def set(self, tag: int | str | None) -> None:
+    self._tag = self.validate(tag)
+
+  def set_default(self, new_default: int | str | None) -> None:
+    self._default = self.validate(new_default)
+
+  def reset(self) -> None:
+    self._tag = self._default
+
+  def validate(self, tag: int | str | None) -> str:
+    """Returns the validated tag or raises a ValueError.
+
+    Args:
+      tag: the tag to validate.
+
+    Raises:
+      ValueError if the tag does not match the expected format.
+    """
+    if not tag and tag != 0:
+      return ''
+    tag = str(tag)
+    if not re.fullmatch(r'([a-z0-9]|[a-z0-9][-_a-z0-9]{0,61}[a-z0-9])', tag):
+      validation_message = (
+          'Tags must be 1-63 characters, '
+          'beginning and ending with a lowercase alphanumeric character '
+          '([a-z0-9]) with dashes (-), underscores (_), '
+          'and lowercase alphanumerics between.'
+      )
+      raise ValueError(f'Invalid tag, "{tag}". {validation_message}')
+    return tag
+
+
+@dataclasses.dataclass()
+class EEState:
+  """Holds the configuration and initialized resources for an EE session."""
+
+  initialized: bool = False
+  credentials: credentials_lib.Credentials | None = None
+  api_base_url: str | None = None
+  tile_base_url: str | None = None
+  cloud_api_base_url: str | None = None
+  cloud_api_key: str | None = None
+  requests_session: requests.Session | None = None
+  cloud_api_resource: Any | None = None
+  cloud_api_resource_raw: Any | None = None
+  cloud_api_user_project: str | None = DEFAULT_CLOUD_API_USER_PROJECT
+  cloud_api_client_version: str | None = None
+  http_transport: Any | None = None
+  deadline_ms: int = 0
+  max_retries: int = 5
+  user_agent: str | None = None
+  workload_tag: _WorkloadTag = dataclasses.field(default_factory=_WorkloadTag)
+
+
+_state: EEState | None = None
+
+
+def get_state() -> EEState:
+  """Retrieves the EEState for the current execution context.
+
+  Returns:
+    The EEState for the current execution context.
+  """
+
+  global _state
+  if not _state:
+    _state = EEState()
+  return _state
+
+
+def reset_state() -> None:
+  """Resets the EEState to the default state."""
+  global _state
+  _state = None

{earthengine_api-1.6.11 → earthengine_api-1.6.12}/ee/apifunction.py

@@ -1,7 +1,7 @@
 """A class for representing built-in EE API Function.
 
 Earth Engine can dynamically produce a JSON array listing the
-algorithms available to the user.  Each item in the dictionary identifies
+algorithms available to the user. Each item in the dictionary identifies
 the name and return type of the algorithm, the name and type of its
 arguments, whether they're required or optional, default values and docs
 for each argument and the algorithms as a whole.

{earthengine_api-1.6.11 → earthengine_api-1.6.12}/ee/apitestcase.py

@@ -2,6 +2,7 @@
 
 from collections.abc import Iterable
 import contextlib
+import copy
 import json
 import os
 from typing import Any, Optional
@@ -11,6 +12,7 @@ from googleapiclient import discovery
 import unittest
 import ee
 from ee import _cloud_api_utils
+from ee import _state
 
 
 # Cached algorithms list
@@ -53,13 +55,8 @@ class ApiTestCase(unittest.TestCase):
     self.old_get_download_id = ee.data.getDownloadId
     self.old_get_thumb_id = ee.data.getThumbId
     self.old_get_table_download_id = ee.data.getTableDownloadId
-    # pylint: disable=protected-access
-    self.old_install_cloud_api_resource = ee.data._install_cloud_api_resource
-    self.old_cloud_api_resource = ee.data._cloud_api_resource
-    self.old_cloud_api_resource_raw = ee.data._cloud_api_resource_raw
-    self.old_initialized = ee.data._initialized
+    # pylint: disable-next=protected-access
     self.old_fetch_data_catalog_stac = ee.deprecation._FetchDataCatalogStac
-    # pylint: enable=protected-access
     self.InitializeApi()
 
   def tearDown(self):
@@ -70,13 +67,9 @@ class ApiTestCase(unittest.TestCase):
     ee.data.getDownloadId = self.old_get_download_id
     ee.data.getThumbId = self.old_get_thumb_id
     ee.data.getTableDownloadId = self.old_get_table_download_id
-    # pylint: disable=protected-access
-    ee.data._install_cloud_api_resource = self.old_install_cloud_api_resource
-    ee.data._cloud_api_resource = self.old_cloud_api_resource
-    ee.data._cloud_api_resource_raw = self.old_cloud_api_resource_raw
-    ee.data._initialized = self.old_initialized
+    _state.reset_state()
+    # pylint: disable-next=protected-access
     ee.deprecation._FetchDataCatalogStac = self.old_fetch_data_catalog_stac
-    # pylint: enable=protected-access
 
   def InitializeApi(self):
     """Initializes the library with standard API methods.
@@ -153,22 +146,23 @@ def UsingCloudApi(
     mock_http: Optional[Any] = None,
 ) -> Iterable[Any]:  # pytype: disable=wrong-arg-types
   """Returns a context manager under which the Cloud API is enabled."""
-  old_cloud_api_resource = ee.data._cloud_api_resource  # pylint: disable=protected-access
-  old_cloud_api_resource_raw = ee.data._cloud_api_resource_raw  # pylint: disable=protected-access
-  old_initialized = ee.data._initialized  # pylint: disable=protected-access
+  # pylint: disable=protected-access
+  old_state = copy.copy(_state._state)
+  # pylint: enable=protected-access
   try:
     if cloud_api_resource is None:
       cloud_api_resource = _GenerateCloudApiResource(mock_http, False)
     if cloud_api_resource_raw is None:
       cloud_api_resource_raw = _GenerateCloudApiResource(mock_http, True)
-    ee.data._cloud_api_resource = cloud_api_resource  # pylint: disable=protected-access
-    ee.data._cloud_api_resource_raw = cloud_api_resource_raw  # pylint: disable=protected-access
-    ee.data._initialized = True  # pylint: disable=protected-access
+    state = _state.get_state()
+    state.cloud_api_resource = cloud_api_resource
+    state.cloud_api_resource_raw = cloud_api_resource_raw
+    state.initialized = True
     yield
   finally:
-    ee.data._cloud_api_resource = old_cloud_api_resource  # pylint: disable=protected-access
-    ee.data._cloud_api_resource_raw = old_cloud_api_resource_raw  # pylint: disable=protected-access
-    ee.data._initialized = old_initialized  # pylint: disable=protected-access
+    # pylint: disable=protected-access
+    _state._state = old_state
+    # pylint: enable=protected-access
 
 
 # A sample of encoded EE API JSON, used by SerializerTest and DeserializerTest.

{earthengine_api-1.6.11 → earthengine_api-1.6.12}/ee/batch.py

@@ -100,7 +100,7 @@ class Task:
     - Unpickling a previously pickled Task object.
 
     If you're looking for a task's status but don't need a full task object,
-    ee.data.getTaskStatus() may be appropriate.
+    ee.data.getOperation() may be appropriate.
 
     Args:
       task_id: The task ID, originally obtained through ee.data.newTaskId().

{earthengine_api-1.6.11 → earthengine_api-1.6.12}/ee/cli/commands.py

@@ -69,7 +69,7 @@ TYPE_STRING = 'string'
 SYSTEM_TIME_START = 'system:time_start'
 SYSTEM_TIME_END = 'system:time_end'
 
-# A regex that parses properties of the form "[(type)]name=value".  The
+# A regex that parses properties of the form "[(type)]name=value". The
 # second, third, and fourth group are type, name, and number, respectively.
 PROPERTY_RE = re.compile(r'(\(([^\)]*)\))?([^=]+)=(.*)')
 
@@ -193,6 +193,39 @@ def _cloud_timestamp_for_timestamp_ms(timestamp_ms: float) -> str:
   return timestamp.replace(tzinfo=None).isoformat() + 'Z'
 
 
+def _datetime_from_cloud_timestamp(
+    cloud_timestamp: str | None,
+) -> datetime.datetime:
+  """Returns a datetime object for the given Cloud-formatted timestamp.
+
+  Args:
+    cloud_timestamp: A timestamp string in the format 'YYYY-MM-DDTHH:MM:SS.mmmZ'
+      or 'YYYY-MM-DDTHH:MM:SSZ'. If None, returns the epoch.
+
+  Returns:
+    A datetime object for the given Cloud-formatted timestamp. If the timestamp
+    is None, returns the epoch.
+  """
+  if not cloud_timestamp:
+    return datetime.datetime.fromtimestamp(0)
+  # Replace 'Z' with the UTC offset +00:00 for fromisoformat compatibility.
+  return datetime.datetime.fromisoformat(cloud_timestamp.replace('Z', '+00:00'))
+
+
+def _format_cloud_timestamp(timestamp: str | None) -> str:
+  """Returns a formatted datetime for the given Cloud-formatted timestamp.
+
+  Args:
+    timestamp: A timestamp string in the format 'YYYY-MM-DDTHH:MM:SS.mmmZ'
+      or 'YYYY-MM-DDTHH:MM:SSZ'.
+
+  Returns:
+    A formatted datetime string in the format 'YYYY-MM-DD HH:MM:SS'. If the
+    timestamp is None, returns the formatted epoch.
+  """
+  return _datetime_from_cloud_timestamp(timestamp).strftime('%Y-%m-%d %H:%M:%S')
+
+
 def _parse_millis(millis: float) -> datetime.datetime:
   return datetime.datetime.fromtimestamp(millis / 1000)
 
@@ -230,13 +263,34 @@ def _decode_date(string: str) -> Union[float, str]:
       'Invalid value for property of type "date": "%s".' % string)
 
 
+def _task_id_to_operation_name(task_id: str) -> str:
+  """Converts a task ID to an operation name."""
+  # pylint: disable=protected-access
+  return ee._cloud_api_utils.convert_task_id_to_operation_name(
+      ee.data._get_state().cloud_api_user_project, task_id
+  )
+  # pylint: enable=protected-access
+
+
+def _operation_name_to_task_id(operation_name: str) -> str:
+  """Converts an operation name to a task ID."""
+  # pylint: disable-next=protected-access
+  return ee._cloud_api_utils.convert_operation_name_to_task_id(operation_name)
+
+
+def _convert_to_operation_state(state: str) -> str:
+  """Converts a task or operation state to an operation state."""
+  # pylint: disable-next=protected-access
+  return ee._cloud_api_utils.convert_to_operation_state(state)
+
+
 def _decode_property(string: str) -> tuple[str, Any]:
   """Decodes a general key-value property from a command-line argument.
 
   Args:
     string: The string must have the form name=value or (type)name=value, where
       type is one of 'number', 'string', or 'date'. The value format for dates
-      is YYYY-MM-DD[THH:MM:SS[.MS]].  The value 'null' is special: it evaluates
+      is YYYY-MM-DD[THH:MM:SS[.MS]]. The value 'null' is special: it evaluates
       to None unless it is cast to a string of 'null'.
 
   Returns:
@@ -400,7 +454,7 @@ class AuthenticateCommand:
         args_auth['auth_mode'] = 'notebook'
 
     if ee.Authenticate(**args_auth):
-      print('Authenticate: Credentials already exist.  Use --force to refresh.')
+      print('Authenticate: Credentials already exist. Use --force to refresh.')
 
 
 class SetProjectCommand:
@@ -1111,19 +1165,21 @@ class TaskCancelCommand:
     config.ee_init()
     cancel_all = args.task_ids == ['all']
     if cancel_all:
-      statuses = ee.data.getTaskList()
+      operations = ee.data.listOperations()
     else:
-      statuses = ee.data.getTaskStatus(args.task_ids)
-    for status in statuses:
-      state = status['state']
-      task_id = status['id']
+      operation_names = map(_task_id_to_operation_name, args.task_ids)
+      operations = map(ee.data.getOperation, operation_names)
+    for operation in operations:
+      name = operation['name']
+      state = operation['metadata']['state']
+      task_id = _operation_name_to_task_id(name)
       if state == 'UNKNOWN':
-        raise ee.EEException('Unknown task id "%s"' % task_id)
-      elif state == 'READY' or state == 'RUNNING':
-        print('Canceling task "%s"' % task_id)
-        ee.data.cancelTask(task_id)
+        raise ee.EEException(f'Unknown task id "{task_id}"')
+      elif state == 'PENDING' or state == 'RUNNING':
+        print(f'Canceling task "{task_id}"')
+        ee.data.cancelOperation(name)
       elif not cancel_all:
-        print('Task "{}" already in state "{}".'.format(status['id'], state))
+        print(f'Task "{task_id}" already in state "{state}".')
 
 
 class TaskInfoCommand:
@@ -1139,26 +1195,30 @@ class TaskInfoCommand:
   ) -> None:
     """Runs the TaskInfo command."""
     config.ee_init()
-    for i, status in enumerate(ee.data.getTaskStatus(args.task_id)):
+    for i, task_id in enumerate(args.task_id):
+      operation = ee.data.getOperation(_task_id_to_operation_name(task_id))
       if i:
         print()
-      print('%s:' % status['id'])
-      print('  State: %s' % status['state'])
-      if status['state'] == 'UNKNOWN':
+      print(f'{task_id}:')
+      metadata = operation['metadata']
+      state = metadata['state']
+      print(f'  State: {state}')
+      if state == 'UNKNOWN':
         continue
-      print('  Type: %s' % TASK_TYPES.get(status.get('task_type'), 'Unknown'))
-      print('  Description: %s' % status.get('description'))
-      print('  Created: %s' % _parse_millis(status['creation_timestamp_ms']))
-      if 'start_timestamp_ms' in status:
-        print('  Started: %s' % _parse_millis(status['start_timestamp_ms']))
-      if 'update_timestamp_ms' in status:
-        print('  Updated: %s' % _parse_millis(status['update_timestamp_ms']))
-      if 'error_message' in status:
-        print('  Error: %s' % status['error_message'])
-      if 'destination_uris' in status:
-        print('  Destination URIs: %s' % ', '.join(status['destination_uris']))
-      if 'priority' in status:
-        print('  Priority: %s' % status['priority'])
+      print(f'  Type: {TASK_TYPES.get(metadata.get("type"), "Unknown")}')
+      print(f'  Description: {metadata.get("description")}')
+      print(f'  Created: {_format_cloud_timestamp(metadata["createTime"])}')
+      if start_time := metadata.get('startTime'):
+        print(f'  Started: {_format_cloud_timestamp(start_time)}')
+      if update_time := metadata.get('updateTime'):
+        print(f'  Updated: {_format_cloud_timestamp(update_time)}')
+      if error := operation.get('error'):
+        if error_message := error.get('message'):
+          print(f'  Error: {error_message}')
+      if destination_uris := metadata.get('destinationUris'):
+        print(f'  Destination URIs: {destination_uris}')
+      if priority := metadata.get('priority'):
+        print(f'  Priority: {priority}')
 
 
 class TaskListCommand:
@@ -1168,10 +1228,27 @@ class TaskListCommand:
 
   def __init__(self, parser: argparse.ArgumentParser):
     parser.add_argument(
-        '--status', '-s', required=False, nargs='*',
-        choices=['READY', 'RUNNING', 'COMPLETED', 'FAILED',
-                 'CANCELLED', 'UNKNOWN'],
-        help=('List tasks only with a given status'))
+        '--status',
+        '-s',
+        required=False,
+        nargs='*',
+        choices=[
+            'CANCELLED',
+            'CANCELLING',
+            'COMPLETED',  # Kept for backward compatibility.
+            'FAILED',
+            'PENDING',
+            'READY',  # Kept for backward compatibility.
+            'RUNNING',
+            'SUCCEEDED',
+            'UNKNOWN',
+        ],
+        help=(
+            'List tasks only with a given status. Note: for backward'
+            ' compatibility, "READY" is an alias for "PENDING" and "COMPLETED"'
+            ' is an alias for "SUCCEEDED".'
+        ),
+    )
     parser.add_argument(
         '--long_format',
         '-l',
@@ -1185,34 +1262,47 @@ class TaskListCommand:
   ) -> None:
     """Lists tasks present for a user, maybe filtering by state."""
     config.ee_init()
-    status = args.status
-    tasks = ee.data.getTaskList()
-    descs = [utils.truncate(task.get('description', ''), 40) for task in tasks]
+    status = list(
+        map(_convert_to_operation_state, args.status) if args.status else []
+    )
+    operations = ee.data.listOperations()
+    descs = [
+        utils.truncate(op.get('metadata', {}).get('description', ''), 40)
+        for op in operations
+    ]
     desc_length = max((len(word) for word in descs), default=0)
-    format_str = '{:25s} {:13s} {:%ds} {:10s} {:s}' % (desc_length + 1)
-    for task in tasks:
-      if status and task['state'] not in status:
+    format_str = f'{{:25s}} {{:13s}} {{:{desc_length + 1}s}} {{:10s}} {{:s}}'
+    for operation in operations:
+      metadata = operation['metadata']
+      if status and metadata['state'] not in status:
         continue
-      truncated_desc = utils.truncate(task.get('description', ''), 40)
-      task_type = TASK_TYPES.get(task['task_type'], 'Unknown')
+      truncated_desc = utils.truncate(metadata.get('description', ''), 40)
+      task_type = TASK_TYPES.get(metadata['type'], 'Unknown')
       extra = ''
       if args.long_format:
-        show_date = lambda ms: _parse_millis(ms).strftime('%Y-%m-%d %H:%M:%S')
-        eecu = '{:.4f}'.format(
-            task['batch_eecu_usage_seconds']
-        ) if 'batch_eecu_usage_seconds' in task else '-'
-        trailing_extras = task.get('destination_uris', [])
-        trailing_extras.append(task.get('priority', '-'))
+        if eecu := metadata.get('batchEecuUsageSeconds'):
+          eecu = f'{eecu:.4f}'
+        else:
+          eecu = '-'
+        trailing_extras = metadata.get('destination_uris', [])
+        trailing_extras.append(metadata.get('priority', '-'))
         extra = ' {:20s} {:20s} {:20s} {:11s} {}'.format(
-            show_date(task['creation_timestamp_ms']),
-            show_date(task['start_timestamp_ms']),
-            show_date(task['update_timestamp_ms']),
+            _format_cloud_timestamp(operation.get('createTime')),
+            _format_cloud_timestamp(operation.get('startTime')),
+            _format_cloud_timestamp(operation.get('updateTime')),
             eecu,
             ' '.join(map(str, trailing_extras)),
         )
-      print(format_str.format(
-          task['id'], task_type, truncated_desc,
-          task['state'], task.get('error_message', '---')) + extra)
+      print(
+          format_str.format(
+              _operation_name_to_task_id(operation['name']),
+              task_type,
+              truncated_desc,
+              metadata['state'],
+              operation.get('error', {}).get('message', '---'),
+          )
+          + extra
+      )
 
 
 class TaskWaitCommand:
@@ -1241,17 +1331,17 @@ class TaskWaitCommand:
     config.ee_init()
     task_ids = []
     if args.task_ids == ['all']:
-      tasks = ee.data.getTaskList()
-      for task in tasks:
-        if task['state'] not in utils.TASK_FINISHED_STATES:
-          task_ids.append(task['id'])
+      operations = ee.data.listOperations()
+      for operation in operations:
+        if not operation.get('done', False):
+          task_ids.append(_operation_name_to_task_id(operation['name']))
     else:
-      statuses = ee.data.getTaskStatus(args.task_ids)
-      for status in statuses:
-        state = status['state']
-        task_id = status['id']
+      for task_id in args.task_ids:
+        operation = ee.data.getOperation(_task_id_to_operation_name(task_id))
+        state = operation['metadata']['state']
+        task_id = _operation_name_to_task_id(operation['name'])
         if state == 'UNKNOWN':
-          raise ee.EEException('Unknown task id "%s"' % task_id)
+          raise ee.EEException(f'Unknown task id "{task_id}"')
         else:
           task_ids.append(task_id)
 

{earthengine_api-1.6.11 → earthengine_api-1.6.12}/ee/cli/eecli.py

@@ -35,7 +35,7 @@ def _run_command(*argv):
       'Defaults to "~/%s".' % utils.DEFAULT_EE_CONFIG_FILE_RELATIVE)
   parser.add_argument(
       '--service_account_file', help='Path to a service account credentials'
-      'file.  Overrides any ee_config if specified.')
+      'file. Overrides any ee_config if specified.')
   parser.add_argument(
       '--project',
       help='Specifies a Google Cloud Platform Project id to override the call.',