earthengine-api 1.6.10__py3-none-any.whl → 1.6.11__py3-none-any.whl

{earthengine_api-1.6.10.dist-info → earthengine_api-1.6.11.dist-info}/METADATA

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

{earthengine_api-1.6.10.dist-info → earthengine_api-1.6.11.dist-info}/RECORD

@@ -1,20 +1,20 @@
-earthengine_api-1.6.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ee/__init__.py,sha256=Ka01WMg7yPfNBRhv5fe8toVoQWBs3YCKRXxWyOYznvg,16808
+earthengine_api-1.6.11.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ee/__init__.py,sha256=Ykj2QoWR5H-fXLBPEx5fC4-hzETVrDR0zwtTN8Ofb4o,16808
 ee/_arg_types.py,sha256=nrJrnPFnAS8fzMxAGmG3TbUOi_yFVrnSGW5IP8ATzDQ,2662
-ee/_cloud_api_utils.py,sha256=W3y3PBjWWCD5PYIxYjsFmU8eq-umN_cEs-u6lv5_9sQ,32459
-ee/_helpers.py,sha256=d2gHX7akpY8pnB9guC10Yy53W8sDfriaH21d-mEol18,4700
+ee/_cloud_api_utils.py,sha256=sG1WtO9zy_xNSSGWiG1Y9ltrvkl5dExqIoWMw5O6llE,32192
+ee/_helpers.py,sha256=71xYDbCO_1usY3SnedoA9zi7j6dnPBijru1eUh4o25g,4859
 ee/_utils.py,sha256=SAXQ_ZefZUaOtyV6Lp3pdYqEFqblMEA6Bvxz0ltLjzA,1329
-ee/apifunction.py,sha256=tzk_emkgi_OxFSEh33zXBHGQd-ja5VHaRTNBCXcrOXo,8747
+ee/apifunction.py,sha256=5oatxvJH1KAFYz5Ae8T58wi40fK33-8y9ajEQz0wpW4,8733
 ee/apitestcase.py,sha256=K3zHLYFCJ_QhwdhoImIeD-DJjSgd_nAGQpftKYvjF-Q,14959
-ee/batch.py,sha256=vGIhExr37KJIU7-ZJJYckDSa7HK8rUHwEMLRONzuhhs,82481
-ee/blob.py,sha256=TttcEI5eQMMKvvlw5OgGk26-T0LPcHEYmse7K6wOTZo,3192
+ee/batch.py,sha256=opkPNZ8V1tGQiMnVKVtSn1XA19AJhxrlTW5u77o8EmY,82401
+ee/blob.py,sha256=cnnqmrHl998U2zEmfKcxQglaGk14Ip6pjObk_Ody6Uk,3221
 ee/classifier.py,sha256=3STLrLT6Ddwzjs2324E02wRWM8VEpeifgOO81geTHJQ,23410
 ee/clusterer.py,sha256=986D68b2eJ4xiiOiIOTNZ1psF8Ro-MFNQFKed058FS4,12256
 ee/collection.py,sha256=20g_Y_UnkhABGFOSybyE_IGmKvod5kR9xm5eKLjzNcE,32277
 ee/computedobject.py,sha256=o5F4y00PK-fye2pduA5QmMd6XIERA1lhC3yLs88zRpY,9082
 ee/confusionmatrix.py,sha256=e6vz-FcT6acWxk5pDEK0vLIN1pUjYMh5Gyn1QSGJT3I,4233
 ee/customfunction.py,sha256=k57sl03_vhOuEwAmgFpg0z3Ze9J3gy_W6n4u3uMaryA,7384
-ee/data.py,sha256=cBPDlbdaAYONZ3_dwZDM_v8rvEoWBDisvFoFE0ZF6Nw,88616
+ee/data.py,sha256=-vgLRmxLmCunjxbK7D0riSNYreD5jqPjv3WLUbuZmGs,88549
 ee/daterange.py,sha256=nrRYkR2M2aVU0ZJyG7yiZStFt-W2TvYVuazoZK_WZqM,4948
 ee/deprecation.py,sha256=dkTRDZcdT90_j41z_mMlhtX8u5eD5N2BuKL90Q0oWYc,6085
 ee/deserializer.py,sha256=Xz9Dis85JgZeLvpF-4yw3ZRv39rjvCTBYHjio8DE1kM,8424
@@ -54,20 +54,20 @@ ee/cli/commands.py,sha256=P2KPuSx0wKcp1lfo7hwkTqwnjxORnxTKqJ0RwrX3O8c,70534
 ee/cli/eecli.py,sha256=iws34w24UJI6H7Wl9WsEUwy-uN57Pw-bgHtr2f92olY,3044
 ee/cli/eecli_wrapper.py,sha256=Z7R3IJcht2uG1h57oY7BSrkPiwQzNmmYlyCSX1_7L7c,1089
 ee/cli/utils.py,sha256=YWrgN_5k8GRWndST20KkGljn4Ee8F8935ID91qiLRtY,13796
