fixed lint

Author: daniel-sanche

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

@@ -98,7 +98,9 @@
         BigtableAsyncClient as GapicClient,
     )
     from google.cloud.bigtable.data._async.mutations_batcher import _MB_SIZE
-    from google.cloud.bigtable.data._async.metrics_interceptor import AsyncBigtableMetricsInterceptor as MetricInterceptorType
+    from google.cloud.bigtable.data._async.metrics_interceptor import (
+        AsyncBigtableMetricsInterceptor as MetricInterceptorType,
+    )
     from google.cloud.bigtable.data._async._swappable_channel import (
         AsyncSwappableChannel,
     )
@@ -109,7 +111,9 @@
     from google.cloud.bigtable_v2.services.bigtable.transports import BigtableGrpcTransport as TransportType  # type: ignore
     from google.cloud.bigtable_v2.services.bigtable import BigtableClient as GapicClient  # type: ignore
     from google.cloud.bigtable.data._sync_autogen.mutations_batcher import _MB_SIZE
-    from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import BigtableMetricsInterceptor as MetricInterceptorType
+    from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
+        BigtableMetricsInterceptor as MetricInterceptorType,
+    )
     from google.cloud.bigtable.data._sync_autogen._swappable_channel import (  # noqa: F401
         SwappableChannel,
     )
@@ -272,9 +276,12 @@ def _build_grpc_channel(self, *args, **kwargs) -> AsyncSwappableChannel:
             create_channel_fn = partial(TransportType.create_channel, *args, **kwargs)
         else:
             # attach sync interceptors in create_channel_fn
-            create_channel_fn = lambda: intercept_channel(
-                TransportType.create_channel(*args, **kwargs), self._metrics_interceptor
-            )
+            def create_channel_fn():
+                return intercept_channel(
+                    TransportType.create_channel(*args, **kwargs),
+                    self._metrics_interceptor,
+                )
+
         new_channel = AsyncSwappableChannel(create_channel_fn)
         if CrossSync.is_async:
             # attach async interceptors

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

@@ -13,10 +13,10 @@
 # limitations under the License
 from __future__ import annotations
 
-import time
-from typing import Any, Callable
 from functools import wraps
-from google.cloud.bigtable.data._metrics.data_model import OPERATION_INTERCEPTOR_METADATA_KEY
+from google.cloud.bigtable.data._metrics.data_model import (
+    OPERATION_INTERCEPTOR_METADATA_KEY,
+)
 from google.cloud.bigtable.data._metrics.data_model import ActiveOperationMetric
 from google.cloud.bigtable.data._metrics.data_model import OperationState
 
