Skip to content

Commit 1049778

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
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
1 parent 6960c5a commit 1049778

14 files changed

Lines changed: 142 additions & 299 deletions

File tree

‎packages/google-cloud-recommender/google/cloud/recommender_v1/services/recommender/async_client.py‎

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@
1919
from typing import Dict, Sequence, Tuple, Type, Union
2020
import pkg_resources
2121

22-
import google.api_core.client_options as ClientOptions # type: ignore
22+
from google.api_core.client_options import ClientOptions # type: ignore
2323
from google.api_core import exceptions as core_exceptions # type: ignore
2424
from google.api_core import gapic_v1 # type: ignore
2525
from google.api_core import retry as retries # type: ignore
2626
from google.auth import credentials as ga_credentials # type: ignore
2727
from google.oauth2 import service_account # type: ignore
2828

29+
OptionalRetry = Union[retries.Retry, object]
30+
2931
from google.cloud.recommender_v1.services.recommender import pagers
3032
from google.cloud.recommender_v1.types import insight
3133
from google.cloud.recommender_v1.types import recommendation
@@ -177,10 +179,10 @@ def __init__(
177179

178180
async def list_insights(
179181
self,
180-
request: recommender_service.ListInsightsRequest = None,
182+
request: Union[recommender_service.ListInsightsRequest, dict] = None,
181183
*,
182184
parent: str = None,
183-
retry: retries.Retry = gapic_v1.method.DEFAULT,
185+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
184186
timeout: float = None,
185187
metadata: Sequence[Tuple[str, str]] = (),
186188
) -> pagers.ListInsightsAsyncPager:
@@ -189,7 +191,7 @@ async def list_insights(
189191
type.
190192
191193
Args:
192-
request (:class:`google.cloud.recommender_v1.types.ListInsightsRequest`):
194+
request (Union[google.cloud.recommender_v1.types.ListInsightsRequest, dict]):
193195
The request object. Request for the `ListInsights`
194196
method.
195197
parent (:class:`str`):
@@ -277,18 +279,18 @@ async def list_insights(
277279

278280
async def get_insight(
279281
self,
280-
request: recommender_service.GetInsightRequest = None,
282+
request: Union[recommender_service.GetInsightRequest, dict] = None,
281283
*,
282284
name: str = None,
283-
retry: retries.Retry = gapic_v1.method.DEFAULT,
285+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
284286
timeout: float = None,
285287
metadata: Sequence[Tuple[str, str]] = (),
286288
) -> insight.Insight:
287289
r"""Gets the requested insight. Requires the recommender.*.get IAM
288290
permission for the specified insight type.
289291
290292
Args:
291-
request (:class:`google.cloud.recommender_v1.types.GetInsightRequest`):
293+
request (Union[google.cloud.recommender_v1.types.GetInsightRequest, dict]):
292294
The request object. Request to the `GetInsight` method.
293295
name (:class:`str`):
294296
Required. Name of the insight.
@@ -358,14 +360,14 @@ async def get_insight(
358360

359361
async def mark_insight_accepted(
360362
self,
361-
request: recommender_service.MarkInsightAcceptedRequest = None,
363+
request: Union[recommender_service.MarkInsightAcceptedRequest, dict] = None,
362364
*,
363365
name: str = None,
364366
state_metadata: Sequence[
365367
recommender_service.MarkInsightAcceptedRequest.StateMetadataEntry
366368
] = None,
367369
etag: str = None,
368-
retry: retries.Retry = gapic_v1.method.DEFAULT,
370+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
369371
timeout: float = None,
370372
metadata: Sequence[Tuple[str, str]] = (),
371373
) -> insight.Insight:
@@ -379,7 +381,7 @@ async def mark_insight_accepted(
379381
specified insight.
380382
381383
Args:
382-
request (:class:`google.cloud.recommender_v1.types.MarkInsightAcceptedRequest`):
384+
request (Union[google.cloud.recommender_v1.types.MarkInsightAcceptedRequest, dict]):
383385
The request object. Request for the
384386
`MarkInsightAccepted` method.
385387
name (:class:`str`):
@@ -459,19 +461,19 @@ async def mark_insight_accepted(
459461

460462
async def list_recommendations(
461463
self,
462-
request: recommender_service.ListRecommendationsRequest = None,
464+
request: Union[recommender_service.ListRecommendationsRequest, dict] = None,
463465
*,
464466
parent: str = None,
465467
filter: str = None,
466-
retry: retries.Retry = gapic_v1.method.DEFAULT,
468+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
467469
timeout: float = None,
468470
metadata: Sequence[Tuple[str, str]] = (),
469471
) -> pagers.ListRecommendationsAsyncPager:
470472
r"""Lists recommendations for a Cloud project. Requires the
471473
recommender.*.list IAM permission for the specified recommender.
472474
473475
Args:
474-
request (:class:`google.cloud.recommender_v1.types.ListRecommendationsRequest`):
476+
request (Union[google.cloud.recommender_v1.types.ListRecommendationsRequest, dict]):
475477
The request object. Request for the
476478
`ListRecommendations` method.
477479
parent (:class:`str`):
@@ -570,18 +572,18 @@ async def list_recommendations(
570572

571573
async def get_recommendation(
572574
self,
573-
request: recommender_service.GetRecommendationRequest = None,
575+
request: Union[recommender_service.GetRecommendationRequest, dict] = None,
574576
*,
575577
name: str = None,
576-
retry: retries.Retry = gapic_v1.method.DEFAULT,
578+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
577579
timeout: float = None,
578580
metadata: Sequence[Tuple[str, str]] = (),
579581
) -> recommendation.Recommendation:
580582
r"""Gets the requested recommendation. Requires the
581583
recommender.*.get IAM permission for the specified recommender.
582584
583585
Args:
584-
request (:class:`google.cloud.recommender_v1.types.GetRecommendationRequest`):
586+
request (Union[google.cloud.recommender_v1.types.GetRecommendationRequest, dict]):
585587
The request object. Request to the `GetRecommendation`
586588
method.
587589
name (:class:`str`):
@@ -652,14 +654,16 @@ async def get_recommendation(
652654

653655
async def mark_recommendation_claimed(
654656
self,
655-
request: recommender_service.MarkRecommendationClaimedRequest = None,
657+
request: Union[
658+
recommender_service.MarkRecommendationClaimedRequest, dict
659+
] = None,
656660
*,
657661
name: str = None,
658662
state_metadata: Sequence[
659663
recommender_service.MarkRecommendationClaimedRequest.StateMetadataEntry
660664
] = None,
661665
etag: str = None,
662-
retry: retries.Retry = gapic_v1.method.DEFAULT,
666+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
663667
timeout: float = None,
664668
metadata: Sequence[Tuple[str, str]] = (),
665669
) -> recommendation.Recommendation:
@@ -676,7 +680,7 @@ async def mark_recommendation_claimed(
676680
specified recommender.
677681
678682
Args:
679-
request (:class:`google.cloud.recommender_v1.types.MarkRecommendationClaimedRequest`):
683+
request (Union[google.cloud.recommender_v1.types.MarkRecommendationClaimedRequest, dict]):
680684
The request object. Request for the
681685
`MarkRecommendationClaimed` Method.
682686
name (:class:`str`):
@@ -759,14 +763,16 @@ async def mark_recommendation_claimed(
759763

760764
async def mark_recommendation_succeeded(
761765
self,
762-
request: recommender_service.MarkRecommendationSucceededRequest = None,
766+
request: Union[
767+
recommender_service.MarkRecommendationSucceededRequest, dict
768+
] = None,
763769
*,
764770
name: str = None,
765771
state_metadata: Sequence[
766772
recommender_service.MarkRecommendationSucceededRequest.StateMetadataEntry
767773
] = None,
768774
etag: str = None,
769-
retry: retries.Retry = gapic_v1.method.DEFAULT,
775+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
770776
timeout: float = None,
771777
metadata: Sequence[Tuple[str, str]] = (),
772778
) -> recommendation.Recommendation:
@@ -783,7 +789,7 @@ async def mark_recommendation_succeeded(
783789
specified recommender.
784790
785791
Args:
786-
request (:class:`google.cloud.recommender_v1.types.MarkRecommendationSucceededRequest`):
792+
request (Union[google.cloud.recommender_v1.types.MarkRecommendationSucceededRequest, dict]):
787793
The request object. Request for the
788794
`MarkRecommendationSucceeded` Method.
789795
name (:class:`str`):
@@ -866,14 +872,16 @@ async def mark_recommendation_succeeded(
866872

867873
async def mark_recommendation_failed(
868874
self,
869-
request: recommender_service.MarkRecommendationFailedRequest = None,
875+
request: Union[
876+
recommender_service.MarkRecommendationFailedRequest, dict
877+
] = None,
870878
*,
871879
name: str = None,
872880
state_metadata: Sequence[
873881
recommender_service.MarkRecommendationFailedRequest.StateMetadataEntry
874882
] = None,
875883
etag: str = None,
876-
retry: retries.Retry = gapic_v1.method.DEFAULT,
884+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
877885
timeout: float = None,
878886
metadata: Sequence[Tuple[str, str]] = (),
879887
) -> recommendation.Recommendation:
@@ -890,7 +898,7 @@ async def mark_recommendation_failed(
890898
specified recommender.
891899
892900
Args:
893-
request (:class:`google.cloud.recommender_v1.types.MarkRecommendationFailedRequest`):
901+
request (Union[google.cloud.recommender_v1.types.MarkRecommendationFailedRequest, dict]):
894902
The request object. Request for the
895903
`MarkRecommendationFailed` Method.
896904
name (:class:`str`):

‎packages/google-cloud-recommender/google/cloud/recommender_v1/services/recommender/client.py‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
from google.auth.exceptions import MutualTLSChannelError # type: ignore
3131
from google.oauth2 import service_account # type: ignore
3232

33+
OptionalRetry = Union[retries.Retry, object]
34+
3335
from google.cloud.recommender_v1.services.recommender import pagers
3436
from google.cloud.recommender_v1.types import insight
3537
from google.cloud.recommender_v1.types import recommendation
@@ -418,7 +420,7 @@ def list_insights(
418420
request: Union[recommender_service.ListInsightsRequest, dict] = None,
419421
*,
420422
parent: str = None,
421-
retry: retries.Retry = gapic_v1.method.DEFAULT,
423+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
422424
timeout: float = None,
423425
metadata: Sequence[Tuple[str, str]] = (),
424426
) -> pagers.ListInsightsPager:
@@ -508,7 +510,7 @@ def get_insight(
508510
request: Union[recommender_service.GetInsightRequest, dict] = None,
509511
*,
510512
name: str = None,
511-
retry: retries.Retry = gapic_v1.method.DEFAULT,
513+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
512514
timeout: float = None,
513515
metadata: Sequence[Tuple[str, str]] = (),
514516
) -> insight.Insight:
@@ -583,7 +585,7 @@ def mark_insight_accepted(
583585
recommender_service.MarkInsightAcceptedRequest.StateMetadataEntry
584586
] = None,
585587
etag: str = None,
586-
retry: retries.Retry = gapic_v1.method.DEFAULT,
588+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
587589
timeout: float = None,
588590
metadata: Sequence[Tuple[str, str]] = (),
589591
) -> insight.Insight:
@@ -680,7 +682,7 @@ def list_recommendations(
680682
*,
681683
parent: str = None,
682684
filter: str = None,
683-
retry: retries.Retry = gapic_v1.method.DEFAULT,
685+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
684686
timeout: float = None,
685687
metadata: Sequence[Tuple[str, str]] = (),
686688
) -> pagers.ListRecommendationsPager:
@@ -780,7 +782,7 @@ def get_recommendation(
780782
request: Union[recommender_service.GetRecommendationRequest, dict] = None,
781783
*,
782784
name: str = None,
783-
retry: retries.Retry = gapic_v1.method.DEFAULT,
785+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
784786
timeout: float = None,
785787
metadata: Sequence[Tuple[str, str]] = (),
786788
) -> recommendation.Recommendation:
@@ -858,7 +860,7 @@ def mark_recommendation_claimed(
858860
recommender_service.MarkRecommendationClaimedRequest.StateMetadataEntry
859861
] = None,
860862
etag: str = None,
861-
retry: retries.Retry = gapic_v1.method.DEFAULT,
863+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
862864
timeout: float = None,
863865
metadata: Sequence[Tuple[str, str]] = (),
864866
) -> recommendation.Recommendation:
@@ -970,7 +972,7 @@ def mark_recommendation_succeeded(
970972
recommender_service.MarkRecommendationSucceededRequest.StateMetadataEntry
971973
] = None,
972974
etag: str = None,
973-
retry: retries.Retry = gapic_v1.method.DEFAULT,
975+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
974976
timeout: float = None,
975977
metadata: Sequence[Tuple[str, str]] = (),
976978
) -> recommendation.Recommendation:
@@ -1082,7 +1084,7 @@ def mark_recommendation_failed(
10821084
recommender_service.MarkRecommendationFailedRequest.StateMetadataEntry
10831085
] = None,
10841086
etag: str = None,
1085-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1087+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10861088
timeout: float = None,
10871089
metadata: Sequence[Tuple[str, str]] = (),
10881090
) -> recommendation.Recommendation:

‎packages/google-cloud-recommender/google/cloud/recommender_v1/services/recommender/transports/base.py‎

Lines changed: 1 addition & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#
1616
import abc
1717
from typing import Awaitable, Callable, Dict, Optional, Sequence, Union
18-
import packaging.version
1918
import pkg_resources
2019

2120
import google.auth # type: ignore
@@ -39,15 +38,6 @@
3938
except pkg_resources.DistributionNotFound:
4039
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4140

42-
try:
43-
# google.auth.__version__ was added in 1.26.0
44-
_GOOGLE_AUTH_VERSION = google.auth.__version__
45-
except AttributeError:
46-
try: # try pkg_resources if it is available
47-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
48-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
49-
_GOOGLE_AUTH_VERSION = None
50-
5141

5242
class RecommenderTransport(abc.ABC):
5343
"""Abstract transport class for Recommender."""
@@ -97,7 +87,7 @@ def __init__(
9787
host += ":443"
9888
self._host = host
9989

100-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
90+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10191

10292
# Save the scopes.
10393
self._scopes = scopes
@@ -130,29 +120,6 @@ def __init__(
130120
# Save the credentials.
131121
self._credentials = credentials
132122

133-
# TODO(busunkim): This method is in the base transport
134-
# to avoid duplicating code across the transport classes. These functions
135-
# should be deleted once the minimum required versions of google-auth is increased.
136-
137-
# TODO: Remove this function once google-auth >= 1.25.0 is required
138-
@classmethod
139-
def _get_scopes_kwargs(
140-
cls, host: str, scopes: Optional[Sequence[str]]
141-
) -> Dict[str, Optional[Sequence[str]]]:
142-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
143-
144-
scopes_kwargs = {}
145-
146-
if _GOOGLE_AUTH_VERSION and (
147-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
148-
>= packaging.version.parse("1.25.0")
149-
):
150-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
151-
else:
152-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
153-
154-
return scopes_kwargs
155-
156123
def _prep_wrapped_messages(self, client_info):
157124
# Precompute the wrapped methods.
158125
self._wrapped_methods = {

‎packages/google-cloud-recommender/google/cloud/recommender_v1/services/recommender/transports/grpc_asyncio.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from google.api_core import grpc_helpers_async # type: ignore
2121
from google.auth import credentials as ga_credentials # type: ignore
2222
from google.auth.transport.grpc import SslCredentials # type: ignore
23-
import packaging.version
2423

2524
import grpc # type: ignore
2625
from grpc.experimental import aio # type: ignore

0 commit comments

Comments
 (0)