earthengine-api 1.7.9__tar.gz → 1.7.10__tar.gz

{earthengine_api-1.7.9/earthengine_api.egg-info → earthengine_api-1.7.10}/PKG-INFO

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

{earthengine_api-1.7.9 → earthengine_api-1.7.10/earthengine_api.egg-info}/PKG-INFO

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

{earthengine_api-1.7.9 → earthengine_api-1.7.10}/ee/__init__.py

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

{earthengine_api-1.7.9 → earthengine_api-1.7.10}/ee/data.py

@@ -691,7 +691,7 @@ def getMapId(params: dict[str, Any]) -> dict[str, Any]:
   map_name = result['name']
   version = _cloud_api_utils.VERSION
   url_format = (
-      '{state.tile_base_url}/{version}/{map_name)}/tiles/{{z}}/{{x}}/{{y}}'
+      f'{state.tile_base_url}/{version}/{map_name}/tiles/{{z}}/{{x}}/{{y}}'
   )
   if state.cloud_api_key:
     url_format += f'?key={state.cloud_api_key}'

{earthengine_api-1.7.9 → earthengine_api-1.7.10}/ee/filter.py

@@ -7,7 +7,6 @@ Example usage:
      .lt('time', value)
 """
 
-# Using lowercase function naming to match the JavaScript names.
 # pylint: disable=g-bad-name
 
 from __future__ import annotations
@@ -70,9 +69,8 @@ class Filter(computedobject.ComputedObject):
       super().__init__(filter_.func, filter_.args, filter_.varName)
       self._filter = (filter_,)
     elif filter_ is None:
-      # A silly call with no arguments left for backward-compatibility.
-      # Encoding such a filter is expected to fail, but it can be composed
-      # by calling the various methods that end up in _append().
+      # A call with no arguments left for backward-compatibility.
+      # Encoding such a filter is expected to fail.
       super().__init__(None, None)
       self._filter = ()
     else:
@@ -102,31 +100,6 @@ class Filter(computedobject.ComputedObject):
     """
     return len(self._filter)
 
