earthengine-api 1.6.15__py3-none-any.whl → 1.7.0__py3-none-any.whl

ee/data.py

@@ -5,14 +5,14 @@
 
 from __future__ import annotations
 
-from collections.abc import Iterator, Sequence
+from collections.abc import Callable, Iterator, Sequence
 import contextlib
 import json
 import platform
 import re
 import sys
 import threading
-from typing import Any, Callable, Optional, Union
+from typing import Any
 import uuid
 import warnings
 
@@ -112,7 +112,7 @@ class _ThreadLocals(threading.local):
     # and the user would have to modify each call to profile, rather than
     # enabling profiling as a wrapper around the entire program (with
     # ee.data.profiling, defined below).
-    self.profile_hook: Optional[Callable[[str], None]] = None
+    self.profile_hook: Callable[[str], None] | None = None
 
 
 _thread_locals = _ThreadLocals()
@@ -125,11 +125,11 @@ def _get_state() -> _state.EEState:
 
 def initialize(
     credentials: Any = None,
-    api_base_url: Optional[str] = None,
-    tile_base_url: Optional[str] = None,
-    cloud_api_base_url: Optional[str] = None,
-    cloud_api_key: Optional[str] = None,
-    project: Optional[str] = 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,
+    project: str | None = None,
     http_transport: Any = None,
 ) -> None:
   """Initializes the data module, setting credentials and base URLs.
@@ -297,7 +297,7 @@ def _get_cloud_projects_raw() -> Any:
   return state.cloud_api_resource_raw.projects()
 
 
-def _make_request_headers() -> Optional[dict[str, Any]]:
+def _make_request_headers() -> dict[str, Any] | None:
   """Adds headers based on client context."""
   state = _get_state()
   headers: dict[str, Any] = {}
@@ -329,7 +329,7 @@ def _handle_profiling_response(response: httplib2.Response) -> None:
 
 
 def _execute_cloud_call(
-    call: googleapiclient.http.HttpRequest, num_retries: Optional[int] = None
+    call: googleapiclient.http.HttpRequest, num_retries: int | None = None
 ) -> Any:
   """Executes a Cloud API call and translates errors to EEExceptions.
 
@@ -399,7 +399,7 @@ def setUserAgent(user_agent: str) -> None:
   _get_state().user_agent = user_agent
 
 
-def getUserAgent() -> Optional[str]:
+def getUserAgent() -> str | None:
   return _get_state().user_agent
 
 
@@ -449,7 +449,7 @@ def profiling(hook: Any) -> Iterator[None]:
 
 
 @deprecation.Deprecated('Use getAsset')
-def getInfo(asset_id: str) -> Optional[Any]:
+def getInfo(asset_id: str) -> Any | None:
   """Load info for an asset, given an asset id.
 
   Args:
@@ -512,8 +512,8 @@ def getList(params: dict[str, Any]) -> Any:
 
 
 def listImages(
-    params: Union[str, dict[str, Any]],
-) -> dict[str, Optional[list[Any]]]:
+    params: str | dict[str, Any],
+) -> dict[str, list[Any] | None]:
   """Returns the images in an image collection or folder.
 
   Args:
@@ -550,7 +550,7 @@ def listImages(
   return images
 
 
-def listAssets(params: Union[str, dict[str, Any]]) -> dict[str, list[Any]]:
+def listAssets(params: str | dict[str, Any]) -> dict[str, list[Any]]:
   """Returns the assets in a folder.
 
   Args:
@@ -603,7 +603,7 @@ def listAssets(params: Union[str, dict[str, Any]]) -> dict[str, list[Any]]:
   return assets
 
 
-def listBuckets(project: Optional[str] = None) -> Any:
+def listBuckets(project: str | None = None) -> Any:
   """Returns top-level assets and folders for the Cloud Project or user.
 
   Args:
@@ -689,7 +689,7 @@ def getMapId(params: dict[str, Any]) -> dict[str, Any]:
   )
   state = _get_state()
   map_name = result['name']
