e6data-python-connector 2.1.21.dev0__tar.gz → 2.2.0rc0__tar.gz

{e6data_python_connector-2.1.21.dev0/e6data_python_connector.egg-info → e6data_python_connector-2.2.0rc0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.1.21.dev0
+Version: 2.2.0rc0
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: Uniphi, Inc.
@@ -27,7 +27,7 @@ Requires-Dist: sqlalchemy
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.1.21-blue.svg)
+![version](https://img.shields.io/badge/version-2.2.0.rc0-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.1.21.dev0 → e6data_python_connector-2.2.0rc0}/README.md

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

{e6data_python_connector-2.1.21.dev0 → e6data_python_connector-2.2.0rc0}/e6data_python_connector/cluster_manager.py

@@ -25,13 +25,11 @@ class _StatusLock:
     def __enter__(self):
         self._status_thread_lock.acquire(timeout=self._LOCK_TIMEOUT)
         self._status_multiprocessing_lock.acquire(timeout=self._LOCK_TIMEOUT)
-        print('Locked threads and processes.')
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self._status_thread_lock.release()
         self._status_multiprocessing_lock.release()
-        print('Released threads and processes.')
 
 
 status_lock = _StatusLock()
@@ -65,30 +63,25 @@ class ClusterManager:
         """
         with status_lock as lock:
             if lock.is_active:
-                print('Cluster is already active')
                 return True
             status_payload = cluster_pb2.ClusterStatusRequest(
                 user=self._user,
                 password=self._password
             )
             current_status = self._get_connection.status(status_payload)
-            print('Current status', current_status)
             if current_status.status == 'suspended':
                 payload = cluster_pb2.ResumeRequest(
                     user=self._user,
                     password=self._password
                 )
                 response = self._get_connection.resume(payload)
-                print('resuming response', response.status)
             elif current_status.status == 'active':
-                print('Cluster is already active.')
                 return True
             elif current_status.status != 'resuming':
                 """
                 If cluster is in resuming state already, start watching for the status.
                 Cluster is in different state, cannot resume.
                 """
-                print('Cluster is in different state, cannot resume.')
                 return False
             while True:
                 try:
@@ -97,20 +90,15 @@ class ClusterManager:
                         password=self._password
                     )
                     response = self._get_connection.status(status_payload)
-                    print(response)
                     if response.status == 'active':
                         lock.set_active()
-                        print('Breaking because of status:', response.status)
                         return True
                     if response.status in ['suspended', 'failed']:
-                        print('Breaking because of status:', response.status)
                         return False
                     if time.time() > self._timeout:
-                        print('Breaking because of timeout')
                         return False
                 except _InactiveRpcError as e:
-                    print('On resume error', e)
-                    print('Retrying')
+                    pass
                 time.sleep(5)
 
     def suspend(self):

{e6data_python_connector-2.1.21.dev0 → e6data_python_connector-2.2.0rc0}/e6data_python_connector/dialect.py

@@ -215,6 +215,7 @@ class E6dataDialect(default.DefaultDialect):
     catalog_name = None
     cluster_uuid = None
     secure = False
+    auto_resume = False
 
     def _dialect_specific_select_one(self):
         return "NOOP"
@@ -230,6 +231,7 @@ class E6dataDialect(default.DefaultDialect):
         self.catalog_name = url.query.get("catalog")
         self.cluster_uuid = url.query.get("cluster-uuid")
         self.secure = url.query.get("secure") == 'true'
+        self.auto_resume = url.query.get("auto-resume") == 'true'
         if not self.catalog_name:
             raise Exception('Please specify catalog in query parameter.')
 
@@ -242,7 +244,8 @@ class E6dataDialect(default.DefaultDialect):
             "database": database,
             "catalog": self.catalog_name,
             "cluster_uuid": self.cluster_uuid,
-            'secure': self.secure
+            'secure': self.secure,
+            'auto_resume': self.auto_resume
         }
         return [], kwargs
 

{e6data_python_connector-2.1.21.dev0 → e6data_python_connector-2.2.0rc0}/e6data_python_connector/e6data_grpc.py

@@ -53,14 +53,31 @@ def _parse_timestamp(value):
             value = datetime.datetime.strptime(value, format)
         else:
             raise Exception(
-                'Cannot convert "{}" into a datetime'.format(value))
+                'Cannot convert "{}" into a datetime'.format(value)
+            )
     else:
         value = None
     return value
 
 
-TYPES_CONVERTER = {"DECIMAL_TYPE": Decimal,
-                   "TIMESTAMP_TYPE": _parse_timestamp}
+TYPES_CONVERTER = {
+    "DECIMAL_TYPE": Decimal,
+    "TIMESTAMP_TYPE": _parse_timestamp
+}
+
+
+def re_auth(func):
+    def wrapper(self, *args, **kwargs):
+        try:
+            return func(self, *args, **kwargs)
+        except _InactiveRpcError as e:
+            if e.code() == grpc.StatusCode.INTERNAL and 'Access denied' in e.details():
+                self.connection.get_re_authenticate_session_id()
+                return func(self, *args, **kwargs)
+            else:
+                raise e
+
+    return wrapper
 
 
 class HiveParamEscaper(ParamEscaper):
@@ -202,6 +219,10 @@ class Connection(object):
             )
         self._client = e6x_engine_pb2_grpc.QueryEngineServiceStub(self._channel)
 
+    def get_re_authenticate_session_id(self):
+        self._session_id = None
+        return self.get_session_id
+
     @property
     def get_session_id(self):
         """
@@ -215,8 +236,7 @@ class Connection(object):
                 )
                 authenticate_response = self._client.authenticate(
                     authenticate_request,
-                    metadata=_get_grpc_header(cluster=self.cluster_uuid),
-                    # timeout=3
+                    metadata=_get_grpc_header(cluster=self.cluster_uuid)
                 )
                 self._session_id = authenticate_response.sessionId
                 if not self._session_id:
