e6data-python-connector 2.3.10rc3__tar.gz → 2.3.10rc4__tar.gz

{e6data_python_connector-2.3.10rc3/e6data_python_connector.egg-info → e6data_python_connector-2.3.10rc4}/PKG-INFO

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

{e6data_python_connector-2.3.10rc3 → e6data_python_connector-2.3.10rc4}/README.md

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

{e6data_python_connector-2.3.10rc3 → e6data_python_connector-2.3.10rc4}/e6data_python_connector/e6data_grpc.py

@@ -80,10 +80,12 @@ def re_auth(func):
                 if current_retry == max_retry:
                     raise e
                 if e.code() == grpc.StatusCode.INTERNAL and 'Access denied' in e.details():
+                    _logger.debug(f'Re-authenticating due to {e}')
                     time.sleep(0.2)
                     self.connection.get_re_authenticate_session_id()
                 elif 'status: 456' in e.details():
                     # Strategy changed, clear cache and retry
+                    _logger.debug(f'Re-authenticating due to status: 456')
                     _clear_strategy_cache()
                     # Force re-authentication which will detect new strategy
                     self.connection.get_re_authenticate_session_id()
@@ -302,10 +304,18 @@ def _get_strategy_debug_info():
         }
 
 
-def _get_grpc_header(engine_ip=None, cluster=None, strategy=None):
+def _get_grpc_header(engine_ip=None, cluster=None, strategy=None, session_id=None, request_type=None):
     """Generate gRPC metadata headers for the request."""
     # Use the strategy module's implementation
-    return _get_strategy_header(engine_ip=engine_ip, cluster=cluster, strategy=strategy)
+    headers = _get_strategy_header(engine_ip=engine_ip, cluster=cluster, strategy=strategy)
+    
+    # Log headers being sent if debug connections exist
+    if _debug_connections:
+        session_info = f", session: {session_id}" if session_id else ""
+        request_info = f" [{request_type}]" if request_type else ""
+        _strategy_debug_log(f"Sending headers{request_info}: strategy={strategy}, cluster={cluster}, engine_ip={engine_ip}{session_info}")
+    
+    return headers
 
 
 def connect(*args, **kwargs):
@@ -546,7 +556,8 @@ class Connection(object):
                     try:
                         authenticate_response = self._client.authenticate(
                             authenticate_request,
-                            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=active_strategy)
+                            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=active_strategy, 
+                                                    session_id=self._session_id, request_type="authenticate")
                         )
                         self._session_id = authenticate_response.sessionId
                         if not self._session_id:
@@ -597,7 +608,8 @@ class Connection(object):
                         try:
                             authenticate_response = self._client.authenticate(
                                 authenticate_request,
-                                metadata=_get_grpc_header(cluster=self.cluster_name, strategy=strategy)
+                                metadata=_get_grpc_header(cluster=self.cluster_name, strategy=strategy, 
+                                                        session_id=None, request_type="authenticate")
                             )
                             self._session_id = authenticate_response.sessionId
                             if self._session_id:
@@ -767,7 +779,8 @@ class Connection(object):
         )
         clear_response = self._client.clear(
             clear_request,
-            metadata=_get_grpc_header(engine_ip=engine_ip, cluster=self.cluster_name, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(engine_ip=engine_ip, cluster=self.cluster_name, strategy=_get_active_strategy(),
+                                    session_id=self.connection.get_session_id, request_type="clear")
         )
 
         # Check for new strategy in clear response
@@ -798,7 +811,8 @@ class Connection(object):
         )
         cancel_response = self._client.cancelQuery(
             cancel_query_request,
-            metadata=_get_grpc_header(engine_ip=engine_ip, cluster=self.cluster_name, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(engine_ip=engine_ip, cluster=self.cluster_name, strategy=_get_active_strategy(),
+                                    session_id=self._session_id, request_type="query_cancel")
         )
 
         # Check for new strategy in cancel response
@@ -822,7 +836,8 @@ class Connection(object):
         )
         dry_run_response = self._client.dryRun(
             dry_run_request,
-            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy(),
+                                    session_id=self.get_session_id, request_type="dry_run")
         )
         return dry_run_response.dryrunValue
 
@@ -844,7 +859,8 @@ class Connection(object):
         )
         get_table_response = self._client.getTablesV2(
             get_table_request,
-            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy(),
+                                    session_id=self.get_session_id, request_type="get_tables")
         )
 
         # Check for new strategy in get tables response
