earthengine-api 1.6.14rc0__tar.gz → 1.6.15rc0__tar.gz

{earthengine_api-1.6.14rc0/earthengine_api.egg-info → earthengine_api-1.6.15rc0}/PKG-INFO

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

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0/earthengine_api.egg-info}/PKG-INFO

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

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/ee/__init__.py

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

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/ee/cli/commands.py

@@ -128,7 +128,7 @@ def _comma_separated_strings(string: str) -> list[str]:
   """Parses an input consisting of comma-separated strings."""
   error_msg = 'Argument should be a comma-separated list of strings: {}'
   values = string.split(',')
-  if not values:
+  if not all(values):
     raise argparse.ArgumentTypeError(error_msg.format(string))
   return values
 
@@ -137,7 +137,7 @@ def _comma_separated_numbers(string: str) -> list[float]:
   """Parses an input consisting of comma-separated numbers."""
   error_msg = 'Argument should be a comma-separated list of numbers: {}'
   values = string.split(',')
-  if not values:
+  if not all(values):
     raise argparse.ArgumentTypeError(error_msg.format(string))
   numbervalues = []
   for value in values:
@@ -155,9 +155,9 @@ def _comma_separated_numbers(string: str) -> list[float]:
 def _comma_separated_pyramiding_policies(string: str) -> list[str]:
   """Parses an input consisting of comma-separated pyramiding policies."""
   error_msg = ('Argument should be a comma-separated list of: '
-               '{{"mean", "sample", "min", "max", "mode"}}: {}')
+               '{{"mean", "median", "sample", "min", "max", "mode"}}: {}')
   values = string.split(',')
-  if not values:
+  if not all(values):
     raise argparse.ArgumentTypeError(error_msg.format(string))
   redvalues = []
   for value in values:
@@ -226,10 +226,6 @@ def _format_cloud_timestamp(timestamp: str | None) -> str:
   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)
