fix linting & format issues

Author: finnzzf

packages/google-cloud-spanner/google/cloud/spanner_v1/_async/batch.py

@@ -20,16 +20,16 @@
 from typing import List, Optional
 
 from google.api_core.exceptions import InternalServerError
+from google.cloud._helpers import _datetime_to_pb_timestamp
 
 from google.cloud.aio._cross_sync import CrossSync
 from google.cloud.spanner_v1._async._helpers import _retry, _retry_on_aborted_exception
-from google.cloud._helpers import _datetime_to_pb_timestamp
 from google.cloud.spanner_v1._helpers import (
     AtomicCounter,
     _check_rst_stream_error,
-    _make_value_pb,
     _make_list_value_pb,
     _make_list_value_pbs,
+    _make_value_pb,
     _merge_client_context,
     _merge_request_options,
     _merge_Transaction_Options,
@@ -183,15 +183,12 @@ def send(self, queue, key, payload=None, deliver_time=None):
         :type deliver_time: :class:`datetime.datetime`
         :param deliver_time: (Optional) The time at which Spanner will begin attempting to deliver the message.
         """
-        send_kwargs = {
-            "queue": queue,
-            "key": _make_list_value_pb(key)
-        }
+        send_kwargs = {"queue": queue, "key": _make_list_value_pb(key)}
         if payload is not None:
             send_kwargs["payload"] = _make_value_pb(payload)
         if deliver_time is not None:
             send_kwargs["deliver_time"] = _datetime_to_pb_timestamp(deliver_time)
-            
+
         send = Mutation.Send(**send_kwargs)
         self._mutations.append(Mutation(send=send))
 
@@ -207,13 +204,10 @@ def ack(self, queue, key, ignore_not_found=None):
         :type ignore_not_found: bool
         :param ignore_not_found: (Optional) Whether to ignore if the message does not exist.
         """
-        ack_kwargs = {
-            "queue": queue,
-            "key": _make_list_value_pb(key)
-        }
+        ack_kwargs = {"queue": queue, "key": _make_list_value_pb(key)}
         if ignore_not_found is not None:
             ack_kwargs["ignore_not_found"] = ignore_not_found
-            
+
         ack = Mutation.Ack(**ack_kwargs)
         self._mutations.append(Mutation(ack=ack))
 

packages/google-cloud-spanner/google/cloud/spanner_v1/batch.py

@@ -22,14 +22,14 @@
 from typing import List, Optional
 
 from google.api_core.exceptions import InternalServerError
-
 from google.cloud._helpers import _datetime_to_pb_timestamp
+
 from google.cloud.spanner_v1._helpers import (
     AtomicCounter,
     _check_rst_stream_error,
-    _make_value_pb,
     _make_list_value_pb,
     _make_list_value_pbs,
+    _make_value_pb,
     _merge_client_context,
     _merge_request_options,
     _merge_Transaction_Options,
@@ -160,15 +160,12 @@ def send(self, queue, key, payload=None, deliver_time=None):
         :type deliver_time: :class:`datetime.datetime`
         :param deliver_time: (Optional) The time at which Spanner will begin attempting to deliver the message.
         """
-        send_kwargs = {
-            "queue": queue,
-            "key": _make_list_value_pb(key)
-        }
+        send_kwargs = {"queue": queue, "key": _make_list_value_pb(key)}
         if payload is not None:
             send_kwargs["payload"] = _make_value_pb(payload)
         if deliver_time is not None:
             send_kwargs["deliver_time"] = _datetime_to_pb_timestamp(deliver_time)
-            
+
         send = Mutation.Send(**send_kwargs)
         self._mutations.append(Mutation(send=send))
 
@@ -184,13 +181,10 @@ def ack(self, queue, key, ignore_not_found=None):
         :type ignore_not_found: bool
         :param ignore_not_found: (Optional) Whether to ignore if the message does not exist.
         """
-        ack_kwargs = {
-            "queue": queue,
-            "key": _make_list_value_pb(key)
-        }
+        ack_kwargs = {"queue": queue, "key": _make_list_value_pb(key)}
         if ignore_not_found is not None:
             ack_kwargs["ignore_not_found"] = ignore_not_found
-            
+
         ack = Mutation.Ack(**ack_kwargs)
         self._mutations.append(Mutation(ack=ack))
 

packages/google-cloud-spanner/tests/system/_async/conftest.py

@@ -140,9 +140,10 @@ async def shared_instance(
     spanner_client._instance_admin_api = None
 
     if _helpers.CREATE_INSTANCE:
-        from google.cloud.spanner_admin_instance_v1.types import spanner_instance_admin
         import time
 
+        from google.cloud.spanner_admin_instance_v1.types import spanner_instance_admin
+
         create_time = str(int(time.time()))
         labels = {"python-spanner-systests": "true", "created": create_time}
 
@@ -157,7 +158,9 @@ async def shared_instance(
                 edition=spanner_instance_admin.Instance.Edition.ENTERPRISE_PLUS,
             ),
         )
-        created_op = await spanner_client.instance_admin_api.create_instance(request=request)
+        created_op = await spanner_client.instance_admin_api.create_instance(
+            request=request
+        )
         await created_op.result(instance_operation_timeout)
 
         instance = spanner_client.instance(
@@ -232,4 +235,3 @@ def not_postgres(database_dialect):
 def not_emulator():
     if _helpers.USE_EMULATOR:
         pytest.skip(f"{_helpers.USE_EMULATOR_ENVVAR} set in environment.")
-

packages/google-cloud-spanner/tests/system/_async/test_database_api.py

@@ -88,16 +88,21 @@ async def test_db_batch_insert_then_db_snapshot_read(shared_database):
 
 
 @pytest.mark.asyncio
-async def test_db_batch_send_and_ack(not_emulator, spanner_client, database_dialect, shared_instance):
+async def test_db_batch_send_and_ack(
+    not_emulator, spanner_client, database_dialect, shared_instance
+):
     import uuid
-    from google.cloud.spanner_admin_instance_v1.types import spanner_instance_admin
+
+    from google.api_core.exceptions import GoogleAPIError, MethodNotImplemented
+
     from google.cloud.spanner_admin_database_v1 import DatabaseDialect
-    from google.api_core.exceptions import MethodNotImplemented, GoogleAPIError
 
     db_name = f"test-db-{uuid.uuid4().hex[:8]}"
     queue_name = f"test_queue_{uuid.uuid4().hex[:8]}"
 
-    test_database = await shared_instance.database(db_name, database_dialect=database_dialect)
+    test_database = await shared_instance.database(
+        db_name, database_dialect=database_dialect
+    )
     operation = await test_database.create()
     operation.result(300)
 
@@ -121,7 +126,14 @@ async def test_db_batch_send_and_ack(not_emulator, spanner_client, database_dial
         except MethodNotImplemented as e:
             pytest.skip(f"Queues are not implemented yet: {e}")
         except GoogleAPIError as e:
-            if getattr(e, 'code', None) == 501 or (getattr(e, 'grpc_status_code', None) and e.grpc_status_code.name == 'UNIMPLEMENTED') or "UNIMPLEMENTED" in str(e):
+            if (
+                getattr(e, "code", None) == 501
+                or (
+                    getattr(e, "grpc_status_code", None)
+                    and e.grpc_status_code.name == "UNIMPLEMENTED"
+                )
+                or "UNIMPLEMENTED" in str(e)
+            ):
                 pytest.skip(f"Queues are not implemented yet: {e}")
             raise
 
@@ -132,7 +144,7 @@ async def test_db_batch_send_and_ack(not_emulator, spanner_client, database_dial
                 key=(2,),
                 payload="Hello, Queues!",
             )
-            
+
         print("Acking message in queue...")
         async with test_database.batch() as batch:
             batch.ack(

packages/google-cloud-spanner/tests/system/conftest.py

@@ -206,6 +206,7 @@ def shared_instance(
 
     if _helpers.CREATE_INSTANCE:
         from google.cloud.spanner_admin_instance_v1.types import spanner_instance_admin
+
         create_time = str(int(time.time()))
         labels = {"python-spanner-systests": "true", "created": create_time}
 
@@ -220,7 +221,9 @@ def shared_instance(
                 edition=spanner_instance_admin.Instance.Edition.ENTERPRISE_PLUS,
             ),
         )
-        created_op = _helpers.retry_429_503(spanner_client.instance_admin_api.create_instance)(request=request)
+        created_op = _helpers.retry_429_503(
+            spanner_client.instance_admin_api.create_instance
+        )(request=request)
         created_op.result(instance_operation_timeout)  # block until completion
 
         instance = spanner_client.instance(

packages/google-cloud-spanner/tests/system/test_database_api.py

@@ -567,11 +567,14 @@ def test_db_batch_insert_then_db_snapshot_read(shared_database):
     sd._check_rows_data(from_snap)
 
 
-def test_db_batch_send_and_ack(not_emulator, spanner_client, database_dialect, shared_instance):
+def test_db_batch_send_and_ack(
+    not_emulator, spanner_client, database_dialect, shared_instance
+):
     import uuid
-    from google.cloud.spanner_admin_instance_v1.types import spanner_instance_admin
+
+    from google.api_core.exceptions import GoogleAPIError, MethodNotImplemented
+
     from google.cloud.spanner_admin_database_v1 import DatabaseDialect
-    from google.api_core.exceptions import MethodNotImplemented, GoogleAPIError
 
     db_id = f"test-db-{uuid.uuid4().hex[:8]}"
     queue_name = f"test_queue_{uuid.uuid4().hex[:8]}"
@@ -600,7 +603,12 @@ def test_db_batch_send_and_ack(not_emulator, spanner_client, database_dialect, s
         except MethodNotImplemented as e:
             pytest.skip(f"Queues are not implemented yet: {e}")
         except GoogleAPIError as e:
-            if getattr(e, 'code', None) == 501 or getattr(e, 'grpc_status_code', None) and e.grpc_status_code.name == 'UNIMPLEMENTED' or "UNIMPLEMENTED" in str(e):
+            if (
+                getattr(e, "code", None) == 501
+                or getattr(e, "grpc_status_code", None)
+                and e.grpc_status_code.name == "UNIMPLEMENTED"
+                or "UNIMPLEMENTED" in str(e)
+            ):
                 pytest.skip(f"Queues are not implemented yet: {e}")
             raise
         print("Queue created successfully.")
@@ -614,7 +622,7 @@ def test_db_batch_send_and_ack(not_emulator, spanner_client, database_dialect, s
                 payload="Hello, Queues!",
             )
         print("Send successful.")
-            
+
         print("Acking message in queue...")
         with test_database.batch() as batch:
             batch.ack(

packages/google-cloud-spanner/tests/unit/_async/test_batch.py

@@ -25,8 +25,8 @@
     RequestOptions,
     TransactionOptions,
 )
-from google.cloud.spanner_v1._helpers import _make_value_pb, _make_list_value_pb
 from google.cloud.spanner_v1._async.batch import Batch, MutationGroups, _BatchBase
+from google.cloud.spanner_v1._helpers import _make_list_value_pb, _make_value_pb
 from google.cloud.spanner_v1.keyset import KeySet
 
 TABLE_NAME = "citizens"

packages/google-cloud-spanner/tests/unit/test_batch.py

@@ -35,10 +35,10 @@
 from google.cloud.spanner_v1._helpers import (
     AtomicCounter,
     _augment_errors_with_request_id,
+    _make_list_value_pb,
+    _make_value_pb,
     _metadata_with_request_id,
     _metadata_with_request_id_and_req_id,
-    _make_value_pb,
-    _make_list_value_pb,
 )
 from google.cloud.spanner_v1.batch import Batch, MutationGroups, _BatchBase
 from google.cloud.spanner_v1.keyset import KeySet