chore: updates imports to avoid circular import errors

Author: chalmerlowe

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

@@ -25,7 +25,8 @@
 )
 from opentelemetry.trace.status import Status, StatusCode
 
-from google.cloud.spanner_v1 import SpannerClient, gapic_version
+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,

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

@@ -20,14 +20,14 @@
 
 from google.api_core.exceptions import InternalServerError
 
-from google.cloud.spanner_v1 import (
+from google.cloud.spanner_v1.types.spanner import (
     BatchWriteRequest,
     CommitRequest,
-    CommitResponse,
-    Mutation,
     RequestOptions,
-    TransactionOptions,
 )
+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,

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

@@ -48,11 +48,9 @@
 from google.cloud.spanner_admin_instance_v1.services.instance_admin.transports.grpc import (
     InstanceAdminGrpcTransport,
 )
-from google.cloud.spanner_v1 import (
-    DefaultTransactionOptions,
-    ExecuteSqlRequest,
-    __version__,
-)
+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,

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

@@ -40,16 +40,14 @@
 )
 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 import (
-    DefaultTransactionOptions,
-    ExecuteSqlRequest,
-    RequestOptions,
-    SpannerClient,
+from google.cloud.spanner_v1.types.spanner import ExecuteSqlRequest, RequestOptions
+from google.cloud.spanner_v1.types.transaction import (
     TransactionOptions,
     TransactionSelector,
-    Type,
-    TypeCode,
 )
+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,

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

@@ -35,7 +35,6 @@
 from google.cloud.spanner_v1._helpers import _metadata_with_prefix
 from google.cloud.spanner_v1.backup import Backup
 from google.cloud.spanner_v1.database import Database
-from google.cloud.spanner_v1.testing.database_test import TestDatabase
 
 _INSTANCE_NAME_RE = re.compile(
     r"^projects/(?P<project>[^/]+)/" r"instances/(?P<instance_id>[a-z][-a-z0-9]*)$"
@@ -502,6 +501,8 @@ def database(
                 proto_descriptors=proto_descriptors,
             )
         else:
+            from google.cloud.spanner_v1.testing.database_test import TestDatabase
+
             return TestDatabase(
                 database_id,
                 self,

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

@@ -14,7 +14,7 @@
 
 """Wrap representation of Spanner keys / ranges."""
 
-from google.cloud.spanner_v1 import KeyRangePB, KeySetPB
+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
 
 

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

@@ -17,7 +17,7 @@
 from google.protobuf.internal.enum_type_wrapper import EnumTypeWrapper
 from google.protobuf.message import Message
 
-from google.cloud.spanner_v1 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)

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

@@ -21,8 +21,10 @@
 
 from google.cloud.exceptions import NotFound
 
-from google.cloud.spanner_v1 import BatchCreateSessionsRequest
-from google.cloud.spanner_v1 import Session as SessionProto
+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,

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

@@ -22,7 +22,7 @@
 from google.api_core.exceptions import Aborted, GoogleAPICallError, NotFound
 from google.api_core.gapic_v1 import method
 
-from google.cloud.spanner_v1 import CreateSessionRequest, ExecuteSqlRequest
+from google.cloud.spanner_v1.types.spanner import CreateSessionRequest, ExecuteSqlRequest
 from google.cloud.spanner_v1._helpers import (
     _delay_until_retry,
     _get_retry_delay,

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

@@ -27,17 +27,18 @@
 )
 from google.protobuf.struct_pb2 import Struct
 
-from google.cloud.spanner_v1 import (
+from google.cloud.spanner_v1.types.spanner import (
     BeginTransactionRequest,
     ExecuteSqlRequest,
-    Mutation,
-    PartialResultSet,
     PartitionOptions,
     PartitionQueryRequest,
     PartitionReadRequest,
     ReadRequest,
     RequestOptions,
-    ResultSet,
+)
+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,