e6data-python-connector 2.2.4__tar.gz → 2.2.5__tar.gz

{e6data_python_connector-2.2.4/e6data_python_connector.egg-info → e6data_python_connector-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: e6data-python-connector
-Version: 2.2.4
+Version: 2.2.5
 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.2.4-blue.svg)
+![version](https://img.shields.io/badge/version-2.2.5-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.2.4 → e6data_python_connector-2.2.5}/README.md

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

{e6data_python_connector-2.2.4 → e6data_python_connector-2.2.5}/e6data_python_connector/cluster_manager.py

@@ -136,7 +136,7 @@ class ClusterManager:
         cluster_uuid (str): The unique identifier for the target cluster.
     """
 
-    def __init__(self, host: str, port: int, user: str, password: str, secure_channel: bool = False, timeout=60 * 3, cluster_uuid=None, grpc_options=None):
+    def __init__(self, host: str, port: int, user: str, password: str, secure_channel: bool = False, timeout=60 * 5, cluster_uuid=None, grpc_options=None):
         """
         Initializes a new instance of the ClusterManager class.
 
@@ -148,7 +148,7 @@ class ClusterManager:
             secure_channel (bool, optional): Whether to use a secure
                 gRPC channel for communication; defaults to False.
             timeout (int, optional): The timeout duration (in seconds) for operations;
-                defaults to 3 minutes.
+                defaults to 5 minutes.
             cluster_uuid (str, optional): The unique identifier for the target cluster;
                 defaults to None.
         """

{e6data_python_connector-2.2.4 → e6data_python_connector-2.2.5}/e6data_python_connector/dialect.py

@@ -10,15 +10,12 @@ from __future__ import unicode_literals
 import datetime
 import decimal
 import logging
-import re
 from decimal import Decimal
 
 from dateutil.parser import parse
 from sqlalchemy import exc
 from sqlalchemy import processors
 from sqlalchemy import types
-from sqlalchemy import util
-# TODO shouldn't use mysql type
 from sqlalchemy.databases import mysql
 from sqlalchemy.engine import default, Engine, Connection
 from sqlalchemy.sql import compiler
@@ -230,11 +227,18 @@ class E6dataDialect(default.DefaultDialect):
             database = url.query.get("schema")
         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'
+        self.secure = url.query.get("secure") == "true"
+        self.auto_resume = url.query.get("auto-resume", "true") == "true"  # default to True
         if not self.catalog_name:
             raise Exception('Please specify catalog in query parameter.')
 
+        # Extract grpc_options from query params
+        grpc_options = {}
+        for key, value in url.query.items():
+            # Skip known parameters that are not grpc_options
+            if key not in {"schema", "catalog", "cluster-uuid", "secure", "auto-resume"}:
+                grpc_options[key] = value
+
         kwargs = {
             "host": url.host,
             "port": url.port,
@@ -245,7 +249,8 @@ class E6dataDialect(default.DefaultDialect):
             "catalog": self.catalog_name,
             "cluster_uuid": self.cluster_uuid,
             'secure': self.secure,
-            'auto_resume': self.auto_resume
+            'auto_resume': self.auto_resume,
+            'grpc_options': grpc_options
         }
         return [], kwargs
 

{e6data_python_connector-2.2.4 → e6data_python_connector-2.2.5}/e6data_python_connector/e6data_grpc.py

@@ -142,7 +142,7 @@ class Connection(object):
             database: str = None,
             cluster_uuid: str = None,
             secure: bool = False,
-            auto_resume: bool = False,
+            auto_resume: bool = True,
             grpc_options: dict = None,
     ):
         """
@@ -198,6 +198,12 @@ class Connection(object):
         if self._grpc_options is None:
             self._grpc_options = dict()
         self.grpc_prepare_timeout = self._grpc_options.get('grpc_prepare_timeout') or 10 * 60  # 10 minutes
+        self.grpc_auto_resume_timeout_seconds = 60 * 5  # 5 minutes
+        if 'grpc_auto_resume_timeout_seconds' in self._grpc_options:
+            """
+            The default maximum time on client side to wait for the cluster to resume is 5 minutes.
+            """
+            self.grpc_auto_resume_timeout_seconds = self._grpc_options.pop('grpc_auto_resume_timeout_seconds')
         self._create_client()
 
     @property
@@ -305,7 +311,8 @@ class Connection(object):
                             user=self.__username,
                             password=self.__password,
                             secure_channel=self._secure_channel,
-                            cluster_uuid=self.cluster_uuid
+                            cluster_uuid=self.cluster_uuid,
+                            timeout=self.grpc_auto_resume_timeout_seconds
                         ).resume()
                         if status:
                             authenticate_request = e6x_engine_pb2.AuthenticateRequest(

{e6data_python_connector-2.2.4 → e6data_python_connector-2.2.5/e6data_python_connector.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: e6data-python-connector
-Version: 2.2.4
+Version: 2.2.5
 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.2.4-blue.svg)
+![version](https://img.shields.io/badge/version-2.2.5-blue.svg)
 
 ## Introduction
 

{e6data_python_connector-2.2.4 → e6data_python_connector-2.2.5}/setup.py

@@ -12,7 +12,7 @@
 
 import setuptools
 
-VERSION = (2, 2, 4)
+VERSION = (2, 2, 5)
 
 
 def get_long_desc():