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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.181
+Version: 0.0.182
 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.181 → fdc_shared_kernel-0.0.182}/fdc_shared_kernel.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fdc_shared_kernel
-Version: 0.0.181
+Version: 0.0.182
 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.181 → fdc_shared_kernel-0.0.182}/pyproject.toml

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

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

@@ -138,6 +138,12 @@ class DatabricksWarehouseConnection(DataWarehouseConnection):
             self._create_connection()
             self.close_connection()
             return True
-        except Exception:
-            return False
+        except OperationalError as e:
+            if "invalid access token" in str(e).lower() or "authentication" in str(e).lower():
+                raise ValueError("Invalid access token")
+            raise ConnectionError(f"Database error: {str(e)}")
+        except InterfaceError as e:
+            raise ConnectionError(f"Cannot connect to database server: {str(e)}")
+        except Exception as e:
+            raise ConnectionError(f"Connection failed: {str(e)}")
         

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

@@ -113,8 +113,8 @@ class JDBCWarehouseConnection(DataWarehouseConnection):
         driver_class = self.driver_info["driver_class"]
         jar_path = self.driver_info["jar_path"]
 
+        conn = None
         for attempt in range(retries):
-            conn = None
             try:
                 logger.info(f"Connecting to JDBC: {self.jdbc_url} (Driver: {driver_class})")
                 
@@ -125,10 +125,7 @@ class JDBCWarehouseConnection(DataWarehouseConnection):
                     driver_args=[cfg.username, cfg.password],
                     jars=jar_path
                 )
-                
-                yield conn
-                return
-
+                break
             except Exception as e:
                 last_exception = e
                 if conn is not None:
@@ -144,14 +141,25 @@ class JDBCWarehouseConnection(DataWarehouseConnection):
                     time.sleep(delay)
                     continue
                 break
-            finally:
-                if conn is not None:
-                    try:
-                        conn.close()
-                    except:
-                        pass
 
-        raise BadRequest(f"Failed to connect to JDBC after {retries} attempts: {last_exception}")
+        if conn is None:
+            error_message = self._extract_jdbc_error_message(str(last_exception))
+            if error_message in [
+                "Invalid host name or address",
+                "Database not found or unauthorized",
+                "Provided username is not valid",
+                "Provided password is not valid"
+            ]:
+                raise ValueError(error_message)
+            raise BadRequest(f"Failed to connect to JDBC after {retries} attempts: {error_message}")
+
+        try:
+            yield conn
+        finally:
+            try:
+                conn.close()
+            except:
+                pass
 
     def close_connection(self):
         """JDBC connections are closed in the context manager."""
@@ -180,4 +188,25 @@ class JDBCWarehouseConnection(DataWarehouseConnection):
                 cursor.close()
                 return True
         except Exception as e:
-            raise ConnectionError(f"JDBC Connection failed: {str(e)}")
+            error_message = self._extract_jdbc_error_message(str(e))
+            if error_message in [
+                "Invalid host name or address",
+                "Database not found or unauthorized",
+                "Provided username is not valid",
+                "Provided password is not valid"
+            ]:
+                raise ValueError(error_message)
+            raise ConnectionError(f"JDBC Connection failed: {error_message}")
+
+    @staticmethod
+    def _extract_jdbc_error_message(error_str: str) -> str:
+        """Extract user-friendly error messages from JDBC exceptions."""
+        if "SQL Server did not return a response" in error_str:
+            return "Invalid host name or address"
+        if "Authentication was successful, but the database was not found" in error_str:
+            return "Database not found or unauthorized"
+        if "AADSTS700016" in error_str:
+            return "Provided username is not valid"
+        if "AADSTS7000215" in error_str:
+            return "Provided password is not valid"
+        return error_str

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

@@ -139,7 +139,7 @@ class RedshiftWarehouseConnection(DataWarehouseConnection):
                     conn.close()
 
         raise BadRequest(
-            f"Failed to connect to Redshift after {retries} attempts"
+            f"Failed to connect to Redshift after {retries} attempts : {str(last_exception)}"
         ) from last_exception
 
     def close_connection(self):
@@ -159,5 +159,16 @@ class RedshiftWarehouseConnection(DataWarehouseConnection):
             with self.get_connection():
                 return True
         except Exception as e:
-            raise ConnectionError(f"Redshift connection test failed: {e}") from e
-        
+            error_msg = str(e)
+            if "Name or service not known" in error_msg:
+                user_msg = "Host not found. Please check the host address."
+            elif "Connection refused" in error_msg:
+                user_msg = "Connection refused. Please check the host and port."
+            elif "database" in error_msg.lower() and "does not exist" in error_msg:
+                user_msg = "Database does not exist. Please check the database name."
+            elif "password authentication failed" in error_msg.lower():
+                user_msg = "Authentication failed. Please check your username and password."
+            else:
+                user_msg = f"Redshift connection test failed: {error_msg}"
+            
+            raise ConnectionError(user_msg) from e

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

@@ -142,5 +142,13 @@ class SnowflakeWarehouseConnection(DataWarehouseConnection):
             self._create_connection()
             self.close_connection()
             return True
-        except Exception:
-            return False
+        except (OperationalError, DatabaseError, ProgrammingError) as e:
+            error_message = extract_snowflake_error_message(str(e))
+            if "incorrect username or password" in error_message.lower() or "authentication" in error_message.lower():
+                raise ValueError("Invalid username or password")
+            raise ConnectionError(f"Database error: {error_message}")
+        except InterfaceError as e:
+            error_message = extract_snowflake_error_message(str(e))
+            raise ConnectionError(f"Cannot connect to database server: {error_message}")
+        except Exception as e:
+            raise ConnectionError(f"Connection failed: {str(e)}")