fdc-shared-kernel 0.0.182__tar.gz → 0.0.183__tar.gz

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.182
+Version: 0.0.183
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.182
+Version: 0.0.183
 Summary: Shared library for microservice
 Author-email: Shikhil S <shikhil.s@dbizsolution.com>, Ahammed Akdham N <ahammedakdham.n@dbizsolution.com>
 Classifier: Programming Language :: Python :: 3

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "fdc_shared_kernel"
-version = "0.0.182"
+version = "0.0.183"
 requires-python = ">=3.7"
 readme = "README_pypi.md"
 description = "Shared library for microservice"

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/shared_kernel/data_warehouse_handlers/connections/databricks_warehouse_connection.py

@@ -88,7 +88,7 @@ class DatabricksWarehouseConnection(DataWarehouseConnection):
                 self.close_connection()
 
     @contextmanager
-    def get_connection(self, retries: int = 3, delay: int = 5):
+    def get_connection(self, retries: int = 3, delay: int = 5, query_timeout: int = 60):
         if not (self._conn and self.is_valid_connection()):
             self._create_connection_with_retry(retries, delay)
         try:

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/shared_kernel/data_warehouse_handlers/connections/jdbc_warehouse_connection.py

@@ -106,7 +106,7 @@ class JDBCWarehouseConnection(DataWarehouseConnection):
                 # We don't raise yet, as the class might somehow be in the global classpath
 
     @contextmanager
-    def get_connection(self, retries: int = 3, delay: int = 5):
+    def get_connection(self, retries: int = 3, delay: int = 5, query_timeout: int = 60):
         """Context manager for JDBC database connections with retry mechanism."""
         last_exception = None
         cfg = self._jdbc_config

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/shared_kernel/data_warehouse_handlers/connections/mssql_warehouse_connection.py

@@ -75,7 +75,7 @@ class MSSQLWarehouseConnection(DataWarehouseConnection):
         return self._engines[key]
 
     @contextmanager
-    def get_connection(self, retries: int = 3, delay: int = 5):
+    def get_connection(self, retries: int = 3, delay: int = 5, query_timeout: int = 60):
         """Context manager for database connections with retry mechanism"""
         engine = self._get_engine()
         last_exception = None

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/shared_kernel/data_warehouse_handlers/connections/mysql_warehouse_connection.py

@@ -82,7 +82,7 @@ class MySQLWarehouseConnection(DataWarehouseConnection):
         return self._engines[key]
 
     @contextmanager
-    def get_connection(self, retries: int = 3, delay: int = 5):
+    def get_connection(self, retries: int = 3, delay: int = 5, query_timeout: int = 60):
         engine = self._get_engine()
         last_exception = None
 

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/shared_kernel/data_warehouse_handlers/connections/postgresql_warehouse_connection.py

@@ -75,7 +75,7 @@ class PostgreSQLWarehouseConnection(DataWarehouseConnection):
         return self._engines[key]
 
     @contextmanager
-    def get_connection(self, retries: int = 3, delay: int = 5):
+    def get_connection(self, retries: int = 3, delay: int = 5, query_timeout: int = 60):
         """Context manager for database connections with retry mechanism"""
         engine = self._get_engine()
         last_exception = None

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/shared_kernel/data_warehouse_handlers/connections/redshift_warehouse_connection.py

@@ -98,7 +98,7 @@ class RedshiftWarehouseConnection(DataWarehouseConnection):
         return False
 
     @contextmanager
-    def get_connection(self, retries: int = 3, delay: int = 5):
+    def get_connection(self, retries: int = 3, delay: int = 5, query_timeout: int = 60):
         """Context manager for database connections with retry mechanism"""
         engine = self._get_engine()
         last_exception = None
@@ -108,7 +108,7 @@ class RedshiftWarehouseConnection(DataWarehouseConnection):
             try:
                 conn = engine.connect()
                 conn.execute(text("SET enable_case_sensitive_identifier TO on"))
-
+                conn.execute(text(f"SET statement_timeout = {query_timeout * 1000}"))
                 if self.org_schema and self.set_default_schema:
                     conn.execute(text(f"SET search_path TO {self.org_schema}"))
                     logger.info(f"Search path set to: {self.org_schema}")
@@ -119,6 +119,10 @@ class RedshiftWarehouseConnection(DataWarehouseConnection):
             except (OperationalError, InterfaceError, ProgrammingError) as e:
                 last_exception = e
                 if conn is not None:
+                    try:
+                        conn.rollback()
+                    except:
+                        pass
                     conn.close()
                     conn = None
 

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/shared_kernel/data_warehouse_handlers/connections/snowflake_warehouse_connection.py

@@ -93,7 +93,7 @@ class SnowflakeWarehouseConnection(DataWarehouseConnection):
                 self.close_connection()
 
     @contextmanager
-    def get_connection(self, retries: int = 3, delay: int = 5):
+    def get_connection(self, retries: int = 3, delay: int = 5, query_timeout: int = 60):
         if not (self._conn and self.is_valid_connection()):
             self._create_connection_with_retry(retries, delay)
         try:

{fdc_shared_kernel-0.0.182 → fdc_shared_kernel-0.0.183}/shared_kernel/interfaces/warehouse_connection.py

@@ -11,7 +11,7 @@ class DataWarehouseConnection(ABC):
         super().__init__()
 
     @abstractmethod
-    def get_connection(self, retries: int, delay: int):
+    def get_connection(self, retries: int, delay: int, query_timeout: int):
         pass
 
     @abstractmethod