Skip to content
This repository was archived by the owner on Apr 1, 2026. It is now read-only.

Commit 6788df3

Browse files
daniel-sanchedaniel-sanche
committed
address PR comments
1 parent c433f3c commit 6788df3

6 files changed

Lines changed: 23 additions & 18 deletions

File tree

‎google/cloud/bigtable/data/_async/client.py‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
AsyncSwappableChannel as SwappableChannelType,
102102
)
103103
from google.cloud.bigtable.data._async.metrics_interceptor import (
104-
AsyncBigtableMetricsInterceptor as MetricInterceptorType,
104+
AsyncBigtableMetricsInterceptor as MetricsInterceptorType,
105105
)
106106
else:
107107
from typing import Iterable # noqa: F401
@@ -114,7 +114,7 @@
114114
SwappableChannel as SwappableChannelType,
115115
)
116116
from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import ( # noqa: F401
117-
BigtableMetricsInterceptor as MetricInterceptorType,
117+
BigtableMetricsInterceptor as MetricsInterceptorType,
118118
)
119119

120120
if TYPE_CHECKING:
@@ -210,7 +210,7 @@ def __init__(
210210
credentials = google.auth.credentials.AnonymousCredentials()
211211
if project is None:
212212
project = _DEFAULT_BIGTABLE_EMULATOR_CLIENT
213-
self._metrics_interceptor = MetricInterceptorType()
213+
self._metrics_interceptor = MetricsInterceptorType()
214214
# initialize client
215215
ClientWithProject.__init__(
216216
self,
@@ -281,21 +281,25 @@ def _build_grpc_channel(self, *args, **kwargs) -> SwappableChannelType:
281281
"""
282282
create_channel_fn: Callable[[], Channel]
283283
if self._emulator_host is not None:
284-
# emulators use insecure channel
284+
# Emulators use insecure channels
285285
create_channel_fn = partial(insecure_channel, self._emulator_host)
286286
elif CrossSync.is_async:
287+
# For async client, use the default create_channel.
287288
create_channel_fn = partial(TransportType.create_channel, *args, **kwargs)
288289
else:
289-
# attach sync interceptors in create_channel_fn
290-
def create_channel_fn():
290+
# For sync client, wrap create_channel with interceptors.
291+
def sync_create_channel_fn():
291292
return intercept_channel(
292293
TransportType.create_channel(*args, **kwargs),
293294
self._metrics_interceptor,
294295
)
295296

297+
create_channel_fn = sync_create_channel_fn
298+
299+
# Instantiate SwappableChannelType with the determined creation function.
296300
new_channel = SwappableChannelType(create_channel_fn)
297301
if CrossSync.is_async:
298-
# attach async interceptors
302+
# Attach async interceptors to the channel instance itself.
299303
new_channel._unary_unary_interceptors.append(self._metrics_interceptor)
300304
new_channel._unary_stream_interceptors.append(self._metrics_interceptor)
301305
return new_channel

‎google/cloud/bigtable/data/_async/metrics_interceptor.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# distributed under the License is distributed on an "AS IS" BASIS,
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
13-
# limitations under the License
13+
# limitations under the License.
1414
from __future__ import annotations
1515

1616
from google.cloud.bigtable.data._cross_sync import CrossSync
@@ -68,7 +68,7 @@ async def intercept_unary_stream(self, continuation, client_call_details, reques
6868
@CrossSync.convert
6969
async def _streaming_generator_wrapper(call):
7070
"""
71-
Wrapped generator to be returned by intercept_unary_stream
71+
Wrapped generator to be returned by intercept_unary_stream.
7272
"""
7373
try:
7474
async for response in call:

‎google/cloud/bigtable/data/_sync_autogen/client.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
SwappableChannel as SwappableChannelType,
8686
)
8787
from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
88-
BigtableMetricsInterceptor as MetricInterceptorType,
88+
BigtableMetricsInterceptor as MetricsInterceptorType,
8989
)
9090

9191
if TYPE_CHECKING:
@@ -149,7 +149,7 @@ def __init__(
149149
credentials = google.auth.credentials.AnonymousCredentials()
150150
if project is None:
151151
project = _DEFAULT_BIGTABLE_EMULATOR_CLIENT
152-
self._metrics_interceptor = MetricInterceptorType()
152+
self._metrics_interceptor = MetricsInterceptorType()
153153
ClientWithProject.__init__(
154154
self,
155155
credentials=credentials,
@@ -211,12 +211,13 @@ def _build_grpc_channel(self, *args, **kwargs) -> SwappableChannelType:
211211
create_channel_fn = partial(insecure_channel, self._emulator_host)
212212
else:
213213

214-
def create_channel_fn():
214+
def sync_create_channel_fn():
215215
return intercept_channel(
216216
TransportType.create_channel(*args, **kwargs),
217217
self._metrics_interceptor,
218218
)
219219

220+
create_channel_fn = sync_create_channel_fn
220221
new_channel = SwappableChannelType(create_channel_fn)
221222
return new_channel
222223

‎google/cloud/bigtable/data/_sync_autogen/metrics_interceptor.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# distributed under the License is distributed on an "AS IS" BASIS,
1111
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
# See the License for the specific language governing permissions and
13-
# limitations under the License
13+
# limitations under the License.
1414

1515
# This file is automatically generated by CrossSync. Do not edit manually.
1616

@@ -51,7 +51,7 @@ def intercept_unary_stream(self, continuation, client_call_details, request):
5151

5252
@staticmethod
5353
def _streaming_generator_wrapper(call):
54-
"""Wrapped generator to be returned by intercept_unary_stream"""
54+
"""Wrapped generator to be returned by intercept_unary_stream."""
5555
try:
5656
for response in call:
5757
yield response

‎tests/unit/data/_async/test_metrics_interceptor.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ async def test_unary_unary_interceptor_success(self):
8181

8282
@CrossSync.pytest
8383
async def test_unary_unary_interceptor_failure(self):
84-
"""test a failed RpcError with metadata"""
84+
"""Test a failed RpcError with metadata"""
8585

8686
instance = self._make_one()
8787
exc = RpcError("test")
@@ -95,7 +95,7 @@ async def test_unary_unary_interceptor_failure(self):
9595

9696
@CrossSync.pytest
9797
async def test_unary_unary_interceptor_failure_generic(self):
98-
"""test generic exception"""
98+
"""Test generic exception"""
9999

100100
instance = self._make_one()
101101
exc = ValueError("test")

‎tests/unit/data/_sync_autogen/test_metrics_interceptor.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def test_unary_unary_interceptor_success(self):
6262
continuation.assert_called_once_with(details, request)
6363

6464
def test_unary_unary_interceptor_failure(self):
65-
"""test a failed RpcError with metadata"""
65+
"""Test a failed RpcError with metadata"""
6666
instance = self._make_one()
6767
exc = RpcError("test")
6868
continuation = CrossSync._Sync_Impl.Mock(side_effect=exc)
@@ -74,7 +74,7 @@ def test_unary_unary_interceptor_failure(self):
7474
continuation.assert_called_once_with(details, request)
7575

7676
def test_unary_unary_interceptor_failure_generic(self):
77-
"""test generic exception"""
77+
"""Test generic exception"""
7878
instance = self._make_one()
7979
exc = ValueError("test")
8080
continuation = CrossSync._Sync_Impl.Mock(side_effect=exc)

0 commit comments

Comments
 (0)