e6data-python-connector 2.3.9rc9__tar.gz → 2.3.9rc11__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: e6data-python-connector
-Version: 2.3.9rc9
+Version: 2.3.9rc11
 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.65.1
+Requires-Dist: grpcio>=1.74.0
 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.9.rc9-blue.svg)
+![version](https://img.shields.io/badge/version-2.3.9rc11-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.3.9rc9 → e6data_python_connector-2.3.9rc11}/README.md

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

{e6data_python_connector-2.3.9rc9 → e6data_python_connector-2.3.9rc11}/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:
+            except _InactiveRpcError as e:
                 return False
             if current_status.status == 'suspended':
                 # Send the resume request with strategy header

{e6data_python_connector-2.3.9rc9 → e6data_python_connector-2.3.9rc11}/e6data_python_connector/e6data_grpc.py

@@ -137,9 +137,18 @@ def _strategy_debug_log(message):
         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
+
+
 def _get_shared_strategy():
     """Get or create the shared strategy storage."""
-    global _strategy_manager, _shared_strategy
     return _local_strategy_cache
 
 
@@ -158,11 +167,8 @@ def _get_active_strategy():
 
 def _set_active_strategy(strategy):
     """Set the active deployment strategy in shared memory."""
-    if not strategy:
-        return
-    # Normalize strategy to lowercase and validate
-    normalized_strategy = strategy.lower()
-    if normalized_strategy not in ['blue', 'green']:
+    normalized_strategy = _get_normalised_strategy_with_validate(strategy)
+    if not normalized_strategy:
         return
 
     with _strategy_lock:
@@ -195,11 +201,8 @@ def _clear_strategy_cache():
 
 def _set_pending_strategy(strategy):
     """Set the pending strategy to be used for the next query."""
-    if not strategy:
-        return
-    # Normalize strategy to lowercase and validate
-    normalized_strategy = strategy.lower()
-    if normalized_strategy not in ['blue', 'green']:
+    normalized_strategy = _get_normalised_strategy_with_validate(strategy)
+    if not normalized_strategy:
         return
 
     with _strategy_lock:
@@ -244,11 +247,8 @@ def _invalidate_all_sessions():
 
 def _register_query_strategy(query_id, strategy):
     """Register the strategy used for a specific query."""
-    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']:
+    normalized_strategy = _get_normalised_strategy_with_validate(strategy)
+    if not normalized_strategy:
         return
 
     with _strategy_lock:
@@ -537,8 +537,9 @@ class Connection(object):
                         # 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()
-                            if new_strategy != active_strategy:
-                                _set_pending_strategy(new_strategy)
+                            normalized_strategy = _get_normalised_strategy_with_validate(new_strategy)
+                            if normalized_strategy and normalized_strategy != active_strategy:
+                                _set_pending_strategy(normalized_strategy)
                                 _apply_pending_strategy()
                                 self._session_id = None
                                 self.close()
@@ -584,7 +585,8 @@ class Connection(object):
                                 # 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()
-                                    if new_strategy != strategy:
+                                    normalized_strategy = _get_normalised_strategy_with_validate(new_strategy)
+                                    if normalized_strategy and normalized_strategy != active_strategy:
                                         _set_pending_strategy(new_strategy)
                                         _apply_pending_strategy()
                                         self.close()
@@ -620,6 +622,7 @@ 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:

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: e6data-python-connector
-Version: 2.3.9rc9
+Version: 2.3.9rc11
 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.65.1
+Requires-Dist: grpcio>=1.74.0
 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.9.rc9-blue.svg)
+![version](https://img.shields.io/badge/version-2.3.9rc11-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.3.9rc9 → e6data_python_connector-2.3.9rc11}/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.65.1
+grpcio>=1.74.0
 grpcio-tools

{e6data_python_connector-2.3.9rc9 → e6data_python_connector-2.3.9rc11}/setup.py

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