Skip to content

Commit b176d13

Browse files
gcf-owl-bot[bot]copybara-github
gcf-owl-bot[bot]
authored and
copybara-github
committed
Copybara import of the project:
-- 1c88eba by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: chore: Update gapic-generator-python to v1.22.1 fix(deps): Require grpc-google-iam-v1>=0.14.0 PiperOrigin-RevId: 726142856 Source-Link: googleapis/googleapis@25989cb Source-Link: googleapis/googleapis-gen@677041b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjc3MDQxYjkxY2VmMTU5OGNjNTU3MjdkNTlhMjgwNGIxOThhNWJiZiJ9 feat: A new field `response_id` is added to message `.google.cloud.aiplatform.v1.GenerateContentResponse` feat: A new field `create_time` is added to message `.google.cloud.aiplatform.v1.GenerateContentResponse` PiperOrigin-RevId: 725444773 Source-Link: googleapis/googleapis@de1e1c0 Source-Link: googleapis/googleapis-gen@163253b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMTYzMjUzYmVkZmVkNTBiZDc2ODUxNWQ5Mjg3NDQxNzI4Y2M2MzIwZCJ9 feat: A new field `response_id` is added to message `.google.cloud.aiplatform.v1.GenerateContentResponse` feat: A new field `create_time` is added to message `.google.cloud.aiplatform.v1.GenerateContentResponse` PiperOrigin-RevId: 725110432 Source-Link: googleapis/googleapis@901fc8e Source-Link: googleapis/googleapis-gen@526751d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTI2NzUxZDIyYWFhZjA2M2U4NzIxNjNmYjlkODc1ZTU1ZDZlOTZiMSJ9 feat: A new field `unversioned_package_disabled` is added to message `.google.api.PythonSettings` docs: A comment for field `content` in message `.google.api.Page` is changed docs: A comment for message `RoutingRule` is changed PiperOrigin-RevId: 724453235 Source-Link: googleapis/googleapis@0a459af Source-Link: googleapis/googleapis-gen@9e261c2 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOWUyNjFjMmVjZmVkOWM5MDdkZWUxOWYxZjRjZGNmZDk4ODBjNWM1OCJ9 feat: add Notebooks Runtime Software Configuration docs: A comment for field `filter` in message `.google.cloud.aiplatform.v1beta1.ListNotebookRuntimeTemplatesRequest` is changed docs: A comment for field `filter` in message `.google.cloud.aiplatform.v1beta1.ListNotebookRuntimesRequest` is changed PiperOrigin-RevId: 724420184 Source-Link: googleapis/googleapis@a7ee03d Source-Link: googleapis/googleapis-gen@8777e3e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODc3N2UzZWNhZGVjMDljM2Y4NDZmNWMzNjU0ZmNhZmZkMGZiNzQ2YiJ9 feat: Add additional Probe options to v1 model.proto PiperOrigin-RevId: 724392463 Source-Link: googleapis/googleapis@9a61ded Source-Link: googleapis/googleapis-gen@b860f05 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYjg2MGYwNTlhOTZjOWUzMDk4YWVlNDVjMGM2ZGU4MzJhNGUyNDdlZCJ9 feat: Add RolloutOptions to DeployedModel in v1beta1 endpoint.proto, add additional Probe options in v1beta1 model.proto PiperOrigin-RevId: 724392348 Source-Link: googleapis/googleapis@b059f3d Source-Link: googleapis/googleapis-gen@d8569f9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZDg1NjlmOTNmNDg1MTFkNmNjMWNlYzliMTAyZjA5NmU2ZmQwNTMxMiJ9 feat: add Notebooks Runtime Software Configuration docs: A comment for field `filter` in message `.google.cloud.aiplatform.v1.ListNotebookRuntimeTemplatesRequest` is changed docs: A comment for field `filter` in message `.google.cloud.aiplatform.v1.ListNotebookRuntimesRequest` is changed PiperOrigin-RevId: 724378909 Source-Link: googleapis/googleapis@42b72b3 Source-Link: googleapis/googleapis-gen@73178ca Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzMxNzhjYWVmZDljYTVlYjA4MWQ1NmRhNDYwZGI5MGZkMTc1YWRiMyJ9 feat: Add REST Interceptors which support reading metadata feat: Add support for reading selective GAPIC generation methods from service YAML chore: Update gapic-generator-python to v1.22.0 PiperOrigin-RevId: 724026024 Source-Link: googleapis/googleapis@ad99638 Source-Link: googleapis/googleapis-gen@e291c4d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTI5MWM0ZGQxZDY3MGVkYTE5OTk4ZGU3NmY5NjdlMTYwM2E0ODk5MyJ9 feat: EvaluateDataset API v1beta1 initial release PiperOrigin-RevId: 723645466 Source-Link: googleapis/googleapis@093d2bf Source-Link: googleapis/googleapis-gen@8b92bcb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGI5MmJjYjg3MzA5MzdmM2VlMDM2ZjdiOWJmM2Q4MGM0MDUzZTQ0MCJ9 feat: Add REST Interceptors which support reading metadata feat: Add support for reading selective GAPIC generation methods from service YAML chore: Update gapic-generator-python to v1.22.0 PiperOrigin-RevId: 724026024 Source-Link: googleapis/googleapis@ad99638 Source-Link: googleapis/googleapis-gen@e291c4d Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiZTI5MWM0ZGQxZDY3MGVkYTE5OTk4ZGU3NmY5NjdlMTYwM2E0ODk5MyJ9 feat: EvaluateDataset API v1beta1 initial release PiperOrigin-RevId: 723645466 Source-Link: googleapis/googleapis@093d2bf Source-Link: googleapis/googleapis-gen@8b92bcb Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiOGI5MmJjYjg3MzA5MzdmM2VlMDM2ZjdiOWJmM2Q4MGM0MDUzZTQ0MCJ9 -- 7367278 by Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>: 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md COPYBARA_INTEGRATE_REVIEW=#4950 from googleapis:owl-bot-copy 7367278 PiperOrigin-RevId: 728303086
1 parent bfb8b34 commit b176d13