-ee/tests/_cloud_api_utils_test.py,sha256=sbts2xDKmf1dCedVv1w3KBp-IvOfihxbM6g_H0nI1sg,18814
-ee/tests/_helpers_test.py,sha256=3nd6pTAykjYRxXDxtYJjkg48EgJSogPRdepi_nwGJAA,1935
+ee/tests/_cloud_api_utils_test.py,sha256=YpTG4wBTuSIyb7XolAre41VuQCiH9di_7olCE_71S1U,18754
+ee/tests/_helpers_test.py,sha256=p_GJaXr9xcQbBFkMp7f9H_h2OBqI1YPH1pRHGNE8cA4,3964
 ee/tests/_utils_test.py,sha256=bOarVj3U-VFo9Prog8WQN_hAOMwJOiWKJxevUbdFPBQ,2753
 ee/tests/algorithms.json,sha256=Vx1Kx_MhHv0z0B3WTeVAvchM8xVd3zYE7L-qT3gDGzA,729368
 ee/tests/apifunction_test.py,sha256=62El-6jcgQmD7qt9eEDdM7IeIQmpV8M5xQ439g-zfN4,3767
-ee/tests/batch_test.py,sha256=QN2F6lUgHYws16pfz9LSPnkEteWwkxU3YOfNvfRl-lo,62210
-ee/tests/blob_test.py,sha256=2Y-btrQ8FQqmf1ccYR8hLzdCaM5uoHfSoB7a5OziTxA,3575
+ee/tests/batch_test.py,sha256=Vo-0_LoH2Ccutta6SAfgbk4VcptfeW2DA5yXJPWJj_Y,62399
+ee/tests/blob_test.py,sha256=uCrM-ubRfAmNgHwhmUhWn7MiXqbNQutybcXIKdVsD_Q,3587
 ee/tests/classifier_test.py,sha256=K6-wNZ2uh9oPYo7BV0vtfU73SBFpeNcFRMRmvEFc6Pg,19087
 ee/tests/cloud_api_discovery_document.json,sha256=SnOeL8One57YdeHa7XxGZM-ptDPCeDSymBc7-Bo_hkA,41154
 ee/tests/clusterer_test.py,sha256=B4m06wAtBeqvnIhRD2lnNy1UHDB_caleK_CqcrAU8dk,11620
 ee/tests/collection_test.py,sha256=dnZwFADWQ8oShJHRTcYSzuP-waAxetTdM_CtVckWbMM,7563
 ee/tests/computedobject_test.py,sha256=B27rDq9Urpvy0WqpdbKRYbt6AcT1i93HX-es7hrhWVY,4840
 ee/tests/confusionmatrix_test.py,sha256=46JJh1-91AiYISXWZ6-2lvY5_Njvc8ompO9kmwqlFdg,7437
-ee/tests/data_test.py,sha256=WxNDhGA-wLNvyX45_KfS49l28QmLs8CKXL6zWeVQKBs,35294
+ee/tests/data_test.py,sha256=9zDGICUCeJFi4Q6lX2mB0Qca9C-eUMEn4vzpTZI5Imk,40222
 ee/tests/daterange_test.py,sha256=a5fpg2lko3kCJzxQPCoAc_vjXkKy2zYcXbeSZKAFovI,8583
 ee/tests/deprecation_test.py,sha256=_sCs59l6c-ijeyt5yPO-IRJsh8GGPp7ArSg3Y12u4mQ,8352
 ee/tests/deserializer_test.py,sha256=-tbrL0cjrXdSLF7M3wl-QQuj6TjXJdkjp7RZvVErUy4,3427
@@ -77,7 +77,7 @@ ee/tests/ee_date_test.py,sha256=8rLUXfjyiW3LiBOCSneA7ZGgmoFgN5oZr58x5THtKGY,1110
 ee/tests/ee_list_test.py,sha256=yd2EWZGdg7pLJhsHSR5AbK58ZhT31GY-n2o1dDT3p9A,21797
 ee/tests/ee_number_test.py,sha256=3MxX8Awie_L3FfwyltrL2UXNdqTyvtYJB9qIi73wlPM,33442
 ee/tests/ee_string_test.py,sha256=9QuseILwZtbcczCyNyJ751kva96_9gPKXLRdgkgWMPs,9389
-ee/tests/ee_test.py,sha256=wTg7mS5dxWtZr5QDpLjsI8LBOQmw5INT6gxo1MBjAGI,17061
+ee/tests/ee_test.py,sha256=_HELrvUb7Wpmeji4Jd_rlZfCcXWQ4mPxRTG7d88u0zI,17082
 ee/tests/ee_types_test.py,sha256=oRnqplaTWg47zuYfAYTTVwembCnw8XT20HPNMdAvgNE,921
 ee/tests/element_test.py,sha256=Kqu_Z65FQcYHX4LebKm3LD0mWkRTRZccs-qAGz3bLsE,1964
 ee/tests/errormargin_test.py,sha256=YEBzvBFsD756nicZBcjnPFAXy06jZNKiSSAa2hAzN-M,5061
@@ -100,8 +100,8 @@ ee/tests/reducer_test.py,sha256=NYJTmX6AmBZyXGjOkgUh4t3tB6E8_vGlPYQIxJQbV9Q,3151
 ee/tests/serializer_test.py,sha256=xZQBQMDK8dlGYLS-6s1JHhR1L5FKoaIwEkxdKlcpQTE,8802
 ee/tests/table_converter_test.py,sha256=2F7DyEj-iHVbt9-W1iwAHDl-K1GA_2QHalTXzac2ot8,3373
 ee/tests/terrain_test.py,sha256=8TmvGconOR-GkGrll4joXhpU9zi0b_8GFxvX_JlcCos,4328
