e6data-python-connector 2.3.9rc5__tar.gz → 2.3.9rc7__tar.gz

{e6data_python_connector-2.3.9rc5/e6data_python_connector.egg-info → e6data_python_connector-2.3.9rc7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: e6data-python-connector
-Version: 2.3.9rc5
+Version: 2.3.9rc7
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: e6data, Inc.
@@ -38,7 +38,7 @@ Dynamic: summary
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.3.9rc5-blue.svg)
+![version](https://img.shields.io/badge/version-2.3.9.rc7-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.3.9rc5 → e6data_python_connector-2.3.9rc7}/README.md

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

{e6data_python_connector-2.3.9rc5 → e6data_python_connector-2.3.9rc7}/e6data_python_connector/cluster_manager.py

@@ -213,30 +213,25 @@ class ClusterManager:
                     user=self._user,
                     password=self._password
                 )
-                print('STATUS', payload)
             elif request_type == "resume":
                 payload = cluster_pb2.ResumeRequest(
                     user=self._user,
                     password=self._password
                 )
-                print('RESUME', payload)
 
         # If we have an active strategy, use it first
         if current_strategy is not None:
             try:
                 if request_type == "status":
-
                     response = self._get_connection.status(
                         payload,
                         metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=current_strategy)
                     )
-                    print('STATUS 2', response, payload)
                 elif request_type == "resume":
                     response = self._get_connection.resume(
                         payload,
                         metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=current_strategy)
                     )
-                    print('RESUME 2', response, payload)
                 else:
                     raise ValueError(f"Unknown request type: {request_type}")
 
@@ -259,13 +254,11 @@ class ClusterManager:
                                 payload,
                                 metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=alternative_strategy)
                             )
-                            print('STATUS 3', response, payload)
                         elif request_type == "resume":
                             response = self._get_connection.resume(
                                 payload,
                                 metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=alternative_strategy)
                             )
-                            print('RESUME 3', response, payload)
 
                         # Update active strategy since the alternative worked
                         _set_active_strategy(alternative_strategy)
@@ -295,13 +288,11 @@ class ClusterManager:
                         payload,
                         metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=strategy)
                     )
-                    print('STATUS 4', response, payload)
                 elif request_type == "resume":
                     response = self._get_connection.resume(
                         payload,
                         metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=strategy)
                     )
-                    print('RESUME 4', response, payload)
                 else:
                     raise ValueError(f"Unknown request type: {request_type}")
 
@@ -374,15 +365,13 @@ class ClusterManager:
             # Retrieve the current cluster status with strategy header
             try:
                 current_status = self._try_cluster_request("status")
-            except _InactiveRpcError as e:
-                print('ERROR', e, 'Returning false1')
+            except _InactiveRpcError:
                 return False
             if current_status.status == 'suspended':
                 # Send the resume request with strategy header
                 try:
                     response = self._try_cluster_request("resume")
-                except _InactiveRpcError as e:
-                    print('ERROR', e, 'Returning false2')
+                except _InactiveRpcError:
                     return False
             elif current_status.status == 'active':
                 return True
@@ -391,18 +380,15 @@ class ClusterManager:
                  If cluster cannot be resumed due to its current state, 
                  or already in a process of resuming, terminate the operation.
                  """
-                print('ERROR', '!resuming', 'Returning false3')
                 return False
 
             for status in self._check_cluster_status():
                 if status == 'active':
                     return True
                 elif status == 'failed' or time.time() > self._timeout:
-                    print('ERROR', 'timed-out', 'Returning false3')
                     return False
                 # Wait for 5 seconds before the next status check
                 time.sleep(5)
-            print('ERROR', 'Nothing worked', 'Returning false3')
             return False
 
     def suspend(self):

{e6data_python_connector-2.3.9rc5 → e6data_python_connector-2.3.9rc7}/e6data_python_connector/e6data_grpc.py

@@ -215,7 +215,6 @@ def _apply_pending_strategy():
     with _strategy_lock:
         shared_strategy = _get_shared_strategy()
         if shared_strategy['pending_strategy']:
-            old_strategy = shared_strategy['active_strategy']
             new_strategy = shared_strategy['pending_strategy']
             current_time = time.time()
 
@@ -380,7 +379,6 @@ class Connection(object):
             """
             self.grpc_auto_resume_timeout_seconds = self._grpc_options.pop('grpc_auto_resume_timeout_seconds')
         self._create_client()
