Modify error message when user relies on Earth Engine's OAuth project

PiperOrigin-RevId: 718036131

Author: Google Earth Engine Authors

python/ee/__init__.py

@@ -211,7 +211,16 @@ def Initialize(
     adc_err = 'authenticating by using local Application Default Credentials'
     api_err = 'Earth Engine API has not been used in project ([0-9]+) before'
     matches = re.search(api_err, str(e))
-    if (adc_err in str(e)) or (matches and oauth.is_sdk_project(matches[1])):
+    oauth_project = '517222506229'
+    oauth_project_err = (
+        'Caller does not have required permission to use project ' +
+        oauth_project
+    )
+    if (
+        (adc_err in str(e))
+        or (matches and oauth.is_sdk_project(matches[1]))
+        or (oauth_project_err in str(e))
+    ):
       raise EEException(NO_PROJECT_EXCEPTION) from None
     raise e
 

python/ee/tests/ee_test.py

@@ -83,6 +83,7 @@ def CheckDataInit(**kwargs):
       cred_args['quota_project_id'] = None
       expected_project = 'qp2'
       ee.Initialize()
+      self.assertEqual(4, inits.call_count)
 
       google_creds = google_creds.with_quota_project(None)
       with self.assertRaisesRegex(ee.EEException, '.*no project found..*'):
@@ -93,17 +94,29 @@ def CheckDataInit(**kwargs):
       with moc(ee.ApiFunction, 'initialize', side_effect=ee.EEException(msg)):
         with self.assertRaisesRegex(ee.EEException, '.*no project found..*'):
           ee.Initialize()
+      self.assertEqual(4, inits.call_count)
+
+      oauth_project = '517222506229'
+      expected_project = oauth_project
+      msg = (
+          'Caller does not have required permission to use project ' +
+          oauth_project
+      )
+      with moc(ee.ApiFunction, 'initialize', side_effect=ee.EEException(msg)):
+        with self.assertRaisesRegex(ee.EEException, '.*no project found..*'):
+          ee.Initialize(project=oauth_project)
+      self.assertEqual(5, inits.call_count)
 
       cred_args['client_id'] = '123456789-xxx'
       cred_args['refresh_token'] = 'rt'
       expected_project = '123456789'
       ee.Initialize()
-      self.assertEqual(5, inits.call_count)
+      self.assertEqual(6, inits.call_count)
 
       cred_args['client_id'] = '764086051850-xxx'  # dummy usable-auth client
       with self.assertRaisesRegex(ee.EEException, '.*no project found..*'):
         ee.Initialize()
-      self.assertEqual(5, inits.call_count)
+      self.assertEqual(6, inits.call_count)
 
   def testCallAndApply(self):
     """Verifies library initialization."""