e6data-python-connector 2.3.6__py3-none-any.whl → 2.3.7rc2__py3-none-any.whl

e6data_python_connector/dialect.py

@@ -210,7 +210,7 @@ class E6dataDialect(default.DefaultDialect):
     driver = 'e6data'
     scheme = 'e6data'
     catalog_name = None
-    cluster_uuid = None
+    cluster_name = None
     secure = False
     auto_resume = False
 
@@ -226,7 +226,7 @@ class E6dataDialect(default.DefaultDialect):
         if url.query.get("schema"):
             database = url.query.get("schema")
         self.catalog_name = url.query.get("catalog")
-        self.cluster_uuid = url.query.get("cluster-uuid")
+        self.cluster_name = url.query.get("cluster-name")
         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:
@@ -247,7 +247,7 @@ class E6dataDialect(default.DefaultDialect):
             "password": url.password or None,
             "database": database,
             "catalog": self.catalog_name,
-            "cluster_uuid": self.cluster_uuid,
+            "cluster_name": self.cluster_name,
             'secure': self.secure,
             'auto_resume': self.auto_resume,
             'grpc_options': grpc_options

e6data_python_connector/e6data_grpc.py

@@ -312,10 +312,9 @@ class Connection(object):
             port: int,
             username: str,
             password: str,
-            scheme: str = 'e6data',
             catalog: str = None,
             database: str = None,
-            cluster_uuid: str = None,
+            cluster_name: str = None,
             secure: bool = False,
             auto_resume: bool = True,
             grpc_options: dict = None,
@@ -331,14 +330,12 @@ class Connection(object):
                 Your e6data Email ID
             password: str
                 Access Token generated in the e6data console
-            scheme: str
-                e6data
             catalog: str
                 Catalog name
             database: str
                 Database to perform the query on
-            cluster_uuid: str
-                Cluster's uuid
+            cluster_name: str
+                Cluster's name
             secure: bool, Optional
                 Flag to use a secure channel for data transfer
             auto_resume: bool, Optional
@@ -358,7 +355,7 @@ class Connection(object):
         self.__username = username
         self.__password = password
         self.database = database
-        self.cluster_uuid = cluster_uuid
+        self.cluster_name = cluster_name
         self._session_id = None
         self._host = host
         self._port = port
@@ -508,7 +505,7 @@ class Connection(object):
                     try:
                         authenticate_response = self._client.authenticate(
                             authenticate_request,
-                            metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=active_strategy)
+                            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=active_strategy)
                         )
                         self._session_id = authenticate_response.sessionId
                         if not self._session_id:
@@ -545,7 +542,7 @@ class Connection(object):
                         try:
                             authenticate_response = self._client.authenticate(
                                 authenticate_request,
-                                metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=strategy)
+                                metadata=_get_grpc_header(cluster=self.cluster_name, strategy=strategy)
                             )
                             self._session_id = authenticate_response.sessionId
                             if self._session_id:
@@ -584,7 +581,7 @@ class Connection(object):
                             user=self.__username,
                             password=self.__password,
                             secure_channel=self._secure_channel,
-                            cluster_uuid=self.cluster_uuid,
+                            cluster_uuid=self.cluster_name,
                             timeout=self.grpc_auto_resume_timeout_seconds
                         ).resume()
                         if status:
@@ -711,7 +708,7 @@ class Connection(object):
         )
         clear_response = self._client.clear(
             clear_request,
-            metadata=_get_grpc_header(engine_ip=engine_ip, cluster=self.cluster_uuid, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(engine_ip=engine_ip, cluster=self.cluster_name, strategy=_get_active_strategy())
         )
 
         # Check for new strategy in clear response
@@ -742,7 +739,7 @@ class Connection(object):
         )
         cancel_response = self._client.cancelQuery(
             cancel_query_request,
-            metadata=_get_grpc_header(engine_ip=engine_ip, cluster=self.cluster_uuid, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(engine_ip=engine_ip, cluster=self.cluster_name, strategy=_get_active_strategy())
         )
 
         # Check for new strategy in cancel response
@@ -766,7 +763,7 @@ class Connection(object):
         )
         dry_run_response = self._client.dryRun(
             dry_run_request,
-            metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy())
         )
         return dry_run_response.dryrunValue
 
@@ -788,7 +785,7 @@ class Connection(object):
         )
         get_table_response = self._client.getTablesV2(
             get_table_request,
-            metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy())
         )
 
         # Check for new strategy in get tables response
@@ -816,7 +813,7 @@ class Connection(object):
         )
         get_columns_response = self._client.getColumnsV2(
             get_columns_request,
-            metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy())
         )
 
         # Check for new strategy in get columns response
@@ -840,7 +837,7 @@ class Connection(object):
         )
         get_schema_response = self._client.getSchemaNamesV2(
             get_schema_request,
-            metadata=_get_grpc_header(cluster=self.cluster_uuid, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy())
         )
 
         # Check for new strategy in get schema names response
