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

Commit 7750cb3

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
chore: use gapic-generator-python 0.53.4 (#110)
- [ ] 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 51aa3a6 commit 7750cb3

28 files changed

Lines changed: 596 additions & 634 deletions

File tree

‎google/cloud/notebooks_v1/services/managed_notebook_service/async_client.py‎

Lines changed: 30 additions & 28 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.notebooks_v1.services.managed_notebook_service import pagers
@@ -173,17 +175,17 @@ def __init__(
173175

174176
async def list_runtimes(
175177
self,
176-
request: managed_service.ListRuntimesRequest = None,
178+
request: Union[managed_service.ListRuntimesRequest, dict] = None,
177179
*,
178180
parent: str = None,
179-
retry: retries.Retry = gapic_v1.method.DEFAULT,
181+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
180182
timeout: float = None,
181183
metadata: Sequence[Tuple[str, str]] = (),
182184
) -> pagers.ListRuntimesAsyncPager:
183185
r"""Lists Runtimes in a given project and location.
184186
185187
Args:
186-
request (:class:`google.cloud.notebooks_v1.types.ListRuntimesRequest`):
188+
request (Union[google.cloud.notebooks_v1.types.ListRuntimesRequest, dict]):
187189
The request object. Request for listing Managed Notebook
188190
Runtimes.
189191
parent (:class:`str`):
@@ -253,18 +255,18 @@ async def list_runtimes(
253255

254256
async def get_runtime(
255257
self,
256-
request: managed_service.GetRuntimeRequest = None,
258+
request: Union[managed_service.GetRuntimeRequest, dict] = None,
257259
*,
258260
name: str = None,
259-
retry: retries.Retry = gapic_v1.method.DEFAULT,
261+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
260262
timeout: float = None,
261263
metadata: Sequence[Tuple[str, str]] = (),
262264
) -> runtime.Runtime:
263265
r"""Gets details of a single Runtime. The location must
264266
be a regional endpoint rather than zonal.
265267
266268
Args:
267-
request (:class:`google.cloud.notebooks_v1.types.GetRuntimeRequest`):
269+
request (Union[google.cloud.notebooks_v1.types.GetRuntimeRequest, dict]):
268270
The request object. Request for getting a Managed
269271
Notebook Runtime.
270272
name (:class:`str`):
@@ -325,20 +327,20 @@ async def get_runtime(
325327

326328
async def create_runtime(
327329
self,
328-
request: managed_service.CreateRuntimeRequest = None,
330+
request: Union[managed_service.CreateRuntimeRequest, dict] = None,
329331
*,
330332
parent: str = None,
331333
runtime_id: str = None,
332334
runtime: gcn_runtime.Runtime = None,
333-
retry: retries.Retry = gapic_v1.method.DEFAULT,
335+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
334336
timeout: float = None,
335337
metadata: Sequence[Tuple[str, str]] = (),
336338
) -> operation_async.AsyncOperation:
337339
r"""Creates a new Runtime in a given project and
338340
location.
339341
340342
Args:
341-
request (:class:`google.cloud.notebooks_v1.types.CreateRuntimeRequest`):
343+
request (Union[google.cloud.notebooks_v1.types.CreateRuntimeRequest, dict]):
342344
The request object. Request for creating a Managed
343345
Notebook Runtime.
344346
parent (:class:`str`):
@@ -426,17 +428,17 @@ async def create_runtime(
426428

427429
async def delete_runtime(
428430
self,
429-
request: managed_service.DeleteRuntimeRequest = None,
431+
request: Union[managed_service.DeleteRuntimeRequest, dict] = None,
430432
*,
431433
name: str = None,
432-
retry: retries.Retry = gapic_v1.method.DEFAULT,
434+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
433435
timeout: float = None,
434436
metadata: Sequence[Tuple[str, str]] = (),
435437
) -> operation_async.AsyncOperation:
436438
r"""Deletes a single Runtime.
437439
438440
Args:
439-
request (:class:`google.cloud.notebooks_v1.types.DeleteRuntimeRequest`):
441+
request (Union[google.cloud.notebooks_v1.types.DeleteRuntimeRequest, dict]):
440442
The request object. Request for deleting a Managed
441443
Notebook Runtime.
442444
name (:class:`str`):
@@ -518,10 +520,10 @@ async def delete_runtime(
518520

519521
async def start_runtime(
520522
self,
521-
request: managed_service.StartRuntimeRequest = None,
523+
request: Union[managed_service.StartRuntimeRequest, dict] = None,
522524
*,
523525
name: str = None,
524-
retry: retries.Retry = gapic_v1.method.DEFAULT,
526+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
525527
timeout: float = None,
526528
metadata: Sequence[Tuple[str, str]] = (),
527529
) -> operation_async.AsyncOperation:
@@ -534,7 +536,7 @@ async def start_runtime(
534536
resume-instance
535537
536538
Args:
537-
request (:class:`google.cloud.notebooks_v1.types.StartRuntimeRequest`):
539+
request (Union[google.cloud.notebooks_v1.types.StartRuntimeRequest, dict]):
538540
The request object. Request for starting a Managed
539541
Notebook Runtime.
540542
name (:class:`str`):
@@ -606,10 +608,10 @@ async def start_runtime(
606608

607609
async def stop_runtime(
608610
self,
609-
request: managed_service.StopRuntimeRequest = None,
611+
request: Union[managed_service.StopRuntimeRequest, dict] = None,
610612
*,
611613
name: str = None,
612-
retry: retries.Retry = gapic_v1.method.DEFAULT,
614+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
613615
timeout: float = None,
614616
metadata: Sequence[Tuple[str, str]] = (),
615617
) -> operation_async.AsyncOperation:
@@ -622,7 +624,7 @@ async def stop_runtime(
622624
resume-instance
623625
624626
Args:
625-
request (:class:`google.cloud.notebooks_v1.types.StopRuntimeRequest`):
627+
request (Union[google.cloud.notebooks_v1.types.StopRuntimeRequest, dict]):
626628
The request object. Request for stopping a Managed
627629
Notebook Runtime.
628630
name (:class:`str`):
@@ -694,17 +696,17 @@ async def stop_runtime(
694696

695697
async def switch_runtime(
696698
self,
697-
request: managed_service.SwitchRuntimeRequest = None,
699+
request: Union[managed_service.SwitchRuntimeRequest, dict] = None,
698700
*,
699701
name: str = None,
700-
retry: retries.Retry = gapic_v1.method.DEFAULT,
702+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
701703
timeout: float = None,
702704
metadata: Sequence[Tuple[str, str]] = (),
703705
) -> operation_async.AsyncOperation:
704706
r"""Switch a Managed Notebook Runtime.
705707
706708
Args:
707-
request (:class:`google.cloud.notebooks_v1.types.SwitchRuntimeRequest`):
709+
request (Union[google.cloud.notebooks_v1.types.SwitchRuntimeRequest, dict]):
708710
The request object. Request for switching a Managed
709711
Notebook Runtime.
710712
name (:class:`str`):
@@ -776,17 +778,17 @@ async def switch_runtime(
776778

777779
async def reset_runtime(
778780
self,
779-
request: managed_service.ResetRuntimeRequest = None,
781+
request: Union[managed_service.ResetRuntimeRequest, dict] = None,
780782
*,
781783
name: str = None,
782-
retry: retries.Retry = gapic_v1.method.DEFAULT,
784+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
783785
timeout: float = None,
784786
metadata: Sequence[Tuple[str, str]] = (),
785787
) -> operation_async.AsyncOperation:
786788
r"""Resets a Managed Notebook Runtime.
787789
788790
Args:
789-
request (:class:`google.cloud.notebooks_v1.types.ResetRuntimeRequest`):
791+
request (Union[google.cloud.notebooks_v1.types.ResetRuntimeRequest, dict]):
790792
The request object. Request for reseting a Managed
791793
Notebook Runtime.
792794
name (:class:`str`):
@@ -858,17 +860,17 @@ async def reset_runtime(
858860

859861
async def report_runtime_event(
860862
self,
861-
request: managed_service.ReportRuntimeEventRequest = None,
863+
request: Union[managed_service.ReportRuntimeEventRequest, dict] = None,
862864
*,
863865
name: str = None,
864-
retry: retries.Retry = gapic_v1.method.DEFAULT,
866+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
865867
timeout: float = None,
866868
metadata: Sequence[Tuple[str, str]] = (),
867869
) -> operation_async.AsyncOperation:
868870
r"""Report and process a runtime event.
869871
870872
Args:
871-
request (:class:`google.cloud.notebooks_v1.types.ReportRuntimeEventRequest`):
873+
request (Union[google.cloud.notebooks_v1.types.ReportRuntimeEventRequest, dict]):
872874
The request object. Request for reporting a Managed
873875
Notebook Event.
874876
name (:class:`str`):

‎google/cloud/notebooks_v1/services/managed_notebook_service/client.py‎

Lines changed: 11 additions & 9 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.notebooks_v1.services.managed_notebook_service import pagers
@@ -361,7 +363,7 @@ def list_runtimes(
361363
request: Union[managed_service.ListRuntimesRequest, dict] = None,
362364
*,
363365
parent: str = None,
364-
retry: retries.Retry = gapic_v1.method.DEFAULT,
366+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
365367
timeout: float = None,
366368
metadata: Sequence[Tuple[str, str]] = (),
367369
) -> pagers.ListRuntimesPager:
@@ -441,7 +443,7 @@ def get_runtime(
441443
request: Union[managed_service.GetRuntimeRequest, dict] = None,
442444
*,
443445
name: str = None,
444-
retry: retries.Retry = gapic_v1.method.DEFAULT,
446+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
445447
timeout: float = None,
446448
metadata: Sequence[Tuple[str, str]] = (),
447449
) -> runtime.Runtime:
@@ -515,7 +517,7 @@ def create_runtime(
515517
parent: str = None,
516518
runtime_id: str = None,
517519
runtime: gcn_runtime.Runtime = None,
518-
retry: retries.Retry = gapic_v1.method.DEFAULT,
520+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
519521
timeout: float = None,
520522
metadata: Sequence[Tuple[str, str]] = (),
521523
) -> operation.Operation:
@@ -614,7 +616,7 @@ def delete_runtime(
614616
request: Union[managed_service.DeleteRuntimeRequest, dict] = None,
615617
*,
616618
name: str = None,
617-
retry: retries.Retry = gapic_v1.method.DEFAULT,
619+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
618620
timeout: float = None,
619621
metadata: Sequence[Tuple[str, str]] = (),
620622
) -> operation.Operation:
@@ -706,7 +708,7 @@ def start_runtime(
706708
request: Union[managed_service.StartRuntimeRequest, dict] = None,
707709
*,
708710
name: str = None,
709-
retry: retries.Retry = gapic_v1.method.DEFAULT,
711+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
710712
timeout: float = None,
711713
metadata: Sequence[Tuple[str, str]] = (),
712714
) -> operation.Operation:
@@ -794,7 +796,7 @@ def stop_runtime(
794796
request: Union[managed_service.StopRuntimeRequest, dict] = None,
795797
*,
796798
name: str = 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:
@@ -882,7 +884,7 @@ def switch_runtime(
882884
request: Union[managed_service.SwitchRuntimeRequest, dict] = None,
883885
*,
884886
name: str = None,
885-
retry: retries.Retry = gapic_v1.method.DEFAULT,
887+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
886888
timeout: float = None,
887889
metadata: Sequence[Tuple[str, str]] = (),
888890
) -> operation.Operation:
@@ -964,7 +966,7 @@ def reset_runtime(
964966
request: Union[managed_service.ResetRuntimeRequest, dict] = None,
965967
*,
966968
name: str = None,
967-
retry: retries.Retry = gapic_v1.method.DEFAULT,
969+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
968970
timeout: float = None,
969971
metadata: Sequence[Tuple[str, str]] = (),
970972
) -> operation.Operation:
@@ -1046,7 +1048,7 @@ def report_runtime_event(
10461048
request: Union[managed_service.ReportRuntimeEventRequest, dict] = None,
10471049
*,
10481050
name: str = None,
1049-
retry: retries.Retry = gapic_v1.method.DEFAULT,
1051+
retry: OptionalRetry = gapic_v1.method.DEFAULT,
10501052
timeout: float = None,
10511053
metadata: Sequence[Tuple[str, str]] = (),
10521054
) -> operation.Operation:

‎google/cloud/notebooks_v1/services/managed_notebook_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
@@ -38,15 +37,6 @@
3837
except pkg_resources.DistributionNotFound:
3938
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo()
4039

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

5141
class ManagedNotebookServiceTransport(abc.ABC):
5242
"""Abstract transport class for ManagedNotebookService."""
@@ -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 = {
@@ -196,7 +163,7 @@ def close(self):
196163
raise NotImplementedError()
197164

198165
@property
199-
def operations_client(self) -> operations_v1.OperationsClient:
166+
def operations_client(self):
200167
"""Return the client designed to process long-running operations."""
201168
raise NotImplementedError()
202169

‎google/cloud/notebooks_v1/services/managed_notebook_service/transports/grpc.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def __init__(
113113
self._grpc_channel = None
114114
self._ssl_channel_credentials = ssl_channel_credentials
115115
self._stubs: Dict[str, Callable] = {}
116-
self._operations_client = None
116+
self._operations_client: Optional[operations_v1.OperationsClient] = None
117117

118118
if api_mtls_endpoint:
119119
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

‎google/cloud/notebooks_v1/services/managed_notebook_service/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
@@ -160,7 +159,7 @@ def __init__(
160159
self._grpc_channel = None
161160
self._ssl_channel_credentials = ssl_channel_credentials
162161
self._stubs: Dict[str, Callable] = {}
163-
self._operations_client = None
162+
self._operations_client: Optional[operations_v1.OperationsAsyncClient] = None
164163

165164
if api_mtls_endpoint:
166165
warnings.warn("api_mtls_endpoint is deprecated", DeprecationWarning)

0 commit comments

Comments
 (0)