-  url_format = '%s/%s/%s/tiles/{z}/{x}/{y}' % (
+  url_format = '{}/{}/{}/tiles/{{z}}/{{x}}/{{y}}'.format(
       state.tile_base_url, _cloud_api_utils.VERSION, map_name)
   if state.cloud_api_key:
     url_format += f'?key={state.cloud_api_key}'
@@ -738,7 +738,7 @@ def getFeatureViewTilesKey(params: dict[str, Any]) -> dict[str, Any]:
   }
 
 
-def _extract_table_converter(params: dict[str, Any]) -> Optional[Any]:
+def _extract_table_converter(params: dict[str, Any]) -> Any | None:
   if 'fileFormat' in params:
     file_format = params.get('fileFormat')
     converter = table_converter.from_file_format(file_format)
@@ -1070,7 +1070,7 @@ def computeValue(obj: computedobject.ComputedObject) -> Any:
 
 @deprecation.Deprecated('Use getThumbId and makeThumbUrl')
 def getThumbnail(
-    params: dict[str, Any], thumbType: Optional[str] = None
+    params: dict[str, Any], thumbType: str | None = None
 ) -> Any:
   """Get a Thumbnail for a given asset.
 
@@ -1105,7 +1105,7 @@ def getThumbnail(
 
 
 def getThumbId(
-    params: dict[str, Any], thumbType: Optional[str] = None
+    params: dict[str, Any], thumbType: str | None = None
 ) -> dict[str, str]:
   """Get a Thumbnail ID for a given asset.
 
@@ -1442,8 +1442,8 @@ def getAlgorithms() -> Any:
 @_utils.accept_opt_prefix('opt_path', 'opt_force', 'opt_properties')
 def createAsset(
     value: dict[str, Any],
-    path: Optional[str] = None,
-    properties: Optional[dict[str, Any]] = None,
+    path: str | None = None,
+    properties: dict[str, Any] | None = None,
 ) -> dict[str, Any]:
   """Creates an asset from a JSON value.
 
@@ -1589,7 +1589,7 @@ def getTaskList() -> list[Any]:
           for o in listOperations()]
 
 
-def listOperations(project: Optional[str] = None) -> list[Any]:
+def listOperations(project: str | None = None) -> list[Any]:
   """Retrieves a list of the user's tasks.
 
   Args:
@@ -1616,7 +1616,7 @@ def listOperations(project: Optional[str] = None) -> list[Any]:
 
 
 @deprecation.Deprecated('Use getOperation')
-def getTaskStatus(taskId: Union[list[str], str]) -> list[Any]:
+def getTaskStatus(taskId: list[str] | str) -> list[Any]:
   """Retrieve status of one or more long-running tasks.
 
   Args:
@@ -1868,7 +1868,7 @@ def _startIngestion(
     request_id: Any,
     params: dict[str, Any],
     allow_overwrite: bool = False,
-    import_mode: Optional[str] = _INTERNAL_IMPORT,
+    import_mode: str | None = _INTERNAL_IMPORT,
 ) -> dict[str, Any]:
   """Starts an ingestion task or creates an external image."""
   request = {
@@ -2126,7 +2126,7 @@ def getIamPolicy(asset_id: str) -> Any:
 
 
 @deprecation.Deprecated('Use setIamPolicy')
-def setAssetAcl(assetId: str, aclUpdate: Union[str, dict[str, Any]]) -> None:
+def setAssetAcl(assetId: str, aclUpdate: str | dict[str, Any]) -> None:
   """Sets the access control list of the asset with the given ID.
 
   The owner ACL cannot be changed, and the final ACL of the asset