-earthengine_api-1.6.10.dist-info/METADATA,sha256=XIe9LVjN_SdvqhcZxuXhZElQ5-GWadIulxMec6-kg3U,2194
-earthengine_api-1.6.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-earthengine_api-1.6.10.dist-info/entry_points.txt,sha256=-Ax4SCU-S474r8OD2LIxata6PRmkZoDrppQ4fP_exNc,50
-earthengine_api-1.6.10.dist-info/top_level.txt,sha256=go5zOwCgm5lIS3yTR-Vsxp1gNI4qdS-MP5eY-7zMxVY,3
-earthengine_api-1.6.10.dist-info/RECORD,,
+earthengine_api-1.6.11.dist-info/METADATA,sha256=7x-iancpCSqSTC9-76xKwI7OVX8r6jej7mlsYogq9_Q,2194
+earthengine_api-1.6.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+earthengine_api-1.6.11.dist-info/entry_points.txt,sha256=-Ax4SCU-S474r8OD2LIxata6PRmkZoDrppQ4fP_exNc,50
+earthengine_api-1.6.11.dist-info/top_level.txt,sha256=go5zOwCgm5lIS3yTR-Vsxp1gNI4qdS-MP5eY-7zMxVY,3
+earthengine_api-1.6.11.dist-info/RECORD,,

ee/__init__.py

@@ -1,6 +1,6 @@
 """The EE Python library."""
 
-__version__ = '1.6.10'
+__version__ = '1.6.11'
 
 # Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name

ee/_cloud_api_utils.py

@@ -35,9 +35,6 @@ 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/?$')
 
-# The default user project to use when making Cloud API calls.
-_cloud_api_user_project: Optional[str] = None
-
 
 class _Http:
   """A httplib2.Http-like object based on requests."""
