chore: use gapic-generator-python 0.53.4 (#145)

- [ ] Regenerate this pull request now.

docs: list oneofs in docstring
fix(deps): require google-api-core >= 1.28.0
fix(deps): drop packaging dependency

committer: busunkim96@
PiperOrigin-RevId: 406468269

Source-Link: googleapis/googleapis@83d81b0

Source-Link: googleapis/googleapis-gen@2ff001f
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9

google/cloud/recommender_v1/services/recommender/async_client.py

@@ -19,13 +19,15 @@
 from typing import Dict, Sequence, Tuple, Type, Union
 import pkg_resources
 
-import google.api_core.client_options as ClientOptions  # type: ignore
+from google.api_core.client_options import ClientOptions  # type: ignore
 from google.api_core import exceptions as core_exceptions  # type: ignore
 from google.api_core import gapic_v1  # type: ignore
 from google.api_core import retry as retries  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.cloud.recommender_v1.services.recommender import pagers
 from google.cloud.recommender_v1.types import insight
 from google.cloud.recommender_v1.types import recommendation
@@ -177,10 +179,10 @@ def __init__(
 
     async 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,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListInsightsAsyncPager:
@@ -189,7 +191,7 @@ async def list_insights(
         type.
 
         Args:
-            request (:class:`google.cloud.recommender_v1.types.ListInsightsRequest`):
+            request (Union[google.cloud.recommender_v1.types.ListInsightsRequest, dict]):
                 The request object. Request for the `ListInsights`
                 method.
             parent (:class:`str`):
@@ -277,18 +279,18 @@ async def list_insights(
 
     async 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,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> insight.Insight:
         r"""Gets the requested insight. Requires the recommender.*.get IAM
         permission for the specified insight type.
 
         Args:
-            request (:class:`google.cloud.recommender_v1.types.GetInsightRequest`):
+            request (Union[google.cloud.recommender_v1.types.GetInsightRequest, dict]):
                 The request object. Request to the `GetInsight` method.
             name (:class:`str`):
                 Required. Name of the insight.
@@ -358,14 +360,14 @@ async def get_insight(
 
     async def mark_insight_accepted(
         self,
-        request: recommender_service.MarkInsightAcceptedRequest = None,
+        request: Union[recommender_service.MarkInsightAcceptedRequest, dict] = None,
         *,
         name: str = None,
         state_metadata: Sequence[
             recommender_service.MarkInsightAcceptedRequest.StateMetadataEntry
         ] = None,
         etag: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> insight.Insight:
@@ -379,7 +381,7 @@ async def mark_insight_accepted(
         specified insight.
 
         Args:
-            request (:class:`google.cloud.recommender_v1.types.MarkInsightAcceptedRequest`):
+            request (Union[google.cloud.recommender_v1.types.MarkInsightAcceptedRequest, dict]):
                 The request object. Request for the
                 `MarkInsightAccepted` method.
             name (:class:`str`):
@@ -459,19 +461,19 @@ async def mark_insight_accepted(
 
     async def list_recommendations(
         self,
-        request: recommender_service.ListRecommendationsRequest = None,
+        request: Union[recommender_service.ListRecommendationsRequest, dict] = None,
         *,
         parent: str = None,
         filter: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListRecommendationsAsyncPager:
         r"""Lists recommendations for a Cloud project. Requires the
         recommender.*.list IAM permission for the specified recommender.
 
         Args:
-            request (:class:`google.cloud.recommender_v1.types.ListRecommendationsRequest`):
+            request (Union[google.cloud.recommender_v1.types.ListRecommendationsRequest, dict]):
                 The request object. Request for the
                 `ListRecommendations` method.
             parent (:class:`str`):
@@ -570,18 +572,18 @@ async def list_recommendations(
 
     async 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,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recommendation.Recommendation:
         r"""Gets the requested recommendation. Requires the
         recommender.*.get IAM permission for the specified recommender.
 
         Args:
-            request (:class:`google.cloud.recommender_v1.types.GetRecommendationRequest`):
+            request (Union[google.cloud.recommender_v1.types.GetRecommendationRequest, dict]):
                 The request object. Request to the `GetRecommendation`
                 method.
             name (:class:`str`):
@@ -652,14 +654,16 @@ async def get_recommendation(
 
     async def mark_recommendation_claimed(
         self,
-        request: recommender_service.MarkRecommendationClaimedRequest = None,
+        request: Union[
+            recommender_service.MarkRecommendationClaimedRequest, dict
+        ] = None,
         *,
         name: str = None,
         state_metadata: Sequence[
             recommender_service.MarkRecommendationClaimedRequest.StateMetadataEntry
         ] = None,
         etag: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recommendation.Recommendation:
@@ -676,7 +680,7 @@ async def mark_recommendation_claimed(
         specified recommender.
 
         Args:
-            request (:class:`google.cloud.recommender_v1.types.MarkRecommendationClaimedRequest`):
+            request (Union[google.cloud.recommender_v1.types.MarkRecommendationClaimedRequest, dict]):
                 The request object. Request for the
                 `MarkRecommendationClaimed` Method.
             name (:class:`str`):
@@ -759,14 +763,16 @@ async def mark_recommendation_claimed(
 
     async def mark_recommendation_succeeded(
         self,
-        request: recommender_service.MarkRecommendationSucceededRequest = None,
+        request: Union[
+            recommender_service.MarkRecommendationSucceededRequest, dict
+        ] = None,
         *,
         name: str = None,
         state_metadata: Sequence[
             recommender_service.MarkRecommendationSucceededRequest.StateMetadataEntry
         ] = None,
         etag: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recommendation.Recommendation:
@@ -783,7 +789,7 @@ async def mark_recommendation_succeeded(
         specified recommender.
 
         Args:
-            request (:class:`google.cloud.recommender_v1.types.MarkRecommendationSucceededRequest`):
+            request (Union[google.cloud.recommender_v1.types.MarkRecommendationSucceededRequest, dict]):
                 The request object. Request for the
                 `MarkRecommendationSucceeded` Method.
             name (:class:`str`):
@@ -866,14 +872,16 @@ async def mark_recommendation_succeeded(
 
     async def mark_recommendation_failed(
         self,
-        request: recommender_service.MarkRecommendationFailedRequest = None,
+        request: Union[
+            recommender_service.MarkRecommendationFailedRequest, dict
+        ] = None,
         *,
         name: str = None,
         state_metadata: Sequence[
             recommender_service.MarkRecommendationFailedRequest.StateMetadataEntry
         ] = None,
         etag: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recommendation.Recommendation:
@@ -890,7 +898,7 @@ async def mark_recommendation_failed(
         specified recommender.
 
         Args:
-            request (:class:`google.cloud.recommender_v1.types.MarkRecommendationFailedRequest`):
+            request (Union[google.cloud.recommender_v1.types.MarkRecommendationFailedRequest, dict]):
                 The request object. Request for the
                 `MarkRecommendationFailed` Method.
             name (:class:`str`):

google/cloud/recommender_v1/services/recommender/client.py

@@ -30,6 +30,8 @@
 from google.auth.exceptions import MutualTLSChannelError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
+OptionalRetry = Union[retries.Retry, object]
+
 from google.cloud.recommender_v1.services.recommender import pagers
 from google.cloud.recommender_v1.types import insight
 from google.cloud.recommender_v1.types import recommendation
@@ -418,7 +420,7 @@ def list_insights(
         request: Union[recommender_service.ListInsightsRequest, dict] = None,
         *,
         parent: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListInsightsPager:
@@ -508,7 +510,7 @@ def get_insight(
         request: Union[recommender_service.GetInsightRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> insight.Insight:
@@ -583,7 +585,7 @@ def mark_insight_accepted(
             recommender_service.MarkInsightAcceptedRequest.StateMetadataEntry
         ] = None,
         etag: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> insight.Insight:
@@ -680,7 +682,7 @@ def list_recommendations(
         *,
         parent: str = None,
         filter: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> pagers.ListRecommendationsPager:
@@ -780,7 +782,7 @@ def get_recommendation(
         request: Union[recommender_service.GetRecommendationRequest, dict] = None,
         *,
         name: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recommendation.Recommendation:
@@ -858,7 +860,7 @@ def mark_recommendation_claimed(
             recommender_service.MarkRecommendationClaimedRequest.StateMetadataEntry
         ] = None,
         etag: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recommendation.Recommendation:
@@ -970,7 +972,7 @@ def mark_recommendation_succeeded(
             recommender_service.MarkRecommendationSucceededRequest.StateMetadataEntry
         ] = None,
         etag: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recommendation.Recommendation:
@@ -1082,7 +1084,7 @@ def mark_recommendation_failed(
             recommender_service.MarkRecommendationFailedRequest.StateMetadataEntry
         ] = None,
         etag: str = None,
-        retry: retries.Retry = gapic_v1.method.DEFAULT,
+        retry: OptionalRetry = gapic_v1.method.DEFAULT,
         timeout: float = None,
         metadata: Sequence[Tuple[str, str]] = (),
     ) -> recommendation.Recommendation:

google/cloud/recommender_v1/services/recommender/transports/base.py

@@ -15,7 +15,6 @@
 #
 import abc
 from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
-import packaging.version
 import pkg_resources
 
 import google.auth  # type: ignore
@@ -39,15 +38,6 @@
 except pkg_resources.DistributionNotFound:
     DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
 
-try:
-    # google.auth.__version__ was added in 1.26.0
-    _GOOGLE_AUTH_VERSION = google.auth.__version__
-except AttributeError:
-    try:  # try pkg_resources if it is available
-        _GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
-    except pkg_resources.DistributionNotFound:  # pragma: NO COVER
-        _GOOGLE_AUTH_VERSION = None
-
 
 class RecommenderTransport(abc.ABC):
     """Abstract transport class for Recommender."""
@@ -97,7 +87,7 @@ def __init__(
             host += ":443"
         self._host = host
 
-        scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
+        scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
 
         # Save the scopes.
         self._scopes = scopes
@@ -130,29 +120,6 @@ def __init__(
         # Save the credentials.
         self._credentials = credentials
 
-    # TODO(busunkim): This method is in the base transport
-    # to avoid duplicating code across the transport classes. These functions
-    # should be deleted once the minimum required versions of google-auth is increased.
-
-    # TODO: Remove this function once google-auth >= 1.25.0 is required
-    @classmethod
-    def _get_scopes_kwargs(
-        cls, host: str, scopes: Optional[Sequence[str]]
-    ) -> Dict[str, Optional[Sequence[str]]]:
-        """Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
-
-        scopes_kwargs = {}
-
-        if _GOOGLE_AUTH_VERSION and (
-            packaging.version.parse(_GOOGLE_AUTH_VERSION)
-            >= packaging.version.parse("1.25.0")
-        ):
-            scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
-        else:
-            scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
-
-        return scopes_kwargs
-
     def _prep_wrapped_messages(self, client_info):
         # Precompute the wrapped methods.
         self._wrapped_methods = {

google/cloud/recommender_v1/services/recommender/transports/grpc_asyncio.py

@@ -20,7 +20,6 @@
 from google.api_core import grpc_helpers_async  # type: ignore
 from google.auth import credentials as ga_credentials  # type: ignore
 from google.auth.transport.grpc import SslCredentials  # type: ignore
-import packaging.version
 
 import grpc  # type: ignore
 from grpc.experimental import aio  # type: ignore