-        self._hash = str(datetime.datetime.now().timestamp()) + 'hash' + str(id(self))
 
     @property
     def _get_grpc_options(self):
@@ -519,9 +517,10 @@ class Connection(object):
                             new_strategy = authenticate_response.new_strategy.lower()
                             if new_strategy != active_strategy:
                                 _set_pending_strategy(new_strategy)
-                                # Don't apply immediately - let new queries use fresh connections
+                                _apply_pending_strategy()
+                                self._session_id = None
+                                return self.get_session_id
                     except _InactiveRpcError as e:
-                        print(self._hash, self.cluster_name, 'Error during authentication with active strategy:', active_strategy, file=sys.stderr)
                         if e.code() == grpc.StatusCode.UNKNOWN and 'status: 456' in e.details():
                             # Strategy changed, clear cache and retry
                             _clear_strategy_cache()
@@ -555,15 +554,15 @@ class Connection(object):
                                 _set_active_strategy(strategy)
 
                                 # Check for new strategy in authenticate response
-                                if hasattr(authenticate_response,
-                                           'new_strategy') and authenticate_response.new_strategy:
+                                if hasattr(authenticate_response, 'new_strategy') and authenticate_response.new_strategy:
                                     new_strategy = authenticate_response.new_strategy.lower()
                                     if new_strategy != strategy:
                                         _set_pending_strategy(new_strategy)
-                                        # Don't apply immediately - let new queries use fresh connections
+                                        _apply_pending_strategy()
+                                        self._session_id = None
+                                        return self.get_session_id
                                 break
                         except _InactiveRpcError as e:
-                            print(self._hash, self.cluster_name, 'Error during authentication with strategy:', strategy, file=sys.stderr)
                             if e.code() == grpc.StatusCode.UNKNOWN and 'status: 456' in e.details():
                                 # Wrong strategy, try the next one
                                 last_error = e
@@ -590,24 +589,8 @@ class Connection(object):
                             cluster_uuid=self.cluster_name,
                             timeout=self.grpc_auto_resume_timeout_seconds
                         ).resume()
-                        print(self._hash, self.cluster_name, 'Cluster resume status:', status, file=sys.stderr)
                         if status:
-                            # return self.get_session_id
-                            authenticate_request = e6x_engine_pb2.AuthenticateRequest(
-                                user=self.__username,
-                                password=self.__password
-                            )
-                            authenticate_response = self._client.authenticate(
-                                authenticate_request,
-                                metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy())
-                            )
-                            self._session_id = authenticate_response.sessionId
-                            # 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 != _get_active_strategy():
-                                    _set_pending_strategy(new_strategy)
-                                    # Don't apply immediately - let new queries use fresh connections
+                            return self.get_session_id
                         else:
                             raise e
                     else:
@@ -615,7 +598,6 @@ class Connection(object):
                 else:
                     raise e
             except Exception as e:
-                print(self._hash, self.cluster_name, 'Error during authentication:', e, file=sys.stderr)
                 self._channel.close()
                 raise e
         return self._session_id

{e6data_python_connector-2.3.9rc5 → e6data_python_connector-2.3.9rc7/e6data_python_connector.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: e6data-python-connector
-Version: 2.3.9rc5
+Version: 2.3.9rc7
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: e6data, Inc.
@@ -38,7 +38,7 @@ Dynamic: summary
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.3.9rc5-blue.svg)
+![version](https://img.shields.io/badge/version-2.3.9.rc7-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.3.9rc5 → e6data_python_connector-2.3.9rc7}/setup.py

@@ -12,7 +12,7 @@
 
 import setuptools
 
-VERSION = (2, 3, 9,'rc5')
+VERSION = (2, 3, 9, 'rc7')
 
 
 def get_long_desc():