@@ -937,7 +934,7 @@ class Cursor(DBAPICursor):
         """
         # 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()
-        return _get_grpc_header(engine_ip=self._engine_ip, cluster=self.connection.cluster_uuid, strategy=strategy)
+        return _get_grpc_header(engine_ip=self._engine_ip, cluster=self.connection.cluster_name, strategy=strategy)
 
     @property
     def arraysize(self):

e6data_python_connector/strategy.py

@@ -190,7 +190,7 @@ def _get_grpc_header(engine_ip=None, cluster=None, strategy=None):
     if engine_ip:
         metadata.append(('plannerip', engine_ip))
     if cluster:
-        metadata.append(('cluster-uuid', cluster))
+        metadata.append(('cluster-name', cluster))
     if strategy:
         # Normalize strategy to lowercase
         normalized_strategy = strategy.lower() if isinstance(strategy, str) else strategy

{e6data_python_connector-2.3.6.dist-info → e6data_python_connector-2.3.7rc2.dist-info}/METADATA

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

{e6data_python_connector-2.3.6.dist-info → e6data_python_connector-2.3.7rc2.dist-info}/RECORD

@@ -4,10 +4,10 @@ e6data_python_connector/common.py,sha256=nk0CDQ5j1iu8DctBOXX4QypPYmxSgIgoA-Cn1UZ
 e6data_python_connector/constants.py,sha256=h5w0lWiFsxz__zUZRlo1f72-8mT_vt9gcWvtWh0viFI,682
 e6data_python_connector/datainputstream.py,sha256=nHQmb0kAdNJWSubhJ6M156EZjBjImpiQOGKlxXC0DnA,25841
 e6data_python_connector/date_time_utils.py,sha256=zmIwRhEGJwDvCOUjAl6VTDWGppluA-DPl_ioHTNpJKI,14413
-e6data_python_connector/dialect.py,sha256=7dRVJjpnMFwOVFXSMFkFr3_ZXVd6o1IWKitgBR_dVTM,11626
-e6data_python_connector/e6data_grpc.py,sha256=DaGNnyMJuXUdLf7ZkN1v-eQSxezRgqHdqn43BDdHcT4,57784
+e6data_python_connector/dialect.py,sha256=4GHNzbbOULhXqi9WPJ7oz-d8aLVze41Zp4uSQ43QAv8,11626
+e6data_python_connector/e6data_grpc.py,sha256=bKmtPaJfCZv395njTjJSOem8kVHCfTkL-nsNtcPqMWc,57701
 e6data_python_connector/exceptions.py,sha256=vrUqdzMq3LjbCmvr5_TcRq9eKmdqGfe-uVjR0BJQf5U,382
-e6data_python_connector/strategy.py,sha256=G2A77yM8dG52UsJrXxpu2CBC-sdmiT9fElE-hd5Yn24,7334
+e6data_python_connector/strategy.py,sha256=bv01noiP6TN80LBWeuRw1HoMaCacFP1rDWOxktIo11w,7334
 e6data_python_connector/typeId.py,sha256=2EMNWK2SO5CBReNuJphma6xp-69r9GDwwys66t-kSk0,1777
 e6data_python_connector/cluster_server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 e6data_python_connector/cluster_server/cluster_pb2.py,sha256=BWxO5vG1SVkx2y-i6A6wvP5sfb8KNKosyl2N5lIsVd8,2339
@@ -62,9 +62,9 @@ test/tests_grpc.py,sha256=VRqJwW2BVRpL3c0BnwCKvtowogAS_0JYa1Ss4ynqTss,5916
 test/validate_decimal128.py,sha256=8m7FFD3nOHFkPKpN1kCd5MDDzfeEEJnMnOoSeXmX_I0,3320
 test/validate_implementation.py,sha256=2keEodBGxztdG1kgavTq-p-cLw1L9UNQLkXTfIijBNQ,5569
 test/verify_decimal_fix.py,sha256=n7XUV4dbo7kTdx-mVqhha9Nr6_bkDudwplHTdV-rM_Y,1051
-e6data_python_connector-2.3.6.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-e6data_python_connector-2.3.6.dist-info/METADATA,sha256=5RbSW9SSmG-_IgkWrAoOiwWGEhhFtk4C5o9Cau0o0hw,12771
-e6data_python_connector-2.3.6.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-e6data_python_connector-2.3.6.dist-info/entry_points.txt,sha256=MDK4cAOND0preLvq2Tlpnz00wXnP_Y_UopqJsAf3U7Y,77
-e6data_python_connector-2.3.6.dist-info/top_level.txt,sha256=uOWV7xMMlZxe030EIU4bGUuKJ-W78lKxX4YHA7YFclw,29
-e6data_python_connector-2.3.6.dist-info/RECORD,,
+e6data_python_connector-2.3.7rc2.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+e6data_python_connector-2.3.7rc2.dist-info/METADATA,sha256=G5Ict2zfOSkxDqnJfZaIWR4FzW0DhULXhQMFr4TM5hA,12777
+e6data_python_connector-2.3.7rc2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+e6data_python_connector-2.3.7rc2.dist-info/entry_points.txt,sha256=MDK4cAOND0preLvq2Tlpnz00wXnP_Y_UopqJsAf3U7Y,77
+e6data_python_connector-2.3.7rc2.dist-info/top_level.txt,sha256=uOWV7xMMlZxe030EIU4bGUuKJ-W78lKxX4YHA7YFclw,29
+e6data_python_connector-2.3.7rc2.dist-info/RECORD,,