Skip to content

Commit 780c5f1

Browse files
gcf-owl-bot[bot]ohmayrparthea
authored
fix: [Many APIs] Resolve AttributeError 'Credentials' object has no attribute 'universe_domain' (#12260)
- [ ] Regenerate this pull request now. BEGIN_COMMIT_OVERRIDE fix: Resolve AttributeError 'Credentials' object has no attribute 'universe_domain' fix: Add google-auth as a direct dependency fix: Add staticmethod decorator to _get_client_cert_source and _get_api_endpoint END_COMMIT_OVERRIDE chore: Update gapic-generator-python to v1.14.1 PiperOrigin-RevId: 603728206 Source-Link: googleapis/googleapis@9063da8 Source-Link: googleapis/googleapis-gen@891c67d Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFpLWdlbmVyYXRpdmVsYW5ndWFnZS8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1hZG1pbi8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFuYWx5dGljcy1kYXRhLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcHMtbWVldC8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFwcHMtc2NyaXB0LXR5cGUvLk93bEJvdC55YW1sIiwiaCI6Ijg5MWM2N2QwYTg1NWIwODA4NWViMzAxZGFiYjE0MDY0ZWY0YjJjNmQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWFyZWExMjAtdGFibGVzLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFjY2Vzcy1hcHByb3ZhbC8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFkdmlzb3J5bm90aWZpY2F0aW9ucy8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFsbG95ZGItY29ubmVjdG9ycy8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFsbG95ZGIvLk93bEJvdC55YW1sIiwiaCI6Ijg5MWM2N2QwYTg1NWIwODA4NWViMzAxZGFiYjE0MDY0ZWY0YjJjNmQifQ== Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaS1nYXRld2F5Ly5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaS1rZXlzLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdlZS1jb25uZWN0Ly5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwaWdlZS1yZWdpc3RyeS8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwcGVuZ2luZS1hZG1pbi8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFwcGVuZ2luZS1sb2dnaW5nLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFydGlmYWN0LXJlZ2lzdHJ5Ly5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFzc2V0Ly5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWFzc3VyZWQtd29ya2xvYWRzLy5Pd2xCb3QueWFtbCIsImgiOiI4OTFjNjdkMGE4NTViMDgwODVlYjMwMWRhYmIxNDA2NGVmNGIyYzZkIn0= Copy-Tag: eyJwIjoicGFja2FnZXMvZ29vZ2xlLWNsb3VkLWF1dG9tbC8uT3dsQm90LnlhbWwiLCJoIjoiODkxYzY3ZDBhODU1YjA4MDg1ZWIzMDFkYWJiMTQwNjRlZjRiMmM2ZCJ9 --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: ohmayr <omairnaveed@ymail.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent f3db074 commit 780c5f1

File tree

242 files changed

+18041
-18399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

242 files changed

+18041
-18399
lines changed

‎packages/google-ai-generativelanguage/google/ai/generativelanguage/gapic_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.5.1" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/gapic_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.5.1" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/generative_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ def _read_environment_variables():
381381
)
382382
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
383383

384+
@staticmethod
384385
def _get_client_cert_source(provided_cert_source, use_cert_flag):
385386
"""Return the client cert source to be used by the client.
386387
@@ -399,6 +400,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
399400
client_cert_source = mtls.default_client_cert_source()
400401
return client_cert_source
401402

403+
@staticmethod
402404
def _get_api_endpoint(
403405
api_override, client_cert_source, universe_domain, use_mtls_endpoint
404406
):
@@ -473,17 +475,18 @@ def _compare_universes(
473475
Raises:
474476
ValueError: when client_universe does not match the universe in credentials.
475477
"""
476-
if credentials:
477-
credentials_universe = credentials.universe_domain
478-
if client_universe != credentials_universe:
479-
default_universe = GenerativeServiceClient._DEFAULT_UNIVERSE
480-
raise ValueError(
481-
"The configured universe domain "
482-
f"({client_universe}) does not match the universe domain "
483-
f"found in the credentials ({credentials_universe}). "
484-
"If you haven't configured the universe domain explicitly, "
485-
f"`{default_universe}` is the default."
486-
)
478+
479+
default_universe = GenerativeServiceClient._DEFAULT_UNIVERSE
480+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
481+
482+
if client_universe != credentials_universe:
483+
raise ValueError(
484+
"The configured universe domain "
485+
f"({client_universe}) does not match the universe domain "
486+
f"found in the credentials ({credentials_universe}). "
487+
"If you haven't configured the universe domain explicitly, "
488+
f"`{default_universe}` is the default."
489+
)
487490
return True
488491

489492
def _validate_universe_domain(self):

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1/services/model_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -377,6 +377,7 @@ def _read_environment_variables():
377377
)
378378
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
379379

