fix(spanner): resolve transport mismatches and DBAPI transaction retry errors

Author: sinhasubham

google/cloud/spanner_dbapi/cursor.py

@@ -327,17 +327,21 @@ def _execute(self, sql, args=None, call_from_execute_many=False):
                 self._execute_in_rw_transaction()
 
         except (AlreadyExists, FailedPrecondition, OutOfRange) as e:
-            exception = e
-            raise IntegrityError(getattr(e, "details", e)) from e
+            exception = IntegrityError(getattr(e, "details", e))
+            exception.__cause__ = e
+            raise exception
         except InvalidArgument as e:
-            exception = e
-            raise ProgrammingError(getattr(e, "details", e)) from e
+            exception = ProgrammingError(getattr(e, "details", e))
+            exception.__cause__ = e
+            raise exception
         except InternalServerError as e:
-            exception = e
-            raise OperationalError(getattr(e, "details", e)) from e
+            exception = OperationalError(getattr(e, "details", e))
+            exception.__cause__ = e
+            raise exception
         except Exception as e:
             exception = e
             raise
+
         finally:
             if not self._in_retry_mode and not call_from_execute_many:
                 self.transaction_helper.add_execute_statement_for_retry(

google/cloud/spanner_v1/_async/client.py

@@ -62,10 +62,13 @@
     from google.cloud.spanner_admin_instance_v1.services.instance_admin.transports.grpc import (
         InstanceAdminGrpcTransport,
     )
+
 from google.cloud.spanner_admin_instance_v1 import (
     ListInstanceConfigsRequest,
     ListInstancesRequest,
 )
+
+
 from google.cloud.spanner_v1._async.instance import Instance
 from google.cloud.spanner_v1._helpers import (
     _create_experimental_host_transport,
@@ -399,6 +402,7 @@ def instance_admin_api(self):
                     client_options=self._client_options,
                     transport=transport,
                 )
+
             elif self._experimental_host:
                 from google.cloud.spanner_v1._async._helpers import (
                     _create_experimental_host_transport as _create_experimental_host_transport_async,
@@ -416,6 +420,7 @@ def instance_admin_api(self):
                         self._client_certificate,
                         self._client_key,
                     )
+
                 else:
                     transport = _create_experimental_host_transport_sync(
                         InstanceAdminGrpcTransport,
@@ -425,6 +430,7 @@ def instance_admin_api(self):
                         self._client_certificate,
                         self._client_key,
                     )
+
                 self._instance_admin_api = InstanceAdminClient(
                     client_info=self._client_info,
                     client_options=self._client_options,
@@ -436,6 +442,7 @@ def instance_admin_api(self):
                     client_info=self._client_info,
                     client_options=self._client_options,
                 )
+
         return self._instance_admin_api
 
     @property
@@ -453,6 +460,7 @@ def database_admin_api(self):
                     client_options=self._client_options,
                     transport=transport,
                 )
+
             elif self._experimental_host:
                 from google.cloud.spanner_v1._async._helpers import (
                     _create_experimental_host_transport as _create_experimental_host_transport_async,
@@ -470,6 +478,7 @@ def database_admin_api(self):
                         self._client_certificate,
                         self._client_key,
                     )
+
                 else:
                     transport = _create_experimental_host_transport_sync(
                         DatabaseAdminGrpcTransport,
@@ -479,11 +488,13 @@ def database_admin_api(self):
                         self._client_certificate,
                         self._client_key,
                     )
+
                 self._database_admin_api = DatabaseAdminClient(
                     client_info=self._client_info,
                     client_options=self._client_options,
                     transport=transport,
                 )
+
             else:
                 self._database_admin_api = DatabaseAdminClient(
                     credentials=self.credentials,

google/cloud/spanner_v1/_async/database.py

@@ -83,11 +83,13 @@
         SpannerGrpcTransport,
     )
 
+
 from google.cloud.spanner_v1._opentelemetry_tracing import (
     add_span_event,
     get_current_span,
     trace_call,
 )
+
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 from google.cloud.spanner_v1.table import Table
 
@@ -487,6 +489,8 @@ def spanner_api(self):
                 self._spanner_api = SpannerClient(
                     client_info=client_info, transport=transport
                 )
+
+
                 return self._spanner_api
             if self._experimental_host is not None:
                 from google.cloud.spanner_v1._async._helpers import (