chore: updates imports to avoid circular import errors

chalmerlowe · chalmerlowe · commit e25decf340e2 · 2026-03-19T08:34:45.000-04:00
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/_opentelemetry_tracing.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/_opentelemetry_tracing.py
@@ -25,13 +25,13 @@
 )
 from opentelemetry.trace.status import Status, StatusCode
 
-from google.cloud.spanner_v1.services.spanner import SpannerClient
 from google.cloud.spanner_v1 import gapic_version
 from google.cloud.spanner_v1._helpers import (
     _get_cloud_region,
     _metadata_with_span_context,
 )
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
+from google.cloud.spanner_v1.services.spanner import SpannerClient
 
 TRACER_NAME = "cloud.google.com/python/spanner"
 TRACER_VERSION = gapic_version.__version__
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/batch.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/batch.py
@@ -20,14 +20,6 @@
 
 from google.api_core.exceptions import InternalServerError
 
-from google.cloud.spanner_v1.types.spanner import (
-    BatchWriteRequest,
-    CommitRequest,
-    RequestOptions,
-)
-from google.cloud.spanner_v1.types.commit_response import CommitResponse
-from google.cloud.spanner_v1.types.mutation import Mutation
-from google.cloud.spanner_v1.types.transaction import TransactionOptions
 from google.cloud.spanner_v1._helpers import (
     AtomicCounter,
     _check_rst_stream_error,
@@ -45,6 +37,14 @@
 from google.cloud.spanner_v1._opentelemetry_tracing import trace_call
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 from google.cloud.spanner_v1.types import ClientContext
+from google.cloud.spanner_v1.types.commit_response import CommitResponse
+from google.cloud.spanner_v1.types.mutation import Mutation
+from google.cloud.spanner_v1.types.spanner import (
+    BatchWriteRequest,
+    CommitRequest,
+    RequestOptions,
+)
+from google.cloud.spanner_v1.types.transaction import TransactionOptions
 
 DEFAULT_RETRY_TIMEOUT_SECS = 30
 
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/client.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/client.py
@@ -48,15 +48,13 @@
 from google.cloud.spanner_admin_instance_v1.services.instance_admin.transports.grpc import (
     InstanceAdminGrpcTransport,
 )
-from google.cloud.spanner_v1.transaction import DefaultTransactionOptions
-from google.cloud.spanner_v1.types.spanner import ExecuteSqlRequest
-from google.cloud.spanner_v1.gapic_version import __version__
 from google.cloud.spanner_v1._helpers import (
     _create_experimental_host_transport,
     _merge_query_options,
     _metadata_with_prefix,
     _validate_client_context,
 )
+from google.cloud.spanner_v1.gapic_version import __version__
 from google.cloud.spanner_v1.instance import Instance
 from google.cloud.spanner_v1.metrics.constants import (
     METRIC_EXPORT_INTERVAL_MS,
@@ -67,6 +65,8 @@
 from google.cloud.spanner_v1.metrics.spanner_metrics_tracer_factory import (
     SpannerMetricsTracerFactory,
 )
+from google.cloud.spanner_v1.transaction import DefaultTransactionOptions
+from google.cloud.spanner_v1.types.spanner import ExecuteSqlRequest
 
 try:
     from opentelemetry import metrics
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/database.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/database.py
@@ -40,14 +40,6 @@
 )
 from google.cloud.spanner_admin_database_v1 import Database as DatabasePB
 from google.cloud.spanner_admin_database_v1.types import DatabaseDialect
-from google.cloud.spanner_v1.types.spanner import ExecuteSqlRequest, RequestOptions
-from google.cloud.spanner_v1.types.transaction import (
-    TransactionOptions,
-    TransactionSelector,
-)
-from google.cloud.spanner_v1.types.type import Type, TypeCode
-from google.cloud.spanner_v1.transaction import DefaultTransactionOptions
-from google.cloud.spanner_v1.services.spanner import SpannerClient
 from google.cloud.spanner_v1._helpers import (
     _augment_errors_with_request_id,
     _create_experimental_host_transport,
@@ -71,14 +63,24 @@
 from google.cloud.spanner_v1.merged_result_set import MergedResultSet
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 from google.cloud.spanner_v1.pool import BurstyPool
+from google.cloud.spanner_v1.services.spanner import SpannerClient
 from google.cloud.spanner_v1.services.spanner.transports.grpc import (
     SpannerGrpcTransport,
 )
 from google.cloud.spanner_v1.session import Session
 from google.cloud.spanner_v1.snapshot import Snapshot, _restart_on_unavailable
 from google.cloud.spanner_v1.streamed import StreamedResultSet
 from google.cloud.spanner_v1.table import Table
-from google.cloud.spanner_v1.transaction import BatchTransactionId
+from google.cloud.spanner_v1.transaction import (
+    BatchTransactionId,
+    DefaultTransactionOptions,
+)
+from google.cloud.spanner_v1.types.spanner import ExecuteSqlRequest, RequestOptions
+from google.cloud.spanner_v1.types.transaction import (
+    TransactionOptions,
+    TransactionSelector,
+)
+from google.cloud.spanner_v1.types.type import Type, TypeCode
 
 SPANNER_DATA_SCOPE = "https://www.googleapis.com/auth/spanner.data"
 
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/keyset.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/keyset.py
@@ -14,8 +14,9 @@
 
 """Wrap representation of Spanner keys / ranges."""
 
-from google.cloud.spanner_v1.types.keys import KeyRange as KeyRangePB, KeySet as KeySetPB
 from google.cloud.spanner_v1._helpers import _make_list_value_pb, _make_list_value_pbs
+from google.cloud.spanner_v1.types.keys import KeyRange as KeyRangePB
+from google.cloud.spanner_v1.types.keys import KeySet as KeySetPB
 
 
 class KeyRange(object):
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/param_types.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/param_types.py
@@ -17,7 +17,12 @@
 from google.protobuf.internal.enum_type_wrapper import EnumTypeWrapper
 from google.protobuf.message import Message
 
-from google.cloud.spanner_v1.types.type import StructType, Type, TypeAnnotationCode, TypeCode
+from google.cloud.spanner_v1.types.type import (
+    StructType,
+    Type,
+    TypeAnnotationCode,
+    TypeCode,
+)
 
 # Scalar parameter types
 STRING = Type(code=TypeCode.STRING)
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/pool.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/pool.py
@@ -21,10 +21,6 @@
 
 from google.cloud.exceptions import NotFound
 
-from google.cloud.spanner_v1.types.spanner import (
-    BatchCreateSessionsRequest,
-    Session as SessionProto,
-)
 from google.cloud.spanner_v1._helpers import (
     _metadata_with_leader_aware_routing,
     _metadata_with_prefix,
@@ -36,6 +32,12 @@
 )
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 from google.cloud.spanner_v1.session import Session
+from google.cloud.spanner_v1.types.spanner import (
+    BatchCreateSessionsRequest,
+)
+from google.cloud.spanner_v1.types.spanner import (
+    Session as SessionProto,
+)
 
 _NOW = datetime.datetime.utcnow  # unit tests may replace
 
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/session.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/session.py
@@ -22,7 +22,6 @@
 from google.api_core.exceptions import Aborted, GoogleAPICallError, NotFound
 from google.api_core.gapic_v1 import method
 
-from google.cloud.spanner_v1.types.spanner import CreateSessionRequest, ExecuteSqlRequest
 from google.cloud.spanner_v1._helpers import (
     _delay_until_retry,
     _get_retry_delay,
@@ -38,6 +37,10 @@
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 from google.cloud.spanner_v1.snapshot import Snapshot
 from google.cloud.spanner_v1.transaction import Transaction
+from google.cloud.spanner_v1.types.spanner import (
+    CreateSessionRequest,
+    ExecuteSqlRequest,
+)
 
 DEFAULT_RETRY_TIMEOUT_SECS = 30
 """Default timeout used by :meth:`Session.run_in_transaction`."""
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/snapshot.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/snapshot.py
@@ -27,22 +27,6 @@
 )
 from google.protobuf.struct_pb2 import Struct
 
-from google.cloud.spanner_v1.types.spanner import (
-    BeginTransactionRequest,
-    ExecuteSqlRequest,
-    PartitionOptions,
-    PartitionQueryRequest,
-    PartitionReadRequest,
-    ReadRequest,
-    RequestOptions,
-)
-from google.cloud.spanner_v1.types.mutation import Mutation
-from google.cloud.spanner_v1.types.result_set import PartialResultSet, ResultSet
-from google.cloud.spanner_v1.types.transaction import (
-    Transaction,
-    TransactionOptions,
-    TransactionSelector,
-)
 from google.cloud.spanner_v1._helpers import (
     AtomicCounter,
     _augment_error_with_request_id,
@@ -61,6 +45,22 @@
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 from google.cloud.spanner_v1.streamed import StreamedResultSet
 from google.cloud.spanner_v1.types import MultiplexedSessionPrecommitToken
+from google.cloud.spanner_v1.types.mutation import Mutation
+from google.cloud.spanner_v1.types.result_set import PartialResultSet, ResultSet
+from google.cloud.spanner_v1.types.spanner import (
+    BeginTransactionRequest,
+    ExecuteSqlRequest,
+    PartitionOptions,
+    PartitionQueryRequest,
+    PartitionReadRequest,
+    ReadRequest,
+    RequestOptions,
+)
+from google.cloud.spanner_v1.types.transaction import (
+    Transaction,
+    TransactionOptions,
+    TransactionSelector,
+)
 
 _STREAM_RESUMPTION_INTERNAL_ERROR_MESSAGES = (
     "RST_STREAM",
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/streamed.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/streamed.py
@@ -17,9 +17,9 @@
 from google.protobuf.struct_pb2 import ListValue, Value
 
 from google.cloud import exceptions
+from google.cloud.spanner_v1._helpers import _get_type_decoder, _parse_nullable
 from google.cloud.spanner_v1.types.result_set import PartialResultSet, ResultSetMetadata
 from google.cloud.spanner_v1.types.type import TypeCode
-from google.cloud.spanner_v1._helpers import _get_type_decoder, _parse_nullable
 
 
 class StreamedResultSet(object):
diff --git a/packages/google-cloud-spanner/google/cloud/spanner_v1/transaction.py b/packages/google-cloud-spanner/google/cloud/spanner_v1/transaction.py
@@ -22,17 +22,6 @@
 from google.api_core.exceptions import InternalServerError
 from google.protobuf.struct_pb2 import Struct
 
-from google.cloud.spanner_v1.types.spanner import (
-    CommitRequest,
-    ExecuteBatchDmlRequest,
-    ExecuteBatchDmlResponse,
-    ExecuteSqlRequest,
-    RequestOptions,
-)
-from google.cloud.spanner_v1.types.commit_response import CommitResponse
-from google.cloud.spanner_v1.types.mutation import Mutation
-from google.cloud.spanner_v1.types.result_set import ResultSet
-from google.cloud.spanner_v1.types.transaction import TransactionOptions
 from google.cloud.spanner_v1._helpers import (
     AtomicCounter,
     _check_rst_stream_error,
@@ -49,6 +38,17 @@
 from google.cloud.spanner_v1.batch import _BatchBase
 from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture
 from google.cloud.spanner_v1.snapshot import _SnapshotBase
+from google.cloud.spanner_v1.types.commit_response import CommitResponse
+from google.cloud.spanner_v1.types.mutation import Mutation
+from google.cloud.spanner_v1.types.result_set import ResultSet
+from google.cloud.spanner_v1.types.spanner import (
+    CommitRequest,
+    ExecuteBatchDmlRequest,
+    ExecuteBatchDmlResponse,
+    ExecuteSqlRequest,
+    RequestOptions,
+)
+from google.cloud.spanner_v1.types.transaction import TransactionOptions
 
 
 class Transaction(_SnapshotBase, _BatchBase):
diff --git a/packages/google-cloud-spanner/noxfile.py b/packages/google-cloud-spanner/noxfile.py
@@ -680,7 +680,7 @@ def mypy(session):
         "mypy",
         "-p",
         "google",
-        #"--check-untyped-defs",
+        # "--check-untyped-defs",
         *session.posargs,
     )
 

Original file line number	Diff line number	Diff line change
`@@ -25,13 +25,13 @@`
`25`	`25`	`)`
`26`	`26`	`from opentelemetry.trace.status import Status, StatusCode`
`27`	`27`
`28`		`-from google.cloud.spanner_v1.services.spanner import SpannerClient`
`29`	`28`	`from google.cloud.spanner_v1 import gapic_version`
`30`	`29`	`from google.cloud.spanner_v1._helpers import (`
`31`	`30`	`_get_cloud_region,`
`32`	`31`	`_metadata_with_span_context,`
`33`	`32`	`)`
`34`	`33`	`from google.cloud.spanner_v1.metrics.metrics_capture import MetricsCapture`
	`34`	`+from google.cloud.spanner_v1.services.spanner import SpannerClient`
`35`	`35`
`36`	`36`	`TRACER_NAME = "cloud.google.com/python/spanner"`
`37`	`37`	`TRACER_VERSION = gapic_version.__version__`