@@ -38,9 +38,17 @@ def _with_operation_from_metadata(func):
     Decorator for interceptor methods to extract the active operation
     from metadata and pass it to the decorated function.
     """
+
     @wraps(func)
     def wrapper(self, continuation, client_call_details, request):
-        key = next((m[1] for m in client_call_details.metadata if m[0] == OPERATION_INTERCEPTOR_METADATA_KEY), None)
+        key = next(
+            (
+                m[1]
+                for m in client_call_details.metadata
+                if m[0] == OPERATION_INTERCEPTOR_METADATA_KEY
+            ),
+            None,
+        )
         operation: "ActiveOperationMetric" = self.operation_map.get(key)
         if operation:
             # start a new attempt if not started
@@ -51,13 +59,14 @@ def wrapper(self, continuation, client_call_details, request):
         else:
             # if operation not found, return unwrapped continuation
             return continuation(client_call_details, request)
+
     return wrapper
 
 
-@CrossSync.convert_class(
-    sync_name="BigtableMetricsInterceptor"
-)
-class AsyncBigtableMetricsInterceptor(UnaryUnaryClientInterceptor, UnaryStreamClientInterceptor):
+@CrossSync.convert_class(sync_name="BigtableMetricsInterceptor")
+class AsyncBigtableMetricsInterceptor(
+    UnaryUnaryClientInterceptor, UnaryStreamClientInterceptor
+):
     """
     An async gRPC interceptor to add client metadata and print server metadata.
     """
@@ -89,7 +98,9 @@ def on_attempt_complete(self, attempt, operation):
 
     @CrossSync.convert
     @_with_operation_from_metadata
-    async def intercept_unary_unary(self, operation, continuation, client_call_details, request):
+    async def intercept_unary_unary(
+        self, operation, continuation, client_call_details, request
+    ):
         encountered_exc: Exception | None = None
         call = None
         try:
@@ -101,8 +112,7 @@ async def intercept_unary_unary(self, operation, continuation, client_call_detai
         finally:
             if call is not None:
                 metadata = (
-                    await call.trailing_metadata()
-                    + await call.initial_metadata()
+                    await call.trailing_metadata() + await call.initial_metadata()
                 )
                 operation.add_response_metadata(metadata)
                 if encountered_exc is not None:
@@ -111,7 +121,9 @@ async def intercept_unary_unary(self, operation, continuation, client_call_detai
 
     @CrossSync.convert
     @_with_operation_from_metadata
-    async def intercept_unary_stream(self, operation, continuation, client_call_details, request):
+    async def intercept_unary_stream(
+        self, operation, continuation, client_call_details, request
+    ):
         async def response_wrapper(call):
             encountered_exc = None
             try:
@@ -123,12 +135,11 @@ async def response_wrapper(call):
                 raise
             finally:
                 metadata = (
-                    await call.trailing_metadata()
-                    + await call.initial_metadata()
+                    await call.trailing_metadata() + await call.initial_metadata()
                 )
                 operation.add_response_metadata(metadata)
                 if encountered_exc is not None:
                     # end attempt. If it succeeded, let higher levels decide when to end operation
                     operation.end_attempt_with_status(encountered_exc)
 
-        return response_wrapper(await continuation(client_call_details, request))
+        return response_wrapper(await continuation(client_call_details, request))

google/cloud/bigtable/data/_helpers.py

@@ -277,4 +277,4 @@ def get_attempt_backoff(self, attempt_idx) -> float:
         """
         returns the backoff time for a specific attempt index, starting at 0.
         """
-        return self.history[attempt_idx]
+        return self.history[attempt_idx]

google/cloud/bigtable/data/_metrics/data_model.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 from __future__ import annotations
 
-from typing import Callable, Any, Tuple, cast, TYPE_CHECKING
+from typing import Callable, Tuple, cast, TYPE_CHECKING
 
 import time
 import re
@@ -48,7 +48,7 @@
 
 INVALID_STATE_ERROR = "Invalid state for {}: {}"
 
-OPERATION_INTERCEPTOR_METADATA_KEY = 'x-goog-operation-key'
+OPERATION_INTERCEPTOR_METADATA_KEY = "x-goog-operation-key"
 
 
 class OperationType(Enum):
@@ -443,4 +443,4 @@ async def __aexit__(self, exc_type, exc_val, exc_tb):
         if exc_val is None:
             self.end_with_success()
         else:
-            self.end_with_status(exc_val)
+            self.end_with_status(exc_val)

google/cloud/bigtable/data/_metrics/metrics_controller.py

@@ -20,8 +20,13 @@
 from google.cloud.bigtable.data._metrics.data_model import OperationType
 
 if TYPE_CHECKING:
-  from google.cloud.bigtable.data._async.metrics_interceptor import AsyncBigtableMetricsInterceptor
-  from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import BigtableMetricsInterceptor
+    from google.cloud.bigtable.data._async.metrics_interceptor import (
+        AsyncBigtableMetricsInterceptor,
+    )
+    from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
+        BigtableMetricsInterceptor,
+    )
+
 
 class BigtableClientSideMetricsController:
     """