380+
@staticmethod
380381
def _get_client_cert_source(provided_cert_source, use_cert_flag):
381382
"""Return the client cert source to be used by the client.
382383
@@ -395,6 +396,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
395396
client_cert_source = mtls.default_client_cert_source()
396397
return client_cert_source
397398

399+
@staticmethod
398400
def _get_api_endpoint(
399401
api_override, client_cert_source, universe_domain, use_mtls_endpoint
400402
):
@@ -469,17 +471,18 @@ def _compare_universes(
469471
Raises:
470472
ValueError: when client_universe does not match the universe in credentials.
471473
"""
472-
if credentials:
473-
credentials_universe = credentials.universe_domain
474-
if client_universe != credentials_universe:
475-
default_universe = ModelServiceClient._DEFAULT_UNIVERSE
476-
raise ValueError(
477-
"The configured universe domain "
478-
f"({client_universe}) does not match the universe domain "
479-
f"found in the credentials ({credentials_universe}). "
480-
"If you haven't configured the universe domain explicitly, "
481-
f"`{default_universe}` is the default."
482-
)
474+
475+
default_universe = ModelServiceClient._DEFAULT_UNIVERSE
476+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
477+
478+
if client_universe != credentials_universe:
479+
raise ValueError(
480+
"The configured universe domain "
481+
f"({client_universe}) does not match the universe domain "
482+
f"found in the credentials ({credentials_universe}). "
483+
"If you haven't configured the universe domain explicitly, "
484+
f"`{default_universe}` is the default."
485+
)
483486
return True
484487

485488
def _validate_universe_domain(self):

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/gapic_version.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
__version__ = "0.5.1" # {x-release-please-version}
16+
__version__ = "0.0.0" # {x-release-please-version}

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/discuss_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -380,6 +380,7 @@ def _read_environment_variables():
380380
)
381381
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
382382

383+
@staticmethod
383384
def _get_client_cert_source(provided_cert_source, use_cert_flag):
384385
"""Return the client cert source to be used by the client.
385386
@@ -398,6 +399,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
398399
client_cert_source = mtls.default_client_cert_source()
399400
return client_cert_source
400401

402+
@staticmethod
401403
def _get_api_endpoint(
402404
api_override, client_cert_source, universe_domain, use_mtls_endpoint
403405
):
@@ -472,17 +474,18 @@ def _compare_universes(
472474
Raises:
473475
ValueError: when client_universe does not match the universe in credentials.
474476
"""
475-
if credentials:
476-
credentials_universe = credentials.universe_domain
477-
if client_universe != credentials_universe:
478-
default_universe = DiscussServiceClient._DEFAULT_UNIVERSE
479-
raise ValueError(
480-
"The configured universe domain "
481-
f"({client_universe}) does not match the universe domain "
482-
f"found in the credentials ({credentials_universe}). "
483-
"If you haven't configured the universe domain explicitly, "
484-
f"`{default_universe}` is the default."
485-
)
477+
478+
default_universe = DiscussServiceClient._DEFAULT_UNIVERSE
479+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
480+
481+
if client_universe != credentials_universe:
482+
raise ValueError(
483+
"The configured universe domain "
484+
f"({client_universe}) does not match the universe domain "
485+
f"found in the credentials ({credentials_universe}). "
486+
"If you haven't configured the universe domain explicitly, "
487+
f"`{default_universe}` is the default."
488+
)
486489
return True
487490

488491
def _validate_universe_domain(self):

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/generative_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -381,6 +381,7 @@ def _read_environment_variables():
381381
)
382382
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
383383

384+
@staticmethod
384385
def _get_client_cert_source(provided_cert_source, use_cert_flag):
385386
"""Return the client cert source to be used by the client.
386387
@@ -399,6 +400,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
399400
client_cert_source = mtls.default_client_cert_source()
400401
return client_cert_source
401402

403+
@staticmethod
402404
def _get_api_endpoint(
403405
api_override, client_cert_source, universe_domain, use_mtls_endpoint
404406
):
@@ -473,17 +475,18 @@ def _compare_universes(
473475
Raises:
474476
ValueError: when client_universe does not match the universe in credentials.
475477
"""
476-
if credentials:
477-
credentials_universe = credentials.universe_domain
478-
if client_universe != credentials_universe:
479-
default_universe = GenerativeServiceClient._DEFAULT_UNIVERSE
480-
raise ValueError(
481-
"The configured universe domain "
482-
f"({client_universe}) does not match the universe domain "
483-
f"found in the credentials ({credentials_universe}). "
484-
"If you haven't configured the universe domain explicitly, "
485-
f"`{default_universe}` is the default."
486-
)
478+
479+
default_universe = GenerativeServiceClient._DEFAULT_UNIVERSE
480+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
481+
482+
if client_universe != credentials_universe:
483+
raise ValueError(
484+
"The configured universe domain "
485+
f"({client_universe}) does not match the universe domain "
486+
f"found in the credentials ({credentials_universe}). "
487+
"If you haven't configured the universe domain explicitly, "
488+
f"`{default_universe}` is the default."
489+
)
487490
return True
488491

489492
def _validate_universe_domain(self):

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/model_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ def _read_environment_variables():
398398
)
399399
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
400400