File tree

320 files changed

+74814
-8358
lines changed

Some content is hidden

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

320 files changed

+74814
-8358
lines changed

‎google/cloud/aiplatform_v1/__init__.py

+10
Original file line numberDiff line numberDiff line change
@@ -703,9 +703,12 @@
703703
from .types.model_service import ListModelEvaluationsResponse
704704
from .types.model_service import ListModelsRequest
705705
from .types.model_service import ListModelsResponse
706+
from .types.model_service import ListModelVersionCheckpointsRequest
707+
from .types.model_service import ListModelVersionCheckpointsResponse
706708
from .types.model_service import ListModelVersionsRequest
707709
from .types.model_service import ListModelVersionsResponse
708710
from .types.model_service import MergeVersionAliasesRequest
711+
from .types.model_service import ModelVersionCheckpoint
709712
from .types.model_service import UpdateExplanationDatasetOperationMetadata
710713
from .types.model_service import UpdateExplanationDatasetRequest
711714
from .types.model_service import UpdateExplanationDatasetResponse
@@ -755,6 +758,8 @@
755758
from .types.notebook_service import UpgradeNotebookRuntimeRequest
756759
from .types.notebook_service import UpgradeNotebookRuntimeResponse
757760
from .types.notebook_service import NotebookExecutionJobView
761+
from .types.notebook_software_config import NotebookSoftwareConfig
762+
from .types.notebook_software_config import PostStartupScriptConfig
758763
from .types.openapi import Schema
759764
from .types.openapi import Type
760765
from .types.operation import DeleteOperationMetadata
@@ -1534,6 +1539,8 @@
15341539
"ListModelEvaluationSlicesResponse",
15351540
"ListModelEvaluationsRequest",
15361541
"ListModelEvaluationsResponse",
1542+
"ListModelVersionCheckpointsRequest",
1543+
"ListModelVersionCheckpointsResponse",
15371544
"ListModelVersionsRequest",
15381545
"ListModelVersionsResponse",
15391546
"ListModelsRequest",
@@ -1620,6 +1627,7 @@
16201627
"ModelMonitoringStatsAnomalies",
16211628
"ModelServiceClient",
16221629
"ModelSourceInfo",
1630+
"ModelVersionCheckpoint",
16231631
"MutateDeployedIndexOperationMetadata",
16241632
"MutateDeployedIndexRequest",
16251633
"MutateDeployedIndexResponse",
@@ -1646,6 +1654,7 @@
16461654
"NotebookRuntimeTemplateRef",
16471655
"NotebookRuntimeType",
16481656
"NotebookServiceClient",
1657+
"NotebookSoftwareConfig",
16491658
"PSCAutomationConfig",
16501659
"PairwiseChoice",
16511660
"PairwiseMetricInput",
@@ -1679,6 +1688,7 @@
16791688
"PointwiseMetricResult",
16801689
"PointwiseMetricSpec",
16811690
"Port",
1691+
"PostStartupScriptConfig",
16821692
"PredefinedSplit",
16831693
"PredictRequest",
16841694
"PredictRequestResponseLoggingConfig",

‎google/cloud/aiplatform_v1/gapic_metadata.json

