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

Commit 9850614

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#112)
- [ ] 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 c687838 commit 9850614

File tree

16 files changed

+596
-305
lines changed

16 files changed

+596
-305
lines changed

‎google/cloud/video/transcoder_v1/services/transcoder_service/async_client.py

+27-25
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.video.transcoder_v1.services.transcoder_service import pagers
3032
from google.cloud.video.transcoder_v1.types import resources
3133
from google.cloud.video.transcoder_v1.types import services
@@ -177,18 +179,18 @@ def __init__(
177179

178180
async def create_job(
179181
self,
180-
request: services.CreateJobRequest = None,
182+
request: Union[services.CreateJobRequest, dict] = None,
181183
*,
182184
parent: str = None,
183185
job: resources.Job = None,
184-
retry: retries.Retry = gapic_v1.method.DEFAULT,
186+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
185187
timeout: float = None,
186188
metadata: Sequence[Tuple[str, str]] = (),
187189
) -> resources.Job:
188190
r"""Creates a job in the specified region.
189191
190192
Args:
191-
request (:class:`google.cloud.video.transcoder_v1.types.CreateJobRequest`):
193+
request (Union[google.cloud.video.transcoder_v1.types.CreateJobRequest, dict]):
192194
The request object. Request message for
193195
`TranscoderService.CreateJob`.
194196
parent (:class:`str`):
@@ -256,17 +258,17 @@ async def create_job(
256258

257259
async def list_jobs(
258260
self,
259-
request: services.ListJobsRequest = None,
261+
request: Union[services.ListJobsRequest, dict] = None,
260262
*,
261263
parent: str = None,
262-
retry: retries.Retry = gapic_v1.method.DEFAULT,
264+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
263265
timeout: float = None,
264266
metadata: Sequence[Tuple[str, str]] = (),
265267
) -> pagers.ListJobsAsyncPager:
266268
r"""Lists jobs in the specified region.
267269
268270
Args:
269-
request (:class:`google.cloud.video.transcoder_v1.types.ListJobsRequest`):
271+
request (Union[google.cloud.video.transcoder_v1.types.ListJobsRequest, dict]):
270272
The request object. Request message for
271273
`TranscoderService.ListJobs`. The parent location from
272274
which to retrieve the collection of jobs.
@@ -336,17 +338,17 @@ async def list_jobs(
336338

337339
async def get_job(
338340
self,
339-
request: services.GetJobRequest = None,
341+
request: Union[services.GetJobRequest, dict] = None,
340342
*,
341343
name: str = None,
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
) -> resources.Job:
346348
r"""Returns the job data.
347349
348350
Args:
349-
request (:class:`google.cloud.video.transcoder_v1.types.GetJobRequest`):
351+
request (Union[google.cloud.video.transcoder_v1.types.GetJobRequest, dict]):
350352
The request object. Request message for
351353
`TranscoderService.GetJob`.
352354
name (:class:`str`):
@@ -405,17 +407,17 @@ async def get_job(
405407

406408
async def delete_job(
407409
self,
408-
request: services.DeleteJobRequest = None,
410+
request: Union[services.DeleteJobRequest, dict] = None,
409411
*,
410412
name: str = None,
411-
retry: retries.Retry = gapic_v1.method.DEFAULT,
413+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
412414
timeout: float = None,
413415
metadata: Sequence[Tuple[str, str]] = (),
414416
) -> None:
415417
r"""Deletes a job.
416418
417419
Args:
418-
request (:class:`google.cloud.video.transcoder_v1.types.DeleteJobRequest`):
420+
request (Union[google.cloud.video.transcoder_v1.types.DeleteJobRequest, dict]):
419421
The request object. Request message for
420422
`TranscoderService.DeleteJob`.
421423
name (:class:`str`):
@@ -469,19 +471,19 @@ async def delete_job(
469471

470472
async def create_job_template(
471473
self,
472-
request: services.CreateJobTemplateRequest = None,
474+
request: Union[services.CreateJobTemplateRequest, dict] = None,
473475
*,
474476
parent: str = None,
475477
job_template: resources.JobTemplate = None,
476478
job_template_id: str = None,
477-
retry: retries.Retry = gapic_v1.method.DEFAULT,
479+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
478480
timeout: float = None,
479481
metadata: Sequence[Tuple[str, str]] = (),
480482
) -> resources.JobTemplate:
481483
r"""Creates a job template in the specified region.
482484
483485
Args:
484-
request (:class:`google.cloud.video.transcoder_v1.types.CreateJobTemplateRequest`):
486+
request (Union[google.cloud.video.transcoder_v1.types.CreateJobTemplateRequest, dict]):
485487
The request object. Request message for
486488
`TranscoderService.CreateJobTemplate`.
487489
parent (:class:`str`):
@@ -564,17 +566,17 @@ async def create_job_template(
564566

565567
async def list_job_templates(
566568
self,
567-
request: services.ListJobTemplatesRequest = None,
569+
request: Union[services.ListJobTemplatesRequest, dict] = None,
568570
*,
569571
parent: str = None,
570-
retry: retries.Retry = gapic_v1.method.DEFAULT,
572+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
571573
timeout: float = None,
572574
metadata: Sequence[Tuple[str, str]] = (),
573575
) -> pagers.ListJobTemplatesAsyncPager:
574576
r"""Lists job templates in the specified region.
575577
576578
Args:
577-
request (:class:`google.cloud.video.transcoder_v1.types.ListJobTemplatesRequest`):
579+
request (Union[google.cloud.video.transcoder_v1.types.ListJobTemplatesRequest, dict]):
578580
The request object. Request message for
579581
`TranscoderService.ListJobTemplates`.
580582
parent (:class:`str`):
@@ -644,17 +646,17 @@ async def list_job_templates(
644646

645647
async def get_job_template(
646648
self,
647-
request: services.GetJobTemplateRequest = None,
649+
request: Union[services.GetJobTemplateRequest, dict] = None,
648650
*,
649651
name: str = None,
650-
retry: retries.Retry = gapic_v1.method.DEFAULT,
652+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
651653
timeout: float = None,
652654
metadata: Sequence[Tuple[str, str]] = (),
653655
) -> resources.JobTemplate:
654656
r"""Returns the job template data.
655657
656658
Args:
657-
request (:class:`google.cloud.video.transcoder_v1.types.GetJobTemplateRequest`):
659+
request (Union[google.cloud.video.transcoder_v1.types.GetJobTemplateRequest, dict]):
658660
The request object. Request message for
659661
`TranscoderService.GetJobTemplate`.
660662
name (:class:`str`):
@@ -714,17 +716,17 @@ async def get_job_template(
714716

715717
async def delete_job_template(
716718
self,
717-
request: services.DeleteJobTemplateRequest = None,
719+
request: Union[services.DeleteJobTemplateRequest, dict] = None,
718720
*,
719721
name: str = None,
720-
retry: retries.Retry = gapic_v1.method.DEFAULT,
722+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
721723
timeout: float = None,
722724
metadata: Sequence[Tuple[str, str]] = (),
723725
) -> None:
724726
r"""Deletes a job template.
725727
726728
Args:
727-
request (:class:`google.cloud.video.transcoder_v1.types.DeleteJobTemplateRequest`):
729+
request (Union[google.cloud.video.transcoder_v1.types.DeleteJobTemplateRequest, dict]):
728730
The request object. Request message for
729731
`TranscoderService.DeleteJobTemplate`.
730732
name (:class:`str`):

‎google/cloud/video/transcoder_v1/services/transcoder_service/client.py

+10-8
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.video.transcoder_v1.services.transcoder_service import pagers
3436
from google.cloud.video.transcoder_v1.types import resources
3537
from google.cloud.video.transcoder_v1.types import services
@@ -381,7 +383,7 @@ def create_job(
381383
*,
382384
parent: str = None,
383385
job: resources.Job = None,
384-
retry: retries.Retry = gapic_v1.method.DEFAULT,
386+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
385387
timeout: float = None,
386388
metadata: Sequence[Tuple[str, str]] = (),
387389
) -> resources.Job:
@@ -459,7 +461,7 @@ def list_jobs(
459461
request: Union[services.ListJobsRequest, dict] = None,
460462
*,
461463
parent: str = None,
462-
retry: retries.Retry = gapic_v1.method.DEFAULT,
464+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
463465
timeout: float = None,
464466
metadata: Sequence[Tuple[str, str]] = (),
465467
) -> pagers.ListJobsPager:
@@ -539,7 +541,7 @@ def get_job(
539541
request: Union[services.GetJobRequest, dict] = None,
540542
*,
541543
name: str = None,
542-
retry: retries.Retry = gapic_v1.method.DEFAULT,
544+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
543545
timeout: float = None,
544546
metadata: Sequence[Tuple[str, str]] = (),
545547
) -> resources.Job:
@@ -608,7 +610,7 @@ def delete_job(
608610
request: Union[services.DeleteJobRequest, dict] = None,
609611
*,
610612
name: str = None,
611-
retry: retries.Retry = gapic_v1.method.DEFAULT,
613+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
612614
timeout: float = None,
613615
metadata: Sequence[Tuple[str, str]] = (),
614616
) -> None:
@@ -674,7 +676,7 @@ def create_job_template(
674676
parent: str = None,
675677
job_template: resources.JobTemplate = None,
676678
job_template_id: str = None,
677-
retry: retries.Retry = gapic_v1.method.DEFAULT,
679+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
678680
timeout: float = None,
679681
metadata: Sequence[Tuple[str, str]] = (),
680682
) -> resources.JobTemplate:
@@ -767,7 +769,7 @@ def list_job_templates(
767769
request: Union[services.ListJobTemplatesRequest, dict] = None,
768770
*,
769771
parent: str = None,
770-
retry: retries.Retry = gapic_v1.method.DEFAULT,
772+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
771773
timeout: float = None,
772774
metadata: Sequence[Tuple[str, str]] = (),
773775
) -> pagers.ListJobTemplatesPager:
@@ -847,7 +849,7 @@ def get_job_template(
847849
request: Union[services.GetJobTemplateRequest, dict] = None,
848850
*,
849851
name: str = None,
850-
retry: retries.Retry = gapic_v1.method.DEFAULT,
852+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
851853
timeout: float = None,
852854
metadata: Sequence[Tuple[str, str]] = (),
853855
) -> resources.JobTemplate:
@@ -917,7 +919,7 @@ def delete_job_template(
917919
request: Union[services.DeleteJobTemplateRequest, dict] = None,
918920
*,
919921
name: str = None,
920-
retry: retries.Retry = gapic_v1.method.DEFAULT,
922+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
921923
timeout: float = None,
922924
metadata: Sequence[Tuple[str, str]] = (),
923925
) -> None:

‎google/cloud/video/transcoder_v1/services/transcoder_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
@@ -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 TranscoderServiceTransport(abc.ABC):
5343
"""Abstract transport class for TranscoderService."""
@@ -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 = {

‎google/cloud/video/transcoder_v1/services/transcoder_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

0 commit comments

Comments
 (0)