@@ -2239,7 +2239,7 @@ def getProjectConfig() -> dict[str, Any]:
 
 
 def updateProjectConfig(
-    project_config: dict[str, Any], update_mask: Optional[Sequence[str]] = None
+    project_config: dict[str, Any], update_mask: Sequence[str] | None = None
 ) -> dict[str, Any]:
   """Updates the project config for the current project.
 
@@ -2311,12 +2311,12 @@ def convert_asset_id_to_asset_name(asset_id: str) -> str:
   return _cloud_api_utils.convert_asset_id_to_asset_name(asset_id)
 
 
-def getWorkloadTag() -> Optional[Union[int, str]]:
+def getWorkloadTag() -> int | str | None:
   """Returns the currently set workload tag."""
   return _get_state().workload_tag.get()
 
 
-def setWorkloadTag(tag: Optional[Union[int, str]]) -> None:
+def setWorkloadTag(tag: int | str | None) -> None:
   """Sets the workload tag, used to label computation and exports.
 
   Workload tag must be 1 - 63 characters, beginning and ending with an
@@ -2330,7 +2330,7 @@ def setWorkloadTag(tag: Optional[Union[int, str]]) -> None:
 
 
 @contextlib.contextmanager
-def workloadTagContext(tag: Optional[Union[int, str]]) -> Iterator[None]:
+def workloadTagContext(tag: int | str | None) -> Iterator[None]:
   """Produces a context manager which sets the workload tag, then resets it.
 
   Workload tag must be 1 - 63 characters, beginning and ending with an
@@ -2350,7 +2350,7 @@ def workloadTagContext(tag: Optional[Union[int, str]]) -> Iterator[None]:
     resetWorkloadTag()
 
 
-def setDefaultWorkloadTag(tag: Optional[Union[int, str]]) -> None:
+def setDefaultWorkloadTag(tag: int | str | None) -> None:
   """Sets the workload tag, and as the default for which to reset back to.
 
   For example, calling `ee.data.resetWorkloadTag()` will reset the workload tag

ee/deprecation.py

@@ -2,12 +2,13 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable
 import dataclasses
 import datetime
 import functools
 import inspect
 import json
-from typing import Any, Callable
+from typing import Any
 import urllib
 import warnings
 
