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

Commit 375332f

Browse files
daniel-sanchedaniel-sanche
committed
fixed lint
1 parent 26cd601 commit 375332f

6 files changed

Lines changed: 56 additions & 36 deletions

File tree

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,16 @@ async def wait_for_state_change(self, last_observed_state):
7373
def __getattr__(self, name):
7474
return getattr(self._channel, name)
7575

76-
if CrossSync.is_async:
77-
# grace not supported by sync version
78-
async def close(self, grace=None):
76+
async def close(self, grace=None):
77+
if CrossSync.is_async:
7978
return await self._channel.close(grace=grace)
79+
else:
80+
# grace not supported by sync version
81+
return self._channel.close()
8082

81-
else:
83+
if not CrossSync.is_async:
8284
# add required sync methods
8385

84-
def close(self):
85-
return self._channel.close()
86-
8786
def subscribe(self, callback, try_to_connect=False):
8887
return self._channel.subscribe(callback, try_to_connect)
8988

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

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@
9292
from google.cloud.bigtable_v2.services.bigtable.transports import (
9393
BigtableGrpcAsyncIOTransport as TransportType,
9494
)
95+
from google.cloud.bigtable_v2.services.bigtable import (
96+
BigtableAsyncClient as GapicClient,
97+
)
9598
from google.cloud.bigtable.data._async.mutations_batcher import _MB_SIZE
9699
from google.cloud.bigtable.data._async._replaceable_channel import (
97100
_AsyncReplaceableChannel,
@@ -100,6 +103,7 @@
100103
from typing import Iterable # noqa: F401
101104
from grpc import insecure_channel
102105
from google.cloud.bigtable_v2.services.bigtable.transports import BigtableGrpcTransport as TransportType # type: ignore
106+
from google.cloud.bigtable_v2.services.bigtable import BigtableClient as GapicClient # type: ignore
103107
from google.cloud.bigtable.data._sync_autogen.mutations_batcher import _MB_SIZE
104108
from google.cloud.bigtable.data._sync_autogen._replaceable_channel import ( # noqa: F401
105109
_ReplaceableChannel,
@@ -207,7 +211,7 @@ def __init__(
207211
project=project,
208212
client_options=client_options,
209213
)
210-
self._gapic_client = CrossSync.GapicClient(
214+
self._gapic_client = GapicClient(
211215
credentials=credentials,
212216
client_options=client_options,
213217
client_info=self.client_info,
@@ -224,7 +228,7 @@ def __init__(
224228
self._instance_owners: dict[_WarmedInstanceKey, Set[int]] = {}
225229
self._channel_init_time = time.monotonic()
226230
self._channel_refresh_task: CrossSync.Task[None] | None = None
227-
self._executor = (
231+
self._executor: concurrent.futures.ThreadPoolExecutor | None = (
228232
concurrent.futures.ThreadPoolExecutor() if not CrossSync.is_async else None
229233
)
230234
if self._emulator_host is None:
@@ -876,24 +880,32 @@ def __init__(
876880
self.table_name = self.client._gapic_client.table_path(
877881
self.client.project, instance_id, table_id
878882
)
879-
self.app_profile_id = app_profile_id
883+
self.app_profile_id: str | None = app_profile_id
880884

881-
self.default_operation_timeout = default_operation_timeout
882-
self.default_attempt_timeout = default_attempt_timeout
883-
self.default_read_rows_operation_timeout = default_read_rows_operation_timeout
884-
self.default_read_rows_attempt_timeout = default_read_rows_attempt_timeout
885-
self.default_mutate_rows_operation_timeout = (
885+
self.default_operation_timeout: float = default_operation_timeout
886+
self.default_attempt_timeout: float | None = default_attempt_timeout
887+
self.default_read_rows_operation_timeout: float = (
888+
default_read_rows_operation_timeout
889+
)
890+
self.default_read_rows_attempt_timeout: float | None = (
891+
default_read_rows_attempt_timeout
892+
)
893+
self.default_mutate_rows_operation_timeout: float = (
886894
default_mutate_rows_operation_timeout
887895
)
888-
self.default_mutate_rows_attempt_timeout = default_mutate_rows_attempt_timeout
896+
self.default_mutate_rows_attempt_timeout: float | None = (
897+
default_mutate_rows_attempt_timeout
898+
)
889899

890-
self.default_read_rows_retryable_errors = (
900+
self.default_read_rows_retryable_errors: Sequence[type[Exception]] = (
891901
default_read_rows_retryable_errors or ()
892902
)
893-
self.default_mutate_rows_retryable_errors = (
903+
self.default_mutate_rows_retryable_errors: Sequence[type[Exception]] = (
894904
default_mutate_rows_retryable_errors or ()
895905
)
896-
self.default_retryable_errors = default_retryable_errors or ()
906+
self.default_retryable_errors: Sequence[type[Exception]] = (
907+
default_retryable_errors or ()
908+
)
897909

898910
try:
899911
self._register_instance_future = CrossSync.create_task(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def wait_for_state_change(self, last_observed_state):
6161
def __getattr__(self, name):
6262
return getattr(self._channel, name)
6363

64-
def close(self):
64+
def close(self, grace=None):
6565
return self._channel.close()
6666

6767
def subscribe(self, callback, try_to_connect=False):

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

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@
7878
from google.cloud.bigtable_v2.services.bigtable.transports import (
7979
BigtableGrpcTransport as TransportType,
8080
)
81+
from google.cloud.bigtable_v2.services.bigtable import BigtableClient as GapicClient
8182
from google.cloud.bigtable.data._sync_autogen.mutations_batcher import _MB_SIZE
8283
from google.cloud.bigtable.data._sync_autogen._replaceable_channel import (
8384
_ReplaceableChannel,
@@ -150,7 +151,7 @@ def __init__(
150151
project=project,
151152
client_options=client_options,
152153
)
153-
self._gapic_client = CrossSync._Sync_Impl.GapicClient(
154+
self._gapic_client = GapicClient(
154155
credentials=credentials,
155156
client_options=client_options,
156157
client_info=self.client_info,
@@ -164,7 +165,7 @@ def __init__(
164165
self._instance_owners: dict[_WarmedInstanceKey, Set[int]] = {}
165166
self._channel_init_time = time.monotonic()
166167
self._channel_refresh_task: CrossSync._Sync_Impl.Task[None] | None = None
167-
self._executor = (
168+
self._executor: concurrent.futures.ThreadPoolExecutor | None = (
168169
concurrent.futures.ThreadPoolExecutor()
169170
if not CrossSync._Sync_Impl.is_async
170171
else None
@@ -682,22 +683,30 @@ def __init__(
682683
self.table_name = self.client._gapic_client.table_path(
683684
self.client.project, instance_id, table_id
684685
)
685-
self.app_profile_id = app_profile_id
686-
self.default_operation_timeout = default_operation_timeout
687-
self.default_attempt_timeout = default_attempt_timeout
688-
self.default_read_rows_operation_timeout = default_read_rows_operation_timeout
689-
self.default_read_rows_attempt_timeout = default_read_rows_attempt_timeout
690-
self.default_mutate_rows_operation_timeout = (
686+
self.app_profile_id: str | None = app_profile_id
687+
self.default_operation_timeout: float = default_operation_timeout
688+
self.default_attempt_timeout: float | None = default_attempt_timeout
689+
self.default_read_rows_operation_timeout: float = (
690+
default_read_rows_operation_timeout
691+
)
692+
self.default_read_rows_attempt_timeout: float | None = (
693+
default_read_rows_attempt_timeout
694+
)
695+
self.default_mutate_rows_operation_timeout: float = (
691696
default_mutate_rows_operation_timeout
692697
)
693-
self.default_mutate_rows_attempt_timeout = default_mutate_rows_attempt_timeout
694-
self.default_read_rows_retryable_errors = (
698+
self.default_mutate_rows_attempt_timeout: float | None = (
699+
default_mutate_rows_attempt_timeout
700+
)
701+
self.default_read_rows_retryable_errors: Sequence[type[Exception]] = (
695702
default_read_rows_retryable_errors or ()
696703
)
697-
self.default_mutate_rows_retryable_errors = (
704+
self.default_mutate_rows_retryable_errors: Sequence[type[Exception]] = (
698705
default_mutate_rows_retryable_errors or ()
699706
)
700-
self.default_retryable_errors = default_retryable_errors or ()
707+
self.default_retryable_errors: Sequence[type[Exception]] = (
708+
default_retryable_errors or ()
709+
)
701710
try:
702711
self._register_instance_future = CrossSync._Sync_Impl.create_task(
703712
self.client._register_instance,

‎google/cloud/bigtable/data/execute_query/_async/execute_query_iterator.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ def __init__(
115115
self._app_profile_id = app_profile_id
116116
self._client = client
117117
self._instance_id = instance_id
118-
self._prepare_metadata = prepare_metadata
119-
self._final_metadata = None
118+
self._prepare_metadata: Metadata = prepare_metadata
119+
self._final_metadata: Metadata | None = None
120120
self._byte_cursor = _ByteCursor()
121121
self._reader: _Reader[QueryResultRow] = _QueryResultRowReader()
122122
self.has_received_token = False

‎google/cloud/bigtable/data/execute_query/_sync_autogen/execute_query_iterator.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ def __init__(
9090
self._app_profile_id = app_profile_id
9191
self._client = client
9292
self._instance_id = instance_id
93-
self._prepare_metadata = prepare_metadata
94-
self._final_metadata = None
93+
self._prepare_metadata: Metadata = prepare_metadata
94+
self._final_metadata: Metadata | None = None
9595
self._byte_cursor = _ByteCursor()
9696
self._reader: _Reader[QueryResultRow] = _QueryResultRowReader()
9797
self.has_received_token = False

0 commit comments

Comments
 (0)