earthengine-api 1.7.10rc0__tar.gz → 1.7.11rc0__tar.gz

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

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

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

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

{earthengine_api-1.7.10rc0 → earthengine_api-1.7.11rc0}/ee/__init__.py

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

{earthengine_api-1.7.10rc0 → earthengine_api-1.7.11rc0}/ee/_cloud_api_utils.py

@@ -721,6 +721,8 @@ def convert_to_image_file_format(format_str: str | None) -> str:
     return 'GEO_TIFF'
   elif format_str == 'TFRECORD':
     return 'TF_RECORD_IMAGE'
+  elif format_str == 'NUMPY':
+    return 'NPY'
   else:
     # It's probably "JPEG" or "PNG", but might be some other supported format.
     # Let the server validate it.

{earthengine_api-1.7.10rc0 → earthengine_api-1.7.11rc0}/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.10rc0 → earthengine_api-1.7.11rc0}/ee/tests/_cloud_api_utils_test.py

@@ -289,6 +289,9 @@ class CloudApiUtilsTest(unittest.TestCase):
                      _cloud_api_utils.convert_to_image_file_format('GeoTIFF'))
     self.assertEqual('TF_RECORD_IMAGE',
                      _cloud_api_utils.convert_to_image_file_format('TFRecord'))
+    self.assertEqual(
+        'NPY', _cloud_api_utils.convert_to_image_file_format('numpy')
+    )
 
   def test_convert_to_table_file_format(self):
     self.assertEqual('CSV',

{earthengine_api-1.7.10rc0 → earthengine_api-1.7.11rc0}/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.10rc0 → earthengine_api-1.7.11rc0}/pyproject.toml

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