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

Commit e50d4c9

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#278)
- [ ] 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 58dc9f3 commit e50d4c9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+585
-665
lines changed

‎google/cloud/automl_v1/services/auto_ml/async_client.py

Lines changed: 57 additions & 55 deletions
Large diffs are not rendered by default.

‎google/cloud/automl_v1/services/auto_ml/client.py

Lines changed: 20 additions & 18 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.automl_v1.services.auto_ml import pagers
@@ -444,7 +446,7 @@ def create_dataset(
444446
*,
445447
parent: str = None,
446448
dataset: gca_dataset.Dataset = None,
447-
retry: retries.Retry = gapic_v1.method.DEFAULT,
449+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
448450
timeout: float = None,
449451
metadata: Sequence[Tuple[str, str]] = (),
450452
) -> operation.Operation:
@@ -532,7 +534,7 @@ def get_dataset(
532534
request: Union[service.GetDatasetRequest, dict] = None,
533535
*,
534536
name: str = None,
535-
retry: retries.Retry = gapic_v1.method.DEFAULT,
537+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
536538
timeout: float = None,
537539
metadata: Sequence[Tuple[str, str]] = (),
538540
) -> dataset.Dataset:
@@ -605,7 +607,7 @@ def list_datasets(
605607
request: Union[service.ListDatasetsRequest, dict] = None,
606608
*,
607609
parent: str = None,
608-
retry: retries.Retry = gapic_v1.method.DEFAULT,
610+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
609611
timeout: float = None,
610612
metadata: Sequence[Tuple[str, str]] = (),
611613
) -> pagers.ListDatasetsPager:
@@ -686,7 +688,7 @@ def update_dataset(
686688
*,
687689
dataset: gca_dataset.Dataset = None,
688690
update_mask: field_mask_pb2.FieldMask = None,
689-
retry: retries.Retry = gapic_v1.method.DEFAULT,
691+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
690692
timeout: float = None,
691693
metadata: Sequence[Tuple[str, str]] = (),
692694
) -> gca_dataset.Dataset:
@@ -770,7 +772,7 @@ def delete_dataset(
770772
request: Union[service.DeleteDatasetRequest, dict] = None,
771773
*,
772774
name: str = None,
773-
retry: retries.Retry = gapic_v1.method.DEFAULT,
775+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
774776
timeout: float = None,
775777
metadata: Sequence[Tuple[str, str]] = (),
776778
) -> operation.Operation:
@@ -867,7 +869,7 @@ def import_data(
867869
*,
868870
name: str = None,
869871
input_config: io.InputConfig = None,
870-
retry: retries.Retry = gapic_v1.method.DEFAULT,
872+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
871873
timeout: float = None,
872874
metadata: Sequence[Tuple[str, str]] = (),
873875
) -> operation.Operation:
@@ -980,7 +982,7 @@ def export_data(
980982
*,
981983
name: str = None,
982984
output_config: io.OutputConfig = None,
983-
retry: retries.Retry = gapic_v1.method.DEFAULT,
985+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
984986
timeout: float = None,
985987
metadata: Sequence[Tuple[str, str]] = (),
986988
) -> operation.Operation:
@@ -1084,7 +1086,7 @@ def get_annotation_spec(
10841086
request: Union[service.GetAnnotationSpecRequest, dict] = None,
10851087
*,
10861088
name: str = None,
1087-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1089+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10881090
timeout: float = None,
10891091
metadata: Sequence[Tuple[str, str]] = (),
10901092
) -> annotation_spec.AnnotationSpec:
@@ -1154,7 +1156,7 @@ def create_model(
11541156
*,
11551157
parent: str = None,
11561158
model: gca_model.Model = None,
1157-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1159+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
11581160
timeout: float = None,
11591161
metadata: Sequence[Tuple[str, str]] = (),
11601162
) -> operation.Operation:
@@ -1248,7 +1250,7 @@ def get_model(
12481250
request: Union[service.GetModelRequest, dict] = None,
12491251
*,
12501252
name: str = None,
1251-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1253+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
12521254
timeout: float = None,
12531255
metadata: Sequence[Tuple[str, str]] = (),
12541256
) -> model.Model:
@@ -1317,7 +1319,7 @@ def list_models(
13171319
request: Union[service.ListModelsRequest, dict] = None,
13181320
*,
13191321
parent: str = None,
1320-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1322+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
13211323
timeout: float = None,
13221324
metadata: Sequence[Tuple[str, str]] = (),
13231325
) -> pagers.ListModelsPager:
@@ -1397,7 +1399,7 @@ def delete_model(
13971399
request: Union[service.DeleteModelRequest, dict] = None,
13981400
*,
13991401
name: str = None,
1400-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1402+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14011403
timeout: float = None,
14021404
metadata: Sequence[Tuple[str, str]] = (),
14031405
) -> operation.Operation:
@@ -1493,7 +1495,7 @@ def update_model(
14931495
*,
14941496
model: gca_model.Model = None,
14951497
update_mask: field_mask_pb2.FieldMask = None,
1496-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1498+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
14971499
timeout: float = None,
14981500
metadata: Sequence[Tuple[str, str]] = (),
14991501
) -> gca_model.Model:
@@ -1575,7 +1577,7 @@ def deploy_model(
15751577
request: Union[service.DeployModelRequest, dict] = None,
15761578
*,
15771579
name: str = None,
1578-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1580+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
15791581
timeout: float = None,
15801582
metadata: Sequence[Tuple[str, str]] = (),
15811583
) -> operation.Operation:
@@ -1681,7 +1683,7 @@ def undeploy_model(
16811683
request: Union[service.UndeployModelRequest, dict] = None,
16821684
*,
16831685
name: str = None,
1684-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1686+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
16851687
timeout: float = None,
16861688
metadata: Sequence[Tuple[str, str]] = (),
16871689
) -> operation.Operation:
@@ -1782,7 +1784,7 @@ def export_model(
17821784
*,
17831785
name: str = None,
17841786
output_config: io.ModelExportOutputConfig = None,
1785-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1787+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
17861788
timeout: float = None,
17871789
metadata: Sequence[Tuple[str, str]] = (),
17881790
) -> operation.Operation:
@@ -1892,7 +1894,7 @@ def get_model_evaluation(
18921894
request: Union[service.GetModelEvaluationRequest, dict] = None,
18931895
*,
18941896
name: str = None,
1895-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1897+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
18961898
timeout: float = None,
18971899
metadata: Sequence[Tuple[str, str]] = (),
18981900
) -> model_evaluation.ModelEvaluation:
@@ -1962,7 +1964,7 @@ def list_model_evaluations(
19621964
*,
19631965
parent: str = None,
19641966
filter: str = None,
1965-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1967+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
19661968
timeout: float = None,
19671969
metadata: Sequence[Tuple[str, str]] = (),
19681970
) -> pagers.ListModelEvaluationsPager:

‎google/cloud/automl_v1/services/auto_ml/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
@@ -43,15 +42,6 @@
4342
except pkg_resources.DistributionNotFound:
4443
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4544

46-
try:
47-
# google.auth.__version__ was added in 1.26.0
48-
_GOOGLE_AUTH_VERSION = google.auth.__version__
49-
except AttributeError:
50-
try: # try pkg_resources if it is available
51-
_GOOGLE_AUTH_VERSION = pkg_resources.get_distribution("google-auth").version
52-
except pkg_resources.DistributionNotFound: # pragma: NO COVER
53-
_GOOGLE_AUTH_VERSION = None
54-
5545

5646
class AutoMlTransport(abc.ABC):
5747
"""Abstract transport class for AutoMl."""
@@ -101,7 +91,7 @@ def __init__(
10191
host += ":443"
10292
self._host = host
10393

104-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
94+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10595

10696
# Save the scopes.
10797
self._scopes = scopes
@@ -134,29 +124,6 @@ def __init__(
134124
# Save the credentials.
135125
self._credentials = credentials
136126

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

336303
@property
337-
def operations_client(self) -> operations_v1.OperationsClient:
304+
def operations_client(self):
338305
"""Return the client designed to process long-running operations."""
339306
raise NotImplementedError()
340307

‎google/cloud/automl_v1/services/auto_ml/transports/grpc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def __init__(
132132
self._grpc_channel = None
133133
self._ssl_channel_credentials = ssl_channel_credentials
134134
self._stubs: Dict[str, Callable] = {}
135-
self._operations_client = None
135+
self._operations_client: Optional[operations_v1.OperationsClient] = None
136136

137137
if api_mtls_endpoint:
138138
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎google/cloud/automl_v1/services/auto_ml/transports/grpc_asyncio.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
from google.api_core import operations_v1 # type: ignore
2222
from google.auth import credentials as ga_credentials # type: ignore
2323
from google.auth.transport.grpc import SslCredentials # type: ignore
24-
import packaging.version
2524

2625
import grpc # type: ignore
2726
from grpc.experimental import aio # type: ignore
@@ -179,7 +178,7 @@ def __init__(
179178
self._grpc_channel = None
180179
self._ssl_channel_credentials = ssl_channel_credentials
181180
self._stubs: Dict[str, Callable] = {}
182-
self._operations_client = None
181+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
183182

184183
if api_mtls_endpoint:
185184
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎google/cloud/automl_v1/services/prediction_service/async_client.py

Lines changed: 9 additions & 7 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.api_core import operation # type: ignore
3032
from google.api_core import operation_async # type: ignore
3133
from google.cloud.automl_v1.types import annotation_payload
@@ -172,12 +174,12 @@ def __init__(
172174

173175
async def predict(
174176
self,
175-
request: prediction_service.PredictRequest = None,
177+
request: Union[prediction_service.PredictRequest, dict] = None,
176178
*,
177179
name: str = None,
178180
payload: data_items.ExamplePayload = None,
179181
params: Sequence[prediction_service.PredictRequest.ParamsEntry] = None,
180-
retry: retries.Retry = gapic_v1.method.DEFAULT,
182+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
181183
timeout: float = None,
182184
metadata: Sequence[Tuple[str, str]] = (),
183185
) -> prediction_service.PredictResponse:
@@ -220,7 +222,7 @@ async def predict(
220222
up to 5MB. Not available for FORECASTING ``prediction_type``.
221223
222224
Args:
223-
request (:class:`google.cloud.automl_v1.types.PredictRequest`):
225+
request (Union[google.cloud.automl_v1.types.PredictRequest, dict]):
224226
The request object. Request message for
225227
[PredictionService.Predict][google.cloud.automl.v1.PredictionService.Predict].
226228
name (:class:`str`):
@@ -330,13 +332,13 @@ async def predict(
330332

331333
async def batch_predict(
332334
self,
333-
request: prediction_service.BatchPredictRequest = None,
335+
request: Union[prediction_service.BatchPredictRequest, dict] = None,
334336
*,
335337
name: str = None,
336338
input_config: io.BatchPredictInputConfig = None,
337339
output_config: io.BatchPredictOutputConfig = None,
338340
params: Sequence[prediction_service.BatchPredictRequest.ParamsEntry] = None,
339-
retry: retries.Retry = gapic_v1.method.DEFAULT,
341+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
340342
timeout: float = None,
341343
metadata: Sequence[Tuple[str, str]] = (),
342344
) -> operation_async.AsyncOperation:
@@ -362,7 +364,7 @@ async def batch_predict(
362364
- AutoML Tables
363365
364366
Args:
365-
request (:class:`google.cloud.automl_v1.types.BatchPredictRequest`):
367+
request (Union[google.cloud.automl_v1.types.BatchPredictRequest, dict]):
366368
The request object. Request message for
367369
[PredictionService.BatchPredict][google.cloud.automl.v1.PredictionService.BatchPredict].
368370
name (:class:`str`):

‎google/cloud/automl_v1/services/prediction_service/client.py

Lines changed: 4 additions & 2 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.automl_v1.types import annotation_payload
@@ -365,7 +367,7 @@ def predict(
365367
name: str = None,
366368
payload: data_items.ExamplePayload = None,
367369
params: Sequence[prediction_service.PredictRequest.ParamsEntry] = 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
) -> prediction_service.PredictResponse:
@@ -523,7 +525,7 @@ def batch_predict(
523525
input_config: io.BatchPredictInputConfig = None,
524526
output_config: io.BatchPredictOutputConfig = None,
525527
params: Sequence[prediction_service.BatchPredictRequest.ParamsEntry] = None,
526-
retry: retries.Retry = gapic_v1.method.DEFAULT,
528+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
527529
timeout: float = None,
528530
metadata: Sequence[Tuple[str, str]] = (),
529531
) -> operation.Operation:

0 commit comments

Comments
 (0)