-  def _append(self, new_filter: _arg_types.Filter) -> Filter:
-    """Append a predicate to this filter.
-
-    These are implicitly ANDed.
-
-    Args:
-      new_filter: The filter to append to this one. Possible types are:
-          1) another fully constructed Filter,
-          2) a JSON representation of a filter,
-          3) an array of 1 or 2.
-
-    Returns:
-      A new filter that is the combination of both.
-    """
-    if new_filter is None:
-      raise ValueError('new_filter should never be None')
-    prev = list(self._filter)
-    if isinstance(new_filter, Filter):
-      prev.extend(new_filter._filter)  # pylint: disable=protected-access
-    elif isinstance(new_filter, list):
-      prev.extend(new_filter)
-    else:
-      prev.append(new_filter)
-    return Filter(prev)
-
   @staticmethod
   def metadata_(name: str, operator: str, value: _arg_types.Any) -> Filter:
     """Filter on metadata. This is deprecated.

{earthengine_api-1.7.9 → earthengine_api-1.7.10}/ee/imagecollection.py

@@ -299,7 +299,8 @@ class ImageCollection(collection.Collection[image.Image]):
     request['format'] = params.get('format', valid_formats[0])
     if request['format'] not in valid_formats:
       raise ee_exception.EEException(
-          'Invalid format specified for thumbnail. ' + str(params['format']))
+          f'Invalid format specified for thumbnail: "{request["format"]}"'
+      )
 
     if params and 'framesPerSecond' in params:
       request['framesPerSecond'] = params.get('framesPerSecond')

{earthengine_api-1.7.9 → earthengine_api-1.7.10}/ee/tests/data_test.py

@@ -565,23 +565,22 @@ class DataTest(unittest.TestCase):
   def test_set_asset_properties(self):
     mock_http = mock.MagicMock(httplib2.Http)
     with apitestcase.UsingCloudApi(mock_http=mock_http), mock.patch.object(
-        ee.data, 'updateAsset', autospec=True) as mock_update_asset:
-      ee.data.setAssetProperties('foo', {
-          'mYPropErTy': 'Value',
-          'system:time_start': 1
-      })
+        ee.data, 'updateAsset', autospec=True
+    ) as mock_update_asset:
+      ee.data.setAssetProperties(
+          'foo', {'mYPropErTy': 'Value', 'system:time_start': 1}
+      )
       asset_id = mock_update_asset.call_args[0][0]
       self.assertEqual(asset_id, 'foo')
       asset = mock_update_asset.call_args[0][1]
-      self.assertEqual(asset['properties'], {
-          'mYPropErTy': 'Value',
-          'system:time_start': 1
-      })
+      self.assertEqual(
+          asset['properties'], {'mYPropErTy': 'Value', 'system:time_start': 1}
+      )
       update_mask = mock_update_asset.call_args[0][2]
       self.assertSetEqual(
           set(update_mask),
-          {'properties.\"mYPropErTy\"',
-               'properties.\"system:time_start\"'})
+          {'properties."mYPropErTy"', 'properties."system:time_start"'},
+      )
 
   def test_update_asset(self):
     cloud_api_resource = mock.MagicMock()
@@ -895,7 +894,10 @@ class DataTest(unittest.TestCase):
   def test_get_map_id_with_cloud_api_key(self):
     cloud_api_resource = mock.MagicMock()
     with apitestcase.UsingCloudApi(cloud_api_resource=cloud_api_resource):
+      custom_url = 'https://example.test'
       ee.data._get_state().cloud_api_key = 'my-api-key'
+      ee.data._get_state().tile_base_url = custom_url
+
       mock_result = {
           'name': 'projects/earthengine-legacy/maps/DOCID',
       }
@@ -905,7 +907,31 @@ class DataTest(unittest.TestCase):
       actual_result = ee.data.getMapId({
           'image': image.Image('my-image'),
       })
-      self.assertIn('?key=my-api-key', actual_result['tile_fetcher'].url_format)
+      expected_url = (
+          custom_url
+          + '/v1/projects/earthengine-legacy/maps/DOCID/tiles/{z}/{x}/{y}'
+          '?key=my-api-key'
+      )
+      self.assertEqual(expected_url, actual_result['tile_fetcher'].url_format)
+
+  def test_get_map_id_no_cloud_api_key(self):
+    cloud_api_resource = mock.MagicMock()
+    with apitestcase.UsingCloudApi(cloud_api_resource=cloud_api_resource):
+      custom_url = 'https://example.test'
+      ee.data._get_state().cloud_api_key = None
+      ee.data._get_state().tile_base_url = custom_url
+      mock_result = {
+          'name': 'projects/earthengine-legacy/maps/DOCID',
+      }
+      cloud_api_resource.projects().maps().create().execute.return_value = (
+          mock_result
+      )
+      actual_result = ee.data.getMapId({'image': image.Image('my-image')})
+      expected_url = (
+          custom_url
+          + '/v1/projects/earthengine-legacy/maps/DOCID/tiles/{z}/{x}/{y}'
+      )
+      self.assertEqual(expected_url, actual_result['tile_fetcher'].url_format)
 
   def test_get_thumbnail_default(self):
     cloud_api_resource_raw = mock.MagicMock()

{earthengine_api-1.7.9 → earthengine_api-1.7.10}/ee/tests/filter_test.py

@@ -40,6 +40,64 @@ class FilterTest(apitestcase.ApiTestCase):
     copy = ee.Filter(from_static_method)
     self.assertEqual(from_static_method, copy)
 
+  def test_constructor_no_args(self):
+    # This is code to be avoided, but since it has been this way for a long
+    # time, this captures the current behavior.
+    # Please do not use `ee.Filter()` to access static methods like `Or`.
+    # Instead, call them directly on the class, e.g., `ee.Filter.Or(...)`.
+    a_filter = ee.Filter()
+    self.assertEqual(a_filter.predicateCount(), 0)
+
+    self.assertTrue(a_filter.isVariable())
+
+    # Not very intuitive error message.
+    with self.assertRaisesRegex(ee.EEException, 'arguments cannot be used'):
+      a_filter.serialize()
+
+    # Not very intuitive error message.
+    with self.assertRaisesRegex(ee.EEException, 'arguments cannot be used'):
+      str(a_filter)
+
+  def test_empty_list_filter(self):
+    with self.assertRaisesRegex(
+        ee.EEException, 'Empty list specified for ee.Filter().'
+    ):
+      ee.Filter([])
+
+  def test_list_of_filters(self):
+    f1 = ee.Filter.eq('x', 1)
+    f2 = ee.Filter.eq('y', 2)
+    filters = [f1, f2]
+    multi_filter = ee.Filter(filters)
+    self.assertEqual(tuple(filters), multi_filter._filter)
+    self.assertEqual(ee.ApiFunction.lookup('Filter.and'), multi_filter.func)
+    self.assertEqual({'filters': tuple(filters)}, multi_filter.args)
+
+  def test_invalid_argument(self):
+    with self.assertRaisesRegex(
+        ee.EEException, 'Invalid argument specified for ee.Filter().*'
+    ):
+      ee.Filter(123)  # pytype: disable=wrong-arg-types
+
+  def test_predicate_count(self):
+    self.assertEqual(0, ee.Filter().predicateCount())
+    self.assertEqual(1, ee.Filter(ee.Filter.eq('x', 1)).predicateCount())
+    self.assertEqual(1, ee.Filter([ee.Filter.eq('x', 1)]).predicateCount())
+    self.assertEqual(
+        2,
+        ee.Filter(
+            [ee.Filter.eq('x', 1), ee.Filter.eq('y', 2)]
+        ).predicateCount(),
+    )
+    self.assertEqual(
+        3,
+        ee.Filter([
+            ee.Filter.eq('x', 1),
+            ee.Filter.eq('y', 2),
+            ee.Filter.eq('z', 3),
+        ]).predicateCount(),
+    )
+
   def test_metadata(self):
     """Verifies that the metadata_() method works."""
     self.assertEqual(

{earthengine_api-1.7.9 → earthengine_api-1.7.10}/ee/tests/image_test.py

@@ -148,6 +148,60 @@ class ImageTest(apitestcase.ApiTestCase):
         'srcImg': image2
     }, combined.args['input'].args)
 
+  def test_rgb(self):
+    """Verifies the behavior of ee.Image.rgb()."""
+    r = 1.1
+    g = 2.2
+    b = 3.3
+    expression = ee.Image.rgb(r, g, b)
+    expect = make_expression_graph({
+        'arguments': {
+            'input': {
+                'functionInvocationValue': {
+                    'functionName': 'Image.addBands',
+                    'arguments': {
+                        'dstImg': {
+                            'functionInvocationValue': {
+                                'functionName': 'Image.addBands',
+                                'arguments': {
+                                    'dstImg': {
+                                        'functionInvocationValue': {
+                                            'functionName': 'Image.constant',
+                                            'arguments': {
+                                                'value': {'constantValue': r}
+                                            },
+                                        }
+                                    },
+                                    'srcImg': {
+                                        'functionInvocationValue': {
+                                            'functionName': 'Image.constant',
+                                            'arguments': {
+                                                'value': {'constantValue': g}
+                                            },
+                                        }
+                                    },
+                                },
+                            }
+                        },
+                        'srcImg': {
+                            'functionInvocationValue': {
+                                'functionName': 'Image.constant',
+                                'arguments': {'value': {'constantValue': b}},
+                            }
+                        },
+                    },
+                }
+            },
+            'bandSelectors': {'constantValue': ['.*']},
+            'newNames': {
+                'constantValue': ['vis-red', 'vis-green', 'vis-blue']
+            },
+        },
+        'functionName': 'Image.select',
+    })
+    result = json.loads(expression.serialize())
+    self.assertEqual(expect, result)
+
   def test_select(self):
     """Verifies regression in the behavior of empty ee.Image.select()."""
     image = ee.Image([1, 2]).select()

{earthengine_api-1.7.9 → earthengine_api-1.7.10}/ee/tests/imagecollection_test.py

@@ -144,13 +144,13 @@ class ImageCollectionTest(apitestcase.ApiTestCase):
 
   def test_filmstrip_thumb_url_invalid_format(self):
     """Verifies correct thumbnailing behavior."""
-    message = r'Invalid format specified for thumbnail\. gif'
+    message = r'Invalid format specified for thumbnail: "gif"'
     with self.assertRaisesRegex(ee.EEException, message):
       ee.ImageCollection(ee.Image(1)).getFilmstripThumbURL({'format': 'gif'})
 
   def test_video_thumb_url_invalid_format(self):
     """Verifies correct thumbnailing behavior."""
-    message = r'Invalid format specified for thumbnail\. png'
+    message = r'Invalid format specified for thumbnail: "png"'
     with self.assertRaisesRegex(ee.EEException, message):
       ee.ImageCollection(ee.Image(1)).getVideoThumbURL({'format': 'png'})
 
@@ -722,7 +722,38 @@ class ImageCollectionTest(apitestcase.ApiTestCase):
     result = json.loads(expression.serialize())
     self.assertEqual(expect, result)
 
-  # fromImages already tested in other tests.
+  def test_from_images(self):
+    images = [ee.Image(1), ee.Image(2)]
+    expect = make_expression_graph({
+        'arguments': {
+            'images': {
+                'arrayValue': {
+                    'values': [
+                        {
+                            'functionInvocationValue': {
+                                'functionName': 'Image.constant',
+                                'arguments': {'value': {'constantValue': 1}},
+                            }
+                        },
+                        {
+                            'functionInvocationValue': {
+                                'functionName': 'Image.constant',
+                                'arguments': {'value': {'constantValue': 2}},
+                            }
+                        },
+                    ]
+                }
+            }
+        },
+        'functionName': 'ImageCollection.fromImages',
+    })
+    expression = ee.ImageCollection.fromImages(images)
+    result = json.loads(expression.serialize())
+    self.assertEqual(expect, result)
+
+    expression = ee.ImageCollection.fromImages(images=images)
+    result = json.loads(expression.serialize())
+    self.assertEqual(expect, result)
 
   def test_geometry(self):
     max_error = 1.1

{earthengine_api-1.7.9 → earthengine_api-1.7.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "earthengine-api"
-version = "1.7.9"
+version = "1.7.10"
 description = "Earth Engine Python API"
 readme = "README.md"
 requires-python = ">=3.10"