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

Commit f8eb430

Browse files
committed
linting
1 parent 53cf34d commit f8eb430

4 files changed

Lines changed: 66 additions & 49 deletions

File tree

google/cloud/bigtable/admin_v2/overlay/services/bigtable_table_admin/client.py

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ def sample_restore_table():
228228
)
229229
return restore_table_operation
230230

231-
232231
def wait_for_consistency(
233232
self,
234233
request: Optional[
@@ -318,11 +317,12 @@ def sample_wait_for_consistency():
318317
# request, apply these.
319318
if name is not None:
320319
request.name = name
321-
322320

323321
# Generate the consistency token.
324-
generate_consistency_token_request = bigtable_table_admin.GenerateConsistencyTokenRequest(
325-
name=request.name,
322+
generate_consistency_token_request = (
323+
bigtable_table_admin.GenerateConsistencyTokenRequest(
324+
name=request.name,
325+
)
326326
)
327327

328328
generate_consistency_response = self.generate_consistency_token(
@@ -335,24 +335,30 @@ def sample_wait_for_consistency():
335335
# Create the CheckConsistencyRequest object.
336336
check_consistency_request = bigtable_table_admin.CheckConsistencyRequest(
337337
name=request.name,
338-
consistency_token=generate_consistency_response.consistency_token
338+
consistency_token=generate_consistency_response.consistency_token,
339339
)
340340

341341
# Since the default values of StandardReadRemoteWrites and DataBoostReadLocalWrites evaluate to
342342
# False in proto plus, we cannot do a simple "if request.standard_read_remote_writes" to check
343-
# whether or not that field is defined in the original request object.
343+
# whether or not that field is defined in the original request object.
344344
mode_oneof_field = request._pb.WhichOneof("mode")
345345
if mode_oneof_field:
346-
setattr(check_consistency_request, mode_oneof_field, getattr(request, mode_oneof_field))
347-
346+
setattr(
347+
check_consistency_request,
348+
mode_oneof_field,
349+
getattr(request, mode_oneof_field),
350+
)
351+
348352
check_consistency_call = functools.partial(
349353
self.check_consistency,
350354
check_consistency_request,
351355
retry=retry,
352356
timeout=timeout,
353-
metadata=metadata
357+
metadata=metadata,
354358
)
355359

356360
# Block and wait until the polling harness returns True.
357-
check_consistency_future = consistency._CheckConsistencyPollingFuture(check_consistency_call)
361+
check_consistency_future = consistency._CheckConsistencyPollingFuture(
362+
check_consistency_call
363+
)
358364
return check_consistency_future.result()

google/cloud/bigtable/admin_v2/overlay/types/wait_for_consistency_request.py

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@
2222
package="google.bigtable.admin.v2",
2323
manifest={
2424
"WaitForConsistencyRequest",
25-
}
25+
},
2626
)
2727

28+
2829
# The WaitForConsistencyRequest object is not a real proto. It is a wrapper
2930
# class intended for the handwritten method wait_for_consistency. It is
3031
# constructed by extending a Proto Plus message class to get a developer
@@ -35,7 +36,7 @@ class WaitForConsistencyRequest(proto.Message):
3536
"""Wrapper class for encapsulating parameters for the `wait_for_consistency` method in both
3637
:class:`google.cloud.bigtable.admin_v2.overlay.services.bigtable_table_admin.client.BigtableTableAdminClient`
3738
and :class:`google.cloud.bigtable.admin_v2.overlay.services.bigtable_table_admin.async_client.BigtableTableAdmiAsyncClient`.
38-
39+
3940
4041
This message has `oneof`_ fields (mutually exclusive fields).
4142
For each oneof, at most one member field can be set at the same time.
@@ -64,19 +65,21 @@ class WaitForConsistencyRequest(proto.Message):
6465
6566
This field is a member of `oneof`_ ``mode``.
6667
"""
67-
name : str = proto.Field(
68-
proto.STRING,
69-
number=1
70-
)
71-
standard_read_remote_writes: bigtable_table_admin.StandardReadRemoteWrites = proto.Field(
72-
proto.MESSAGE,
73-
number=2,
74-
oneof="mode",
75-
message=bigtable_table_admin.StandardReadRemoteWrites,
68+
69+
name: str = proto.Field(proto.STRING, number=1)
70+
standard_read_remote_writes: bigtable_table_admin.StandardReadRemoteWrites = (
71+
proto.Field(
72+
proto.MESSAGE,
73+
number=2,
74+
oneof="mode",
75+
message=bigtable_table_admin.StandardReadRemoteWrites,
76+
)
7677
)
77-
data_boost_read_local_writes: bigtable_table_admin.DataBoostReadLocalWrites = proto.Field(
78-
proto.MESSAGE,
79-
number=3,
80-
oneof="mode",
81-
message=bigtable_table_admin.DataBoostReadLocalWrites,
78+
data_boost_read_local_writes: bigtable_table_admin.DataBoostReadLocalWrites = (
79+
proto.Field(
80+
proto.MESSAGE,
81+
number=3,
82+
oneof="mode",
83+
message=bigtable_table_admin.DataBoostReadLocalWrites,
84+
)
8285
)

tests/unit/admin_overlay/test_client.py

Lines changed: 29 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
BigtableTableAdminClient,
3131
DEFAULT_CLIENT_INFO,
3232
)
33-
from google.cloud.bigtable.admin_v2.overlay.types import restore_table, wait_for_consistency_request
33+
from google.cloud.bigtable.admin_v2.overlay.types import (
34+
restore_table,
35+
wait_for_consistency_request,
36+
)
3437

3538
from google.cloud.bigtable import __version__ as bigtable_version
3639

@@ -186,7 +189,9 @@ def test_bigtable_table_admin_client_restore_table(kwargs):
186189
),
187190
],
188191
)
189-
def test_bigtable_table_admin_client_wait_for_consistency(kwargs, check_consistency_request_extras):
192+
def test_bigtable_table_admin_client_wait_for_consistency(
193+
kwargs, check_consistency_request_extras
194+
):
190195
client = BigtableTableAdminClient()
191196
poll_count = 3
192197
check_mock_side_effect = [FALSE_CONSISTENCY_RESPONSE] * (poll_count - 1)
@@ -214,17 +219,19 @@ def test_bigtable_table_admin_client_wait_for_consistency(kwargs, check_consiste
214219
metadata=kwargs.get("metadata", ()),
215220
)
216221