@@ -36,7 +37,7 @@ def Deprecated(message: str):
     @functools.wraps(func)
     def Wrapper(*args, **kwargs):
       warnings.warn_explicit(
-          '{}() is deprecated: {}'.format(func.__name__, message),
+          f'{func.__name__}() is deprecated: {message}',
           category=DeprecationWarning,
           filename=func.__code__.co_filename,
           lineno=func.__code__.co_firstlineno + 1,

ee/deserializer.py

@@ -1,7 +1,7 @@
 """A deserializer that decodes EE object trees from JSON DAGs."""
 
 import json
-from typing import Any, Union
+from typing import Any
 
 from ee import apifunction
 from ee import computedobject
@@ -13,7 +13,7 @@ from ee import function
 from ee import geometry
 
 
-def fromJSON(json_obj: Union[bytes, str]) -> Any:  # pylint: disable=g-bad-name
+def fromJSON(json_obj: bytes | str) -> Any:  # pylint: disable=g-bad-name
   """Deserialize an object from a JSON string appropriate for API calls.
 
   Args:
@@ -153,7 +153,7 @@ def _invocation(func: Any, args: dict[str, Any]) -> Any:
   raise ee_exception.EEException(f'Invalid function value: {func}')
 
 
-def fromCloudApiJSON(json_obj: Union[str, bytes]) -> Any:  # pylint: disable=g-bad-name
+def fromCloudApiJSON(json_obj: str | bytes) -> Any:  # pylint: disable=g-bad-name
   """Deserializes an object from the JSON string used in Cloud API calls.
 
   Args:
@@ -180,7 +180,7 @@ def decodeCloudApi(json_obj: dict[str, Any]) -> Any:
   def lookup(reference, kind):
     if reference not in decoded:
       if reference not in json_obj['values']:
-        raise ee_exception.EEException('Cannot find {} {}'.format(reference, kind))
+        raise ee_exception.EEException(f'Cannot find {reference} {kind}')
       decoded[reference] = decode_node(json_obj['values'][reference])
     return decoded[reference]
 

ee/ee_number.py

@@ -1,7 +1,7 @@
 """A wrapper for numbers."""
 from __future__ import annotations
 
-from typing import Any, Union
+from typing import Any
 
 from ee import _arg_types
 from ee import _cloud_api_utils
@@ -586,9 +586,9 @@ class Number(computedobject.ComputedObject):
 
     return apifunction.ApiFunction.call_(self.name() + '.or', self, right)
 
+  @staticmethod
   def parse(
-      # pylint: disable=redefined-builtin
-      input: _arg_types.String,
+      input: _arg_types.String,  # pylint: disable=redefined-builtin
       radix: _arg_types.Integer | None = None,
   ) -> Number:
     """Returns a number from a string.
@@ -772,27 +772,17 @@ class Number(computedobject.ComputedObject):
 
     return apifunction.ApiFunction.call_(self.name() + '.uint8', self)
 
-  # pylint: disable=redefined-builtin
-  # pytype: disable=invalid-annotation
-  def unitScale(
-      self,
-      min: Union[int, float, computedobject.ComputedObject],
-      max: Union[int, float, computedobject.ComputedObject],
-  ) -> Number:
-    """Scales the input so that [min, max] becomes [0, 1].
+  # pylint: disable-next=redefined-builtin
+  def unitScale(self, min: _arg_types.Number, max: _arg_types.Number) -> Number:
+    """Returns the input scaled so that [min, max] becomes [0, 1].
 
     Values outside the range are NOT clamped. If min == max, 0 is returned.
 
     Args:
       min: Minimum value of the input to be scaled to 0.
       max: Maximum value of the input to be scaled to 1.
-
-    Returns:
-      An ee.Number.
     """
 
     return apifunction.ApiFunction.call_(
         self.name() + '.unitScale', self, min, max
     )
-  # pytype: enable=invalid-annotation
-  # pylint: enable=redefined-builtin

ee/encodable.py

@@ -1,6 +1,7 @@
 """Interfaces implemented by serializable objects."""
 
-from typing import Any, Callable
+from collections.abc import Callable
+from typing import Any
 
 
 class Encodable:

ee/image_converter.py

@@ -1,7 +1,7 @@
 """Converters used in the image data fetching methods."""
 
 import io
-from typing import Any, Optional, Union
+from typing import Any
 
 
 class ImageConverter:
@@ -49,8 +49,8 @@ _PIXEL_DATA_CONVERTERS: dict[str, type[ImageConverter]] = {
 
 
 def from_file_format(
-    file_format: Union[str, ImageConverter]
-) -> Optional[ImageConverter]:
+    file_format: str | ImageConverter,
+) -> ImageConverter | None:
   if isinstance(file_format, ImageConverter):
     return file_format
   if file_format in _PIXEL_DATA_CONVERTERS:

ee/imagecollection.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from collections.abc import Sequence
-from typing import Any, Callable
+from collections.abc import Callable, Sequence
+from typing import Any
 
 from ee import _arg_types
 from ee import _utils

ee/model.py

@@ -1,7 +1,5 @@
 """A wrapper for Models."""
 
-from typing import Optional
-
 from ee import _arg_types
 from ee import apifunction
 from ee import computedobject
@@ -66,26 +64,26 @@ class Model(computedobject.ComputedObject):
   @deprecation.Deprecated('Migrate to Vertex AI')
   def fromAiPlatformPredictor(
       # pylint: disable=invalid-name
-      projectName: Optional[_arg_types.Any] = None,
-      projectId: Optional[_arg_types.String] = None,
-      modelName: Optional[_arg_types.String] = None,
+      projectName: _arg_types.Any | None = None,
+      projectId: _arg_types.String | None = None,
+      modelName: _arg_types.String | None = None,
       # pylint: enable=invalid-name
-      version: Optional[_arg_types.String] = None,
-      region: Optional[_arg_types.String] = None,
+      version: _arg_types.String | None = None,
+      region: _arg_types.String | None = None,
       # pylint: disable=invalid-name
-      inputProperties: Optional[_arg_types.List] = None,
-      inputTypeOverride: Optional[_arg_types.Dictionary] = None,
-      inputShapes: Optional[_arg_types.Dictionary] = None,
+      inputProperties: _arg_types.List | None = None,
+      inputTypeOverride: _arg_types.Dictionary | None = None,
+      inputShapes: _arg_types.Dictionary | None = None,
       # pylint: enable=invalid-name
-      proj: Optional[_arg_types.Projection] = None,
+      proj: _arg_types.Projection | None = None,
       # pylint: disable=invalid-name
-      fixInputProj: Optional[_arg_types.Bool] = None,
-      inputTileSize: Optional[_arg_types.List] = None,
-      inputOverlapSize: Optional[_arg_types.List] = None,
-      outputTileSize: Optional[_arg_types.List] = None,
-      outputBands: Optional[_arg_types.Dictionary] = None,
-      outputProperties: Optional[_arg_types.Dictionary] = None,
-      outputMultiplier: Optional[_arg_types.Number] = None,
+      fixInputProj: _arg_types.Bool | None = None,
+      inputTileSize: _arg_types.List | None = None,
+      inputOverlapSize: _arg_types.List | None = None,
+      outputTileSize: _arg_types.List | None = None,
+      outputBands: _arg_types.Dictionary | None = None,
+      outputProperties: _arg_types.Dictionary | None = None,
+      outputMultiplier: _arg_types.Number | None = None,
       # pylint: enable=invalid-name
   ) -> 'Model':
     """Returns an ee.Model from a description of an AI Platform prediction model.
@@ -168,21 +166,21 @@ class Model(computedobject.ComputedObject):
   def fromVertexAi(
       endpoint: _arg_types.String,
       # pylint: disable=invalid-name
-      inputProperties: Optional[_arg_types.List] = None,
-      inputTypeOverride: Optional[_arg_types.Dictionary] = None,
-      inputShapes: Optional[_arg_types.Dictionary] = None,
+      inputProperties: _arg_types.List | None = None,
+      inputTypeOverride: _arg_types.Dictionary | None = None,
+      inputShapes: _arg_types.Dictionary | None = None,
       # pylint: enable=invalid-name
-      proj: Optional[_arg_types.Projection] = None,
+      proj: _arg_types.Projection | None = None,
       # pylint: disable=invalid-name
-      fixInputProj: Optional[_arg_types.Bool] = None,
-      inputTileSize: Optional[_arg_types.List] = None,
-      inputOverlapSize: Optional[_arg_types.List] = None,
-      outputTileSize: Optional[_arg_types.List] = None,
-      outputBands: Optional[_arg_types.Dictionary] = None,
-      outputProperties: Optional[_arg_types.Dictionary] = None,
-      outputMultiplier: Optional[_arg_types.Number] = None,
-      maxPayloadBytes: Optional[_arg_types.Integer] = None,
-      payloadFormat: Optional[_arg_types.String] = None,
+      fixInputProj: _arg_types.Bool | None = None,
+      inputTileSize: _arg_types.List | None = None,
+      inputOverlapSize: _arg_types.List | None = None,
+      outputTileSize: _arg_types.List | None = None,
+      outputBands: _arg_types.Dictionary | None = None,
+      outputProperties: _arg_types.Dictionary | None = None,
+      outputMultiplier: _arg_types.Number | None = None,
+      maxPayloadBytes: _arg_types.Integer | None = None,
+      payloadFormat: _arg_types.String | None = None,
       # pylint: enable=invalid-name
   ) -> 'Model':
     """Returns an ee.Model from a description of a Vertex AI model endpoint.

ee/oauth.py

@@ -9,6 +9,7 @@ Typical use-case consists of:
 """
 
 import base64
+from collections.abc import Sequence
 import errno
 import hashlib
 import http.server
@@ -17,8 +18,7 @@ import os
 import shutil
 import subprocess
 import sys
-from typing import Any, Optional, Union
-from collections.abc import Sequence
+from typing import Any
 import urllib.error
 import urllib.parse
 import urllib.request
@@ -101,13 +101,13 @@ def get_credentials_arguments() -> dict[str, Any]:
     return args
 
 
-def is_sdk_credentials(credentials: Optional[Any]) -> bool:
+def is_sdk_credentials(credentials: Any | None) -> bool:
   return is_sdk_project(project_number_from_credentials(credentials))
 
 
 def project_number_from_credentials(
-    credentials: Optional[Any],
-) -> Optional[str]:
+    credentials: Any | None,
+) -> str | None:
   client_id = credentials and getattr(credentials, 'client_id', None)
   return _project_number_from_client_id(client_id)
 
@@ -116,7 +116,7 @@ def is_sdk_project(project: str) -> bool:
   return project in SDK_PROJECTS
 
 
-def get_appdefault_project() -> Optional[str]:
+def get_appdefault_project() -> str | None:
   try:
     adc_path = _cloud_sdk.get_application_default_credentials_path()
     with open(adc_path) as adc_json:
@@ -134,7 +134,7 @@ def _valid_credentials_exist() -> bool:
     return False
 
 
-def is_valid_credentials(credentials: Optional[Any]) -> bool:
+def is_valid_credentials(credentials: Any | None) -> bool:
   if credentials is None:
     return False
   try:
@@ -146,8 +146,8 @@ def is_valid_credentials(credentials: Optional[Any]) -> bool:
 
 def get_authorization_url(
     code_challenge: str,
-    scopes: Optional[Sequence[str]] = None,
-    redirect_uri: Optional[str] = None,
+    scopes: Sequence[str] | None = None,
+    redirect_uri: str | None = None,
 ) -> str:
   """Returns a URL to generate an auth code."""
 
@@ -164,9 +164,9 @@ def get_authorization_url(
 def request_token(
     auth_code: str,
     code_verifier: str,
-    client_id: Optional[str] = None,
-    client_secret: Optional[str] = None,
-    redirect_uri: Optional[str] = None,
+    client_id: str | None = None,
+    client_secret: str | None = None,
+    redirect_uri: str | None = None,
 ) -> str:
   """Uses authorization code to request tokens."""
 
@@ -201,7 +201,7 @@ def write_private_json(json_path: str, info_dict: dict[str, Any]) -> None:
   except OSError as e:
     if e.errno != errno.EEXIST:
       # pylint:disable=broad-exception-raised,raise-missing-from
-      raise Exception('Error creating directory {}: {}'.format(dirname, e))
+      raise Exception(f'Error creating directory {dirname}: {e}')
       # pylint:enable=broad-exception-raised,raise-missing-from
 
   file_content = json.dumps(info_dict)
@@ -234,7 +234,7 @@ def _in_jupyter_shell() -> bool:
     return False
 
 
-def _project_number_from_client_id(client_id: Optional[str]) -> Optional[str]:
+def _project_number_from_client_id(client_id: str | None) -> str | None:
   """Returns the project number associated with the given OAuth client ID."""
   # Client IDs are of the form:
   # PROJECTNUMBER-BASE32STUFF.apps.googleusercontent.com.
@@ -243,10 +243,10 @@ def _project_number_from_client_id(client_id: Optional[str]) -> Optional[str]:
 
 
 def _obtain_and_write_token(
-    auth_code: Optional[str] = None,
-    code_verifier: Optional[str] = None,
-    scopes: Optional[Sequence[str]] = None,
-    redirect_uri: Optional[str] = None,
+    auth_code: str | None = None,
+    code_verifier: str | None = None,
+    scopes: Sequence[str] | None = None,
+    redirect_uri: str | None = None,
 ) -> None:
   """Obtains and writes credentials token based on an authorization code."""
   fetch_data = {}
@@ -283,7 +283,7 @@ def _obtain_and_write_token(
 
 
 def _display_auth_instructions_for_noninteractive(
-    auth_url: str, code_verifier: Union[bytes, str]
+    auth_url: str, code_verifier: bytes | str
 ) -> None:
   """Displays instructions for authenticating without blocking for user input."""
   # Python 3 `bytes` should be decoded to `str` if used as an argument of
@@ -310,7 +310,7 @@ def _display_auth_instructions_for_noninteractive(
 
 
 def _display_auth_instructions_with_print(
-    auth_url: str, coda: Optional[str] = None
+    auth_url: str, coda: str | None = None
 ) -> None:
   """Displays instructions for authenticating using a print statement."""
   print(
@@ -325,7 +325,7 @@ def _display_auth_instructions_with_print(
 
 
 def _display_auth_instructions_with_html(
-    auth_url: str, coda: Optional[str] = None
+    auth_url: str, coda: str | None = None
 ) -> None:
   """Displays instructions for authenticating using HTML code."""
   try:
@@ -382,8 +382,8 @@ def _no_gcloud() -> bool:
 
 
 def _load_gcloud_credentials(
-    scopes: Optional[Sequence[str]] = None,
-    quiet: Optional[bool] = None,
+    scopes: Sequence[str] | None = None,
+    quiet: bool | None = None,
     run_gcloud_legacy: bool = False,
 ) -> None:
   """Initializes credentials by running gcloud flows."""
@@ -435,7 +435,7 @@ def _start_server(port: int):
   class Handler(http.server.BaseHTTPRequestHandler):
     """Handles the OAuth callback and reports a success page."""
 
-    code: Optional[str] = None
+    code: str | None = None
 
     def do_GET(self) -> None:  # pylint: disable=invalid-name
       Handler.code = urllib.parse.parse_qs(
@@ -460,7 +460,7 @@ def _start_server(port: int):
       self.server = http.server.HTTPServer(('localhost', port), Handler)
       self.url = 'http://localhost:%s' % self.server.server_address[1]
 
-    def fetch_code(self) -> Optional[str]:
+    def fetch_code(self) -> str | None:
       self.server.handle_request()  # Blocks until a single request arrives.
       self.server.server_close()
       return Handler.code
@@ -469,13 +469,13 @@ def _start_server(port: int):
 
 
 def authenticate(
-    cli_authorization_code: Optional[str] = None,
-    quiet: Optional[bool] = None,
-    cli_code_verifier: Optional[str] = None,
-    auth_mode: Optional[str] = None,
-    scopes: Optional[Sequence[str]] = None,
+    cli_authorization_code: str | None = None,
+    quiet: bool | None = None,
+    cli_code_verifier: str | None = None,
+    auth_mode: str | None = None,
+    scopes: Sequence[str] | None = None,
     force: bool = False,
-) -> Optional[bool]:
+) -> bool | None:
   """Prompts the user to authorize access to Earth Engine via OAuth2.
 
   Args:
@@ -564,11 +564,11 @@ class Flow:
   """Holds state for auth flows."""
   code_verifier: str
   scopes: Sequence[str]
-  server: Optional[Any]
+  server: Any | None
   auth_url: str
 
   def __init__(
-      self, auth_mode: str = 'notebook', scopes: Optional[Sequence[str]] = None
+      self, auth_mode: str = 'notebook', scopes: Sequence[str] | None = None
   ):
     """Initializes auth URL and PKCE verifier, for use in save_code().
 
@@ -601,7 +601,7 @@ class Flow:
       # pylint:disable-next=broad-exception-raised
       raise ee_exception.EEException('Unknown auth_mode "%s"' % auth_mode)
 
-  def save_code(self, code: Optional[str] = None) -> None:
+  def save_code(self, code: str | None = None) -> None:
     """Fetches auth code if not given, and saves the generated credentials."""
     redirect_uri = None
     if self.server and not code:
@@ -609,7 +609,7 @@ class Flow:
       code = self.server.fetch_code()  # Waits for oauth callback
     _obtain_and_write_token(code, self.code_verifier, self.scopes, redirect_uri)
 
-  def display_instructions(self, quiet: Optional[bool] = None) -> bool:
+  def display_instructions(self, quiet: bool | None = None) -> bool:
     """Prints to stdout, and returns True if a browser should be opened."""
 
     if quiet: