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

Commit 3ff2900

Browse files
gcf-owl-bot[bot]parthea
gcf-owl-bot[bot]
and
parthea
authored
chore: Update gapic-generator-python to v1.6.1 (#392)
* chore: update to gapic-generator-python 1.5.0 feat: add support for `google.cloud.<api>.__version__` PiperOrigin-RevId: 484665853 Source-Link: googleapis/googleapis@8eb249a Source-Link: https://github.com/googleapis/googleapis-gen/commit/c8aa327b5f478865fc3fd91e3c2768e54e26ad44 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYzhhYTMyN2I1ZjQ3ODg2NWZjM2ZkOTFlM2MyNzY4ZTU0ZTI2YWQ0NCJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * update version in gapic_version.py * add .release-please-manifest.json with correct version * add owlbot.py to exclude generated gapic_version.py * set manifest to true in .github/release-please.yml * add release-please-config.json * fix spacing * revert * typo * chore: Update to gapic-generator-python 1.6.0 feat(python): Add typing to proto.Message based class attributes feat(python): Snippetgen handling of repeated enum field PiperOrigin-RevId: 487326846 Source-Link: googleapis/googleapis@da380c7 Source-Link: https://github.com/googleapis/googleapis-gen/commit/61ef5762ee6731a0cbbfea22fd0eecee51ab1c8e Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjFlZjU3NjJlZTY3MzFhMGNiYmZlYTIyZmQwZWVjZWU1MWFiMWM4ZSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: new APIs added to reflect updates to the filestore service - Add ENTERPRISE Tier - Add snapshot APIs: RevertInstance, ListSnapshots, CreateSnapshot, DeleteSnapshot, UpdateSnapshot - Add multi-share APIs: ListShares, GetShare, CreateShare, DeleteShare, UpdateShare - Add ConnectMode to NetworkConfig (for Private Service Access support) - New status codes (SUSPENDED/SUSPENDING, REVERTING/RESUMING) - Add SuspensionReason (for KMS related suspension) - Add new fields to Instance information: max_capacity_gb, capacity_step_size_gb, max_share_count, capacity_gb, multi_share_enabled PiperOrigin-RevId: 487492758 Source-Link: googleapis/googleapis@5be5981 Source-Link: https://github.com/googleapis/googleapis-gen/commit/ab0e217f560cc2c1afc11441c2eab6b6950efd2b Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiYWIwZTIxN2Y1NjBjYzJjMWFmYzExNDQxYzJlYWI2YjY5NTBlZmQyYiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * update path to snippet metadata json * chore: Update gapic-generator-python to v1.6.1 PiperOrigin-RevId: 488036204 Source-Link: googleapis/googleapis@08f275f Source-Link: https://github.com/googleapis/googleapis-gen/commit/555c0945e60649e38739ae64bc45719cdf72178f Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNTU1YzA5NDVlNjA2NDllMzg3MzlhZTY0YmM0NTcxOWNkZjcyMTc4ZiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * configure release-please to use manifest * drop flake8-import-order Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <[email protected]>
1 parent cb1b186 commit 3ff2900

File tree

26 files changed

+541
-400
lines changed

26 files changed

+541
-400
lines changed

‎.github/release-please.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
releaseType: python
22
handleGHRelease: true
3+
manifest: true
34
# NOTE: this section is generated by synthtool.languages.python
45
# See https://github.com/googleapis/synthtool/blob/master/synthtool/languages/python.py
56
branches:

‎docs/language_v1/types.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ Types for Google Cloud Language v1 API
33

44
.. automodule:: google.cloud.language_v1.types
55
:members:
6-
:undoc-members:
76
:show-inheritance:

‎docs/language_v1beta2/types.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ Types for Google Cloud Language v1beta2 API
33

44
.. automodule:: google.cloud.language_v1beta2.types
55
:members:
6-
:undoc-members:
76
:show-inheritance:

‎google/cloud/language/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16+
from google.cloud.language import gapic_version as package_version
17+
18+
__version__ = package_version.__version__
19+
1620

1721
from google.cloud.language_v1.services.language_service.async_client import (
1822
LanguageServiceAsyncClient,

‎google/cloud/language_v1/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16+
from google.cloud.language import gapic_version as package_version
17+
18+
__version__ = package_version.__version__
19+
1620

1721
from .services.language_service import LanguageServiceAsyncClient, LanguageServiceClient
1822
from .types.language_service import (

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

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,17 @@
1616
from collections import OrderedDict
1717
import functools
1818
import re
19-
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
19+
from typing import (
20+
Dict,
21+
Mapping,
22+
MutableMapping,
23+
MutableSequence,
24+
Optional,
25+
Sequence,
26+
Tuple,
27+
Type,
28+
Union,
29+
)
2030

2131
from google.api_core import exceptions as core_exceptions
2232
from google.api_core import gapic_v1
@@ -158,9 +168,9 @@ def transport(self) -> LanguageServiceTransport:
158168
def __init__(
159169
self,
160170
*,
161-
credentials: ga_credentials.Credentials = None,
171+
credentials: Optional[ga_credentials.Credentials] = None,
162172
transport: Union[str, LanguageServiceTransport] = "grpc_asyncio",
163-
client_options: ClientOptions = None,
173+
client_options: Optional[ClientOptions] = None,
164174
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
165175
) -> None:
166176
"""Instantiates the language service client.
@@ -204,12 +214,12 @@ def __init__(
204214

205215
async def analyze_sentiment(
206216
self,
207-
request: Union[language_service.AnalyzeSentimentRequest, dict] = None,
217+
request: Optional[Union[language_service.AnalyzeSentimentRequest, dict]] = None,
208218
*,
209-
document: language_service.Document = None,
210-
encoding_type: language_service.EncodingType = None,
219+
document: Optional[language_service.Document] = None,
220+
encoding_type: Optional[language_service.EncodingType] = None,
211221
retry: OptionalRetry = gapic_v1.method.DEFAULT,
212-
timeout: float = None,
222+
timeout: Optional[float] = None,
213223
metadata: Sequence[Tuple[str, str]] = (),
214224
) -> language_service.AnalyzeSentimentResponse:
215225
r"""Analyzes the sentiment of the provided text.
@@ -244,7 +254,7 @@ async def sample_analyze_sentiment():
244254
print(response)
245255
246256
Args:
247-
request (Union[google.cloud.language_v1.types.AnalyzeSentimentRequest, dict]):
257+
request (Optional[Union[google.cloud.language_v1.types.AnalyzeSentimentRequest, dict]]):
248258
The request object. The sentiment analysis request
249259
message.
250260
document (:class:`google.cloud.language_v1.types.Document`):
@@ -321,12 +331,12 @@ async def sample_analyze_sentiment():
321331

322332
async def analyze_entities(
323333
self,
324-
request: Union[language_service.AnalyzeEntitiesRequest, dict] = None,
334+
request: Optional[Union[language_service.AnalyzeEntitiesRequest, dict]] = None,
325335
*,
326-
document: language_service.Document = None,
327-
encoding_type: language_service.EncodingType = None,
336+
document: Optional[language_service.Document] = None,
337+
encoding_type: Optional[language_service.EncodingType] = None,
328338
retry: OptionalRetry = gapic_v1.method.DEFAULT,
329-
timeout: float = None,
339+
timeout: Optional[float] = None,
330340
metadata: Sequence[Tuple[str, str]] = (),
331341
) -> language_service.AnalyzeEntitiesResponse:
332342
r"""Finds named entities (currently proper names and
@@ -364,7 +374,7 @@ async def sample_analyze_entities():
364374
print(response)
365375
366376
Args:
367-
request (Union[google.cloud.language_v1.types.AnalyzeEntitiesRequest, dict]):
377+
request (Optional[Union[google.cloud.language_v1.types.AnalyzeEntitiesRequest, dict]]):
368378
The request object. The entity analysis request message.
369379
document (:class:`google.cloud.language_v1.types.Document`):
370380
Required. Input document.
@@ -438,12 +448,14 @@ async def sample_analyze_entities():
438448

439449
async def analyze_entity_sentiment(
440450
self,
441-
request: Union[language_service.AnalyzeEntitySentimentRequest, dict] = None,
451+
request: Optional[
452+
Union[language_service.AnalyzeEntitySentimentRequest, dict]
453+
] = None,
442454
*,
443-
document: language_service.Document = None,
444-
encoding_type: language_service.EncodingType = None,
455+
document: Optional[language_service.Document] = None,
456+
encoding_type: Optional[language_service.EncodingType] = None,
445457
retry: OptionalRetry = gapic_v1.method.DEFAULT,
446-
timeout: float = None,
458+
timeout: Optional[float] = None,
447459
metadata: Sequence[Tuple[str, str]] = (),
448460
) -> language_service.AnalyzeEntitySentimentResponse:
449461
r"""Finds entities, similar to
@@ -481,7 +493,7 @@ async def sample_analyze_entity_sentiment():
481493
print(response)
482494
483495
Args:
484-
request (Union[google.cloud.language_v1.types.AnalyzeEntitySentimentRequest, dict]):
496+
request (Optional[Union[google.cloud.language_v1.types.AnalyzeEntitySentimentRequest, dict]]):
485497
The request object. The entity-level sentiment analysis
486498
request message.
487499
document (:class:`google.cloud.language_v1.types.Document`):
@@ -558,12 +570,12 @@ async def sample_analyze_entity_sentiment():
558570

559571
async def analyze_syntax(
560572
self,
561-
request: Union[language_service.AnalyzeSyntaxRequest, dict] = None,
573+
request: Optional[Union[language_service.AnalyzeSyntaxRequest, dict]] = None,
562574
*,
563-
document: language_service.Document = None,
564-
encoding_type: language_service.EncodingType = None,
575+
document: Optional[language_service.Document] = None,
576+
encoding_type: Optional[language_service.EncodingType] = None,
565577
retry: OptionalRetry = gapic_v1.method.DEFAULT,
566-
timeout: float = None,
578+
timeout: Optional[float] = None,
567579
metadata: Sequence[Tuple[str, str]] = (),
568580
) -> language_service.AnalyzeSyntaxResponse:
569581
r"""Analyzes the syntax of the text and provides sentence
@@ -600,7 +612,7 @@ async def sample_analyze_syntax():
600612
print(response)
601613
602614
Args:
603-
request (Union[google.cloud.language_v1.types.AnalyzeSyntaxRequest, dict]):
615+
request (Optional[Union[google.cloud.language_v1.types.AnalyzeSyntaxRequest, dict]]):
604616
The request object. The syntax analysis request message.
605617
document (:class:`google.cloud.language_v1.types.Document`):
606618
Required. Input document.
@@ -674,11 +686,11 @@ async def sample_analyze_syntax():
674686

675687
async def classify_text(
676688
self,
677-
request: Union[language_service.ClassifyTextRequest, dict] = None,
689+
request: Optional[Union[language_service.ClassifyTextRequest, dict]] = None,
678690
*,
679-
document: language_service.Document = None,
691+
document: Optional[language_service.Document] = None,
680692
retry: OptionalRetry = gapic_v1.method.DEFAULT,
681-
timeout: float = None,
693+
timeout: Optional[float] = None,
682694
metadata: Sequence[Tuple[str, str]] = (),
683695
) -> language_service.ClassifyTextResponse:
684696
r"""Classifies a document into categories.
@@ -713,7 +725,7 @@ async def sample_classify_text():
713725
print(response)
714726
715727
Args:
716-
request (Union[google.cloud.language_v1.types.ClassifyTextRequest, dict]):
728+
request (Optional[Union[google.cloud.language_v1.types.ClassifyTextRequest, dict]]):
717729
The request object. The document classification request
718730
message.
719731
document (:class:`google.cloud.language_v1.types.Document`):
@@ -781,13 +793,13 @@ async def sample_classify_text():
781793

782794
async def annotate_text(
783795
self,
784-
request: Union[language_service.AnnotateTextRequest, dict] = None,
796+
request: Optional[Union[language_service.AnnotateTextRequest, dict]] = None,
785797
*,
786-
document: language_service.Document = None,
787-
features: language_service.AnnotateTextRequest.Features = None,
788-
encoding_type: language_service.EncodingType = None,
798+
document: Optional[language_service.Document] = None,
799+
features: Optional[language_service.AnnotateTextRequest.Features] = None,
800+
encoding_type: Optional[language_service.EncodingType] = None,
789801
retry: OptionalRetry = gapic_v1.method.DEFAULT,
790-
timeout: float = None,
802+
timeout: Optional[float] = None,
791803
metadata: Sequence[Tuple[str, str]] = (),
792804
) -> language_service.AnnotateTextResponse:
793805
r"""A convenience method that provides all the features
@@ -824,7 +836,7 @@ async def sample_annotate_text():
824836
print(response)
825837
826838
Args:
827-
request (Union[google.cloud.language_v1.types.AnnotateTextRequest, dict]):
839+
request (Optional[Union[google.cloud.language_v1.types.AnnotateTextRequest, dict]]):
828840
The request object. The request message for the text
829841
annotation API, which can perform multiple analysis
830842
types (sentiment, entities, and syntax) in one call.

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

Lines changed: 43 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,18 @@
1616
from collections import OrderedDict
1717
import os
1818
import re
19-
from typing import Dict, Mapping, Optional, Sequence, Tuple, Type, Union
19+
from typing import (
20+
Dict,
21+
Mapping,
22+
MutableMapping,
23+
MutableSequence,
24+
Optional,
25+
Sequence,
26+
Tuple,
27+
Type,
28+
Union,
29+
cast,
30+
)
2031

2132
from google.api_core import client_options as client_options_lib
2233
from google.api_core import exceptions as core_exceptions
@@ -57,7 +68,7 @@ class LanguageServiceClientMeta(type):
5768

5869
def get_transport_class(
5970
cls,
60-
label: str = None,
71+
label: Optional[str] = None,
6172
) -> Type[LanguageServiceTransport]:
6273
"""Returns an appropriate transport class.
6374
@@ -312,8 +323,8 @@ def __init__(
312323
self,
313324
*,
314325
credentials: Optional[ga_credentials.Credentials] = None,
315-
transport: Union[str, LanguageServiceTransport, None] = None,
316-
client_options: Optional[client_options_lib.ClientOptions] = None,
326+
transport: Optional[Union[str, LanguageServiceTransport]] = None,
327+
client_options: Optional[Union[client_options_lib.ClientOptions, dict]] = None,
317328
client_info: gapic_v1.client_info.ClientInfo = DEFAULT_CLIENT_INFO,
318329
) -> None:
319330
"""Instantiates the language service client.
@@ -327,7 +338,7 @@ def __init__(
327338
transport (Union[str, LanguageServiceTransport]): The
328339
transport to use. If set to None, a transport is chosen
329340
automatically.
330-
client_options (google.api_core.client_options.ClientOptions): Custom options for the
341+
client_options (Optional[Union[google.api_core.client_options.ClientOptions, dict]]): Custom options for the
331342
client. It won't take effect if a ``transport`` instance is provided.
332343
(1) The ``api_endpoint`` property can be used to override the
333344
default endpoint provided by the client. GOOGLE_API_USE_MTLS_ENDPOINT
@@ -357,6 +368,7 @@ def __init__(
357368
client_options = client_options_lib.from_dict(client_options)
358369
if client_options is None:
359370
client_options = client_options_lib.ClientOptions()
371+
client_options = cast(client_options_lib.ClientOptions, client_options)
360372

361373
api_endpoint, client_cert_source_func = self.get_mtls_endpoint_and_cert_source(
362374
client_options
@@ -409,12 +421,12 @@ def __init__(
409421

410422
def analyze_sentiment(
411423
self,
412-
request: Union[language_service.AnalyzeSentimentRequest, dict] = None,
424+
request: Optional[Union[language_service.AnalyzeSentimentRequest, dict]] = None,
413425
*,
414-
document: language_service.Document = None,
415-
encoding_type: language_service.EncodingType = None,
426+
document: Optional[language_service.Document] = None,
427+
encoding_type: Optional[language_service.EncodingType] = None,
416428
retry: OptionalRetry = gapic_v1.method.DEFAULT,
417-
timeout: float = None,
429+
timeout: Optional[float] = None,
418430
metadata: Sequence[Tuple[str, str]] = (),
419431
) -> language_service.AnalyzeSentimentResponse:
420432
r"""Analyzes the sentiment of the provided text.
@@ -516,12 +528,12 @@ def sample_analyze_sentiment():
516528

517529
def analyze_entities(
518530
self,
519-
request: Union[language_service.AnalyzeEntitiesRequest, dict] = None,
531+
request: Optional[Union[language_service.AnalyzeEntitiesRequest, dict]] = None,
520532
*,
521-
document: language_service.Document = None,
522-
encoding_type: language_service.EncodingType = None,
533+
document: Optional[language_service.Document] = None,
534+
encoding_type: Optional[language_service.EncodingType] = None,
523535
retry: OptionalRetry = gapic_v1.method.DEFAULT,
524-
timeout: float = None,
536+
timeout: Optional[float] = None,
525537
metadata: Sequence[Tuple[str, str]] = (),
526538
) -> language_service.AnalyzeEntitiesResponse:
527539
r"""Finds named entities (currently proper names and
@@ -623,12 +635,14 @@ def sample_analyze_entities():
623635

624636
def analyze_entity_sentiment(
625637
self,
626-
request: Union[language_service.AnalyzeEntitySentimentRequest, dict] = None,
638+
request: Optional[
639+
Union[language_service.AnalyzeEntitySentimentRequest, dict]
640+
] = None,
627641
*,
628-
document: language_service.Document = None,
629-
encoding_type: language_service.EncodingType = None,
642+
document: Optional[language_service.Document] = None,
643+
encoding_type: Optional[language_service.EncodingType] = None,
630644
retry: OptionalRetry = gapic_v1.method.DEFAULT,
631-
timeout: float = None,
645+
timeout: Optional[float] = None,
632646
metadata: Sequence[Tuple[str, str]] = (),
633647
) -> language_service.AnalyzeEntitySentimentResponse:
634648
r"""Finds entities, similar to
@@ -733,12 +747,12 @@ def sample_analyze_entity_sentiment():
733747

734748
def analyze_syntax(
735749
self,
736-
request: Union[language_service.AnalyzeSyntaxRequest, dict] = None,
750+
request: Optional[Union[language_service.AnalyzeSyntaxRequest, dict]] = None,
737751
*,
738-
document: language_service.Document = None,
739-
encoding_type: language_service.EncodingType = None,
752+
document: Optional[language_service.Document] = None,
753+
encoding_type: Optional[language_service.EncodingType] = None,
740754
retry: OptionalRetry = gapic_v1.method.DEFAULT,
741-
timeout: float = None,
755+
timeout: Optional[float] = None,
742756
metadata: Sequence[Tuple[str, str]] = (),
743757
) -> language_service.AnalyzeSyntaxResponse:
744758
r"""Analyzes the syntax of the text and provides sentence
@@ -839,11 +853,11 @@ def sample_analyze_syntax():
839853

840854
def classify_text(
841855
self,
842-
request: Union[language_service.ClassifyTextRequest, dict] = None,
856+
request: Optional[Union[language_service.ClassifyTextRequest, dict]] = None,
843857
*,
844-
document: language_service.Document = None,
858+
document: Optional[language_service.Document] = None,
845859
retry: OptionalRetry = gapic_v1.method.DEFAULT,
846-
timeout: float = None,
860+
timeout: Optional[float] = None,
847861
metadata: Sequence[Tuple[str, str]] = (),
848862
) -> language_service.ClassifyTextResponse:
849863
r"""Classifies a document into categories.
@@ -936,13 +950,13 @@ def sample_classify_text():
936950

937951
def annotate_text(
938952
self,
939-
request: Union[language_service.AnnotateTextRequest, dict] = None,
953+
request: Optional[Union[language_service.AnnotateTextRequest, dict]] = None,
940954
*,
941-
document: language_service.Document = None,
942-
features: language_service.AnnotateTextRequest.Features = None,
943-
encoding_type: language_service.EncodingType = None,
955+
document: Optional[language_service.Document] = None,
956+
features: Optional[language_service.AnnotateTextRequest.Features] = None,
957+
encoding_type: Optional[language_service.EncodingType] = None,
944958
retry: OptionalRetry = gapic_v1.method.DEFAULT,
945-
timeout: float = None,
959+
timeout: Optional[float] = None,
946960
metadata: Sequence[Tuple[str, str]] = (),
947961
) -> language_service.AnnotateTextResponse:
948962
r"""A convenience method that provides all the features

‎google/cloud/language_v1/services/language_service/transports/base.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def __init__(
5151
self,
5252
*,
5353
host: str = DEFAULT_HOST,
54-
credentials: ga_credentials.Credentials = None,
54+
credentials: Optional[ga_credentials.Credentials] = None,
5555
credentials_file: Optional[str] = None,
5656
scopes: Optional[Sequence[str]] = None,
5757
quota_project_id: Optional[str] = None,

0 commit comments

Comments
 (0)