earthengine-api 1.7.10rc0__py3-none-any.whl → 1.7.10rc1__py3-none-any.whl

{earthengine_api-1.7.10rc0.dist-info → earthengine_api-1.7.10rc1.dist-info}/METADATA

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

{earthengine_api-1.7.10rc0.dist-info → earthengine_api-1.7.10rc1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-earthengine_api-1.7.10rc0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ee/__init__.py,sha256=VQd47xDwRNdo7ygHuIypAiPnEJUbNJrT6RgNP2O706A,16763
+earthengine_api-1.7.10rc1.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ee/__init__.py,sha256=2JgEeOTScwG1pgdzS3-Og7HUX4xmKFStihNq8jq_lRQ,16763
 ee/_arg_types.py,sha256=nrJrnPFnAS8fzMxAGmG3TbUOi_yFVrnSGW5IP8ATzDQ,2662
 ee/_cloud_api_utils.py,sha256=5WPzP5bcBIbjA7yYN-Cwmht_HU-XobbTrZvRiOEn0e0,32890
 ee/_helpers.py,sha256=afDDqoz1WESKE-lzqLtrCbvoQ1yVpfvJIgFcmUjO4L8,4821
@@ -15,7 +15,7 @@ ee/collection.py,sha256=c8OFIX9OVLxTbu8HGYiHOS3Yg6QjnxaO_FAhDhDQpic,32588
 ee/computedobject.py,sha256=Cdlccd4vw2neeRQlo5Jn3Q5R-VpQcQufNuxOHfpd1FU,9186
 ee/confusionmatrix.py,sha256=e6vz-FcT6acWxk5pDEK0vLIN1pUjYMh5Gyn1QSGJT3I,4233
 ee/customfunction.py,sha256=Me_iHDnjkYR33JMttGA7pKJlPCjUk8rO_kgaIhDm27M,7408
-ee/data.py,sha256=GdskXveIWk4hFMqd0T0P6qoOUEEP8MO1XE4LX2hc8lU,85503
+ee/data.py,sha256=n-kkVRxxk3U8KIaUIYNewRUlcCO46V-4K5fjOsfNR40,85503
 ee/daterange.py,sha256=nrRYkR2M2aVU0ZJyG7yiZStFt-W2TvYVuazoZK_WZqM,4948
 ee/deprecation.py,sha256=mAFdO7fBjOu9TJd8CJB_M_NsZ6VNSxtSe820QKJx8fE,6243
 ee/deserializer.py,sha256=TjhQjcBnFpz8Kodoj74eSbvkJ2zLjpTTfUpcNEoQR2o,8357
@@ -69,7 +69,7 @@ ee/tests/clusterer_test.py,sha256=B4m06wAtBeqvnIhRD2lnNy1UHDB_caleK_CqcrAU8dk,11
 ee/tests/collection_test.py,sha256=zsBerYrFr390awe-wD8uN9VME_qEsuaEN197hom4Xps,8815
 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=SBxHQqgZ4kEaWR13MWa-XPBuUr06keImvbp0t308wuY,57306
+ee/tests/data_test.py,sha256=nEwxk91MPS3fmSQKj45hARS2u7s6rOlIWlY0MP41tN4,58316
 ee/tests/daterange_test.py,sha256=7gEhFCWEa2KJW_ZaQMBavuJ0wLtUcVgsD8COF7NOd98,9389
 ee/tests/deprecation_test.py,sha256=CoVug7J9YdB2utZ-BikyJcjitYPQLz49JL_z89xuQSQ,8484
 ee/tests/deserializer_test.py,sha256=i_tlyzKgCo1-VpWPAQnTWNcr2klourcMcBbFZJN6Ivw,5050
@@ -103,8 +103,8 @@ ee/tests/reducer_test.py,sha256=vqXpgLZ7fPyfZ12srpREgMpfrKYLcFQod3Qn1Niv7VM,3197
 ee/tests/serializer_test.py,sha256=d6IEW_dt-G900IRfQnZftrwjpc1wJ-ouaQQwaLO0FxI,9834
 ee/tests/table_converter_test.py,sha256=t4yIfy40R3U17I_2nVtKm_Q2Tae-UifwZLz8qOmoC9A,5091
 ee/tests/terrain_test.py,sha256=inZ2sy807nDG_HMutzGHaqcTUaLnZQOMdWyf0NrQzV0,4561
-earthengine_api-1.7.10rc0.dist-info/METADATA,sha256=J-f7WEECoA-LUQ5C8ZtGvmrksKq9OwnzLwyqkelDnxo,2199
-earthengine_api-1.7.10rc0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-earthengine_api-1.7.10rc0.dist-info/entry_points.txt,sha256=-Ax4SCU-S474r8OD2LIxata6PRmkZoDrppQ4fP_exNc,50
-earthengine_api-1.7.10rc0.dist-info/top_level.txt,sha256=go5zOwCgm5lIS3yTR-Vsxp1gNI4qdS-MP5eY-7zMxVY,3
-earthengine_api-1.7.10rc0.dist-info/RECORD,,
+earthengine_api-1.7.10rc1.dist-info/METADATA,sha256=NS2_fYKjRZv2xCB19s3GCc-SkKsBRcLU0LlcE_souGQ,2199
+earthengine_api-1.7.10rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+earthengine_api-1.7.10rc1.dist-info/entry_points.txt,sha256=-Ax4SCU-S474r8OD2LIxata6PRmkZoDrppQ4fP_exNc,50
+earthengine_api-1.7.10rc1.dist-info/top_level.txt,sha256=go5zOwCgm5lIS3yTR-Vsxp1gNI4qdS-MP5eY-7zMxVY,3
+earthengine_api-1.7.10rc1.dist-info/RECORD,,

ee/__init__.py

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

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}'

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()