Skip to content
This repository was archived by the owner on Oct 31, 2023. It is now read-only.

Commit 89dbf65

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#50)
- [ ] 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: https://github.com/googleapis/googleapis-gen/commit/2ff001fbacb9e77e71d734de5f955c05fdae8526 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmZmMDAxZmJhY2I5ZTc3ZTcxZDczNGRlNWY5NTVjMDVmZGFlODUyNiJ9
1 parent 5845f4e commit 89dbf65

35 files changed

+213
-872
lines changed

‎google/cloud/dataflow_v1beta3/services/flex_templates_service/async_client.py

+6-4
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.dataflow_v1beta3.types import jobs
3032
from google.cloud.dataflow_v1beta3.types import templates
3133
from .transports.base import FlexTemplatesServiceTransport, DEFAULT_CLIENT_INFO
@@ -164,16 +166,16 @@ def __init__(
164166

165167
async def launch_flex_template(
166168
self,
167-
request: templates.LaunchFlexTemplateRequest = None,
169+
request: Union[templates.LaunchFlexTemplateRequest, dict] = None,
168170
*,
169-
retry: retries.Retry = gapic_v1.method.DEFAULT,
171+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
170172
timeout: float = None,
171173
metadata: Sequence[Tuple[str, str]] = (),
172174
) -> templates.LaunchFlexTemplateResponse:
173175
r"""Launch a job with a FlexTemplate.
174176
175177
Args:
176-
request (:class:`google.cloud.dataflow_v1beta3.types.LaunchFlexTemplateRequest`):
178+
request (Union[google.cloud.dataflow_v1beta3.types.LaunchFlexTemplateRequest, dict]):
177179
The request object. A request to launch a Cloud Dataflow
178180
job from a FlexTemplate.
179181
retry (google.api_core.retry.Retry): Designation of what errors, if any,

‎google/cloud/dataflow_v1beta3/services/flex_templates_service/client.py

+3-1
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.dataflow_v1beta3.types import jobs
3436
from google.cloud.dataflow_v1beta3.types import templates
3537
from .transports.base import FlexTemplatesServiceTransport, DEFAULT_CLIENT_INFO
@@ -339,7 +341,7 @@ def launch_flex_template(
339341
self,
340342
request: Union[templates.LaunchFlexTemplateRequest, dict] = None,
341343
*,
342-
retry: retries.Retry = gapic_v1.method.DEFAULT,
344+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
343345
timeout: float = None,
344346
metadata: Sequence[Tuple[str, str]] = (),
345347
) -> templates.LaunchFlexTemplateResponse:

‎google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/base.py

+1-34
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
@@ -37,15 +36,6 @@
3736
except pkg_resources.DistributionNotFound:
3837
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3938

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

5040
class FlexTemplatesServiceTransport(abc.ABC):
5141
"""Abstract transport class for FlexTemplatesService."""
@@ -100,7 +90,7 @@ def __init__(
10090
host += ":443"
10191
self._host = host
10292

103-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
93+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10494

10595
# Save the scopes.
10696
self._scopes = scopes
@@ -133,29 +123,6 @@ def __init__(
133123
# Save the credentials.
134124
self._credentials = credentials
135125

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

‎google/cloud/dataflow_v1beta3/services/flex_templates_service/transports/grpc_asyncio.py

-1
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

‎google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/async_client.py

+24-22
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.dataflow_v1beta3.services.jobs_v1_beta3 import pagers
3032
from google.cloud.dataflow_v1beta3.types import environment
3133
from google.cloud.dataflow_v1beta3.types import jobs
@@ -164,9 +166,9 @@ def __init__(
164166

165167
async def create_job(
166168
self,
167-
request: jobs.CreateJobRequest = None,
169+
request: Union[jobs.CreateJobRequest, dict] = None,
168170
*,
169-
retry: retries.Retry = gapic_v1.method.DEFAULT,
171+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
170172
timeout: float = None,
171173
metadata: Sequence[Tuple[str, str]] = (),
172174
) -> jobs.Job:
@@ -179,7 +181,7 @@ async def create_job(
179181
will always start in ``us-central1``.
180182
181183
Args:
182-
request (:class:`google.cloud.dataflow_v1beta3.types.CreateJobRequest`):
184+
request (Union[google.cloud.dataflow_v1beta3.types.CreateJobRequest, dict]):
183185
The request object. Request to create a Cloud Dataflow
184186
job.
185187
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -213,9 +215,9 @@ async def create_job(
213215

214216
async def get_job(
215217
self,
216-
request: jobs.GetJobRequest = None,
218+
request: Union[jobs.GetJobRequest, dict] = None,
217219
*,
218-
retry: retries.Retry = gapic_v1.method.DEFAULT,
220+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
219221
timeout: float = None,
220222
metadata: Sequence[Tuple[str, str]] = (),
221223
) -> jobs.Job:
@@ -228,7 +230,7 @@ async def get_job(
228230
get the state of jobs that are running in ``us-central1``.
229231
230232
Args:
231-
request (:class:`google.cloud.dataflow_v1beta3.types.GetJobRequest`):
233+
request (Union[google.cloud.dataflow_v1beta3.types.GetJobRequest, dict]):
232234
The request object. Request to get the state of a Cloud
233235
Dataflow job.
234236
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -262,9 +264,9 @@ async def get_job(
262264

263265
async def update_job(
264266
self,
265-
request: jobs.UpdateJobRequest = None,
267+
request: Union[jobs.UpdateJobRequest, dict] = None,
266268
*,
267-
retry: retries.Retry = gapic_v1.method.DEFAULT,
269+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
268270
timeout: float = None,
269271
metadata: Sequence[Tuple[str, str]] = (),
270272
) -> jobs.Job:
@@ -278,7 +280,7 @@ async def update_job(
278280
``us-central1``.
279281
280282
Args:
281-
request (:class:`google.cloud.dataflow_v1beta3.types.UpdateJobRequest`):
283+
request (Union[google.cloud.dataflow_v1beta3.types.UpdateJobRequest, dict]):
282284
The request object. Request to update a Cloud Dataflow
283285
job.
284286
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -312,9 +314,9 @@ async def update_job(
312314

313315
async def list_jobs(
314316
self,
315-
request: jobs.ListJobsRequest = None,
317+
request: Union[jobs.ListJobsRequest, dict] = None,
316318
*,
317-
retry: retries.Retry = gapic_v1.method.DEFAULT,
319+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
318320
timeout: float = None,
319321
metadata: Sequence[Tuple[str, str]] = (),
320322
) -> pagers.ListJobsAsyncPager:
@@ -329,7 +331,7 @@ async def list_jobs(
329331
running in ``us-central1``.
330332
331333
Args:
332-
request (:class:`google.cloud.dataflow_v1beta3.types.ListJobsRequest`):
334+
request (Union[google.cloud.dataflow_v1beta3.types.ListJobsRequest, dict]):
333335
The request object. Request to list Cloud Dataflow jobs.
334336
retry (google.api_core.retry.Retry): Designation of what errors, if any,
335337
should be retried.
@@ -378,16 +380,16 @@ async def list_jobs(
378380

379381
async def aggregated_list_jobs(
380382
self,
381-
request: jobs.ListJobsRequest = None,
383+
request: Union[jobs.ListJobsRequest, dict] = None,
382384
*,
383-
retry: retries.Retry = gapic_v1.method.DEFAULT,
385+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
384386
timeout: float = None,
385387
metadata: Sequence[Tuple[str, str]] = (),
386388
) -> pagers.AggregatedListJobsAsyncPager:
387389
r"""List the jobs of a project across all regions.
388390
389391
Args:
390-
request (:class:`google.cloud.dataflow_v1beta3.types.ListJobsRequest`):
392+
request (Union[google.cloud.dataflow_v1beta3.types.ListJobsRequest, dict]):
391393
The request object. Request to list Cloud Dataflow jobs.
392394
retry (google.api_core.retry.Retry): Designation of what errors, if any,
393395
should be retried.
@@ -436,17 +438,17 @@ async def aggregated_list_jobs(
436438

437439
async def check_active_jobs(
438440
self,
439-
request: jobs.CheckActiveJobsRequest = None,
441+
request: Union[jobs.CheckActiveJobsRequest, dict] = None,
440442
*,
441-
retry: retries.Retry = gapic_v1.method.DEFAULT,
443+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
442444
timeout: float = None,
443445
metadata: Sequence[Tuple[str, str]] = (),
444446
) -> jobs.CheckActiveJobsResponse:
445447
r"""Check for existence of active jobs in the given
446448
project across all regions.
447449
448450
Args:
449-
request (:class:`google.cloud.dataflow_v1beta3.types.CheckActiveJobsRequest`):
451+
request (Union[google.cloud.dataflow_v1beta3.types.CheckActiveJobsRequest, dict]):
450452
The request object. Request to check is active jobs
451453
exists for a project
452454
retry (google.api_core.retry.Retry): Designation of what errors, if any,
@@ -478,16 +480,16 @@ async def check_active_jobs(
478480

479481
async def snapshot_job(
480482
self,
481-
request: jobs.SnapshotJobRequest = None,
483+
request: Union[jobs.SnapshotJobRequest, dict] = None,
482484
*,
483-
retry: retries.Retry = gapic_v1.method.DEFAULT,
485+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
484486
timeout: float = None,
485487
metadata: Sequence[Tuple[str, str]] = (),
486488
) -> snapshots.Snapshot:
487489
r"""Snapshot the state of a streaming job.
488490
489491
Args:
490-
request (:class:`google.cloud.dataflow_v1beta3.types.SnapshotJobRequest`):
492+
request (Union[google.cloud.dataflow_v1beta3.types.SnapshotJobRequest, dict]):
491493
The request object. Request to create a snapshot of a
492494
job.
493495
retry (google.api_core.retry.Retry): Designation of what errors, if any,

‎google/cloud/dataflow_v1beta3/services/jobs_v1_beta3/client.py

+9-7
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.dataflow_v1beta3.services.jobs_v1_beta3 import pagers
3436
from google.cloud.dataflow_v1beta3.types import environment
3537
from google.cloud.dataflow_v1beta3.types import jobs
@@ -340,7 +342,7 @@ def create_job(
340342
self,
341343
request: Union[jobs.CreateJobRequest, dict] = None,
342344
*,
343-
retry: retries.Retry = gapic_v1.method.DEFAULT,
345+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
344346
timeout: float = None,
345347
metadata: Sequence[Tuple[str, str]] = (),
346348
) -> jobs.Job:
@@ -390,7 +392,7 @@ def get_job(
390392
self,
391393
request: Union[jobs.GetJobRequest, dict] = None,
392394
*,
393-
retry: retries.Retry = gapic_v1.method.DEFAULT,
395+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
394396
timeout: float = None,
395397
metadata: Sequence[Tuple[str, str]] = (),
396398
) -> jobs.Job:
@@ -440,7 +442,7 @@ def update_job(
440442
self,
441443
request: Union[jobs.UpdateJobRequest, dict] = None,
442444
*,
443-
retry: retries.Retry = gapic_v1.method.DEFAULT,
445+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
444446
timeout: float = None,
445447
metadata: Sequence[Tuple[str, str]] = (),
446448
) -> jobs.Job:
@@ -491,7 +493,7 @@ def list_jobs(
491493
self,
492494
request: Union[jobs.ListJobsRequest, dict] = None,
493495
*,
494-
retry: retries.Retry = gapic_v1.method.DEFAULT,
496+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
495497
timeout: float = None,
496498
metadata: Sequence[Tuple[str, str]] = (),
497499
) -> pagers.ListJobsPager:
@@ -558,7 +560,7 @@ def aggregated_list_jobs(
558560
self,
559561
request: Union[jobs.ListJobsRequest, dict] = None,
560562
*,
561-
retry: retries.Retry = gapic_v1.method.DEFAULT,
563+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
562564
timeout: float = None,
563565
metadata: Sequence[Tuple[str, str]] = (),
564566
) -> pagers.AggregatedListJobsPager:
@@ -617,7 +619,7 @@ def check_active_jobs(
617619
self,
618620
request: Union[jobs.CheckActiveJobsRequest, dict] = None,
619621
*,
620-
retry: retries.Retry = gapic_v1.method.DEFAULT,
622+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
621623
timeout: float = None,
622624
metadata: Sequence[Tuple[str, str]] = (),
623625
) -> jobs.CheckActiveJobsResponse:
@@ -660,7 +662,7 @@ def snapshot_job(
660662
self,
661663
request: Union[jobs.SnapshotJobRequest, dict] = None,
662664
*,
663-
retry: retries.Retry = gapic_v1.method.DEFAULT,
665+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
664666
timeout: float = None,
665667
metadata: Sequence[Tuple[str, str]] = (),
666668
) -> snapshots.Snapshot:

0 commit comments

Comments
 (0)