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

Commit 6374e7f

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#214)
- [ ] 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 20babb6 commit 6374e7f

File tree

14 files changed

+98
-307
lines changed

14 files changed

+98
-307
lines changed

‎google/cloud/language_v1/services/language_service/async_client.py‎

Lines changed: 21 additions & 19 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.language_v1.types import language_service
3032
from .transports.base import LanguageServiceTransport, DEFAULT_CLIENT_INFO
3133
from .transports.grpc_asyncio import LanguageServiceGrpcAsyncIOTransport
@@ -162,18 +164,18 @@ def __init__(
162164

163165
async def analyze_sentiment(
164166
self,
165-
request: language_service.AnalyzeSentimentRequest = None,
167+
request: Union[language_service.AnalyzeSentimentRequest, dict] = None,
166168
*,
167169
document: language_service.Document = None,
168170
encoding_type: language_service.EncodingType = None,
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
) -> language_service.AnalyzeSentimentResponse:
173175
r"""Analyzes the sentiment of the provided text.
174176
175177
Args:
176-
request (:class:`google.cloud.language_v1.types.AnalyzeSentimentRequest`):
178+
request (Union[google.cloud.language_v1.types.AnalyzeSentimentRequest, dict]):
177179
The request object. The sentiment analysis request
178180
message.
179181
document (:class:`google.cloud.language_v1.types.Document`):
@@ -245,11 +247,11 @@ async def analyze_sentiment(
245247

246248
async def analyze_entities(
247249
self,
248-
request: language_service.AnalyzeEntitiesRequest = None,
250+
request: Union[language_service.AnalyzeEntitiesRequest, dict] = None,
249251
*,
250252
document: language_service.Document = None,
251253
encoding_type: language_service.EncodingType = None,
252-
retry: retries.Retry = gapic_v1.method.DEFAULT,
254+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
253255
timeout: float = None,
254256
metadata: Sequence[Tuple[str, str]] = (),
255257
) -> language_service.AnalyzeEntitiesResponse:
@@ -259,7 +261,7 @@ async def analyze_entities(
259261
properties.
260262
261263
Args:
262-
request (:class:`google.cloud.language_v1.types.AnalyzeEntitiesRequest`):
264+
request (Union[google.cloud.language_v1.types.AnalyzeEntitiesRequest, dict]):
263265
The request object. The entity analysis request message.
264266
document (:class:`google.cloud.language_v1.types.Document`):
265267
Input document.
@@ -328,11 +330,11 @@ async def analyze_entities(
328330

329331
async def analyze_entity_sentiment(
330332
self,
331-
request: language_service.AnalyzeEntitySentimentRequest = None,
333+
request: Union[language_service.AnalyzeEntitySentimentRequest, dict] = None,
332334
*,
333335
document: language_service.Document = None,
334336
encoding_type: language_service.EncodingType = None,
335-
retry: retries.Retry = gapic_v1.method.DEFAULT,
337+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
336338
timeout: float = None,
337339
metadata: Sequence[Tuple[str, str]] = (),
338340
) -> language_service.AnalyzeEntitySentimentResponse:
@@ -342,7 +344,7 @@ async def analyze_entity_sentiment(
342344
and its mentions.
343345
344346
Args:
345-
request (:class:`google.cloud.language_v1.types.AnalyzeEntitySentimentRequest`):
347+
request (Union[google.cloud.language_v1.types.AnalyzeEntitySentimentRequest, dict]):
346348
The request object. The entity-level sentiment analysis
347349
request message.
348350
document (:class:`google.cloud.language_v1.types.Document`):
@@ -414,11 +416,11 @@ async def analyze_entity_sentiment(
414416

415417
async def analyze_syntax(
416418
self,
417-
request: language_service.AnalyzeSyntaxRequest = None,
419+
request: Union[language_service.AnalyzeSyntaxRequest, dict] = None,
418420
*,
419421
document: language_service.Document = None,
420422
encoding_type: language_service.EncodingType = None,
421-
retry: retries.Retry = gapic_v1.method.DEFAULT,
423+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
422424
timeout: float = None,
423425
metadata: Sequence[Tuple[str, str]] = (),
424426
) -> language_service.AnalyzeSyntaxResponse:
@@ -427,7 +429,7 @@ async def analyze_syntax(
427429
tags, dependency trees, and other properties.
428430
429431
Args:
430-
request (:class:`google.cloud.language_v1.types.AnalyzeSyntaxRequest`):
432+
request (Union[google.cloud.language_v1.types.AnalyzeSyntaxRequest, dict]):
431433
The request object. The syntax analysis request message.
432434
document (:class:`google.cloud.language_v1.types.Document`):
433435
Input document.
@@ -496,17 +498,17 @@ async def analyze_syntax(
496498

497499
async def classify_text(
498500
self,
499-
request: language_service.ClassifyTextRequest = None,
501+
request: Union[language_service.ClassifyTextRequest, dict] = None,
500502
*,
501503
document: language_service.Document = None,
502-
retry: retries.Retry = gapic_v1.method.DEFAULT,
504+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
503505
timeout: float = None,
504506
metadata: Sequence[Tuple[str, str]] = (),
505507
) -> language_service.ClassifyTextResponse:
506508
r"""Classifies a document into categories.
507509
508510
Args:
509-
request (:class:`google.cloud.language_v1.types.ClassifyTextRequest`):
511+
request (Union[google.cloud.language_v1.types.ClassifyTextRequest, dict]):
510512
The request object. The document classification request
511513
message.
512514
document (:class:`google.cloud.language_v1.types.Document`):
@@ -569,12 +571,12 @@ async def classify_text(
569571

570572
async def annotate_text(
571573
self,
572-
request: language_service.AnnotateTextRequest = None,
574+
request: Union[language_service.AnnotateTextRequest, dict] = None,
573575
*,
574576
document: language_service.Document = None,
575577
features: language_service.AnnotateTextRequest.Features = None,
576578
encoding_type: language_service.EncodingType = None,
577-
retry: retries.Retry = gapic_v1.method.DEFAULT,
579+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
578580
timeout: float = None,
579581
metadata: Sequence[Tuple[str, str]] = (),
580582
) -> language_service.AnnotateTextResponse:
@@ -583,7 +585,7 @@ async def annotate_text(
583585
analyzeSyntax provide in one call.
584586
585587
Args:
586-
request (:class:`google.cloud.language_v1.types.AnnotateTextRequest`):
588+
request (Union[google.cloud.language_v1.types.AnnotateTextRequest, dict]):
587589
The request object. The request message for the text
588590
annotation API, which can perform multiple analysis
589591
types (sentiment, entities, and syntax) in one call.

‎google/cloud/language_v1/services/language_service/client.py‎

Lines changed: 8 additions & 6 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.language_v1.types import language_service
3436
from .transports.base import LanguageServiceTransport, DEFAULT_CLIENT_INFO
3537
from .transports.grpc import LanguageServiceGrpcTransport
@@ -338,7 +340,7 @@ def analyze_sentiment(
338340
*,
339341
document: language_service.Document = None,
340342
encoding_type: language_service.EncodingType = None,
341-
retry: retries.Retry = gapic_v1.method.DEFAULT,
343+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
342344
timeout: float = None,
343345
metadata: Sequence[Tuple[str, str]] = (),
344346
) -> language_service.AnalyzeSentimentResponse:
@@ -411,7 +413,7 @@ def analyze_entities(
411413
*,
412414
document: language_service.Document = None,
413415
encoding_type: language_service.EncodingType = None,
414-
retry: retries.Retry = gapic_v1.method.DEFAULT,
416+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
415417
timeout: float = None,
416418
metadata: Sequence[Tuple[str, str]] = (),
417419
) -> language_service.AnalyzeEntitiesResponse:
@@ -484,7 +486,7 @@ def analyze_entity_sentiment(
484486
*,
485487
document: language_service.Document = None,
486488
encoding_type: language_service.EncodingType = None,
487-
retry: retries.Retry = gapic_v1.method.DEFAULT,
489+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
488490
timeout: float = None,
489491
metadata: Sequence[Tuple[str, str]] = (),
490492
) -> language_service.AnalyzeEntitySentimentResponse:
@@ -560,7 +562,7 @@ def analyze_syntax(
560562
*,
561563
document: language_service.Document = None,
562564
encoding_type: language_service.EncodingType = None,
563-
retry: retries.Retry = gapic_v1.method.DEFAULT,
565+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
564566
timeout: float = None,
565567
metadata: Sequence[Tuple[str, str]] = (),
566568
) -> language_service.AnalyzeSyntaxResponse:
@@ -631,7 +633,7 @@ def classify_text(
631633
request: Union[language_service.ClassifyTextRequest, dict] = None,
632634
*,
633635
document: language_service.Document = None,
634-
retry: retries.Retry = gapic_v1.method.DEFAULT,
636+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
635637
timeout: float = None,
636638
metadata: Sequence[Tuple[str, str]] = (),
637639
) -> language_service.ClassifyTextResponse:
@@ -696,7 +698,7 @@ def annotate_text(
696698
document: language_service.Document = None,
697699
features: language_service.AnnotateTextRequest.Features = None,
698700
encoding_type: language_service.EncodingType = None,
699-
retry: retries.Retry = gapic_v1.method.DEFAULT,
701+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
700702
timeout: float = None,
701703
metadata: Sequence[Tuple[str, str]] = (),
702704
) -> language_service.AnnotateTextResponse:

‎google/cloud/language_v1/services/language_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 LanguageServiceTransport(abc.ABC):
4939
"""Abstract transport class for LanguageService."""
@@ -96,7 +86,7 @@ def __init__(
9686
host += ":443"
9787
self._host = host
9888

99-
scopes_kwargs = self._get_scopes_kwargs(self._host, scopes)
89+
scopes_kwargs = {"scopes": scopes, "default_scopes": self.AUTH_SCOPES}
10090

10191
# Save the scopes.
10292
self._scopes = scopes
@@ -129,29 +119,6 @@ def __init__(
129119
# Save the credentials.
130120
self._credentials = credentials
131121

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

‎google/cloud/language_v1/services/language_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/language_v1/types/language_service.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,13 @@ class EncodingType(proto.Enum):
6262
class Document(proto.Message):
6363
r"""Represents the input to API methods.
6464
65+
This message has `oneof`_ fields (mutually exclusive fields).
66+
For each oneof, at most one member field can be set at the same time.
67+
Setting any member of the oneof automatically clears all other
68+
members.
69+
70+
.. _oneof: https://proto-plus-python.readthedocs.io/en/stable/fields.html#oneofs-mutually-exclusive-fields
71+
6572
Attributes:
6673
type_ (google.cloud.language_v1.types.Document.Type):
6774
Required. If the type is not set or is ``TYPE_UNSPECIFIED``,
@@ -70,12 +77,14 @@ class Document(proto.Message):
7077
The content of the input in string format.
7178
Cloud audit logging exempt since it is based on
7279
user data.
80+
This field is a member of `oneof`_ ``source``.
7381
gcs_content_uri (str):
7482
The Google Cloud Storage URI where the file content is
7583
located. This URI must be of the form:
7684
gs://bucket_name/object_name. For more details, see
7785
https://cloud.google.com/storage/docs/reference-uris. NOTE:
7886
Cloud Storage object versioning is not supported.
87+
This field is a member of `oneof`_ ``source``.
7988
language (str):
8089
The language of the document (if not specified, the language
8190
is automatically detected). Both ISO and BCP-47 language

0 commit comments

Comments
 (0)