e6data-python-connector 2.3.9rc11__tar.gz → 2.3.10rc2__tar.gz

{e6data_python_connector-2.3.9rc11/e6data_python_connector.egg-info → e6data_python_connector-2.3.10rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: e6data-python-connector
-Version: 2.3.9rc11
+Version: 2.3.10rc2
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: e6data, Inc.
@@ -24,7 +24,7 @@ Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: pycryptodome==3.19.1
 Requires-Dist: pytz==2024.1
 Requires-Dist: thrift==0.20.0
-Requires-Dist: grpcio>=1.74.0
+Requires-Dist: grpcio==1.65.1
 Requires-Dist: grpcio-tools
 Dynamic: author
 Dynamic: author-email
@@ -38,7 +38,7 @@ Dynamic: summary
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.3.9rc11-blue.svg)
+![version](https://img.shields.io/badge/version-2.3.10,rc2-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.3.9rc11 → e6data_python_connector-2.3.10rc2}/README.md

@@ -1,6 +1,6 @@
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.3.9rc11-blue.svg)
+![version](https://img.shields.io/badge/version-2.3.10,rc2-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.3.9rc11 → e6data_python_connector-2.3.10rc2}/e6data_python_connector/cluster_manager.py

@@ -365,7 +365,7 @@ class ClusterManager:
             # Retrieve the current cluster status with strategy header
             try:
                 current_status = self._try_cluster_request("status")
-            except _InactiveRpcError as e:
+            except _InactiveRpcError:
                 return False
             if current_status.status == 'suspended':
                 # Send the resume request with strategy header

{e6data_python_connector-2.3.9rc11 → e6data_python_connector-2.3.10rc2}/e6data_python_connector/e6data_grpc.py

@@ -14,7 +14,6 @@ from decimal import Decimal
 from io import BytesIO
 from ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
 import threading
-import multiprocessing
 
 import grpc
 from grpc._channel import _InactiveRpcError
@@ -26,6 +25,9 @@ from e6data_python_connector.constants import *
 from e6data_python_connector.datainputstream import get_query_columns_info, read_rows_from_chunk
 from e6data_python_connector.server import e6x_engine_pb2_grpc, e6x_engine_pb2
 from e6data_python_connector.typeId import *
+import logging
+
+_logger = logging.getLogger(__name__)
 
 apilevel = '2.0'
 threadsafety = 2  # Threads may share the e6xdb and connections.
@@ -134,17 +136,7 @@ _debug_connections = set()
 def _strategy_debug_log(message):
     """Log strategy debug messages if any connection has debug enabled."""
     if _debug_connections:
-        print(f"[E6DATA_STRATEGY_DEBUG] {time.strftime('%Y-%m-%d %H:%M:%S')} - {message}")
-
-
-def _get_normalised_strategy_with_validate(strategy):
-    if not strategy:
-        return False
-    # Normalize strategy to lowercase and validate
-    normalized_strategy = strategy.lower()
-    if normalized_strategy not in ['blue', 'green']:
-        return False
-    return normalized_strategy
+        _logger.debug(f"[E6DATA_STRATEGY_DEBUG] {time.strftime('%Y-%m-%d %H:%M:%S')} - {message}")
 
 
 def _get_shared_strategy():
@@ -167,8 +159,11 @@ def _get_active_strategy():
 
 def _set_active_strategy(strategy):
     """Set the active deployment strategy in shared memory."""
-    normalized_strategy = _get_normalised_strategy_with_validate(strategy)
-    if not normalized_strategy:
+    if not strategy:
+        return
+    # Normalize strategy to lowercase and validate
+    normalized_strategy = strategy.lower()
+    if normalized_strategy not in ['blue', 'green']:
         return
 
     with _strategy_lock:
@@ -201,8 +196,11 @@ def _clear_strategy_cache():
 
 def _set_pending_strategy(strategy):
     """Set the pending strategy to be used for the next query."""
-    normalized_strategy = _get_normalised_strategy_with_validate(strategy)
-    if not normalized_strategy:
+    if not strategy:
+        return
+    # Normalize strategy to lowercase and validate
+    normalized_strategy = strategy.lower()
+    if normalized_strategy not in ['blue', 'green']:
         return
 
     with _strategy_lock:
@@ -247,8 +245,11 @@ def _invalidate_all_sessions():
 
 def _register_query_strategy(query_id, strategy):
     """Register the strategy used for a specific query."""
-    normalized_strategy = _get_normalised_strategy_with_validate(strategy)
-    if not normalized_strategy:
+    if not query_id or not strategy:
+        return
+    # Normalize strategy to lowercase and validate
+    normalized_strategy = strategy.lower()
+    if normalized_strategy not in ['blue', 'green']:
         return
 
     with _strategy_lock:
@@ -373,6 +374,7 @@ class Connection(object):
         self.database = database
         self.cluster_name = cluster_name
         self._session_id = None
+        self._session_strategy = None  # Track which strategy was used for current session
         self._host = host
         self._port = port
 
@@ -495,6 +497,7 @@ class Connection(object):
         # Check if session was invalidated globally
         if self._session_id and session_invalidated:
             self._session_id = None
+            self._session_strategy = None
             self.close()
             self._create_client()
             # Clear the invalidation flag
@@ -508,8 +511,18 @@ class Connection(object):
                 _apply_pending_strategy()
                 # Force complete reconnection with new strategy
                 self._session_id = None
+                self._session_strategy = None
                 self.close()
                 self._create_client()
+        
+        # Check if session strategy matches current active strategy
+        elif self._session_id and self._session_strategy and self._session_strategy != _get_active_strategy():
+            # Session was created with different strategy, need to re-authenticate
+            _strategy_debug_log(f"Session strategy mismatch: session created with {self._session_strategy}, current active is {_get_active_strategy()}")
+            self._session_id = None
+            self._session_strategy = None
+            self.close()
+            self._create_client()
 
         if not self._session_id:
             try:
@@ -534,14 +547,16 @@ class Connection(object):
                         self._session_id = authenticate_response.sessionId
                         if not self._session_id:
                             raise ValueError("Invalid credentials.")
+                        # Track which strategy was used for this session
+                        self._session_strategy = active_strategy
                         # Check for new strategy in authenticate response
                         if hasattr(authenticate_response, 'new_strategy') and authenticate_response.new_strategy:
                             new_strategy = authenticate_response.new_strategy.lower()
-                            normalized_strategy = _get_normalised_strategy_with_validate(new_strategy)
-                            if normalized_strategy and normalized_strategy != active_strategy:
-                                _set_pending_strategy(normalized_strategy)
+                            if new_strategy != active_strategy:
+                                _set_pending_strategy(new_strategy)
                                 _apply_pending_strategy()
                                 self._session_id = None
+                                self._session_strategy = None
                                 self.close()
                                 self._create_client()
                                 return self.get_session_id
@@ -581,17 +596,19 @@ class Connection(object):
                                 # Success! Cache this strategy
                                 _strategy_debug_log(f"Authentication successful with strategy: {strategy}")
                                 _set_active_strategy(strategy)
+                                # Track which strategy was used for this session
+                                self._session_strategy = strategy
 
                                 # Check for new strategy in authenticate response
                                 if hasattr(authenticate_response, 'new_strategy') and authenticate_response.new_strategy:
                                     new_strategy = authenticate_response.new_strategy.lower()
-                                    normalized_strategy = _get_normalised_strategy_with_validate(new_strategy)
-                                    if normalized_strategy and normalized_strategy != active_strategy:
+                                    if new_strategy != strategy:
                                         _set_pending_strategy(new_strategy)
                                         _apply_pending_strategy()
                                         self.close()
                                         self._create_client()
                                         self._session_id = None
+                                        self._session_strategy = None
                                         return self.get_session_id
                                 break
                         except _InactiveRpcError as e:
@@ -622,7 +639,6 @@ class Connection(object):
                             cluster_uuid=self.cluster_name,
                             timeout=self.grpc_auto_resume_timeout_seconds
                         ).resume()
