From 99b111d12987d6a79c96294971747cb092bb381d Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Fri, 24 Sep 2021 15:12:39 +0000 Subject: [PATCH] chore: use gapic-generator-python 0.51.2 (#130) - [ ] Regenerate this pull request now. fix: add 'dict' annotation type to 'request' Committer: @busunkim96 PiperOrigin-RevId: 398509016 Source-Link: https://github.com/googleapis/googleapis/commit/b224dfa52642a733ea64849d4e06d15c274bc08f Source-Link: https://github.com/googleapis/googleapis-gen/commit/63a1db7a38d74b9639592f521ed1daaf7299ad9a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjNhMWRiN2EzOGQ3NGI5NjM5NTkyZjUyMWVkMWRhYWY3Mjk5YWQ5YSJ9 --- .../services/recommender/client.py | 40 +++++++++++-------- .../services/recommender/transports/base.py | 2 +- .../services/recommender/transports/grpc.py | 6 +-- .../recommender/transports/grpc_asyncio.py | 6 +-- .../services/recommender/client.py | 40 +++++++++++-------- .../services/recommender/transports/base.py | 2 +- .../services/recommender/transports/grpc.py | 6 +-- .../recommender/transports/grpc_asyncio.py | 6 +-- scripts/fixup_recommender_v1_keywords.py | 18 ++++----- scripts/fixup_recommender_v1beta1_keywords.py | 18 ++++----- 10 files changed, 78 insertions(+), 66 deletions(-) diff --git a/google/cloud/recommender_v1/services/recommender/client.py b/google/cloud/recommender_v1/services/recommender/client.py index d1f83a5..8b5d5bf 100644 --- a/google/cloud/recommender_v1/services/recommender/client.py +++ b/google/cloud/recommender_v1/services/recommender/client.py @@ -17,7 +17,7 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources from google.api_core import client_options as client_options_lib # type: ignore @@ -418,7 +418,7 @@ def __init__( def list_insights( self, - request: recommender_service.ListInsightsRequest = None, + request: Union[recommender_service.ListInsightsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -430,7 +430,7 @@ def list_insights( type. Args: - request (google.cloud.recommender_v1.types.ListInsightsRequest): + request (Union[google.cloud.recommender_v1.types.ListInsightsRequest, dict]): The request object. Request for the `ListInsights` method. parent (str): @@ -508,7 +508,7 @@ def list_insights( def get_insight( self, - request: recommender_service.GetInsightRequest = None, + request: Union[recommender_service.GetInsightRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -519,7 +519,7 @@ def get_insight( permission for the specified insight type. Args: - request (google.cloud.recommender_v1.types.GetInsightRequest): + request (Union[google.cloud.recommender_v1.types.GetInsightRequest, dict]): The request object. Request to the `GetInsight` method. name (str): Required. Name of the insight. @@ -579,7 +579,7 @@ def get_insight( def mark_insight_accepted( self, - request: recommender_service.MarkInsightAcceptedRequest = None, + request: Union[recommender_service.MarkInsightAcceptedRequest, dict] = None, *, name: str = None, state_metadata: Sequence[ @@ -600,7 +600,7 @@ def mark_insight_accepted( specified insight. Args: - request (google.cloud.recommender_v1.types.MarkInsightAcceptedRequest): + request (Union[google.cloud.recommender_v1.types.MarkInsightAcceptedRequest, dict]): The request object. Request for the `MarkInsightAccepted` method. name (str): @@ -679,7 +679,7 @@ def mark_insight_accepted( def list_recommendations( self, - request: recommender_service.ListRecommendationsRequest = None, + request: Union[recommender_service.ListRecommendationsRequest, dict] = None, *, parent: str = None, filter: str = None, @@ -691,7 +691,7 @@ def list_recommendations( recommender.*.list IAM permission for the specified recommender. Args: - request (google.cloud.recommender_v1.types.ListRecommendationsRequest): + request (Union[google.cloud.recommender_v1.types.ListRecommendationsRequest, dict]): The request object. Request for the `ListRecommendations` method. parent (str): @@ -780,7 +780,7 @@ def list_recommendations( def get_recommendation( self, - request: recommender_service.GetRecommendationRequest = None, + request: Union[recommender_service.GetRecommendationRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -791,7 +791,7 @@ def get_recommendation( recommender.*.get IAM permission for the specified recommender. Args: - request (google.cloud.recommender_v1.types.GetRecommendationRequest): + request (Union[google.cloud.recommender_v1.types.GetRecommendationRequest, dict]): The request object. Request to the `GetRecommendation` method. name (str): @@ -852,7 +852,9 @@ def get_recommendation( def mark_recommendation_claimed( self, - request: recommender_service.MarkRecommendationClaimedRequest = None, + request: Union[ + recommender_service.MarkRecommendationClaimedRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ @@ -876,7 +878,7 @@ def mark_recommendation_claimed( specified recommender. Args: - request (google.cloud.recommender_v1.types.MarkRecommendationClaimedRequest): + request (Union[google.cloud.recommender_v1.types.MarkRecommendationClaimedRequest, dict]): The request object. Request for the `MarkRecommendationClaimed` Method. name (str): @@ -962,7 +964,9 @@ def mark_recommendation_claimed( def mark_recommendation_succeeded( self, - request: recommender_service.MarkRecommendationSucceededRequest = None, + request: Union[ + recommender_service.MarkRecommendationSucceededRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ @@ -986,7 +990,7 @@ def mark_recommendation_succeeded( specified recommender. Args: - request (google.cloud.recommender_v1.types.MarkRecommendationSucceededRequest): + request (Union[google.cloud.recommender_v1.types.MarkRecommendationSucceededRequest, dict]): The request object. Request for the `MarkRecommendationSucceeded` Method. name (str): @@ -1072,7 +1076,9 @@ def mark_recommendation_succeeded( def mark_recommendation_failed( self, - request: recommender_service.MarkRecommendationFailedRequest = None, + request: Union[ + recommender_service.MarkRecommendationFailedRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ @@ -1096,7 +1102,7 @@ def mark_recommendation_failed( specified recommender. Args: - request (google.cloud.recommender_v1.types.MarkRecommendationFailedRequest): + request (Union[google.cloud.recommender_v1.types.MarkRecommendationFailedRequest, dict]): The request object. Request for the `MarkRecommendationFailed` Method. name (str): diff --git a/google/cloud/recommender_v1/services/recommender/transports/base.py b/google/cloud/recommender_v1/services/recommender/transports/base.py index 6f8d458..1c302cf 100644 --- a/google/cloud/recommender_v1/services/recommender/transports/base.py +++ b/google/cloud/recommender_v1/services/recommender/transports/base.py @@ -119,7 +119,7 @@ def __init__( **scopes_kwargs, quota_project_id=quota_project_id ) - # If the credentials is service account credentials, then always try to use self signed JWT. + # If the credentials are service account credentials, then always try to use self signed JWT. if ( always_use_jwt_access and isinstance(credentials, service_account.Credentials) diff --git a/google/cloud/recommender_v1/services/recommender/transports/grpc.py b/google/cloud/recommender_v1/services/recommender/transports/grpc.py index 78dc19c..88bcb32 100644 --- a/google/cloud/recommender_v1/services/recommender/transports/grpc.py +++ b/google/cloud/recommender_v1/services/recommender/transports/grpc.py @@ -86,16 +86,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/google/cloud/recommender_v1/services/recommender/transports/grpc_asyncio.py b/google/cloud/recommender_v1/services/recommender/transports/grpc_asyncio.py index 4931b2b..7e74bcc 100644 --- a/google/cloud/recommender_v1/services/recommender/transports/grpc_asyncio.py +++ b/google/cloud/recommender_v1/services/recommender/transports/grpc_asyncio.py @@ -133,16 +133,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/google/cloud/recommender_v1beta1/services/recommender/client.py b/google/cloud/recommender_v1beta1/services/recommender/client.py index fe469ad..40f9799 100644 --- a/google/cloud/recommender_v1beta1/services/recommender/client.py +++ b/google/cloud/recommender_v1beta1/services/recommender/client.py @@ -17,7 +17,7 @@ from distutils import util import os import re -from typing import Callable, Dict, Optional, Sequence, Tuple, Type, Union +from typing import Dict, Optional, Sequence, Tuple, Type, Union import pkg_resources from google.api_core import client_options as client_options_lib # type: ignore @@ -418,7 +418,7 @@ def __init__( def list_insights( self, - request: recommender_service.ListInsightsRequest = None, + request: Union[recommender_service.ListInsightsRequest, dict] = None, *, parent: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -430,7 +430,7 @@ def list_insights( type. Args: - request (google.cloud.recommender_v1beta1.types.ListInsightsRequest): + request (Union[google.cloud.recommender_v1beta1.types.ListInsightsRequest, dict]): The request object. Request for the `ListInsights` method. parent (str): @@ -508,7 +508,7 @@ def list_insights( def get_insight( self, - request: recommender_service.GetInsightRequest = None, + request: Union[recommender_service.GetInsightRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -519,7 +519,7 @@ def get_insight( permission for the specified insight type. Args: - request (google.cloud.recommender_v1beta1.types.GetInsightRequest): + request (Union[google.cloud.recommender_v1beta1.types.GetInsightRequest, dict]): The request object. Request to the `GetInsight` method. name (str): Required. Name of the insight. @@ -579,7 +579,7 @@ def get_insight( def mark_insight_accepted( self, - request: recommender_service.MarkInsightAcceptedRequest = None, + request: Union[recommender_service.MarkInsightAcceptedRequest, dict] = None, *, name: str = None, state_metadata: Sequence[ @@ -600,7 +600,7 @@ def mark_insight_accepted( specified insight. Args: - request (google.cloud.recommender_v1beta1.types.MarkInsightAcceptedRequest): + request (Union[google.cloud.recommender_v1beta1.types.MarkInsightAcceptedRequest, dict]): The request object. Request for the `MarkInsightAccepted` method. name (str): @@ -679,7 +679,7 @@ def mark_insight_accepted( def list_recommendations( self, - request: recommender_service.ListRecommendationsRequest = None, + request: Union[recommender_service.ListRecommendationsRequest, dict] = None, *, parent: str = None, filter: str = None, @@ -691,7 +691,7 @@ def list_recommendations( recommender.*.list IAM permission for the specified recommender. Args: - request (google.cloud.recommender_v1beta1.types.ListRecommendationsRequest): + request (Union[google.cloud.recommender_v1beta1.types.ListRecommendationsRequest, dict]): The request object. Request for the `ListRecommendations` method. parent (str): @@ -780,7 +780,7 @@ def list_recommendations( def get_recommendation( self, - request: recommender_service.GetRecommendationRequest = None, + request: Union[recommender_service.GetRecommendationRequest, dict] = None, *, name: str = None, retry: retries.Retry = gapic_v1.method.DEFAULT, @@ -791,7 +791,7 @@ def get_recommendation( recommender.*.get IAM permission for the specified recommender. Args: - request (google.cloud.recommender_v1beta1.types.GetRecommendationRequest): + request (Union[google.cloud.recommender_v1beta1.types.GetRecommendationRequest, dict]): The request object. Request to the `GetRecommendation` method. name (str): @@ -852,7 +852,9 @@ def get_recommendation( def mark_recommendation_claimed( self, - request: recommender_service.MarkRecommendationClaimedRequest = None, + request: Union[ + recommender_service.MarkRecommendationClaimedRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ @@ -876,7 +878,7 @@ def mark_recommendation_claimed( specified recommender. Args: - request (google.cloud.recommender_v1beta1.types.MarkRecommendationClaimedRequest): + request (Union[google.cloud.recommender_v1beta1.types.MarkRecommendationClaimedRequest, dict]): The request object. Request for the `MarkRecommendationClaimed` Method. name (str): @@ -962,7 +964,9 @@ def mark_recommendation_claimed( def mark_recommendation_succeeded( self, - request: recommender_service.MarkRecommendationSucceededRequest = None, + request: Union[ + recommender_service.MarkRecommendationSucceededRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ @@ -986,7 +990,7 @@ def mark_recommendation_succeeded( specified recommender. Args: - request (google.cloud.recommender_v1beta1.types.MarkRecommendationSucceededRequest): + request (Union[google.cloud.recommender_v1beta1.types.MarkRecommendationSucceededRequest, dict]): The request object. Request for the `MarkRecommendationSucceeded` Method. name (str): @@ -1072,7 +1076,9 @@ def mark_recommendation_succeeded( def mark_recommendation_failed( self, - request: recommender_service.MarkRecommendationFailedRequest = None, + request: Union[ + recommender_service.MarkRecommendationFailedRequest, dict + ] = None, *, name: str = None, state_metadata: Sequence[ @@ -1096,7 +1102,7 @@ def mark_recommendation_failed( specified recommender. Args: - request (google.cloud.recommender_v1beta1.types.MarkRecommendationFailedRequest): + request (Union[google.cloud.recommender_v1beta1.types.MarkRecommendationFailedRequest, dict]): The request object. Request for the `MarkRecommendationFailed` Method. name (str): diff --git a/google/cloud/recommender_v1beta1/services/recommender/transports/base.py b/google/cloud/recommender_v1beta1/services/recommender/transports/base.py index 55137c2..ba05958 100644 --- a/google/cloud/recommender_v1beta1/services/recommender/transports/base.py +++ b/google/cloud/recommender_v1beta1/services/recommender/transports/base.py @@ -119,7 +119,7 @@ def __init__( **scopes_kwargs, quota_project_id=quota_project_id ) - # If the credentials is service account credentials, then always try to use self signed JWT. + # If the credentials are service account credentials, then always try to use self signed JWT. if ( always_use_jwt_access and isinstance(credentials, service_account.Credentials) diff --git a/google/cloud/recommender_v1beta1/services/recommender/transports/grpc.py b/google/cloud/recommender_v1beta1/services/recommender/transports/grpc.py index 5b5f655..affa28d 100644 --- a/google/cloud/recommender_v1beta1/services/recommender/transports/grpc.py +++ b/google/cloud/recommender_v1beta1/services/recommender/transports/grpc.py @@ -86,16 +86,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/google/cloud/recommender_v1beta1/services/recommender/transports/grpc_asyncio.py b/google/cloud/recommender_v1beta1/services/recommender/transports/grpc_asyncio.py index e090ee6..abbeac6 100644 --- a/google/cloud/recommender_v1beta1/services/recommender/transports/grpc_asyncio.py +++ b/google/cloud/recommender_v1beta1/services/recommender/transports/grpc_asyncio.py @@ -133,16 +133,16 @@ def __init__( api_mtls_endpoint (Optional[str]): Deprecated. The mutual TLS endpoint. If provided, it overrides the ``host`` argument and tries to create a mutual TLS channel with client SSL credentials from - ``client_cert_source`` or applicatin default SSL credentials. + ``client_cert_source`` or application default SSL credentials. client_cert_source (Optional[Callable[[], Tuple[bytes, bytes]]]): Deprecated. A callback to provide client SSL certificate bytes and private key bytes, both in PEM format. It is ignored if ``api_mtls_endpoint`` is None. ssl_channel_credentials (grpc.ChannelCredentials): SSL credentials - for grpc channel. It is ignored if ``channel`` is provided. + for the grpc channel. It is ignored if ``channel`` is provided. client_cert_source_for_mtls (Optional[Callable[[], Tuple[bytes, bytes]]]): A callback to provide client certificate bytes and private key bytes, - both in PEM format. It is used to configure mutual TLS channel. It is + both in PEM format. It is used to configure a mutual TLS channel. It is ignored if ``channel`` or ``ssl_channel_credentials`` is provided. quota_project_id (Optional[str]): An optional project to use for billing and quota. diff --git a/scripts/fixup_recommender_v1_keywords.py b/scripts/fixup_recommender_v1_keywords.py index c0fe445..ebca0e7 100644 --- a/scripts/fixup_recommender_v1_keywords.py +++ b/scripts/fixup_recommender_v1_keywords.py @@ -39,14 +39,14 @@ def partition( class recommenderCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'get_insight': ('name', ), - 'get_recommendation': ('name', ), - 'list_insights': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_recommendations': ('parent', 'page_size', 'page_token', 'filter', ), - 'mark_insight_accepted': ('name', 'etag', 'state_metadata', ), - 'mark_recommendation_claimed': ('name', 'etag', 'state_metadata', ), - 'mark_recommendation_failed': ('name', 'etag', 'state_metadata', ), - 'mark_recommendation_succeeded': ('name', 'etag', 'state_metadata', ), + 'get_insight': ('name', ), + 'get_recommendation': ('name', ), + 'list_insights': ('parent', 'page_size', 'page_token', 'filter', ), + 'list_recommendations': ('parent', 'page_size', 'page_token', 'filter', ), + 'mark_insight_accepted': ('name', 'etag', 'state_metadata', ), + 'mark_recommendation_claimed': ('name', 'etag', 'state_metadata', ), + 'mark_recommendation_failed': ('name', 'etag', 'state_metadata', ), + 'mark_recommendation_succeeded': ('name', 'etag', 'state_metadata', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -65,7 +65,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs ) diff --git a/scripts/fixup_recommender_v1beta1_keywords.py b/scripts/fixup_recommender_v1beta1_keywords.py index c0fe445..ebca0e7 100644 --- a/scripts/fixup_recommender_v1beta1_keywords.py +++ b/scripts/fixup_recommender_v1beta1_keywords.py @@ -39,14 +39,14 @@ def partition( class recommenderCallTransformer(cst.CSTTransformer): CTRL_PARAMS: Tuple[str] = ('retry', 'timeout', 'metadata') METHOD_TO_PARAMS: Dict[str, Tuple[str]] = { - 'get_insight': ('name', ), - 'get_recommendation': ('name', ), - 'list_insights': ('parent', 'page_size', 'page_token', 'filter', ), - 'list_recommendations': ('parent', 'page_size', 'page_token', 'filter', ), - 'mark_insight_accepted': ('name', 'etag', 'state_metadata', ), - 'mark_recommendation_claimed': ('name', 'etag', 'state_metadata', ), - 'mark_recommendation_failed': ('name', 'etag', 'state_metadata', ), - 'mark_recommendation_succeeded': ('name', 'etag', 'state_metadata', ), + 'get_insight': ('name', ), + 'get_recommendation': ('name', ), + 'list_insights': ('parent', 'page_size', 'page_token', 'filter', ), + 'list_recommendations': ('parent', 'page_size', 'page_token', 'filter', ), + 'mark_insight_accepted': ('name', 'etag', 'state_metadata', ), + 'mark_recommendation_claimed': ('name', 'etag', 'state_metadata', ), + 'mark_recommendation_failed': ('name', 'etag', 'state_metadata', ), + 'mark_recommendation_succeeded': ('name', 'etag', 'state_metadata', ), } def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: @@ -65,7 +65,7 @@ def leave_Call(self, original: cst.Call, updated: cst.Call) -> cst.CSTNode: return updated kwargs, ctrl_kwargs = partition( - lambda a: not a.keyword.value in self.CTRL_PARAMS, + lambda a: a.keyword.value not in self.CTRL_PARAMS, kwargs )