@@ -497,6 +517,7 @@ class Cursor(DBAPICursor):
         )
         return self.connection.client.status(status_request, metadata=self.metadata)
 
+    @re_auth
     def execute(self, operation, parameters=None, **kwargs):
         """Prepare and execute a database operation (query or command).
         Return values are not defined.
@@ -552,6 +573,7 @@ class Cursor(DBAPICursor):
 
             self._query_id = prepare_statement_response.queryId
             self._engine_ip = prepare_statement_response.engineIP
+
             execute_statement_request = e6x_engine_pb2.ExecuteStatementV2Request(
                 engineIP=self._engine_ip,
                 sessionId=self.connection.get_session_id,
@@ -636,7 +658,6 @@ class Cursor(DBAPICursor):
         return self._fetch_all()
 
     def fetchmany(self, size: int = None):
-        # _logger.info("fetching all from overriden method")
         if size is None:
             size = self.arraysize
         if self._data is None:

{e6data_python_connector-2.1.21.dev0 → e6data_python_connector-2.2.0rc0/e6data_python_connector.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e6data-python-connector
-Version: 2.1.21.dev0
+Version: 2.2.0rc0
 Summary: Client for the e6data distributed SQL Engine.
 Home-page: https://github.com/e6x-labs/e6data-python-connector
 Author: Uniphi, Inc.
@@ -27,7 +27,7 @@ Requires-Dist: sqlalchemy
 
 # e6data Python Connector
 
-![version](https://img.shields.io/badge/version-2.1.21-blue.svg)
+![version](https://img.shields.io/badge/version-2.2.0.rc0-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.1.21.dev0 → e6data_python_connector-2.2.0rc0}/setup.py

@@ -12,7 +12,7 @@
 
 import setuptools
 
-VERSION = [2, 1, 21, 'dev']
+VERSION = [2, 2, 0, 'rc0']
 
 
 def get_long_desc():