Merge branch 'csm_interceptor' into csm_1_data_model

Author: daniel-sanche

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

@@ -102,7 +102,10 @@
         AsyncBigtableMetricsInterceptor as MetricInterceptorType,
     )
     from google.cloud.bigtable.data._async._swappable_channel import (
-        AsyncSwappableChannel,
+        AsyncSwappableChannel as SwappableChannelType,
+    )
+    from google.cloud.bigtable.data._async.metrics_interceptor import (
+        AsyncBigtableMetricsInterceptor as MetricInterceptorType,
     )
 else:
     from typing import Iterable  # noqa: F401
@@ -115,9 +118,11 @@
         BigtableMetricsInterceptor as MetricInterceptorType,
     )
     from google.cloud.bigtable.data._sync_autogen._swappable_channel import (  # noqa: F401
-        SwappableChannel,
+        SwappableChannel as SwappableChannelType,
+    )
+    from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (  # noqa: F401
+        BigtableMetricsInterceptor as MetricInterceptorType,
     )
-
 
 if TYPE_CHECKING:
     from google.cloud.bigtable.data._helpers import RowKeySamples
@@ -266,12 +271,11 @@ def __init__(
                     stacklevel=2,
                 )
 
-    @CrossSync.convert(replace_symbols={"AsyncSwappableChannel": "SwappableChannel"})
-    def _build_grpc_channel(self, *args, **kwargs) -> AsyncSwappableChannel:
+    def _build_grpc_channel(self, *args, **kwargs) -> SwappableChannelType:
         """
         This method is called by the gapic transport to create a grpc channel.
 
-        The init arguments passed down are captured in a partial used by AsyncSwappableChannel
+        The init arguments passed down are captured in a partial used by SwappableChannel
         to create new channel instances in the future, as part of the channel refresh logic
 
         Emulators always use an inseucre channel
@@ -296,7 +300,7 @@ def create_channel_fn():
                     self._metrics_interceptor,
                 )
 
-        new_channel = AsyncSwappableChannel(create_channel_fn)
+        new_channel = SwappableChannelType(create_channel_fn)
         if CrossSync.is_async:
             # attach async interceptors
             new_channel._unary_unary_interceptors.append(self._metrics_interceptor)
@@ -423,7 +427,7 @@ def _invalidate_channel_stubs(self):
         self.transport._stubs = {}
         self.transport._prep_wrapped_messages(self.client_info)
 
-    @CrossSync.convert(replace_symbols={"AsyncSwappableChannel": "SwappableChannel"})
+    @CrossSync.convert
     async def _manage_channel(
         self,
         refresh_interval_min: float = 60 * 35,
@@ -448,10 +452,10 @@ async def _manage_channel(
             grace_period: time to allow previous channel to serve existing
                 requests before closing, in seconds
         """
-        if not isinstance(self.transport.grpc_channel, AsyncSwappableChannel):
+        if not isinstance(self.transport.grpc_channel, SwappableChannelType):
             warnings.warn("Channel does not support auto-refresh.")
             return
-        super_channel: AsyncSwappableChannel = self.transport.grpc_channel
+        super_channel: SwappableChannelType = self.transport.grpc_channel
         first_refresh = self._channel_init_time + random.uniform(
             refresh_interval_min, refresh_interval_max
         )

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

@@ -85,7 +85,12 @@
 from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
     BigtableMetricsInterceptor as MetricInterceptorType,
 )
-from google.cloud.bigtable.data._sync_autogen._swappable_channel import SwappableChannel
+from google.cloud.bigtable.data._sync_autogen._swappable_channel import (
+    SwappableChannel as SwappableChannelType,
+)
+from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
+    BigtableMetricsInterceptor as MetricInterceptorType,
+)
 
 if TYPE_CHECKING:
     from google.cloud.bigtable.data._helpers import RowKeySamples
@@ -192,7 +197,7 @@ def __init__(
                     stacklevel=2,
                 )
 
-    def _build_grpc_channel(self, *args, **kwargs) -> SwappableChannel:
+    def _build_grpc_channel(self, *args, **kwargs) -> SwappableChannelType:
         """This method is called by the gapic transport to create a grpc channel.
 
         The init arguments passed down are captured in a partial used by SwappableChannel
@@ -216,7 +221,7 @@ def create_channel_fn():
                     self._metrics_interceptor,
                 )
 
-        new_channel = SwappableChannel(create_channel_fn)
+        new_channel = SwappableChannelType(create_channel_fn)
         return new_channel
 
     @property
@@ -338,10 +343,10 @@ def _manage_channel(
                 between `refresh_interval_min` and `refresh_interval_max`
             grace_period: time to allow previous channel to serve existing
                 requests before closing, in seconds"""
-        if not isinstance(self.transport.grpc_channel, SwappableChannel):
+        if not isinstance(self.transport.grpc_channel, SwappableChannelType):
             warnings.warn("Channel does not support auto-refresh.")
             return
-        super_channel: SwappableChannel = self.transport.grpc_channel
+        super_channel: SwappableChannelType = self.transport.grpc_channel
         first_refresh = self._channel_init_time + random.uniform(
             refresh_interval_min, refresh_interval_max
         )

tests/system/data/test_system_async.py

@@ -292,7 +292,7 @@ async def test_channel_refresh(self, table_id, instance_id, temp_rows):
                 assert len(rows_after_refresh) == 2
                 assert client.transport.grpc_channel is channel_wrapper
                 updated_channel = channel_wrapper._channel
-                assert channel_wrapper._channel is not first_channel
+                assert updated_channel is not first_channel
                 # ensure interceptors are kept (gapic's logging interceptor, and metric interceptor)
                 if CrossSync.is_async:
                     unary_interceptors = updated_channel._unary_unary_interceptors

tests/system/data/test_system_autogen.py

@@ -244,7 +244,7 @@ def test_channel_refresh(self, table_id, instance_id, temp_rows):
                 assert len(rows_after_refresh) == 2
                 assert client.transport.grpc_channel is channel_wrapper
                 updated_channel = channel_wrapper._channel
-                assert channel_wrapper._channel is not first_channel
+                assert updated_channel is not first_channel
                 assert isinstance(
                     client.transport._logged_channel._interceptor, GapicInterceptor
                 )