fix tests

Author: rahul2393

google/cloud/spanner_v1/_helpers.py

@@ -29,13 +29,10 @@
 from google.rpc.error_details_pb2 import RetryInfo
 
 from google.cloud._helpers import _date_from_iso8601_date
-from google.cloud.spanner_v1 import (
-    ExecuteSqlRequest,
-    Interval,
-    JsonObject,
-    TransactionOptions,
-    TypeCode,
-)
+from google.cloud.spanner_v1.types.spanner import ExecuteSqlRequest
+from google.cloud.spanner_v1.data_types import Interval, JsonObject
+from google.cloud.spanner_v1.types.transaction import TransactionOptions
+from google.cloud.spanner_v1.types.type import TypeCode
 from google.cloud.spanner_v1.request_id_header import with_request_id
 
 try:

google/cloud/spanner_v1/_opentelemetry_tracing.py

@@ -18,7 +18,8 @@
 from datetime import datetime
 import os
 
-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 _metadata_with_span_context
 
 try:

google/cloud/spanner_v1/batch.py

@@ -18,13 +18,13 @@
 
 from google.api_core.exceptions import InternalServerError
 
-from google.cloud.spanner_v1 import (
+from google.cloud.spanner_v1.types.spanner import (
     BatchWriteRequest,
     CommitRequest,
-    Mutation,
-    RequestOptions,
-    TransactionOptions,
 )
+from google.cloud.spanner_v1.types.mutation import Mutation
+from google.cloud.spanner_v1.types import RequestOptions
+from google.cloud.spanner_v1.types.transaction import TransactionOptions
 from google.cloud.spanner_v1._helpers import (
     AtomicCounter,
     _check_rst_stream_error,

google/cloud/spanner_v1/client.py

@@ -45,11 +45,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 import ExecuteSqlRequest
+from google.cloud.spanner_v1 import __version__
 from google.cloud.spanner_v1._helpers import _merge_query_options, _metadata_with_prefix
 from google.cloud.spanner_v1.instance import Instance
 from google.cloud.spanner_v1.metrics.constants import (

google/cloud/spanner_v1/database.py

@@ -39,16 +39,12 @@
 from google.cloud.spanner_admin_database_v1 import CreateDatabaseRequest
 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,
-    TransactionOptions,
-    TransactionSelector,
-    Type,
-    TypeCode,
-)
+from google.cloud.spanner_v1.transaction import DefaultTransactionOptions
+from google.cloud.spanner_v1.types.spanner import ExecuteSqlRequest
+from google.cloud.spanner_v1.types import RequestOptions
+from google.cloud.spanner_v1.services.spanner import SpannerClient
+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._helpers import (
     _merge_query_options,
     _metadata_with_leader_aware_routing,
@@ -467,6 +463,38 @@ def session_options(self) -> SessionOptions:
         """
         return self._instance._client.session_options
 
+    @property
+    def _pool(self):
+        """Backward compatibility property for accessing the session pool.
+        
+        :rtype: :class:`~google.cloud.spanner_v1.pool.AbstractSessionPool`
+        :returns: the session pool from the session manager
+        """
+        return self._session_manager._pool
+
+    def session(self, labels=None, database_role=None):
+        """Factory to create a session.
+
+        :type labels: dict (str -> str)
+        :param labels: (Optional) user-assigned labels for the session.
+
+        :type database_role: str
+        :param database_role: (Optional) user-assigned database_role for the session.
+
+        :rtype: :class:`~google.cloud.spanner_v1.session.Session`
+        :returns: a new session bound to this database.
+        """
+        from google.cloud.spanner_v1.session import Session
+        
+        session_labels = labels or {}
+        session_database_role = database_role or self.database_role
+        
+        return Session(
+            database=self,
+            labels=session_labels,
+            database_role=session_database_role
+        )
+
     def metadata_with_request_id(
         self, nth_request, nth_attempt, prior_metadata=[], span=None
     ):

google/cloud/spanner_v1/database_sessions_manager.py

@@ -46,7 +46,7 @@ class DatabaseSessionsManager(object):
 
     def __init__(self, database, pool):
         self._database = database
-        self._logger = database.logger
+        self._logger = None  # Lazy initialization to avoid triggering database.logger during __init__
 
         # The session pool manages non-multiplexed sessions, and
         # will only be used if multiplexed sessions are not enabled.
@@ -64,6 +64,13 @@ def __init__(self, database, pool):
         self._multiplexed_session_lock = threading.Lock()
         self._is_multiplexed_sessions_disabled_event = threading.Event()
 
+    @property
+    def logger(self):
+        """Get the logger, initializing it lazily to avoid triggering database.logger during __init__."""
+        if self._logger is None:
+            self._logger = self._database.logger
+        return self._logger
+
     def get_session(self, transaction_type: TransactionType) -> Session:
         """Returns a session for the given transaction type from the database session manager.
         :rtype: :class:`~google.cloud.spanner_v1.session.Session`
@@ -157,7 +164,7 @@ def _build_multiplexed_session(self) -> Session:
 
         session.create()
 
-        self._logger.info("Created multiplexed session.")
+        self.logger.info("Created multiplexed session.")
 
         return session
 
@@ -169,12 +176,12 @@ def _disable_multiplexed_sessions(self) -> None:
                     self._multiplexed_session.delete()
                 except Exception as exc:  # noqa: BLE001
                     # Keep the client alive; best-effort cleanup.
-                    self._logger.warning(
+                    self.logger.warning(
                         "Failed to delete multiplexed session during disable: %s", exc
                     )
             self._multiplexed_session = None
         self._is_multiplexed_sessions_disabled_event.set()
-        self._database.session_options.disable_multiplexed(self._logger)
+        self._database.session_options.disable_multiplexed(self.logger)
 
     def _build_maintenance_thread(self) -> threading.Thread:
         """Builds and returns a multiplexed session maintenance thread for
@@ -241,7 +248,7 @@ def _maintain_multiplexed_session(session_manager_ref) -> None:
                 try:
                     session_manager._multiplexed_session.delete()
                 except Exception as exc:  # noqa: BLE001
-                    session_manager._logger.warning(
+                    session_manager.logger.warning(
                         "Failed to delete multiplexed session during refresh: %s", exc
                     )
 

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
 
 

google/cloud/spanner_v1/metrics/spanner_metrics_tracer_factory.py

@@ -35,8 +35,6 @@
     # Override Resource detector logging to not warn when GCP resources are not detected
     import logging
 
-    import mmh3
-
     logging.getLogger("opentelemetry.resourcedetector.gcp_resource_detector").setLevel(
         logging.ERROR
     )
@@ -145,17 +143,27 @@ def _generate_client_hash(client_uid: str) -> str:
         """
         if not client_uid:
             return "000000"
-        hashed_client = mmh3.hash64(client_uid)
+            
+        if not HAS_OPENTELEMETRY_INSTALLED:
+            # Fallback to a simple hash if mmh3 is not available
+            return f"{hash(client_uid) % 0xFFFFFF:06x}"
+            
+        try:
+            import mmh3
+            hashed_client = mmh3.hash64(client_uid)
 
-        # Join the hashes back together since mmh3 splits into high and low 32bits
-        full_hash = (hashed_client[0] << 32) | (hashed_client[1] & 0xFFFFFFFF)
-        unsigned_hash = full_hash & 0xFFFFFFFFFFFFFFFF
+            # Join the hashes back together since mmh3 splits into high and low 32bits
+            full_hash = (hashed_client[0] << 32) | (hashed_client[1] & 0xFFFFFFFF)
+            unsigned_hash = full_hash & 0xFFFFFFFFFFFFFFFF
 
-        k_prefix_length = 10
-        sig_figs = unsigned_hash >> (64 - k_prefix_length)
+            k_prefix_length = 10
+            sig_figs = unsigned_hash >> (64 - k_prefix_length)
 
-        # Return as 6 digit zero padded hex string
-        return f"{sig_figs:06x}"
+            # Return as 6 digit zero padded hex string
+            return f"{sig_figs:06x}"
+        except ImportError:
+            # Fallback to a simple hash if mmh3 is not available
+            return f"{hash(client_uid) % 0xFFFFFF:06x}"
 
     @staticmethod
     def _get_location() -> str:

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)

google/cloud/spanner_v1/pool.py

@@ -20,8 +20,8 @@
 from warnings import warn
 
 from google.cloud.exceptions import NotFound
-from google.cloud.spanner_v1 import BatchCreateSessionsRequest
-from google.cloud.spanner_v1 import Session as SessionPB
+from google.cloud.spanner_v1.types.spanner import BatchCreateSessionsRequest
+from google.cloud.spanner_v1.types import Session as SessionPB
 from google.cloud.spanner_v1._helpers import (
     _metadata_with_leader_aware_routing,
     _metadata_with_prefix,
@@ -131,9 +131,7 @@ def _new_session(self):
         :returns: new session instance.
         """
         database_role = self.database_role or self._database.database_role
-        return Session(
-            database=self._database, labels=self.labels, database_role=database_role
-        )
+        return self._database.session(labels=self.labels, database_role=database_role)
 
     def session(self, **kwargs):
         """Return a context manager for a session from the pool.