-
-
 def _decode_date(string: str) -> Union[float, str]:
   """Decodes a date from a command line argument, returning msec since epoch".
 

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/ee/cli/utils.py

@@ -145,7 +145,10 @@ class CommandLineConfig:
 
 
 def _split_gcs_path(path):
-  m = re.search('gs://([a-z0-9-_.]*)/(.*)', path, re.IGNORECASE)
+  # This only catches some troubles. For complete details on naming, see:
+  #   https://cloud.google.com/storage/docs/buckets
+  #   https://cloud.google.com/storage/docs/objects#naming
+  m = re.search('gs://([a-z0-9][a-z0-9-_.]*)/(.*)', path, re.IGNORECASE)
   if not m:
     raise ValueError(f"'{path}' is not a valid GCS path")
 
@@ -197,7 +200,7 @@ class GcsHelper:
       if not os.path.exists(dir_path):
         os.makedirs(dir_path)
 
-      if output_path[-1:] != '/':
+      if not output_path.endswith('/'):
         blob.download_to_filename(output_path)
 
     return temp_dir
@@ -206,7 +209,7 @@ class GcsHelper:
     """Uploads a directory to cloud storage."""
     canonical_path = _canonicalize_dir_path(source_path)
 
-    files = list()
+    files = []
     for dirpath, _, filenames in os.walk(canonical_path):
       files += [os.path.join(dirpath, f) for f in filenames]
 
@@ -224,7 +227,7 @@ def is_gcs_path(path: str) -> bool:
 
 
 def query_yes_no(msg: str) -> bool:
-  print('%s (y/n)' % msg)
+  print(f'{msg} (y/n)')
   while True:
     confirm = input().lower()
     if confirm == 'y':
@@ -264,10 +267,9 @@ def wait_for_task(
     state = status['metadata']['state']
     if status.get('done', False):
       error_message = status.get('error', {}).get('message')
-      print('Task %s ended at state: %s after %.2f seconds'
-            % (task_id, state, elapsed))
+      print(f'Task {task_id} ended at state: {state} after {elapsed:.2f} seconds')
       if error_message:
-        raise ee.ee_exception.EEException('Error: %s' % error_message)
+        raise ee.ee_exception.EEException(f'Error: {error_message}')
       return
     if log_progress and elapsed - last_check >= 30:
       print('[{:%H:%M:%S}] Current state for task {}: {}'
@@ -309,17 +311,20 @@ def wait_for_tasks(
   status_counts = collections.defaultdict(int)
   for status in status_list:
     status_counts[status] += 1
+  succeeded = status_counts['SUCCEEDED']
+  failed = status_counts['FAILED']
+  cancelled = status_counts['CANCELLED']
   num_incomplete = (
       len(status_list)
-      - status_counts['SUCCEEDED']
-      - status_counts['FAILED']
-      - status_counts['CANCELLED']
+      - succeeded
+      - failed
+      - cancelled
   )
   print('Finished waiting for tasks.\n  Status summary:')
-  print('  %d tasks completed successfully.' % status_counts['SUCCEEDED'])
-  print('  %d tasks failed.' % status_counts['FAILED'])
-  print('  %d tasks cancelled.' % status_counts['CANCELLED'])
-  print('  %d tasks are still incomplete (timed-out)' % num_incomplete)
+  print(f'  {succeeded} tasks completed successfully.')
+  print(f'  {failed} tasks failed.')
+  print(f'  {cancelled} tasks cancelled.')
+  print(f'  {num_incomplete} tasks are still incomplete (timed-out)')
 
 
 def expand_gcs_wildcards(source_files: list[str]) -> Iterable[str]:
@@ -351,7 +356,7 @@ def expand_gcs_wildcards(source_files: list[str]) -> Iterable[str]:
       bucket, rest = bucket_match.group(1, 2)
     else:
       raise ee.ee_exception.EEException(
-          'Badly formatted source file or bucket: %s' % source)
+          f'Badly formatted source file or bucket: {source}')
     prefix = rest[:rest.find('*')]  # Everything before the first wildcard
 
     bucket_files = _gcs_ls(bucket, prefix)
@@ -395,23 +400,23 @@ def _gcs_ls(bucket: str, prefix: str = '') -> Iterable[str]:
     try:
       response, content = http.request(url, method=method)
     except httplib2.HttpLib2Error as e:
-      raise ee.ee_exception.EEException('Unexpected HTTP error: %s' % str(e))
+      raise ee.ee_exception.EEException(f'Unexpected HTTP error: {e}') from e
 
     if response.status < 100 or response.status >= 300:
       raise ee.ee_exception.EEException(
-          'Error retrieving bucket %s; Server returned HTTP code: %d'
-          % (bucket, response.status)
+          f'Error retrieving bucket {bucket}; '
+          f'Server returned HTTP code: {response.status}'
       )
 
     json_content = json.loads(content)
     if 'error' in json_content:
       json_error = json_content['error']['message']
-      raise ee.ee_exception.EEException('Error retrieving bucket %s: %s' %
-                                        (bucket, json_error))
+      raise ee.ee_exception.EEException(
+          f'Error retrieving bucket {bucket}: {json_error}')
 
     if 'items' not in json_content:
       raise ee.ee_exception.EEException(
-          'Cannot find items list in the response from GCS: %s' % json_content)
+          f'Cannot find items list in the response from GCS: {json_content}')
     objects = json_content['items']
     object_names = [str(gc_object['name']) for gc_object in objects]
 

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/ee/deserializer.py

@@ -76,7 +76,7 @@ def _decodeValue(json_obj: Any, named_values: dict[str, Any]) -> Any:
 
   # Ensure that we've got a proper object at this point.
   if not isinstance(json_obj, dict):
-    raise ee_exception.EEException('Cannot decode object: ' + json_obj)
+    raise ee_exception.EEException(f'Cannot decode object: {json_obj}')
 
   # Check for explicitly typed values.
   type_name = json_obj['type']
@@ -88,12 +88,12 @@ def _decodeValue(json_obj: Any, named_values: dict[str, Any]) -> Any:
   elif type_name == 'ArgumentRef':
     var_name = json_obj['value']
     if not isinstance(var_name, str):
-      raise ee_exception.EEException('Invalid variable name: ' + var_name)
-    return customfunction.CustomFunction.variable(None, var_name)  # pylint: disable=protected-access
+      raise ee_exception.EEException(f'Invalid variable name: {var_name}')
+    return customfunction.CustomFunction.variable(None, var_name)
   elif type_name == 'Date':
     microseconds = json_obj['value']
     if not isinstance(microseconds, (float, int)):
-      raise ee_exception.EEException('Invalid date value: ' + microseconds)
+      raise ee_exception.EEException(f'Invalid date value: {microseconds}')
     return ee_date.Date(microseconds / 1e3)
   elif type_name == 'Bytes':
     result = encodable.Encodable()
@@ -131,7 +131,7 @@ def _decodeValue(json_obj: Any, named_values: dict[str, Any]) -> Any:
   elif type_name == 'CompoundValue':
     raise ee_exception.EEException('Nested CompoundValues are disallowed.')
   else:
-    raise ee_exception.EEException('Unknown encoded object type: ' + type_name)
+    raise ee_exception.EEException(f'Unknown encoded object type: {type_name}')
 
 
 def _invocation(func: Any, args: dict[str, Any]) -> Any:
@@ -150,7 +150,7 @@ def _invocation(func: Any, args: dict[str, Any]) -> Any:
         'returns': 'ComputedObject'
     }
     return function.SecondOrderFunction(func, signature).apply(args)
-  raise ee_exception.EEException('Invalid function value: %s' % func)
+  raise ee_exception.EEException(f'Invalid function value: {func}')
 
 
 def fromCloudApiJSON(json_obj: Union[str, bytes]) -> Any:  # pylint: disable=g-bad-name

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/ee/reducer.py

@@ -465,8 +465,10 @@ class Reducer(computedobject.ComputedObject):
 
   def group(
       self,
+      # pylint: disable=invalid-name
       groupField: _arg_types.Integer | None = None,
       groupName: _arg_types.String | None = None,
+      # pylint: enable=invalid-name
   ) -> Reducer:
     """Returns a reducer groups reducer records by the value of a given input.
 

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/ee/tests/deserializer_test.py

