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

Commit 0710b41

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#167)
- [ ] Regenerate this pull request now. docs: list oneofs in docstring fix(deps): require google-api-core >= 1.28.0 fix(deps): drop packaging dependency fix: fix extras_require typo in setup.py 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 bde9eb8 commit 0710b41

14 files changed

Lines changed: 339 additions & 265 deletions

File tree

‎google/cloud/datalabeling_v1beta1/services/data_labeling_service/async_client.py‎

Lines changed: 115 additions & 103 deletions
Large diffs are not rendered by default.

‎google/cloud/datalabeling_v1beta1/services/data_labeling_service/client.py‎

Lines changed: 36 additions & 34 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.api_core import operation # type: ignore
3436
from google.api_core import operation_async # type: ignore
3537
from google.cloud.datalabeling_v1beta1.services.data_labeling_service import pagers
@@ -488,7 +490,7 @@ def create_dataset(
488490
*,
489491
parent: str = None,
490492
dataset: gcd_dataset.Dataset = None,
491-
retry: retries.Retry = gapic_v1.method.DEFAULT,
493+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
492494
timeout: float = None,
493495
metadata: Sequence[Tuple[str, str]] = (),
494496
) -> gcd_dataset.Dataset:
@@ -568,7 +570,7 @@ def get_dataset(
568570
request: Union[data_labeling_service.GetDatasetRequest, dict] = None,
569571
*,
570572
name: str = None,
571-
retry: retries.Retry = gapic_v1.method.DEFAULT,
573+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
572574
timeout: float = None,
573575
metadata: Sequence[Tuple[str, str]] = (),
574576
) -> dataset.Dataset:
@@ -641,7 +643,7 @@ def list_datasets(
641643
*,
642644
parent: str = None,
643645
filter: str = None,
644-
retry: retries.Retry = gapic_v1.method.DEFAULT,
646+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
645647
timeout: float = None,
646648
metadata: Sequence[Tuple[str, str]] = (),
647649
) -> pagers.ListDatasetsPager:
@@ -730,7 +732,7 @@ def delete_dataset(
730732
request: Union[data_labeling_service.DeleteDatasetRequest, dict] = None,
731733
*,
732734
name: str = None,
733-
retry: retries.Retry = gapic_v1.method.DEFAULT,
735+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
734736
timeout: float = None,
735737
metadata: Sequence[Tuple[str, str]] = (),
736738
) -> None:
@@ -794,7 +796,7 @@ def import_data(
794796
*,
795797
name: str = None,
796798
input_config: dataset.InputConfig = None,
797-
retry: retries.Retry = gapic_v1.method.DEFAULT,
799+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
798800
timeout: float = None,
799801
metadata: Sequence[Tuple[str, str]] = (),
800802
) -> operation.Operation:
@@ -892,7 +894,7 @@ def export_data(
892894
annotated_dataset: str = None,
893895
filter: str = None,
894896
output_config: dataset.OutputConfig = None,
895-
retry: retries.Retry = gapic_v1.method.DEFAULT,
897+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
896898
timeout: float = None,
897899
metadata: Sequence[Tuple[str, str]] = (),
898900
) -> operation.Operation:
@@ -1003,7 +1005,7 @@ def get_data_item(
10031005
request: Union[data_labeling_service.GetDataItemRequest, dict] = None,
10041006
*,
10051007
name: str = None,
1006-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1008+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10071009
timeout: float = None,
10081010
metadata: Sequence[Tuple[str, str]] = (),
10091011
) -> dataset.DataItem:
@@ -1075,7 +1077,7 @@ def list_data_items(
10751077
*,
10761078
parent: str = None,
10771079
filter: str = None,
1078-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1080+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10791081
timeout: float = None,
10801082
metadata: Sequence[Tuple[str, str]] = (),
10811083
) -> pagers.ListDataItemsPager:
@@ -1165,7 +1167,7 @@ def get_annotated_dataset(
11651167
request: Union[data_labeling_service.GetAnnotatedDatasetRequest, dict] = None,
11661168
*,
11671169
name: str = None,
1168-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1170+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11691171
timeout: float = None,
11701172
metadata: Sequence[Tuple[str, str]] = (),
11711173
) -> dataset.AnnotatedDataset:
@@ -1241,7 +1243,7 @@ def list_annotated_datasets(
12411243
*,
12421244
parent: str = None,
12431245
filter: str = None,
1244-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1246+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12451247
timeout: float = None,
12461248
metadata: Sequence[Tuple[str, str]] = (),
12471249
) -> pagers.ListAnnotatedDatasetsPager:
@@ -1333,7 +1335,7 @@ def delete_annotated_dataset(
13331335
data_labeling_service.DeleteAnnotatedDatasetRequest, dict
13341336
] = None,
13351337
*,
1336-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1338+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13371339
timeout: float = None,
13381340
metadata: Sequence[Tuple[str, str]] = (),
13391341
) -> None:
@@ -1379,7 +1381,7 @@ def label_image(
13791381
parent: str = None,
13801382
basic_config: human_annotation_config.HumanAnnotationConfig = None,
13811383
feature: data_labeling_service.LabelImageRequest.Feature = None,
1382-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1384+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13831385
timeout: float = None,
13841386
metadata: Sequence[Tuple[str, str]] = (),
13851387
) -> operation.Operation:
@@ -1482,7 +1484,7 @@ def label_video(
14821484
parent: str = None,
14831485
basic_config: human_annotation_config.HumanAnnotationConfig = None,
14841486
feature: data_labeling_service.LabelVideoRequest.Feature = None,
1485-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1487+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14861488
timeout: float = None,
14871489
metadata: Sequence[Tuple[str, str]] = (),
14881490
) -> operation.Operation:
@@ -1584,7 +1586,7 @@ def label_text(
15841586
parent: str = None,
15851587
basic_config: human_annotation_config.HumanAnnotationConfig = None,
15861588
feature: data_labeling_service.LabelTextRequest.Feature = None,
1587-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1589+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15881590
timeout: float = None,
15891591
metadata: Sequence[Tuple[str, str]] = (),
15901592
) -> operation.Operation:
@@ -1685,7 +1687,7 @@ def get_example(
16851687
*,
16861688
name: str = None,
16871689
filter: str = None,
1688-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1690+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16891691
timeout: float = None,
16901692
metadata: Sequence[Tuple[str, str]] = (),
16911693
) -> dataset.Example:
@@ -1769,7 +1771,7 @@ def list_examples(
17691771
*,
17701772
parent: str = None,
17711773
filter: str = None,
1772-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1774+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17731775
timeout: float = None,
17741776
metadata: Sequence[Tuple[str, str]] = (),
17751777
) -> pagers.ListExamplesPager:
@@ -1861,7 +1863,7 @@ def create_annotation_spec_set(
18611863
*,
18621864
parent: str = None,
18631865
annotation_spec_set: gcd_annotation_spec_set.AnnotationSpecSet = None,
1864-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1866+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
18651867
timeout: float = None,
18661868
metadata: Sequence[Tuple[str, str]] = (),
18671869
) -> gcd_annotation_spec_set.AnnotationSpecSet:
@@ -1951,7 +1953,7 @@ def get_annotation_spec_set(
19511953
request: Union[data_labeling_service.GetAnnotationSpecSetRequest, dict] = None,
19521954
*,
19531955
name: str = None,
1954-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1956+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19551957
timeout: float = None,
19561958
metadata: Sequence[Tuple[str, str]] = (),
19571959
) -> annotation_spec_set.AnnotationSpecSet:
@@ -2029,7 +2031,7 @@ def list_annotation_spec_sets(
20292031
*,
20302032
parent: str = None,
20312033
filter: str = None,
2032-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2034+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
20332035
timeout: float = None,
20342036
metadata: Sequence[Tuple[str, str]] = (),
20352037
) -> pagers.ListAnnotationSpecSetsPager:
@@ -2123,7 +2125,7 @@ def delete_annotation_spec_set(
21232125
] = None,
21242126
*,
21252127
name: str = None,
2126-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2128+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21272129
timeout: float = None,
21282130
metadata: Sequence[Tuple[str, str]] = (),
21292131
) -> None:
@@ -2192,7 +2194,7 @@ def create_instruction(
21922194
*,
21932195
parent: str = None,
21942196
instruction: gcd_instruction.Instruction = None,
2195-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2197+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
21962198
timeout: float = None,
21972199
metadata: Sequence[Tuple[str, str]] = (),
21982200
) -> operation.Operation:
@@ -2283,7 +2285,7 @@ def get_instruction(
22832285
request: Union[data_labeling_service.GetInstructionRequest, dict] = None,
22842286
*,
22852287
name: str = None,
2286-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2288+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
22872289
timeout: float = None,
22882290
metadata: Sequence[Tuple[str, str]] = (),
22892291
) -> instruction.Instruction:
@@ -2356,7 +2358,7 @@ def list_instructions(
23562358
*,
23572359
parent: str = None,
23582360
filter: str = None,
2359-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2361+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
23602362
timeout: float = None,
23612363
metadata: Sequence[Tuple[str, str]] = (),
23622364
) -> pagers.ListInstructionsPager:
@@ -2446,7 +2448,7 @@ def delete_instruction(
24462448
request: Union[data_labeling_service.DeleteInstructionRequest, dict] = None,
24472449
*,
24482450
name: str = None,
2449-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2451+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
24502452
timeout: float = None,
24512453
metadata: Sequence[Tuple[str, str]] = (),
24522454
) -> None:
@@ -2510,7 +2512,7 @@ def get_evaluation(
25102512
request: Union[data_labeling_service.GetEvaluationRequest, dict] = None,
25112513
*,
25122514
name: str = None,
2513-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2515+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
25142516
timeout: float = None,
25152517
metadata: Sequence[Tuple[str, str]] = (),
25162518
) -> evaluation.Evaluation:
@@ -2585,7 +2587,7 @@ def search_evaluations(
25852587
*,
25862588
parent: str = None,
25872589
filter: str = None,
2588-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2590+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
25892591
timeout: float = None,
25902592
metadata: Sequence[Tuple[str, str]] = (),
25912593
) -> pagers.SearchEvaluationsPager:
@@ -2708,7 +2710,7 @@ def search_example_comparisons(
27082710
] = None,
27092711
*,
27102712
parent: str = None,
2711-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2713+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
27122714
timeout: float = None,
27132715
metadata: Sequence[Tuple[str, str]] = (),
27142716
) -> pagers.SearchExampleComparisonsPager:
@@ -2799,7 +2801,7 @@ def create_evaluation_job(
27992801
*,
28002802
parent: str = None,
28012803
job: evaluation_job.EvaluationJob = None,
2802-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2804+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
28032805
timeout: float = None,
28042806
metadata: Sequence[Tuple[str, str]] = (),
28052807
) -> evaluation_job.EvaluationJob:
@@ -2884,7 +2886,7 @@ def update_evaluation_job(
28842886
*,
28852887
evaluation_job: gcd_evaluation_job.EvaluationJob = None,
28862888
update_mask: field_mask_pb2.FieldMask = None,
2887-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2889+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
28882890
timeout: float = None,
28892891
metadata: Sequence[Tuple[str, str]] = (),
28902892
) -> gcd_evaluation_job.EvaluationJob:
@@ -2984,7 +2986,7 @@ def get_evaluation_job(
29842986
request: Union[data_labeling_service.GetEvaluationJobRequest, dict] = None,
29852987
*,
29862988
name: str = None,
2987-
retry: retries.Retry = gapic_v1.method.DEFAULT,
2989+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
29882990
timeout: float = None,
29892991
metadata: Sequence[Tuple[str, str]] = (),
29902992
) -> evaluation_job.EvaluationJob:
@@ -3060,7 +3062,7 @@ def pause_evaluation_job(
30603062
request: Union[data_labeling_service.PauseEvaluationJobRequest, dict] = None,
30613063
*,
30623064
name: str = None,
3063-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3065+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
30643066
timeout: float = None,
30653067
metadata: Sequence[Tuple[str, str]] = (),
30663068
) -> None:
@@ -3127,7 +3129,7 @@ def resume_evaluation_job(
31273129
request: Union[data_labeling_service.ResumeEvaluationJobRequest, dict] = None,
31283130
*,
31293131
name: str = None,
3130-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3132+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
31313133
timeout: float = None,
31323134
metadata: Sequence[Tuple[str, str]] = (),
31333135
) -> None:
@@ -3194,7 +3196,7 @@ def delete_evaluation_job(
31943196
request: Union[data_labeling_service.DeleteEvaluationJobRequest, dict] = None,
31953197
*,
31963198
name: str = None,
3197-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3199+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
31983200
timeout: float = None,
31993201
metadata: Sequence[Tuple[str, str]] = (),
32003202
) -> None:
@@ -3260,7 +3262,7 @@ def list_evaluation_jobs(
32603262
*,
32613263
parent: str = None,
32623264
filter: str = None,
3263-
retry: retries.Retry = gapic_v1.method.DEFAULT,
3265+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
32643266
timeout: float = None,
32653267
metadata: Sequence[Tuple[str, str]] = (),
32663268
) -> pagers.ListEvaluationJobsPager:

