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

Commit 80768c8

Browse files
feat: add context manager support in client (#175)
- [ ] Regenerate this pull request now. chore: fix docstring for first attribute of protos committer: @busunkim96 PiperOrigin-RevId: 401271153 Source-Link: googleapis/googleapis@787f8c9 Source-Link: https://github.com/googleapis/googleapis-gen/commit/81decffe9fc72396a8153e756d1d67a6eecfd620 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiODFkZWNmZmU5ZmM3MjM5NmE4MTUzZTc1NmQxZDY3YTZlZWNmZDYyMCJ9
1 parent 6e06ed3 commit 80768c8

File tree

7 files changed

+88
-4
lines changed

7 files changed

+88
-4
lines changed

google/cloud/bigquery_reservation_v1/services/reservation_service/async_client.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2119,6 +2119,12 @@ async def update_bi_reservation(
21192119
# Done; return the response.
21202120
return response
21212121

2122+
async def __aenter__(self):
2123+
return self
2124+
2125+
async def __aexit__(self, exc_type, exc, tb):
2126+
await self.transport.close()
2127+
21222128

21232129
try:
21242130
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(

google/cloud/bigquery_reservation_v1/services/reservation_service/client.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -423,10 +423,7 @@ def __init__(
423423
client_cert_source_for_mtls=client_cert_source_func,
424424
quota_project_id=client_options.quota_project_id,
425425
client_info=client_info,
426-
always_use_jwt_access=(
427-
Transport == type(self).get_transport_class("grpc")
428-
or Transport == type(self).get_transport_class("grpc_asyncio")
429-
),
426+
always_use_jwt_access=True,
430427
)
431428

432429
def create_reservation(
@@ -2262,6 +2259,19 @@ def update_bi_reservation(
22622259
# Done; return the response.
22632260
return response
22642261

2262+
def __enter__(self):
2263+
return self
2264+
2265+
def __exit__(self, type, value, traceback):
2266+
"""Releases underlying transport's resources.
2267+
2268+
.. warning::
2269+
ONLY use as a context manager if the transport is NOT shared
2270+
with other clients! Exiting the with block will CLOSE the transport
2271+
and may cause errors in other clients!
2272+
"""
2273+
self.transport.close()
2274+
22652275

22662276
try:
22672277
DEFAULT_CLIENT_INFO = gapic_v1.client_info.ClientInfo(

google/cloud/bigquery_reservation_v1/services/reservation_service/transports/base.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,15 @@ def _prep_wrapped_messages(self, client_info):
353353
),
354354
}
355355

356+
def close(self):
357+
"""Closes resources associated with the transport.
358+
359+
.. warning::
360+
Only call this method if the transport is NOT shared
361+
with other clients - this may cause errors in other clients!
362+
"""
363+
raise NotImplementedError()
364+
356365
@property
357366
def create_reservation(
358367
self,

google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -950,5 +950,8 @@ def update_bi_reservation(
950950
)
951951
return self._stubs["update_bi_reservation"]
952952

953+
def close(self):
954+
self.grpc_channel.close()
955+
953956

954957
__all__ = ("ReservationServiceGrpcTransport",)

google/cloud/bigquery_reservation_v1/services/reservation_service/transports/grpc_asyncio.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -974,5 +974,8 @@ def update_bi_reservation(
974974
)
975975
return self._stubs["update_bi_reservation"]
976976

977+
def close(self):
978+
return self.grpc_channel.close()
979+
977980

978981
__all__ = ("ReservationServiceGrpcAsyncIOTransport",)

google/cloud/bigquery_reservation_v1/types/reservation.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -732,6 +732,7 @@ class MoveAssignmentRequest(proto.Message):
732732

733733
class BiReservation(proto.Message):
734734
r"""Represents a BI Reservation.
735+
735736
Attributes:
736737
name (str):
737738
The resource name of the singleton BI reservation.
@@ -751,6 +752,7 @@ class BiReservation(proto.Message):
751752

752753
class GetBiReservationRequest(proto.Message):
753754
r"""A request to get a singleton BI reservation.
755+
754756
Attributes:
755757
name (str):
756758
Required. Name of the requested reservation, for example:
@@ -762,6 +764,7 @@ class GetBiReservationRequest(proto.Message):
762764

763765
class UpdateBiReservationRequest(proto.Message):
764766
r"""A request to update a BI reservation.
767+
765768
Attributes:
766769
bi_reservation (google.cloud.bigquery_reservation_v1.types.BiReservation):
767770
A reservation to update.

tests/unit/gapic/bigquery_reservation_v1/test_reservation_service.py

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from google.api_core import gapic_v1
3030
from google.api_core import grpc_helpers
3131
from google.api_core import grpc_helpers_async
32+
from google.api_core import path_template
3233
from google.auth import credentials as ga_credentials
3334
from google.auth.exceptions import MutualTLSChannelError
3435
from google.cloud.bigquery_reservation_v1.services.reservation_service import (
@@ -6122,6 +6123,9 @@ def test_reservation_service_base_transport():
61226123
with pytest.raises(NotImplementedError):
61236124
getattr(transport, method)(request=object())
61246125

6126+
with pytest.raises(NotImplementedError):
6127+
transport.close()
6128+
61256129

61266130
@requires_google_auth_gte_1_25_0
61276131
def test_reservation_service_base_transport_with_credentials_file():
@@ -6706,3 +6710,49 @@ def test_client_withDEFAULT_CLIENT_INFO():
67066710
credentials=ga_credentials.AnonymousCredentials(), client_info=client_info,
67076711
)
67086712
prep.assert_called_once_with(client_info)
6713+
6714+
6715+
@pytest.mark.asyncio
6716+
async def test_transport_close_async():
6717+
client = ReservationServiceAsyncClient(
6718+
credentials=ga_credentials.AnonymousCredentials(), transport="grpc_asyncio",
6719+
)
6720+
with mock.patch.object(
6721+
type(getattr(client.transport, "grpc_channel")), "close"
6722+
) as close:
6723+
async with client:
6724+
close.assert_not_called()
6725+
close.assert_called_once()
6726+
6727+
6728+
def test_transport_close():
6729+
transports = {
6730+
"grpc": "_grpc_channel",
6731+
}
6732+
6733+
for transport, close_name in transports.items():
6734+
client = ReservationServiceClient(
6735+
credentials=ga_credentials.AnonymousCredentials(), transport=transport
6736+
)
6737+
with mock.patch.object(
6738+
type(getattr(client.transport, close_name)), "close"
6739+
) as close:
6740+
with client:
6741+
close.assert_not_called()
6742+
close.assert_called_once()
6743+
6744+
6745+
def test_client_ctx():
6746+
transports = [
6747+
"grpc",
6748+
]
6749+
for transport in transports:
6750+
client = ReservationServiceClient(
6751+
credentials=ga_credentials.AnonymousCredentials(), transport=transport
6752+
)
6753+
# Test client calls underlying transport.
6754+
with mock.patch.object(type(client.transport), "close") as close:
6755+
close.assert_not_called()
6756+
with client:
6757+
pass
6758+
close.assert_called()

0 commit comments

Comments
 (0)