217-
expected_check_consistency_request = bigtable_table_admin.CheckConsistencyRequest(
218-
name=TABLE_NAME,
219-
consistency_token=CONSISTENCY_TOKEN,
220-
**check_consistency_request_extras,
222+
expected_check_consistency_request = (
223+
bigtable_table_admin.CheckConsistencyRequest(
224+
name=TABLE_NAME,
225+
consistency_token=CONSISTENCY_TOKEN,
226+
**check_consistency_request_extras,
227+
)
221228
)
222229

223230
check_mock.assert_called_with(
224-
expected_check_consistency_request,
225-
retry=kwargs.get("retry", gapic_v1.method.DEFAULT),
226-
timeout=kwargs.get("timeout", gapic_v1.method.DEFAULT),
227-
metadata=kwargs.get("metadata", ()),
231+
expected_check_consistency_request,
232+
retry=kwargs.get("retry", gapic_v1.method.DEFAULT),
233+
timeout=kwargs.get("timeout", gapic_v1.method.DEFAULT),
234+
metadata=kwargs.get("metadata", ()),
228235
)
229236

230237

@@ -236,9 +243,10 @@ def test_bigtable_table_admin_client_wait_for_consistency_error_in_call():
236243

237244
with pytest.raises(exceptions.GoogleAPICallError):
238245
with mock.patch.object(client, "generate_consistency_token") as generate_mock:
239-
generate_mock.side_effect = exceptions.DeadlineExceeded("Deadline Exceeded.")
246+
generate_mock.side_effect = exceptions.DeadlineExceeded(
247+
"Deadline Exceeded."
248+
)
240249
client.wait_for_consistency(request)
241-
242250

243251
with pytest.raises(exceptions.GoogleAPICallError):
244252
with mock.patch.object(client, "generate_consistency_token") as generate_mock:
@@ -249,14 +257,18 @@ def test_bigtable_table_admin_client_wait_for_consistency_error_in_call():
249257
)
250258
)
251259

252-
check_mock.side_effect = exceptions.DeadlineExceeded("Deadline Exceeded.")
260+
check_mock.side_effect = exceptions.DeadlineExceeded(
261+
"Deadline Exceeded."
262+
)
253263
client.wait_for_consistency(request)
254264

255265

256266
def test_bigtable_table_admin_client_wait_for_consistency_user_error():
257267
client = BigtableTableAdminClient()
258268
with pytest.raises(ValueError):
259-
client.wait_for_consistency({
260-
"name": TABLE_NAME,
261-
},
262-
name=TABLE_NAME)
269+
client.wait_for_consistency(
270+
{
271+
"name": TABLE_NAME,
272+
},
273+
name=TABLE_NAME,
274+
)

tests/unit/admin_overlay/test_consistency.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,14 +61,10 @@ def test_check_consistency_future_result():
6161
is_consistent = future.result()
6262

6363
assert is_consistent
64-
check_consistency_call.assert_has_calls(
65-
[mock.call()] * times
66-
)
64+
check_consistency_call.assert_has_calls([mock.call()] * times)
6765

6866
# Check that calling result again doesn't produce more calls.
6967
is_consistent = future.result()
7068

7169
assert is_consistent
72-
check_consistency_call.assert_has_calls(
73-
[mock.call()] * times
74-
)
70+
check_consistency_call.assert_has_calls([mock.call()] * times)

0 commit comments

Comments
 (0)