-                        print('starus', status)
                         if status:
                             return self.get_session_id
                         else:
@@ -670,6 +686,7 @@ class Connection(object):
             self._channel.close()
             self._channel = None
         self._session_id = None
+        self._session_strategy = None
         
         # Remove from debug connections if debug was enabled
         if self._debug:
@@ -961,8 +978,14 @@ class Cursor(DBAPICursor):
         Returns:
             list: A list of tuples containing gRPC metadata.
         """
-        # Use query-specific strategy if available, otherwise use active strategy
-        strategy = _get_query_strategy(self._query_id) if self._query_id else _get_active_strategy()
+        # Use query-specific strategy if available, otherwise use session strategy, otherwise use active strategy
+        if self._query_id:
+            strategy = _get_query_strategy(self._query_id)
+        elif self.connection._session_strategy:
+            # Use the strategy that was used to create the current session
+            strategy = self.connection._session_strategy
+        else:
+            strategy = _get_active_strategy()
         return _get_grpc_header(engine_ip=self._engine_ip, cluster=self.connection.cluster_name, strategy=strategy)
 
     @property

{e6data_python_connector-2.3.9rc11 → e6data_python_connector-2.3.10rc2/e6data_python_connector.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: e6data-python-connector
-Version: 2.3.9rc11
+Version: 2.3.10rc2
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: e6data, Inc.
@@ -24,7 +24,7 @@ Requires-Dist: python-dateutil==2.9.0.post0
 Requires-Dist: pycryptodome==3.19.1
 Requires-Dist: pytz==2024.1
 Requires-Dist: thrift==0.20.0
-Requires-Dist: grpcio>=1.74.0
+Requires-Dist: grpcio==1.65.1
 Requires-Dist: grpcio-tools
 Dynamic: author
 Dynamic: author-email
@@ -38,7 +38,7 @@ Dynamic: summary
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.3.9rc11-blue.svg)
+![version](https://img.shields.io/badge/version-2.3.10,rc2-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.3.9rc11 → e6data_python_connector-2.3.10rc2}/e6data_python_connector.egg-info/requires.txt

@@ -4,5 +4,5 @@ python-dateutil==2.9.0.post0
 pycryptodome==3.19.1
 pytz==2024.1
 thrift==0.20.0
-grpcio>=1.74.0
+grpcio==1.65.1
 grpcio-tools

{e6data_python_connector-2.3.9rc11 → e6data_python_connector-2.3.10rc2}/setup.py

@@ -12,7 +12,7 @@
 
 import setuptools
 
-VERSION = (2, 3, 9, 'rc11',)
+VERSION = (2, 3, 10, 'rc2')
 
 
 def get_long_desc():
@@ -49,7 +49,7 @@ setuptools.setup(
         'pycryptodome==3.19.1',
         'pytz==2024.1',
         'thrift==0.20.0',
-        'grpcio>=1.74.0',
+        'grpcio==1.65.1',
         'grpcio-tools',
     ],
     classifiers=[