@@ -80,6 +80,53 @@ class DeserializerTest(apitestcase.ApiTestCase):
     ):
       deserializer.decode(encoded)
 
+  def test_duplicate_scope_key(self):
+    """Verifies raising duplicate scope key in decode()."""
+    encoded = {
+        'type': 'CompoundValue',
+        'scope': [['a', 1], ['a', 2]],
+        'value': 3,
+    }
+    with self.assertRaisesRegex(
+        ee.EEException, 'Duplicate scope key "a" in scope #1.'
+    ):
+      deserializer.decode(encoded)
+
+  def test_cannot_decode_object(self):
+    """Verifies raising EEException for non-dict objects in _decodeValue()."""
+    with self.assertRaisesRegex(
+        ee.EEException, r'Cannot decode object: \(1\+1j\)'
+    ):
+      deserializer.decode([1 + 1j])
+
+  def test_invalid_date_value(self):
+    """Verifies EEException for invalid date values in _decodeValue()."""
+    with self.assertRaisesRegex(
+        ee.EEException, r'Invalid date value: not-a-number'
+    ):
+      deserializer.decode({'type': 'Date', 'value': 'not-a-number'})
+
+  def test_invocation_of_custom_function(self):
+    """Verifies decoding of an Invocation of a CustomFunction."""
+    encoded = {
+        'type': 'Invocation',
+        'function': {
+            'type': 'Function',
+            'argumentNames': ['foo'],
+            'body': {'type': 'ArgumentRef', 'value': 'foo'},
+        },
+        'arguments': {'foo': 1},
+    }
+    decoded = deserializer.decode(encoded)
+    self.assertIsInstance(decoded, ee.ComputedObject)
+
+  def test_date_decode(self):
+    """Verifies decoding of a Date."""
+    encoded = {'type': 'Date', 'value': 1609459200000000}
+    decoded = deserializer.decode(encoded)
+    self.assertIsInstance(decoded, ee.Date)
+    self.assertEqual({'value': 1609459200000}, decoded.args)
+
 
 if __name__ == '__main__':
   unittest.main()

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/ee/tests/kernel_test.py

@@ -287,6 +287,10 @@ class KernelTest(apitestcase.ApiTestCase):
     result = json.loads(expression.serialize())
     self.assertEqual(expect, result)
 
+  def test_fixed_no_weights(self):
+    with self.assertRaisesRegex(ValueError, 'weights is required.'):
+      ee.Kernel.fixed()
+
   def test_gaussian(self):
     radius = 1.1
     sigma = 2.2

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/ee/tests/model_test.py

@@ -115,6 +115,18 @@ class ModelTest(apitestcase.ApiTestCase):
     }
     self.assertEqual(expect, result)
 
+  def test_model_constructor_invalid(self):
+    with self.assertRaisesRegex(
+        TypeError, 'Model constructor can only cast to Model.'
+    ):
+      ee.Model('not a computed object')  # pytype: disable=wrong-arg-types
+
+  def test_model_constructor_invalid_int(self):
+    with self.assertRaisesRegex(
+        TypeError, 'Model constructor can only cast to Model.'
+    ):
+      ee.Model(123)  # pytype: disable=wrong-arg-types
+
   def test_from_ai_platform_predictor(self):
     project_name = 'some project'
     project_id = 'a project id'

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/ee/tests/reducer_test.py

@@ -809,6 +809,19 @@ class ReducerTest(apitestcase.ApiTestCase):
     result = json.loads(expression.serialize())
     self.assertEqual(expect, result)
 
+  def test_ridge_regression_kwargs_with_lambda(self):
+    with self.assertRaisesRegex(
+        ValueError, 'lambda_ cannot be set when providing kwargs.'
+    ):
+      ee.Reducer.ridgeRegression(1, lambda_=3, **{'lambda': 4})
+
+  def test_ridge_regression_unexpected_kwargs(self):
+    with self.assertRaisesRegex(
+        ValueError,
+        r"Unexpected arguments: \['unexpected'\]\. Expected: lambda.",
+    ):
+      ee.Reducer.ridgeRegression(1, unexpected=4)
+
   def test_robust_linear_regression(self):
     num_x = 1
     num_y = 2

{earthengine_api-1.6.14rc0 → earthengine_api-1.6.15rc0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "earthengine-api"
-version = "1.6.14rc0"
+version = "1.6.15rc0"
 description = "Earth Engine Python API"
 readme = "README.md"
 requires-python = ">=3.9"