@@ -31,10 +36,11 @@ class BigtableClientSideMetricsController:
     registered with the handlers associated with this controller.
     """
 
-    def __init__(self, 
-        interceptor: AsyncBigtableMetricsInterceptor | BigtableMetricsInterceptor, 
+    def __init__(
+        self,
+        interceptor: AsyncBigtableMetricsInterceptor | BigtableMetricsInterceptor,
         handlers: list[MetricsHandler] | None = None,
-        **kwargs
+        **kwargs,
     ):
         """
         Initializes the metrics controller.
@@ -69,4 +75,4 @@ def create_operation(
         handlers = self.handlers + kwargs.pop("handlers", [])
         new_op = ActiveOperationMetric(op_type, **kwargs, handlers=handlers)
         self.interceptor.register_operation(new_op)
-        return new_op
+        return new_op

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

@@ -201,9 +201,13 @@ def _build_grpc_channel(self, *args, **kwargs) -> SwappableChannel:
         if self._emulator_host is not None:
             create_channel_fn = partial(insecure_channel, self._emulator_host)
         else:
-            create_channel_fn = lambda: intercept_channel(
-                TransportType.create_channel(*args, **kwargs), self._metrics_interceptor
-            )
+
+            def create_channel_fn():
+                return intercept_channel(
+                    TransportType.create_channel(*args, **kwargs),
+                    self._metrics_interceptor,
+                )
+
         new_channel = SwappableChannel(create_channel_fn)
         return new_channel
 

tests/system/data/test_system_async.py

@@ -302,15 +302,11 @@ async def test_channel_refresh(self, table_id, instance_id, temp_rows):
                 assert channel_wrapper._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
-                    )
+                    unary_interceptors = updated_channel._unary_unary_interceptors
                     assert len(unary_interceptors) == 2
                     assert GapicInterceptor in [type(i) for i in unary_interceptors]
                     assert client._metrics_interceptor in unary_interceptors
-                    stream_interceptors = (
-                        updated_channel._unary_stream_interceptors
-                    )
+                    stream_interceptors = updated_channel._unary_stream_interceptors
                     assert len(stream_interceptors) == 1
                     assert client._metrics_interceptor in stream_interceptors
                 else:

tests/unit/data/_async/test_client.py

@@ -54,7 +54,9 @@
     from google.cloud.bigtable.data._async._swappable_channel import (
         AsyncSwappableChannel,
     )
-    from google.cloud.bigtable.data._async.metrics_interceptor import AsyncBigtableMetricsInterceptor
+    from google.cloud.bigtable.data._async.metrics_interceptor import (
+        AsyncBigtableMetricsInterceptor,
+    )
 
     CrossSync.add_mapping("grpc_helpers", grpc_helpers_async)
     CrossSync.add_mapping("SwappableChannel", AsyncSwappableChannel)
@@ -65,7 +67,9 @@
     from google.cloud.bigtable.data._sync_autogen._swappable_channel import (
         SwappableChannel,
     )
-    from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import BigtableMetricsInterceptor
+    from google.cloud.bigtable.data._sync_autogen.metrics_interceptor import (
+        BigtableMetricsInterceptor,
+    )
 
     CrossSync.add_mapping("grpc_helpers", grpc_helpers)
     CrossSync.add_mapping("SwappableChannel", SwappableChannel)

tests/unit/data/test__helpers.py

@@ -269,12 +269,13 @@ def test_get_retryable_errors(self, input_codes, input_table, expected):
 
 
 class TestTrackedBackoffGenerator:
-
     def test_tracked_backoff_generator_history(self):
         """
         Should be able to retrieve historical results from backoff generator
         """
-        generator = _helpers.TrackedBackoffGenerator(initial=0, multiplier=2, maximum=10)
+        generator = _helpers.TrackedBackoffGenerator(
+            initial=0, multiplier=2, maximum=10
+        )
         got_list = [next(generator) for _ in range(20)]
 
         # check all values are correct