401+
@staticmethod
401402
def _get_client_cert_source(provided_cert_source, use_cert_flag):
402403
"""Return the client cert source to be used by the client.
403404
@@ -416,6 +417,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
416417
client_cert_source = mtls.default_client_cert_source()
417418
return client_cert_source
418419

420+
@staticmethod
419421
def _get_api_endpoint(
420422
api_override, client_cert_source, universe_domain, use_mtls_endpoint
421423
):
@@ -490,17 +492,18 @@ def _compare_universes(
490492
Raises:
491493
ValueError: when client_universe does not match the universe in credentials.
492494
"""
493-
if credentials:
494-
credentials_universe = credentials.universe_domain
495-
if client_universe != credentials_universe:
496-
default_universe = ModelServiceClient._DEFAULT_UNIVERSE
497-
raise ValueError(
498-
"The configured universe domain "
499-
f"({client_universe}) does not match the universe domain "
500-
f"found in the credentials ({credentials_universe}). "
501-
"If you haven't configured the universe domain explicitly, "
502-
f"`{default_universe}` is the default."
503-
)
495+
496+
default_universe = ModelServiceClient._DEFAULT_UNIVERSE
497+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
498+
499+
if client_universe != credentials_universe:
500+
raise ValueError(
501+
"The configured universe domain "
502+
f"({client_universe}) does not match the universe domain "
503+
f"found in the credentials ({credentials_universe}). "
504+
"If you haven't configured the universe domain explicitly, "
505+
f"`{default_universe}` is the default."
506+
)
504507
return True
505508

506509
def _validate_universe_domain(self):

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/permission_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ def _read_environment_variables():
386386
)
387387
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
388388

389+
@staticmethod
389390
def _get_client_cert_source(provided_cert_source, use_cert_flag):
390391
"""Return the client cert source to be used by the client.
391392
@@ -404,6 +405,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
404405
client_cert_source = mtls.default_client_cert_source()
405406
return client_cert_source
406407

408+
@staticmethod
407409
def _get_api_endpoint(
408410
api_override, client_cert_source, universe_domain, use_mtls_endpoint
409411
):
@@ -478,17 +480,18 @@ def _compare_universes(
478480
Raises:
479481
ValueError: when client_universe does not match the universe in credentials.
480482
"""
481-
if credentials:
482-
credentials_universe = credentials.universe_domain
483-
if client_universe != credentials_universe:
484-
default_universe = PermissionServiceClient._DEFAULT_UNIVERSE
485-
raise ValueError(
486-
"The configured universe domain "
487-
f"({client_universe}) does not match the universe domain "
488-
f"found in the credentials ({credentials_universe}). "
489-
"If you haven't configured the universe domain explicitly, "
490-
f"`{default_universe}` is the default."
491-
)
483+
484+
default_universe = PermissionServiceClient._DEFAULT_UNIVERSE
485+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
486+
487+
if client_universe != credentials_universe:
488+
raise ValueError(
489+
"The configured universe domain "
490+
f"({client_universe}) does not match the universe domain "
491+
f"found in the credentials ({credentials_universe}). "
492+
"If you haven't configured the universe domain explicitly, "
493+
f"`{default_universe}` is the default."
494+
)
492495
return True
493496

494497
def _validate_universe_domain(self):

‎packages/google-ai-generativelanguage/google/ai/generativelanguage_v1beta/services/retriever_service/client.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ def _read_environment_variables():
420420
)
421421
return use_client_cert == "true", use_mtls_endpoint, universe_domain_env
422422

423+
@staticmethod
423424
def _get_client_cert_source(provided_cert_source, use_cert_flag):
424425
"""Return the client cert source to be used by the client.
425426
@@ -438,6 +439,7 @@ def _get_client_cert_source(provided_cert_source, use_cert_flag):
438439
client_cert_source = mtls.default_client_cert_source()
439440
return client_cert_source
440441

442+
@staticmethod
441443
def _get_api_endpoint(
442444
api_override, client_cert_source, universe_domain, use_mtls_endpoint
443445
):
@@ -512,17 +514,18 @@ def _compare_universes(
512514
Raises:
513515
ValueError: when client_universe does not match the universe in credentials.
514516
"""
515-
if credentials:
516-
credentials_universe = credentials.universe_domain
517-
if client_universe != credentials_universe:
518-
default_universe = RetrieverServiceClient._DEFAULT_UNIVERSE
519-
raise ValueError(
520-
"The configured universe domain "
521-
f"({client_universe}) does not match the universe domain "
522-
f"found in the credentials ({credentials_universe}). "
523-
"If you haven't configured the universe domain explicitly, "
524-
f"`{default_universe}` is the default."
525-
)
517+
518+
default_universe = RetrieverServiceClient._DEFAULT_UNIVERSE
519+
credentials_universe = getattr(credentials, "universe_domain", default_universe)
520+
521+
if client_universe != credentials_universe:
522+
raise ValueError(
523+
"The configured universe domain "
524+
f"({client_universe}) does not match the universe domain "
525+
f"found in the credentials ({credentials_universe}). "
526+
"If you haven't configured the universe domain explicitly, "
527+
f"`{default_universe}` is the default."
528+
)
526529
return True
527530

528531
def _validate_universe_domain(self):

0 commit comments

Comments
 (0)