+15
Original file line numberDiff line numberDiff line change
@@ -3191,6 +3191,11 @@
31913191
"list_model_evaluations"
31923192
]
31933193
},
3194+
"ListModelVersionCheckpoints": {
3195+
"methods": [
3196+
"list_model_version_checkpoints"
3197+
]
3198+
},
31943199
"ListModelVersions": {
31953200
"methods": [
31963201
"list_model_versions"
@@ -3286,6 +3291,11 @@
32863291
"list_model_evaluations"
32873292
]
32883293
},
3294+
"ListModelVersionCheckpoints": {
3295+
"methods": [
3296+
"list_model_version_checkpoints"
3297+
]
3298+
},
32893299
"ListModelVersions": {
32903300
"methods": [
32913301
"list_model_versions"
@@ -3381,6 +3391,11 @@
33813391
"list_model_evaluations"
33823392
]
33833393
},
3394+
"ListModelVersionCheckpoints": {
3395+
"methods": [
3396+
"list_model_version_checkpoints"
3397+
]
3398+
},
33843399
"ListModelVersions": {
33853400
"methods": [
33863401
"list_model_versions"

‎google/cloud/aiplatform_v1/services/dataset_service/client.py

+133-72
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
# limitations under the License.
1515
#
1616
from collections import OrderedDict
17+
from http import HTTPStatus
18+
import json
1719
import logging as std_logging
1820
import os
1921
import re
@@ -641,6 +643,33 @@ def _validate_universe_domain(self):
641643
# NOTE (b/349488459): universe validation is disabled until further notice.
642644
return True
643645

646+
def _add_cred_info_for_auth_errors(
647+
self, error: core_exceptions.GoogleAPICallError
648+
) -> None:
649+
"""Adds credential info string to error details for 401/403/404 errors.
650+
651+
Args:
652+
error (google.api_core.exceptions.GoogleAPICallError): The error to add the cred info.
653+
"""
654+
if error.code not in [
655+
HTTPStatus.UNAUTHORIZED,
656+
HTTPStatus.FORBIDDEN,
657+
HTTPStatus.NOT_FOUND,
658+
]:
659+
return
660+
661+
cred = self._transport._credentials
662+
663+
# get_cred_info is only available in google-auth>=2.35.0
664+
if not hasattr(cred, "get_cred_info"):
665+
return
666+
667+
# ignore the type check since pypy test fails when get_cred_info
668+
# is not available
669+
cred_info = cred.get_cred_info() # type: ignore
670+
if cred_info and hasattr(error._details, "append"):
671+
error._details.append(json.dumps(cred_info))
672+
644673
@property
645674
def api_endpoint(self):
646675
"""Return the API endpoint used by the client instance.
@@ -3248,16 +3277,20 @@ def list_operations(
32483277
# Validate the universe domain.
32493278
self._validate_universe_domain()
32503279

3251-
# Send the request.
3252-
response = rpc(
3253-
request,
3254-
retry=retry,
3255-
timeout=timeout,
3256-
metadata=metadata,
3257-
)
3280+
try:
3281+
# Send the request.
3282+
response = rpc(
3283+
request,
3284+
retry=retry,
3285+
timeout=timeout,
3286+
metadata=metadata,
3287+
)
32583288

3259-
# Done; return the response.
3260-
return response
3289+
# Done; return the response.
3290+
return response
3291+
except core_exceptions.GoogleAPICallError as e:
3292+
self._add_cred_info_for_auth_errors(e)
3293+
raise e
32613294

32623295
def get_operation(
32633296
self,
@@ -3303,16 +3336,20 @@ def get_operation(
33033336
# Validate the universe domain.
33043337
self._validate_universe_domain()
33053338

3306-
# Send the request.
3307-
response = rpc(
3308-
request,
3309-
retry=retry,
3310-
timeout=timeout,
3311-
metadata=metadata,
3312-
)
3339+
try:
3340+
# Send the request.
3341+
response = rpc(
3342+
request,
3343+
retry=retry,
3344+
timeout=timeout,
3345+
metadata=metadata,
3346+
)
33133347

3314-
# Done; return the response.
3315-
return response
3348+
# Done; return the response.
3349+
return response
3350+
except core_exceptions.GoogleAPICallError as e:
3351+
self._add_cred_info_for_auth_errors(e)
3352+
raise e
33163353

33173354
def delete_operation(
33183355
self,
@@ -3475,16 +3512,20 @@ def wait_operation(
34753512
# Validate the universe domain.
34763513
self._validate_universe_domain()
34773514

3478-
# Send the request.
3479-
response = rpc(
3480-
request,
3481-
retry=retry,
3482-
timeout=timeout,
3483-
metadata=metadata,
3484-
)
3515+
try:
3516+
# Send the request.
3517+
response = rpc(
3518+
request,
3519+
retry=retry,
3520+
timeout=timeout,
3521+
metadata=metadata,
3522+
)
34853523

3486-
# Done; return the response.
3487-
return response
3524+
# Done; return the response.
3525+
return response
3526+
except core_exceptions.GoogleAPICallError as e:
3527+
self._add_cred_info_for_auth_errors(e)
3528+
raise e
34883529

34893530
def set_iam_policy(
34903531
self,
@@ -3596,16 +3637,20 @@ def set_iam_policy(
35963637
# Validate the universe domain.
35973638
self._validate_universe_domain()
35983639

3599-
# Send the request.
3600-
response = rpc(
3601-
request,
3602-
retry=retry,
3603-
timeout=timeout,
3604-
metadata=metadata,
3605-
)
3640+
try:
3641+
# Send the request.
3642+
response = rpc(
3643+
request,
3644+
retry=retry,
3645+
timeout=timeout,
3646+
metadata=metadata,
3647+
)
36063648

3607-
# Done; return the response.
3608-
return response
3649+
# Done; return the response.
3650+
return response
3651+
except core_exceptions.GoogleAPICallError as e:
3652+
self._add_cred_info_for_auth_errors(e)
3653+
raise e
36093654

36103655
def get_iam_policy(
36113656
self,
@@ -3718,16 +3763,20 @@ def get_iam_policy(
37183763
# Validate the universe domain.
37193764
self._validate_universe_domain()
37203765

3721-
# Send the request.
3722-
response = rpc(
3723-
request,
3724-
retry=retry,
3725-
timeout=timeout,
3726-
metadata=metadata,
3727-
)
3766+
try:
3767+
# Send the request.
3768+
response = rpc(
3769+
request,
3770+
retry=retry,
3771+
timeout=timeout,
3772+
metadata=metadata,
3773+
)
37283774

3729-
# Done; return the response.
3730-
return response
3775+
# Done; return the response.
3776+
return response
3777+
except core_exceptions.GoogleAPICallError as e:
3778+
self._add_cred_info_for_auth_errors(e)
3779+
raise e
37313780

37323781
def test_iam_permissions(
37333782
self,
@@ -3778,16 +3827,20 @@ def test_iam_permissions(
37783827
# Validate the universe domain.
37793828
self._validate_universe_domain()
37803829

3781-
# Send the request.
3782-
response = rpc(
3783-
request,
3784-
retry=retry,
3785-
timeout=timeout,
3786-
metadata=metadata,
3787-
)
3830+
try:
3831+
# Send the request.
3832+
response = rpc(
3833+
request,
3834+
retry=retry,
3835+
timeout=timeout,
3836+
metadata=metadata,
3837+
)
37883838

3789-
# Done; return the response.
3790-
return response
3839+
# Done; return the response.
3840+
return response
3841+
except core_exceptions.GoogleAPICallError as e:
3842+
self._add_cred_info_for_auth_errors(e)
3843+
raise e
37913844

37923845
def get_location(
37933846
self,
@@ -3833,16 +3886,20 @@ def get_location(
38333886
# Validate the universe domain.
38343887
self._validate_universe_domain()
38353888

3836-
# Send the request.
3837-
response = rpc(
3838-
request,
3839-
retry=retry,
3840-
timeout=timeout,
3841-
metadata=metadata,
3842-
)
3889+
try:
3890+
# Send the request.
3891+
response = rpc(
3892+
request,
3893+
retry=retry,
3894+
timeout=timeout,
3895+
metadata=metadata,
3896+
)
38433897

3844-
# Done; return the response.
3845-
return response
3898+
# Done; return the response.
3899+
return response
3900+
except core_exceptions.GoogleAPICallError as e:
3901+
self._add_cred_info_for_auth_errors(e)
3902+
raise e
38463903

38473904
def list_locations(
38483905
self,
@@ -3888,16 +3945,20 @@ def list_locations(
38883945
# Validate the universe domain.
38893946
self._validate_universe_domain()
38903947

3891-
# Send the request.
3892-
response = rpc(
3893-
request,
3894-
retry=retry,
3895-
timeout=timeout,
3896-
metadata=metadata,
3897-
)
3948+
try:
3949+
# Send the request.
3950+
response = rpc(
3951+
request,
3952+
retry=retry,
3953+
timeout=timeout,
3954+
metadata=metadata,
3955+
)
38983956

3899-
# Done; return the response.
3900-
return response
3957+
# Done; return the response.
3958+
return response
3959+
except core_exceptions.GoogleAPICallError as e:
3960+
self._add_cred_info_for_auth_errors(e)
3961+
raise e
39013962

39023963

39033964
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(

0 commit comments

Comments
 (0)