‎google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/base.py‎

Lines changed: 2 additions & 35 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
@@ -50,15 +49,6 @@
5049
except pkg_resources.DistributionNotFound:
5150
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
5251

53-
try:
54-
# google.auth.__version__ was added in 1.26.0
55-
_GOOGLE_AUTH_VERSION = google.auth.__version__
56-
except AttributeError:
57-
try: # try pkg_resources if it is available
58-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
59-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
60-
_GOOGLE_AUTH_VERSION = None
61-
6252

6353
class DataLabelingServiceTransport(abc.ABC):
6454
"""Abstract transport class for DataLabelingService."""
@@ -108,7 +98,7 @@ def __init__(
10898
host += ":443"
10999
self._host = host
110100

111-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
101+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
112102

113103
# Save the scopes.
114104
self._scopes = scopes
@@ -141,29 +131,6 @@ def __init__(
141131
# Save the credentials.
142132
self._credentials = credentials
143133

144-
# TODO(busunkim): This method is in the base transport
145-
# to avoid duplicating code across the transport classes. These functions
146-
# should be deleted once the minimum required versions of google-auth is increased.
147-
148-
# TODO: Remove this function once google-auth >= 1.25.0 is required
149-
@classmethod
150-
def _get_scopes_kwargs(
151-
cls, host: str, scopes: Optional[Sequence[str]]
152-
) -> Dict[str, Optional[Sequence[str]]]:
153-
"""Returns scopes kwargs to pass to google-auth methods depending on the google-auth version"""
154-
155-
scopes_kwargs = {}
156-
157-
if _GOOGLE_AUTH_VERSION and (
158-
packaging.version.parse(_GOOGLE_AUTH_VERSION)
159-
>= packaging.version.parse("1.25.0")
160-
):
161-
scopes_kwargs = {"scopes": scopes, "default_scopes": cls.AUTH_SCOPES}
162-
else:
163-
scopes_kwargs = {"scopes": scopes or cls.AUTH_SCOPES}
164-
165-
return scopes_kwargs
166-
167134
def _prep_wrapped_messages(self, client_info):
168135
# Precompute the wrapped methods.
169136
self._wrapped_methods = {
@@ -547,7 +514,7 @@ def close(self):
547514
raise NotImplementedError()
548515

549516
@property
550-
def operations_client(self) -> operations_v1.OperationsClient:
517+
def operations_client(self):
551518
"""Return the client designed to process long-running operations."""
552519
raise NotImplementedError()
553520

‎google/cloud/datalabeling_v1beta1/services/data_labeling_service/transports/grpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def __init__(
123123
self._grpc_channel = None
124124
self._ssl_channel_credentials = ssl_channel_credentials
125125
self._stubs: Dict[str, Callable] = {}
126-
self._operations_client = None
126+
self._operations_client: Optional[operations_v1.OperationsClient] = None
127127

128128
if api_mtls_endpoint:
129129
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

0 commit comments

Comments
 (0)