@@ -136,11 +133,6 @@ def _wrap_request(
   return builder
 
 
-def set_cloud_api_user_project(cloud_api_user_project: str) -> None:
-  global _cloud_api_user_project
-  _cloud_api_user_project = cloud_api_user_project
-
-
 def build_cloud_resource(
     api_base_url: str,
     session: requests.Session,
@@ -560,9 +552,9 @@ def convert_operation_name_to_task_id(operation_name: str) -> str:
   return found.group(1) if found else operation_name
 
 
-def convert_task_id_to_operation_name(task_id: str) -> str:
+def convert_task_id_to_operation_name(project: str, task_id: str) -> str:
   """Converts a task ID to an Operation name."""
-  return f'projects/{_cloud_api_user_project}/operations/{task_id}'
+  return f'projects/{project}/operations/{task_id}'
 
 
 def convert_params_to_image_manifest(params: dict[str, Any]) -> dict[str, Any]:

ee/_helpers.py

@@ -22,13 +22,14 @@ from ee import data
 from ee import ee_exception
 from ee import oauth
 
-
 # Number of times to retry fetching profile data.
 _PROFILE_RETRIES = 5
 
 
 def ServiceAccountCredentials(
-    email: str, key_file: Optional[str] = None, key_data: Optional[str] = None
+    email: Optional[str] = None,
+    key_file: Optional[str] = None,
+    key_data: Optional[str] = None,
 ) -> service_account.Credentials:
   """Configure OAuth2 credentials for a Google Service Account.
 
@@ -42,6 +43,10 @@ def ServiceAccountCredentials(
   Returns:
     An OAuth2 credentials object.
   """
+  if not email and not key_file and not key_data:
+    raise ValueError(
+        'At least one of email, key_file, or key_data must be specified.'
+    )
 
   # Assume anything that doesn't end in '.pem' is a JSON key.
   if key_file and not key_file.endswith('.pem'):
@@ -119,14 +124,13 @@ def profilePrinting(destination: TextIO = sys.stderr) -> Iterator[None]:
   The profile will be printed when the context ends, whether or not any error
   occurred within the context.
 
-  # Simple example:
-  with ee.profilePrinting():
-     print ee.Number(1).add(1).getInfo()
+  Example:
+    with ee.profilePrinting():
+      print(ee.Number(1).add(1).getInfo())
 
   Args:
     destination: A file-like object to which the profile text is written.
         Defaults to sys.stderr.
-
   """
   # Profile.getProfiles is `hidden`, so call it explicitly.
   get_profiles = apifunction.ApiFunction.lookup('Profile.getProfiles').call
@@ -136,12 +140,11 @@ def profilePrinting(destination: TextIO = sys.stderr) -> Iterator[None]:
       yield
   finally:
     # Make several attempts in case of transient errors.
-    attempts = _PROFILE_RETRIES
-    for i in range(_PROFILE_RETRIES):
+    for attempt in range(_PROFILE_RETRIES):
       try:
         profile_text = get_profiles(ids=profile_ids).getInfo()
         destination.write(profile_text)
         break
       except ee_exception.EEException as exception:
-        if i == attempts - 1:
+        if attempt == _PROFILE_RETRIES - 1:
           raise exception

ee/apifunction.py

@@ -60,7 +60,7 @@ class ApiFunction(function.Function):
     return (isinstance(other, ApiFunction) and
             self.getSignature() == other.getSignature())
 
-  # For Python 3, __hash__ is needed because __eq__ is defined.
+  # __hash__ is needed because __eq__ is defined.
   # See https://docs.python.org/3/reference/datamodel.html#object.__hash__
   def __hash__(self) -> int:
     return hash(computedobject.ComputedObject.freeze(self.getSignature()))

ee/batch.py

@@ -112,7 +112,7 @@ class Task:
           - description: The name of the task, a freeform string.
           - sourceUrl: An optional URL for the script that generated the task.
           Specific task types have other custom config fields.
-      name: The name of the operation.  Only relevant when using the cloud api.
+      name: The name of the operation.
     """
     self.id = self._request_id = task_id
     self.config = config and config.copy()
@@ -123,10 +123,9 @@ class Task:
 
   @property
   def operation_name(self) -> str | None:
+    """The server-assigned name for this task."""
     if self.name:
       return self.name
-    if self.id:
-      return _cloud_api_utils.convert_task_id_to_operation_name(self.id)
     return None
 
   def start(self) -> None:

ee/blob.py

@@ -46,24 +46,22 @@ class Blob(computedobject.ComputedObject):
     """
     self.initialize()
 
-    args: dict[str, Any] = {'url': url}
-    func = apifunction.ApiFunction(self.name())
-
-    if isinstance(url, str):
-      if not url.startswith('gs://'):
-        raise ValueError(f'{self.name()} url must start with "gs://": "{url}"')
-
-    elif isinstance(url, computedobject.ComputedObject):
+    if isinstance(url, computedobject.ComputedObject):
       if self.is_func_returning_same(url):
         # If it is a call that is already returning a Blob, just cast.
         super().__init__(url.func, url.args, url.varName)
         return
-
+    elif isinstance(url, str):
+      if not url.startswith('gs://'):
+        raise ValueError(f'{self.name()} url must start with "gs://": "{url}"')
     else:
       raise ValueError(
-          f'{self.name()} url must be a string: {type(url)} -> "{url}"'
+          f'{self.name()} url must be a string or ComputedObject: '
+          f'{type(url)} -> "{url}"'
       )
 
+    func = apifunction.ApiFunction(self.name())
+    args: dict[str, Any] = {'url': url}
     super().__init__(func, func.promoteArgs(args))
 
   @classmethod

ee/data.py

@@ -35,6 +35,64 @@ from ee import table_converter
 
 from ee import __version__
 
+# The HTTP header through which profile results are returned.
+# Lowercase because that's how httplib2 does things.
+_PROFILE_RESPONSE_HEADER_LOWERCASE = 'x-earth-engine-computation-profile'
+
+# The HTTP header through which profiling is requested when using the Cloud API.
+_PROFILE_REQUEST_HEADER = 'X-Earth-Engine-Computation-Profiling'
+
+# The HTTP header through which a user project override is provided.
+_USER_PROJECT_OVERRIDE_HEADER = 'X-Goog-User-Project'
+
+# The HTTP header used to indicate the version of the client library used.
+_API_CLIENT_VERSION_HEADER = 'X-Goog-Api-Client'
+
+# The HTTP header used to indicate the user agent.
+_USER_AGENT_HEADER = 'user-agent'
+
+# Optional HTTP header returned to display initialization-time messages.
+_INIT_MESSAGE_HEADER = 'x-earth-engine-init-message'  # lowercase for httplib2
+
+# Maximum time to wait before retrying a rate-limited request (in milliseconds).
+MAX_RETRY_WAIT = 120000
+
+# Base time (in ms) to wait when performing exponential backoff in request
+# retries.
+BASE_RETRY_WAIT = 1000
+
+# The default base URL for API calls.
+DEFAULT_API_BASE_URL = 'https://earthengine.googleapis.com/api'
+HIGH_VOLUME_API_BASE_URL = 'https://earthengine-highvolume.googleapis.com'
+
+# The default base URL for media/tile calls.
+DEFAULT_TILE_BASE_URL = 'https://earthengine.googleapis.com'
+
+# The default base URL for Cloud API calls.
+DEFAULT_CLOUD_API_BASE_URL = 'https://earthengine.googleapis.com'
+
+# The default project to use for Cloud API calls.
+DEFAULT_CLOUD_API_USER_PROJECT = 'earthengine-legacy'
+
+# Asset types recognized by create_assets().
+ASSET_TYPE_FOLDER = 'Folder'
+ASSET_TYPE_IMAGE_COLL = 'ImageCollection'
+# Cloud API versions of the asset types.
+ASSET_TYPE_FOLDER_CLOUD = 'FOLDER'
+ASSET_TYPE_IMAGE_COLL_CLOUD = 'IMAGE_COLLECTION'
+# Max length of the above type names
+MAX_TYPE_LENGTH = len(ASSET_TYPE_IMAGE_COLL_CLOUD)
+
+# The maximum number of tasks to retrieve in each request to "/tasklist".
+_TASKLIST_PAGE_SIZE = 500
+
+# Next page token key for list endpoints.
+_NEXT_PAGE_TOKEN_KEY = 'nextPageToken'
+
+_NOT_INITIALIZED_MESSAGE = (
+    'Earth Engine client library not initialized. See http://goo.gle/ee-auth.'
+)
+
 # OAuth2 credentials object.  This may be set by ee.Initialize().
 _credentials: Optional[credentials_lib.Credentials] = None
 
@@ -60,7 +118,7 @@ _cloud_api_resource = None
 _cloud_api_resource_raw = None
 
 # The default user project to use when making Cloud API calls.
-_cloud_api_user_project: Optional[str] = None
+_cloud_api_user_project: str = DEFAULT_CLOUD_API_USER_PROJECT
 
 # The API client version number to send when making requests.
 _cloud_api_client_version: Optional[str] = None
@@ -102,64 +160,6 @@ class _ThreadLocals(threading.local):
 
 _thread_locals = _ThreadLocals()
 
-# The HTTP header through which profile results are returned.
-# Lowercase because that's how httplib2 does things.
-_PROFILE_RESPONSE_HEADER_LOWERCASE = 'x-earth-engine-computation-profile'
-
-# The HTTP header through which profiling is requested when using the Cloud API.
-_PROFILE_REQUEST_HEADER = 'X-Earth-Engine-Computation-Profiling'
-
-# The HTTP header through which a user project override is provided.
-_USER_PROJECT_OVERRIDE_HEADER = 'X-Goog-User-Project'
-
-# The HTTP header used to indicate the version of the client library used.
-_API_CLIENT_VERSION_HEADER = 'X-Goog-Api-Client'
-
-# The HTTP header used to indicate the user agent.
-_USER_AGENT_HEADER = 'user-agent'
-
-# Optional HTTP header returned to display initialization-time messages.
-_INIT_MESSAGE_HEADER = 'x-earth-engine-init-message'  # lowercase for httplib2
-
-# Maximum time to wait before retrying a rate-limited request (in milliseconds).
-MAX_RETRY_WAIT = 120000
-
-# Base time (in ms) to wait when performing exponential backoff in request
-# retries.
-BASE_RETRY_WAIT = 1000
-
-# The default base URL for API calls.
-DEFAULT_API_BASE_URL = 'https://earthengine.googleapis.com/api'
-HIGH_VOLUME_API_BASE_URL = 'https://earthengine-highvolume.googleapis.com'
-
-# The default base URL for media/tile calls.
-DEFAULT_TILE_BASE_URL = 'https://earthengine.googleapis.com'
-
-# The default base URL for Cloud API calls.
-DEFAULT_CLOUD_API_BASE_URL = 'https://earthengine.googleapis.com'
-
-# The default project to use for Cloud API calls.
-DEFAULT_CLOUD_API_USER_PROJECT = 'earthengine-legacy'
-
-# Asset types recognized by create_assets().
-ASSET_TYPE_FOLDER = 'Folder'
-ASSET_TYPE_IMAGE_COLL = 'ImageCollection'
-# Cloud API versions of the asset types.
-ASSET_TYPE_FOLDER_CLOUD = 'FOLDER'
-ASSET_TYPE_IMAGE_COLL_CLOUD = 'IMAGE_COLLECTION'
-# Max length of the above type names
-MAX_TYPE_LENGTH = len(ASSET_TYPE_IMAGE_COLL_CLOUD)
-
-# The maximum number of tasks to retrieve in each request to "/tasklist".
-_TASKLIST_PAGE_SIZE = 500
-
-# Next page token key for list endpoints.
-_NEXT_PAGE_TOKEN_KEY = 'nextPageToken'
-
-_NOT_INITIALIZED_MESSAGE = (
-    'Earth Engine client library not initialized. See http://goo.gle/ee-auth.'
-)
-
 
 def initialize(
     credentials: Any = None,
@@ -231,9 +231,8 @@ def initialize(
 
   if project is not None:
     _cloud_api_user_project = project
-    _cloud_api_utils.set_cloud_api_user_project(project)
   else:
-    _cloud_api_utils.set_cloud_api_user_project(DEFAULT_CLOUD_API_USER_PROJECT)
+    _cloud_api_user_project = DEFAULT_CLOUD_API_USER_PROJECT
 
   _initialized = True
 
@@ -302,18 +301,14 @@ def reset() -> None:
   _cloud_api_key = None
   _cloud_api_resource = None
   _cloud_api_resource_raw = None
-  _cloud_api_user_project = None
-  _cloud_api_utils.set_cloud_api_user_project(DEFAULT_CLOUD_API_USER_PROJECT)
+  _cloud_api_user_project = DEFAULT_CLOUD_API_USER_PROJECT
   _http_transport = None
   _initialized = False
 
 
 def _get_projects_path() -> str:
   """Returns the projects path to use for constructing a request."""
-  if _cloud_api_user_project is not None:
-    return 'projects/' + _cloud_api_user_project
-  else:
-    return 'projects/' + DEFAULT_CLOUD_API_USER_PROJECT
+  return f'projects/{_cloud_api_user_project}'
 
 
 def _install_cloud_api_resource() -> None:
@@ -372,7 +367,7 @@ def _make_request_headers() -> Optional[dict[str, Any]]:
   headers[_API_CLIENT_VERSION_HEADER] = ' '.join(client_version_header_values)
   if _thread_locals.profile_hook:
     headers[_PROFILE_REQUEST_HEADER] = '1'
-  if _cloud_api_user_project is not None:
+  if _cloud_api_user_project is not DEFAULT_CLOUD_API_USER_PROJECT:
     headers[_USER_PROJECT_OVERRIDE_HEADER] = _cloud_api_user_project
   if headers:
     return headers
@@ -455,7 +450,6 @@ def setCloudApiKey(cloud_api_key: str) -> None:
 def setCloudApiUserProject(cloud_api_user_project: str) -> None:
   global _cloud_api_user_project
   _cloud_api_user_project = cloud_api_user_project
-  _cloud_api_utils.set_cloud_api_user_project(_cloud_api_user_project)
 
 
 def setUserAgent(user_agent: str) -> None:
@@ -1683,7 +1677,8 @@ def getTaskStatus(taskId: Union[list[str], str]) -> list[Any]:
   """Retrieve status of one or more long-running tasks.
 
   Args:
-    taskId: ID of the task or a list of multiple IDs.
+    taskId: ID of the task or a list of multiple IDs. These will be assumed to
+      be running in the currently initialized project.
 
   Returns:
     List containing one object for each queried task, in the same order as
@@ -1698,19 +1693,22 @@ def getTaskStatus(taskId: Union[list[str], str]) -> list[Any]:
     taskId = [taskId]
   result = []
   for one_id in taskId:
+    # Don't use getOperation as it will translate the exception, and we need
+    # to handle 404s specially.
+    name = _cloud_api_utils.convert_task_id_to_operation_name(
+        _cloud_api_user_project, one_id
+    )
     try:
-      # Don't use getOperation as it will translate the exception, and we need
-      # to handle 404s specially.
       operation = (
           _get_cloud_projects()
           .operations()
-          .get(name=_cloud_api_utils.convert_task_id_to_operation_name(one_id))
+          .get(name=name)
           .execute(num_retries=_max_retries)
       )
       result.append(_cloud_api_utils.convert_operation_to_task(operation))
     except googleapiclient.errors.HttpError as e:
       if e.resp.status == 404:
-        result.append({'id': one_id, 'state': 'UNKNOWN'})
+        result.append({'id': one_id, 'state': 'UNKNOWN', 'name': name})
       else:
         raise _translate_cloud_exception(e)  # pylint: disable=raise-missing-from
   return result
@@ -1734,7 +1732,11 @@ def getOperation(operation_name: str) -> Any:
 @deprecation.Deprecated('Use cancelOperation')
 def cancelTask(taskId: str) -> None:
   """Cancels a batch task."""
-  cancelOperation(_cloud_api_utils.convert_task_id_to_operation_name(taskId))
+  cancelOperation(
+      _cloud_api_utils.convert_task_id_to_operation_name(
+          _cloud_api_user_project, taskId
+      )
+  )
 
 
 def cancelOperation(operation_name: str) -> None:

ee/tests/_cloud_api_utils_test.py

@@ -16,10 +16,6 @@ from ee import ee_exception
 
 class CloudApiUtilsTest(unittest.TestCase):
 
-  def setUp(self):
-    super().setUp()
-    _cloud_api_utils.set_cloud_api_user_project('earthengine-legacy')
-
   def test_build_cloud_resource(self):
     base = 'https://earthengine.basetest'
     path = '$discovery/rest?version=v1&prettyPrint=false'
@@ -171,7 +167,10 @@ class CloudApiUtilsTest(unittest.TestCase):
   def test_convert_task_id_to_operation_name(self):
     self.assertEqual(
         'projects/earthengine-legacy/operations/taskId',
-        _cloud_api_utils.convert_task_id_to_operation_name('taskId'))
+        _cloud_api_utils.convert_task_id_to_operation_name(
+            'earthengine-legacy', 'taskId'
+        ),
+    )
 
   def test_encode_number_as_cloud_value(self):
     self.assertEqual({

ee/tests/_helpers_test.py

@@ -7,14 +7,67 @@ name since that is the name we want to ensure works.
 """
 
 import io
+import json
 import unittest
+from unittest import mock
 
 import unittest
 import ee
+from ee import _helpers
 from ee import apifunction
 from ee import apitestcase
 from ee import computedobject
 from ee import ee_exception
+from ee import oauth
+
+
+class ServiceAccountCredentialsTest(unittest.TestCase):
+
+  def testNoArgs(self):
+    with self.assertRaisesRegex(ValueError, 'At least one of'):
+      ee.ServiceAccountCredentials()
+
+  @mock.patch('google.oauth2.service_account.Credentials')
+  def testJsonFile(self, mock_credentials):
+    ee.ServiceAccountCredentials(key_file='foo.json')
+    mock_credentials.from_service_account_file.assert_called_with(
+        'foo.json', scopes=oauth.SCOPES
+    )
+
+  @mock.patch('google.oauth2.service_account.Credentials')
+  def testJsonKeyData(self, mock_credentials):
+    key_data = {'client_email': 'foo@bar.com'}
+    ee.ServiceAccountCredentials(key_data=json.dumps(key_data))
+    mock_credentials.from_service_account_info.assert_called_with(
+        key_data, scopes=oauth.SCOPES
+    )
+
+  @mock.patch('google.auth.crypt.RSASigner')
+  @mock.patch('google.oauth2.service_account.Credentials')
+  def testPemKeyData(self, mock_credentials, mock_signer):
+    ee.ServiceAccountCredentials(email='foo@bar.com', key_data='pem_key_data')
+    mock_signer.from_string.assert_called_with('pem_key_data')
+    self.assertEqual(
+        mock_credentials.call_args[0][1], 'foo@bar.com'
+    )
+
+  @mock.patch('google.auth.crypt.RSASigner')
+  @mock.patch('google.oauth2.service_account.Credentials')
+  def testPemFile(self, mock_credentials, mock_signer):
+    with mock.patch.object(
+        _helpers, 'open', mock.mock_open(read_data='pem_key_data')
+    ):
+      ee.ServiceAccountCredentials(email='foo@bar.com', key_file='foo.pem')
+    mock_signer.from_string.assert_called_with('pem_key_data')
+    self.assertEqual(
+        mock_credentials.call_args[0][1], 'foo@bar.com'
+    )
+
+  def testBadJsonKeyData(self):
+    # This causes a different failure based on where the test is run.
+    message = r'Could not deserialize key data|No key could be detected'
+    with self.assertRaisesRegex(ValueError, message):
+      ee.ServiceAccountCredentials(key_data='not json')
 
 
 class ProfilingTest(apitestcase.ApiTestCase):

ee/tests/batch_test.py

@@ -72,7 +72,8 @@ class TaskTest(unittest.TestCase):
       task.start()
 
   def testStatusWithId(self):
-    task = batch.Task('test_1', 'a task type', 'a state')
+    name = 'projects/test-project/operations/test_1'
+    task = batch.Task('an id', 'a task type', 'a state', name=name)
     with mock.patch.object(
         data, 'getOperation', return_value=RUNNING_OPERATION
     ) as m:
@@ -97,7 +98,8 @@ class TaskTest(unittest.TestCase):
       )
 
   def testStatusWithIdStateUnknown(self):
-    task = batch.Task('an id', 'a task type', 'a state')
+    name = 'projects/test-project/operations/an id'
+    task = batch.Task('an id', 'a task type', 'a state', name=name)
     with mock.patch.object(
         data, 'getOperation', return_value=UNKNOWN_OPERATION
     ) as m:
@@ -111,7 +113,8 @@ class TaskTest(unittest.TestCase):
     self.assertEqual('UNSUBMITTED', task.status()['state'])
 
   def testActive(self):
-    task = batch.Task('an id', 'a task type', 'a state')
+    name = 'projects/test-project/operations/an id'
+    task = batch.Task('an id', 'a task type', 'a state', name=name)
     with mock.patch.object(
         data, 'getOperation', return_value=RUNNING_OPERATION
     ):

ee/tests/blob_test.py

@@ -75,9 +75,9 @@ class BlobTest(apitestcase.ApiTestCase):
     self.assertEqual({'value': 'fakeValue'}, result.getInfo())
 
   def test_wrong_arg_type(self):
-    message = 'Blob url must be a string: <class \'int\'> -> "123"'
+    message = r'url must be a string or ComputedObject: <class \'int\'> -> "13"'
     with self.assertRaisesRegex(ValueError, message):
-      ee.Blob(123)  # pytype: disable=wrong-arg-types
+      ee.Blob(13)  # pytype: disable=wrong-arg-types
 
   def test_does_not_start_with_gs(self):
     url = 'http://example.com/something'

ee/tests/data_test.py

@@ -49,6 +49,7 @@ class DataTest(unittest.TestCase):
 
   def tearDown(self):
     super().tearDown()
+    ee.data.reset()
     mock.patch.stopall()
 
   def testIsInitialized(self):
@@ -56,6 +57,27 @@ class DataTest(unittest.TestCase):
     with apitestcase.UsingCloudApi():
       self.assertTrue(ee.data.is_initialized())
 
+  @mock.patch.object(ee.data, '_install_cloud_api_resource', return_value=None)
+  def testInitialize(self, mock_install_cloud_api_resource):
+    ee.data.initialize()
+
+    self.assertTrue(ee.data.is_initialized())
+    mock_install_cloud_api_resource.assert_called_once()
+
+  @mock.patch.object(ee.data, '_install_cloud_api_resource', return_value=None)
+  def testInitializeWithProject(self, unused_mock_install_cloud_api_resource):
+    ee.data.initialize(project='my-project')
+
+    self.assertTrue(ee.data.is_initialized())
+    self.assertEqual(ee.data._cloud_api_user_project, 'my-project')
+
+  @mock.patch.object(ee.data, '_install_cloud_api_resource', return_value=None)
+  def testInitializeWithNoProject(self, unused_mock_install_cloud_api_resource):
+    ee.data.initialize()
+
+    self.assertTrue(ee.data.is_initialized())
+    self.assertEqual(ee.data._cloud_api_user_project, 'earthengine-legacy')
+
   def testSetMaxRetries_badValues(self):
     with self.assertRaises(ValueError):
       ee.data.setMaxRetries(-1)
@@ -108,6 +130,112 @@ class DataTest(unittest.TestCase):
     with apitestcase.UsingCloudApi(mock_http=mock_http):
       self.assertEqual([], ee.data.listOperations())
 
+  def testGetOperation(self):
+    cloud_api_resource = mock.MagicMock()
+    with apitestcase.UsingCloudApi(cloud_api_resource=cloud_api_resource):
+      name = 'projects/test-project/operations/foo'
+      cloud_api_resource.projects().operations().get.execute.return_value = {
+          'name': name,
+          'done': False,
+      }
+      ee.data.getOperation(name)
+      cloud_api_resource.projects().operations().get.assert_called_once_with(
+          name=name
+      )
+
+  def testGetTaskStatus(self):
+    cloud_api_resource = mock.MagicMock()
+    with apitestcase.UsingCloudApi(cloud_api_resource=cloud_api_resource):
+      cloud_api_resource.projects().operations().get.return_value.execute.return_value = {
+          'name': 'projects/earthengine-legacy/operations/foo',
+          'done': False,
+          'metadata': {'state': 'RUNNING'},
+      }
+      result = ee.data.getTaskStatus('foo')
+      cloud_api_resource.projects().operations().get.assert_called_once_with(
+          name='projects/earthengine-legacy/operations/foo'
+      )
+      self.assertEqual(
+          result,
+          [{
+              'id': 'foo',
+              'state': 'RUNNING',
+              'name': 'projects/earthengine-legacy/operations/foo',
+          }],
+      )
+
+  def testGetTaskStatus_withNotFound(self):
+    cloud_api_resource = mock.MagicMock()
+    with apitestcase.UsingCloudApi(cloud_api_resource=cloud_api_resource):
+      cloud_api_resource.projects().operations().get.return_value.execute.side_effect = [
+          {
+              'name': 'projects/earthengine-legacy/operations/foo',
+              'done': False,
+              'metadata': {'state': 'RUNNING'},
+          },
+          NotFoundError(),
+          {
+              'name': 'projects/earthengine-legacy/operations/bar',
+              'done': True,
+              'metadata': {'state': 'SUCCEEDED'},
+          },
+      ]
+      result = ee.data.getTaskStatus(['foo', 'missing', 'bar'])
+      cloud_api_resource.projects().operations().get.assert_has_calls([
+          mock.call(name='projects/earthengine-legacy/operations/foo'),
+          mock.call().execute(num_retries=5),
+          mock.call(name='projects/earthengine-legacy/operations/missing'),
+          mock.call().execute(num_retries=5),
+          mock.call(name='projects/earthengine-legacy/operations/bar'),
+          mock.call().execute(num_retries=5),
+      ])
+      self.assertEqual(
+          3,
+          cloud_api_resource.projects()
+          .operations()
+          .get.return_value.execute.call_count,
+      )
+      self.assertEqual(
+          result,
+          [
+              {
+                  'id': 'foo',
+                  'state': 'RUNNING',
+                  'name': 'projects/earthengine-legacy/operations/foo',
+              },
+              {
+                  'id': 'missing',
+                  'state': 'UNKNOWN',
+                  'name': 'projects/earthengine-legacy/operations/missing',
+              },
+              {
+                  'id': 'bar',
+                  'state': 'COMPLETED',
+                  'name': 'projects/earthengine-legacy/operations/bar',
+              },
+          ],
+      )
+
+  def testCancelOperation(self):
+    cloud_api_resource = mock.MagicMock()
+    with apitestcase.UsingCloudApi(cloud_api_resource=cloud_api_resource):
+      cancel_mock = cloud_api_resource.projects().operations().cancel
+      cancel_mock.execute.return_value = {}
+      ee.data.cancelOperation('projects/test-project/operations/foo')
+      cancel_mock.assert_called_once_with(
+          name='projects/test-project/operations/foo', body={}
+      )
+
+  def testCancelTask(self):
+    cloud_api_resource = mock.MagicMock()
+    with apitestcase.UsingCloudApi(cloud_api_resource=cloud_api_resource):
+      cancel_mock = cloud_api_resource.projects().operations().cancel
+      cancel_mock.execute.return_value = {}
+      ee.data.cancelTask('foo')
+      cancel_mock.assert_called_once_with(
+          name='projects/earthengine-legacy/operations/foo', body={}
+      )
+
   def testCreateAsset(self):
     cloud_api_resource = mock.MagicMock()
     with apitestcase.UsingCloudApi(cloud_api_resource=cloud_api_resource):

ee/tests/ee_test.py

@@ -49,7 +49,7 @@ class EETestCase(apitestcase.ApiTestCase):
     ee.Reset()
     self.assertFalse(ee.data._initialized)
     self.assertIsNone(ee.data._api_base_url)
-    self.assertIsNone(ee.data._cloud_api_user_project)
+    self.assertEqual(ee.data._cloud_api_user_project, 'earthengine-legacy')
     self.assertEqual(ee.ApiFunction._api, {})
     self.assertFalse(ee.Image._initialized)