@@ -872,7 +888,8 @@ class Connection(object):
         )
         get_columns_response = self._client.getColumnsV2(
             get_columns_request,
-            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy(),
+                                    session_id=self.get_session_id, request_type="get_columns")
         )
 
         # Check for new strategy in get columns response
@@ -896,7 +913,8 @@ class Connection(object):
         )
         get_schema_response = self._client.getSchemaNamesV2(
             get_schema_request,
-            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy())
+            metadata=_get_grpc_header(cluster=self.cluster_name, strategy=_get_active_strategy(),
+                                    session_id=self.get_session_id, request_type="get_schema")
         )
 
         # Check for new strategy in get schema names response
@@ -983,10 +1001,12 @@ class Cursor(DBAPICursor):
         """Reset state about the previous query in preparation for running another query"""
         pass
 
-    @property
-    def metadata(self):
+    def _get_metadata(self, request_type="query_operation"):
         """
-        Get the gRPC metadata for the current query.
+        Get the gRPC metadata for the current query with specific request type.
+
+        Args:
+            request_type (str): The type of request being made
 
         Returns:
             list: A list of tuples containing gRPC metadata.
@@ -999,7 +1019,18 @@ class Cursor(DBAPICursor):
             strategy = self.connection._session_strategy
         else:
             strategy = _get_active_strategy()
-        return _get_grpc_header(engine_ip=self._engine_ip, cluster=self.connection.cluster_name, strategy=strategy)
+        return _get_grpc_header(engine_ip=self._engine_ip, cluster=self.connection.cluster_name, strategy=strategy,
+                               session_id=self.connection.get_session_id, request_type=request_type)
+
+    @property
+    def metadata(self):
+        """
+        Get the gRPC metadata for the current query.
+
+        Returns:
+            list: A list of tuples containing gRPC metadata.
+        """
+        return self._get_metadata("query_operation")
 
     @property
     def arraysize(self):
@@ -1141,7 +1172,7 @@ class Cursor(DBAPICursor):
         )
         # Get fresh client after session access (may have been invalidated)
         client = self.connection.client
-        clear_response = client.clearOrCancelQuery(clear_request, metadata=self.metadata)
+        clear_response = client.clearOrCancelQuery(clear_request, metadata=self._get_metadata("clear_or_cancel"))
 
         # Check for new strategy in clear response
         if hasattr(clear_response, 'new_strategy') and clear_response.new_strategy:
@@ -1199,7 +1230,7 @@ class Cursor(DBAPICursor):
             queryId=query_id,
             engineIP=self._engine_ip
         )
-        status_response = self.connection.client.status(status_request, metadata=self.metadata)
+        status_response = self.connection.client.status(status_request, metadata=self._get_metadata("status"))
 
         # Check for new strategy in status response
         if hasattr(status_response, 'new_strategy') and status_response.new_strategy:
@@ -1240,7 +1271,7 @@ class Cursor(DBAPICursor):
             client = self.connection.client
             prepare_statement_response = client.prepareStatement(
                 prepare_statement_request,
-                metadata=self.metadata
+                metadata=self._get_metadata("prepare_statement")
             )
 
             self._query_id = prepare_statement_response.queryId
@@ -1266,7 +1297,7 @@ class Cursor(DBAPICursor):
             client = self.connection.client
             execute_response = client.executeStatement(
                 execute_statement_request,
-                metadata=self.metadata
+                metadata=self._get_metadata("execute_statement")
             )
 
             # Check for new strategy in execute response
@@ -1285,7 +1316,7 @@ class Cursor(DBAPICursor):
             client = self.connection.client
             prepare_statement_response = client.prepareStatementV2(
                 prepare_statement_request,
-                metadata=self.metadata,
+                metadata=self._get_metadata("prepare_statement_v2"),
                 timeout=self.connection.grpc_prepare_timeout
             )
 
@@ -1313,7 +1344,7 @@ class Cursor(DBAPICursor):
             client = self.connection.client
             execute_response = client.executeStatementV2(
                 execute_statement_request,
-                metadata=self.metadata
+                metadata=self._get_metadata("execute_statement_v2")
             )
 
             # Check for new strategy in execute response

{e6data_python_connector-2.3.10rc3 → e6data_python_connector-2.3.10rc4/e6data_python_connector.egg-info}/PKG-INFO

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

{e6data_python_connector-2.3.10rc3 → e6data_python_connector-2.3.10rc4}/setup.py

@@ -12,7 +12,7 @@
 
 import setuptools
 
-VERSION = (2, 3, 10, 'rc3')
+VERSION = (2, 3, 10, 'rc4')
 
 
 def get_long_desc():