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

Commit 2cce50d

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#101)
- [ ] 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 cac4d75 commit 2cce50d

File tree

12 files changed

+56
-267
lines changed

12 files changed

+56
-267
lines changed

‎google/cloud/dataqna_v1alpha/services/auto_suggestion_service/async_client.py

Lines changed: 6 additions & 4 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.dataqna_v1alpha.types import auto_suggestion_service
3032
from .transports.base import AutoSuggestionServiceTransport, DEFAULT_CLIENT_INFO
3133
from .transports.grpc_asyncio import AutoSuggestionServiceGrpcAsyncIOTransport
@@ -234,17 +236,17 @@ def __init__(
234236

235237
async def suggest_queries(
236238
self,
237-
request: auto_suggestion_service.SuggestQueriesRequest = None,
239+
request: Union[auto_suggestion_service.SuggestQueriesRequest, dict] = None,
238240
*,
239-
retry: retries.Retry = gapic_v1.method.DEFAULT,
241+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
240242
timeout: float = None,
241243
metadata: Sequence[Tuple[str, str]] = (),
242244
) -> auto_suggestion_service.SuggestQueriesResponse:
243245
r"""Gets a list of suggestions based on a prefix string.
244246
AutoSuggestion tolerance should be less than 1 second.
245247
246248
Args:
247-
request (:class:`google.cloud.dataqna_v1alpha.types.SuggestQueriesRequest`):
249+
request (Union[google.cloud.dataqna_v1alpha.types.SuggestQueriesRequest, dict]):
248250
The request object. Request for query suggestions.
249251
retry (google.api_core.retry.Retry): Designation of what errors, if any,
250252
should be retried.

‎google/cloud/dataqna_v1alpha/services/auto_suggestion_service/client.py

Lines changed: 3 additions & 1 deletion
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.dataqna_v1alpha.types import auto_suggestion_service
3436
from .transports.base import AutoSuggestionServiceTransport, DEFAULT_CLIENT_INFO
3537
from .transports.grpc import AutoSuggestionServiceGrpcTransport
@@ -407,7 +409,7 @@ def suggest_queries(
407409
self,
408410
request: Union[auto_suggestion_service.SuggestQueriesRequest, dict] = None,
409411
*,
410-
retry: retries.Retry = gapic_v1.method.DEFAULT,
412+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
411413
timeout: float = None,
412414
metadata: Sequence[Tuple[str, str]] = (),
413415
) -> auto_suggestion_service.SuggestQueriesResponse:

‎google/cloud/dataqna_v1alpha/services/auto_suggestion_service/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
@@ -35,15 +34,6 @@
3534
except pkg_resources.DistributionNotFound:
3635
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
3736

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

4838
class AutoSuggestionServiceTransport(abc.ABC):
4939
"""Abstract transport class for AutoSuggestionService."""
@@ -93,7 +83,7 @@ def __init__(
9383
host += ":443"
9484
self._host = host
9585

96-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
86+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
9787

9888
# Save the scopes.
9989
self._scopes = scopes
@@ -126,29 +116,6 @@ def __init__(
126116
# Save the credentials.
127117
self._credentials = credentials
128118

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

‎google/cloud/dataqna_v1alpha/services/auto_suggestion_service/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

‎google/cloud/dataqna_v1alpha/services/question_service/async_client.py

Lines changed: 18 additions & 16 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.dataqna_v1alpha.types import question
3032
from google.cloud.dataqna_v1alpha.types import question as gcd_question
3133
from google.cloud.dataqna_v1alpha.types import question_service
@@ -190,17 +192,17 @@ def __init__(
190192

191193
async def get_question(
192194
self,
193-
request: question_service.GetQuestionRequest = None,
195+
request: Union[question_service.GetQuestionRequest, dict] = None,
194196
*,
195197
name: str = None,
196-
retry: retries.Retry = gapic_v1.method.DEFAULT,
198+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
197199
timeout: float = None,
198200
metadata: Sequence[Tuple[str, str]] = (),
199201
) -> question.Question:
200202
r"""Gets a previously created question.
201203
202204
Args:
203-
request (:class:`google.cloud.dataqna_v1alpha.types.GetQuestionRequest`):
205+
request (Union[google.cloud.dataqna_v1alpha.types.GetQuestionRequest, dict]):
204206
The request object. A request to get a previously
205207
created question.
206208
name (:class:`str`):
@@ -264,18 +266,18 @@ async def get_question(
264266

265267
async def create_question(
266268
self,
267-
request: question_service.CreateQuestionRequest = None,
269+
request: Union[question_service.CreateQuestionRequest, dict] = None,
268270
*,
269271
parent: str = None,
270272
question: gcd_question.Question = None,
271-
retry: retries.Retry = gapic_v1.method.DEFAULT,
273+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
272274
timeout: float = None,
273275
metadata: Sequence[Tuple[str, str]] = (),
274276
) -> gcd_question.Question:
275277
r"""Creates a question.
276278
277279
Args:
278-
request (:class:`google.cloud.dataqna_v1alpha.types.CreateQuestionRequest`):
280+
request (Union[google.cloud.dataqna_v1alpha.types.CreateQuestionRequest, dict]):
279281
The request object. Request to create a question
280282
resource.
281283
parent (:class:`str`):
@@ -347,18 +349,18 @@ async def create_question(
347349

348350
async def execute_question(
349351
self,
350-
request: question_service.ExecuteQuestionRequest = None,
352+
request: Union[question_service.ExecuteQuestionRequest, dict] = None,
351353
*,
352354
name: str = None,
353355
interpretation_index: int = None,
354-
retry: retries.Retry = gapic_v1.method.DEFAULT,
356+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
355357
timeout: float = None,
356358
metadata: Sequence[Tuple[str, str]] = (),
357359
) -> question.Question:
358360
r"""Executes an interpretation.
359361
360362
Args:
361-
request (:class:`google.cloud.dataqna_v1alpha.types.ExecuteQuestionRequest`):
363+
request (Union[google.cloud.dataqna_v1alpha.types.ExecuteQuestionRequest, dict]):
362364
The request object. Request to execute an
363365
interpretation.
364366
name (:class:`str`):
@@ -431,17 +433,17 @@ async def execute_question(
431433

432434
async def get_user_feedback(
433435
self,
434-
request: question_service.GetUserFeedbackRequest = None,
436+
request: Union[question_service.GetUserFeedbackRequest, dict] = None,
435437
*,
436438
name: str = None,
437-
retry: retries.Retry = gapic_v1.method.DEFAULT,
439+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
438440
timeout: float = None,
439441
metadata: Sequence[Tuple[str, str]] = (),
440442
) -> user_feedback.UserFeedback:
441443
r"""Gets previously created user feedback.
442444
443445
Args:
444-
request (:class:`google.cloud.dataqna_v1alpha.types.GetUserFeedbackRequest`):
446+
request (Union[google.cloud.dataqna_v1alpha.types.GetUserFeedbackRequest, dict]):
445447
The request object. Request to get user feedback.
446448
name (:class:`str`):
447449
Required. The unique identifier for the user feedback.
@@ -501,19 +503,19 @@ async def get_user_feedback(
501503

502504
async def update_user_feedback(
503505
self,
504-
request: question_service.UpdateUserFeedbackRequest = None,
506+
request: Union[question_service.UpdateUserFeedbackRequest, dict] = None,
505507
*,
506508
user_feedback: gcd_user_feedback.UserFeedback = None,
507509
update_mask: field_mask_pb2.FieldMask = None,
508-
retry: retries.Retry = gapic_v1.method.DEFAULT,
510+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
509511
timeout: float = None,
510512
metadata: Sequence[Tuple[str, str]] = (),
511513
) -> gcd_user_feedback.UserFeedback:
512514
r"""Updates user feedback. This creates user feedback if
513515
there was none before (upsert).
514516
515517
Args:
516-
request (:class:`google.cloud.dataqna_v1alpha.types.UpdateUserFeedbackRequest`):
518+
request (Union[google.cloud.dataqna_v1alpha.types.UpdateUserFeedbackRequest, dict]):
517519
The request object. Request to updates user feedback.
518520
user_feedback (:class:`google.cloud.dataqna_v1alpha.types.UserFeedback`):
519521
Required. The user feedback to

‎google/cloud/dataqna_v1alpha/services/question_service/client.py

Lines changed: 7 additions & 5 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.dataqna_v1alpha.types import question
3436
from google.cloud.dataqna_v1alpha.types import question as gcd_question
3537
from google.cloud.dataqna_v1alpha.types import question_service
@@ -391,7 +393,7 @@ def get_question(
391393
request: Union[question_service.GetQuestionRequest, dict] = None,
392394
*,
393395
name: str = None,
394-
retry: retries.Retry = gapic_v1.method.DEFAULT,
396+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
395397
timeout: float = None,
396398
metadata: Sequence[Tuple[str, str]] = (),
397399
) -> question.Question:
@@ -466,7 +468,7 @@ def create_question(
466468
*,
467469
parent: str = None,
468470
question: gcd_question.Question = None,
469-
retry: retries.Retry = gapic_v1.method.DEFAULT,
471+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
470472
timeout: float = None,
471473
metadata: Sequence[Tuple[str, str]] = (),
472474
) -> gcd_question.Question:
@@ -549,7 +551,7 @@ def execute_question(
549551
*,
550552
name: str = None,
551553
interpretation_index: int = None,
552-
retry: retries.Retry = gapic_v1.method.DEFAULT,
554+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
553555
timeout: float = None,
554556
metadata: Sequence[Tuple[str, str]] = (),
555557
) -> question.Question:
@@ -632,7 +634,7 @@ def get_user_feedback(
632634
request: Union[question_service.GetUserFeedbackRequest, dict] = None,
633635
*,
634636
name: str = None,
635-
retry: retries.Retry = gapic_v1.method.DEFAULT,
637+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
636638
timeout: float = None,
637639
metadata: Sequence[Tuple[str, str]] = (),
638640
) -> user_feedback.UserFeedback:
@@ -703,7 +705,7 @@ def update_user_feedback(
703705
*,
704706
user_feedback: gcd_user_feedback.UserFeedback = None,
705707
update_mask: field_mask_pb2.FieldMask = None,
706-
retry: retries.Retry = gapic_v1.method.DEFAULT,
708+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
707709
timeout: float = None,
708710
metadata: Sequence[Tuple[str, str]] = (),
709711
) -> gcd_user_feedback.UserFeedback:

‎google/cloud/dataqna_v1alpha/services/question_service/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 QuestionServiceTransport(abc.ABC):
5343
"""Abstract transport class for QuestionService."""
@@ -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/dataqna_v1alpha/services/question_service/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

‎setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
# NOTE: Maintainers, please do not require google-api-core>=2.x.x
4949
# Until this issue is closed
5050
# https://github.com/googleapis/google-cloud-python/issues/10566
51-
"google-api-core[grpc] >= 1.26.0, <3.0.0dev",
51+
"google-api-core[grpc] >= 1.28.0, <3.0.0dev",
5252
"proto-plus >= 1.10.0",
53-
"packaging >= 14.3",
5453
),
5554
python_requires=">=3.6",
5655
classifiers=[

‎testing/constraints-3.6.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,5 @@
55
#
66
# e.g., if setup.py has "foo >= 1.14.0, < 2.0.0dev",
77
# Then this file should have foo==1.14.0
8-
google-api-core==1.26.0
8+
google-api-core==1.28.0
99
proto-plus==1.10.0
10-
packaging==14.3
11-
# TODO: remove once google-auth>=1.25.0 is required transitively
12-
# through google-api-core>=1.28.0
13-
google-auth==1.24.0

0 commit comments

Comments
 (0)