fdc-shared-kernel 0.0.195__tar.gz → 0.0.197__tar.gz

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/PKG-INFO

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

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

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

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/shared_kernel/data_warehouse_handlers/connections/databricks_warehouse_connection.py

@@ -6,7 +6,7 @@ from databricks import sql
 from databricks.sql.exc import InterfaceError, OperationalError, ProgrammingError
 
 from shared_kernel.dataclasses.warehouse_configs import DatabricksConfig
-from shared_kernel.exceptions.http_exceptions import BadRequest
+from shared_kernel.exceptions.http_exceptions import BadRequest, Unauthorized
 from shared_kernel.interfaces.warehouse_connection import DataWarehouseConnection, cancel_check_connection
 from shared_kernel.logger import Logger
 from shared_kernel.config import Config
@@ -134,17 +134,17 @@ class DatabricksWarehouseConnection(DataWarehouseConnection):
             raise Exception("Databricks connection validation failed.")
 
     def test_connection(self) -> bool:
-        """Verify the connection is reachable."""
+        """Verify the connection is reachable. Raises Unauthorized/BadRequest on failure."""
         try:
             self._create_connection()
             self.close_connection()
             return True
         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)}")
+                raise Unauthorized("Invalid access token") from e
+            raise BadRequest(f"Databricks connection test failed: {str(e)}") from e
         except InterfaceError as e:
-            raise ConnectionError(f"Cannot connect to database server: {str(e)}")
+            raise BadRequest(f"Cannot connect to database server: {str(e)}") from e
         except Exception as e:
-            raise ConnectionError(f"Connection failed: {str(e)}")
+            raise BadRequest(f"Databricks connection test failed: {str(e)}") from e
         

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/shared_kernel/data_warehouse_handlers/connections/fabric_sql_warehouse_connection.py

@@ -13,7 +13,7 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.exc import InterfaceError, OperationalError, ProgrammingError
 
 from shared_kernel.dataclasses.warehouse_configs import FabricSQLConfig
-from shared_kernel.exceptions.http_exceptions import BadRequest
+from shared_kernel.exceptions.http_exceptions import BadRequest, Unauthorized
 from shared_kernel.interfaces.warehouse_connection import DataWarehouseConnection, cancel_check_connection
 from shared_kernel.data_warehouse_handlers.utils import extract_sql_server_error_message
 from shared_kernel.logger import Logger
@@ -85,12 +85,13 @@ class FabricSQLWarehouseConnection(DataWarehouseConnection):
                     from sqlalchemy import event
                     
                     connection_string = self._get_fabric_connection_params(cfg)
+                    pool_size = int(Config.get("FABRIC_SQL_POOL_SIZE", 15))
 
                     engine = create_engine(
                         connection_string,
-                        pool_size=50,
+                        pool_size=pool_size,
                         max_overflow=5,
-                        pool_timeout=120,
+                        pool_timeout=300,
                         pool_recycle=1800,
                         pool_pre_ping=True,
                     )
@@ -224,7 +225,7 @@ class FabricSQLWarehouseConnection(DataWarehouseConnection):
                     conn.close()
 
         raise BadRequest(
-            f"Failed to connect to Fabric SQL after {retries} attempts"
+            f"Failed to connect to Fabric SQL after {retries} attempts: {extract_sql_server_error_message(str(last_exception))}"
         ) from last_exception
 
     def close_connection(self):
@@ -240,14 +241,30 @@ class FabricSQLWarehouseConnection(DataWarehouseConnection):
         return True
 
     def test_connection(self) -> bool:
-        """Verify the connection is reachable. Raises on failure."""
+        """Verify the connection is reachable. Raises Unauthorized/BadRequest on failure."""
         try:
-            with self.get_connection() as conn:
+            with self.get_connection(retries=1) as conn:
                 conn.execute(text("SELECT 1"))
             return True
-        except OperationalError as e:
-            if "authentication failed" in str(e).lower():
-                raise ValueError("Invalid username or password")
-            raise ConnectionError(f"Database error: {str(e)}")
-        except InterfaceError:
-            raise ConnectionError("Cannot connect to database server")
+        except Exception as e:
+            error_msg = str(e)
+            error_message = extract_sql_server_error_message(error_msg)
+            if (
+                "failed to open the explicitly specified database" in error_msg.lower()
+                or "cannot open database" in error_msg.lower()
+                or "could not be opened" in error_msg.lower()
+                or "database was not found" in error_msg.lower()
+            ):
+                raise BadRequest("Database does not exist. Please check the database name.") from e
+            if "28000" in error_msg or "login error" in error_message.lower() or "login failed" in error_msg.lower():
+                raise Unauthorized("Authentication failed. Please check your username and password.") from e
+            if "HYT00" in error_msg or "login timeout" in error_message.lower():
+                raise BadRequest("Connection timed out. Please check the host and port.") from e
+            if (
+                "could not open a connection" in error_msg.lower()
+                or "connection refused" in error_msg.lower()
+                or "42000" in error_msg
+                or "08S01" in error_msg
+            ):
+                raise BadRequest("Connection refused. Please check the host and port.") from e
+            raise BadRequest(f"Fabric SQL connection test failed: {error_message}") from e

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/shared_kernel/data_warehouse_handlers/connections/jdbc_warehouse_connection.py

@@ -8,7 +8,7 @@ from contextlib import contextmanager
 from typing import Dict, Any, Optional
 
 from shared_kernel.dataclasses.warehouse_configs import JDBCConfig
-from shared_kernel.exceptions.http_exceptions import BadRequest
+from shared_kernel.exceptions.http_exceptions import BadRequest, Unauthorized
 from shared_kernel.interfaces.warehouse_connection import DataWarehouseConnection, cancel_check_connection
 from shared_kernel.logger import Logger
 from shared_kernel.config import Config
@@ -151,14 +151,11 @@ class JDBCWarehouseConnection(DataWarehouseConnection):
 
         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}")
+            if error_message in ["Provided username is not valid", "Provided password is not valid"]:
+                raise Unauthorized(error_message) from last_exception
+            if error_message in ["Invalid host name or address", "Database not found or unauthorized"]:
+                raise BadRequest(error_message) from last_exception
+            raise BadRequest(f"Failed to connect to JDBC after {retries} attempts: {error_message}") from last_exception
 
         try:
             yield conn
@@ -181,9 +178,9 @@ class JDBCWarehouseConnection(DataWarehouseConnection):
             return False
 
     def test_connection(self) -> bool:
-        """Verify the connection is reachable."""
+        """Verify the connection is reachable. Raises Unauthorized/BadRequest on failure."""
         try:
-            with self.get_connection() as conn:
+            with self.get_connection(retries=1) as conn:
                 # Use a simple generic query for testing
                 cursor = conn.cursor()
                 # Most DBs support SELECT 1, but we might need variations
@@ -194,16 +191,15 @@ class JDBCWarehouseConnection(DataWarehouseConnection):
                     pass
                 cursor.close()
                 return True
+        except (Unauthorized, BadRequest):
+            raise
         except Exception as 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}")
+            if error_message in ["Provided username is not valid", "Provided password is not valid"]:
+                raise Unauthorized(error_message) from e
+            if error_message in ["Invalid host name or address", "Database not found or unauthorized"]:
+                raise BadRequest(error_message) from e
+            raise BadRequest(f"JDBC connection test failed: {error_message}") from e
 
     @staticmethod
     def _extract_jdbc_error_message(error_str: str) -> str:

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/shared_kernel/data_warehouse_handlers/connections/mssql_warehouse_connection.py

@@ -11,7 +11,7 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.exc import InterfaceError, OperationalError, ProgrammingError
 
 from shared_kernel.dataclasses.warehouse_configs import MSSQLConfig
-from shared_kernel.exceptions.http_exceptions import BadRequest
+from shared_kernel.exceptions.http_exceptions import BadRequest, Unauthorized
 from shared_kernel.interfaces.warehouse_connection import DataWarehouseConnection, cancel_check_connection
 from shared_kernel.constants.constants import get_constant
 from shared_kernel.data_warehouse_handlers.utils import extract_sql_server_error_message
@@ -62,10 +62,12 @@ class MSSQLWarehouseConnection(DataWarehouseConnection):
                     )
                     connect_args = {}
 
+                    pool_size = int(Config.get("MSSQL_POOL_SIZE", 10))
+
                     self._engines[key] = create_engine(
                         connection_string,
                         connect_args=connect_args,
-                        pool_size=10,
+                        pool_size=pool_size,
                         max_overflow=5,
                         pool_timeout=30,
                         pool_recycle=1800,
@@ -114,7 +116,7 @@ class MSSQLWarehouseConnection(DataWarehouseConnection):
                     conn.close()
 
         raise BadRequest(
-            f"Failed to connect to MSSQL after {retries} attempts"
+            f"Failed to connect to MSSQL after {retries} attempts: {extract_sql_server_error_message(str(last_exception))}"
         ) from last_exception
 
     def close_connection(self):
@@ -129,14 +131,30 @@ class MSSQLWarehouseConnection(DataWarehouseConnection):
         return True
 
     def test_connection(self) -> bool:
-        """Verify the connection is reachable. Raises on failure."""
+        """Verify the connection is reachable. Raises Unauthorized/BadRequest on failure."""
         try:
-            with self.get_connection() as conn:
+            with self.get_connection(retries=1) as conn:
                 conn.execute(text("SELECT 1"))
             return True
-        except OperationalError as e:
-            if "authentication failed" in str(e).lower():
-                raise ValueError("Invalid username or password")
-            raise ConnectionError(f"Database error: {str(e)}")
-        except InterfaceError:
-            raise ConnectionError("Cannot connect to database server")
+        except Exception as e:
+            error_msg = str(e)
+            error_message = extract_sql_server_error_message(error_msg)
+            if (
+                "failed to open the explicitly specified database" in error_msg.lower()
+                or "cannot open database" in error_msg.lower()
+                or "could not be opened" in error_msg.lower()
+                or "database was not found" in error_msg.lower()
+            ):
+                raise BadRequest("Database does not exist. Please check the database name.") from e
+            if "28000" in error_msg or "login error" in error_message.lower() or "login failed" in error_msg.lower():
+                raise Unauthorized("Authentication failed. Please check your username and password.") from e
+            if "HYT00" in error_msg or "login timeout" in error_message.lower():
+                raise BadRequest("Connection timed out. Please check the host and port.") from e
+            if (
+                "could not open a connection" in error_msg.lower()
+                or "connection refused" in error_msg.lower()
+                or "42000" in error_msg
+                or "08S01" in error_msg
+            ):
+                raise BadRequest("Connection refused. Please check the host and port.") from e
+            raise BadRequest(f"MSSQL connection test failed: {error_message}") from e

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/shared_kernel/data_warehouse_handlers/connections/mysql_warehouse_connection.py

@@ -13,7 +13,7 @@ from sqlalchemy.exc import InterfaceError, OperationalError, ProgrammingError
 
 from shared_kernel.constants.constants import get_constant
 from shared_kernel.dataclasses.warehouse_configs import MySQLConfig
-from shared_kernel.exceptions.http_exceptions import BadRequest
+from shared_kernel.exceptions.http_exceptions import BadRequest, Unauthorized
 from shared_kernel.interfaces.warehouse_connection import DataWarehouseConnection, cancel_check_connection
 from shared_kernel.logger import Logger
 from shared_kernel.config import Config
@@ -68,10 +68,11 @@ class MySQLWarehouseConnection(DataWarehouseConnection):
                     connection_string = get_constant("mysql", "CONNECTION_STRING").format(
                         cfg.username, password, cfg.host, int(cfg.port), cfg.database
                     )
+                    pool_size = int(Config.get("MYSQL_POOL_SIZE", 10))
                     self._engines[key] = create_engine(
                         connection_string,
                         connect_args=self._CONNECT_ARGS,
-                        pool_size=10,
+                        pool_size=pool_size,
                         max_overflow=5,
                         pool_timeout=30,
                         pool_recycle=1800,
@@ -119,7 +120,7 @@ class MySQLWarehouseConnection(DataWarehouseConnection):
                     conn.close()
 
         raise BadRequest(
-            f"Failed to connect to MySQL after {retries} attempts"
+            f"Failed to connect to MySQL after {retries} attempts: {str(last_exception)}"
         ) from last_exception
 
     def close_connection(self):
@@ -134,17 +135,19 @@ class MySQLWarehouseConnection(DataWarehouseConnection):
         return True
 
     def test_connection(self) -> bool:
-        """Verify the connection is reachable. Raises on failure."""
+        """Verify the connection is reachable. Raises Unauthorized/BadRequest on failure."""
         try:
-            with self.get_connection() as conn:
+            with self.get_connection(retries=1) as conn:
                 conn.execute(text("SELECT 1"))
             return True
-        except OperationalError as e:
-            if "authentication failed" in str(e).lower():
-                raise ValueError("Invalid username or password")
-            raise ConnectionError(f"Database error: {str(e)}")
-        except InterfaceError:
-            raise ConnectionError("Cannot connect to database server")
         except Exception as e:
-            raise ConnectionError(f"Connection failed: {str(e)}")
-        
+            error_msg = str(e)
+            if "access denied" in error_msg.lower() or "authentication failed" in error_msg.lower():
+                raise Unauthorized("Authentication failed. Please check your username and password.") from e
+            if "unknown mysql server host" in error_msg.lower() or "name or service not known" in error_msg.lower():
+                raise BadRequest("Host not found. Please check the host address.") from e
+            if "can't connect to mysql server" in error_msg.lower() or "connection refused" in error_msg.lower() or "timed out" in error_msg.lower():
+                raise BadRequest("Connection refused. Please check the host and port.") from e
+            if "unknown database" in error_msg.lower():
+                raise BadRequest("Database does not exist. Please check the database name.") from e
+            raise BadRequest(f"MySQL connection test failed: {error_msg}") from e

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/shared_kernel/data_warehouse_handlers/connections/postgresql_warehouse_connection.py

@@ -11,7 +11,7 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.exc import InterfaceError, OperationalError, ProgrammingError, SQLAlchemyError
 
 from shared_kernel.dataclasses.warehouse_configs import PostgreSQLConfig
-from shared_kernel.exceptions.http_exceptions import BadRequest
+from shared_kernel.exceptions.http_exceptions import BadRequest, Unauthorized
 from shared_kernel.interfaces.warehouse_connection import DataWarehouseConnection, cancel_check_connection
 from shared_kernel.logger import Logger
 from shared_kernel.config import Config
@@ -61,9 +61,10 @@ class PostgreSQLWarehouseConnection(DataWarehouseConnection):
                         f"postgresql+psycopg2://{cfg.username}:{password}"
                         f"@{cfg.host}:{cfg.port}/{cfg.database}"
                     )
+                    pool_size = int(Config.get("POSTGRES_POOL_SIZE", 10))
                     self._engines[key] = create_engine(
                         url,
-                        pool_size=10,
+                        pool_size=pool_size,
                         max_overflow=5,
                         pool_timeout=30,
                         pool_recycle=1800,
@@ -113,7 +114,7 @@ class PostgreSQLWarehouseConnection(DataWarehouseConnection):
                     conn.close()
 
         raise BadRequest(
-            f"Failed to connect to PostgreSQL after {retries} attempts"
+            f"Failed to connect to PostgreSQL after {retries} attempts: {str(last_exception)}"
         ) from last_exception
 
     def close_connection(self):
@@ -128,16 +129,18 @@ class PostgreSQLWarehouseConnection(DataWarehouseConnection):
         return True
 
     def test_connection(self) -> bool:
-        """Verify the connection is reachable. Raises ConnectionError on failure."""
+        """Verify the connection is reachable. Raises Unauthorized/BadRequest on failure."""
         try:
-            with self.get_connection():
+            with self.get_connection(retries=1):
                 return True
-        except OperationalError as e:
-            if "password authentication failed" in str(e).lower():
-                raise ValueError("Invalid username or password")
-            raise ConnectionError(f"Database error: {str(e)}")
-        except InterfaceError:
-            raise ConnectionError("Cannot connect to database server")
-        except SQLAlchemyError as e:
-            raise RuntimeError(f"SQLAlchemy error: {e}")
-        
+        except Exception as e:
+            error_msg = str(e)
+            if "password authentication failed" in error_msg.lower():
+                raise Unauthorized("Authentication failed. Please check your username and password.") from e
+            if "could not translate host name" in error_msg.lower() or "name or service not known" in error_msg.lower():
+                raise BadRequest("Host not found. Please check the host address.") from e
+            if "connection refused" in error_msg.lower() or "timeout expired" in error_msg.lower():
+                raise BadRequest("Connection refused. Please check the host and port.") from e
+            if "does not exist" in error_msg.lower() and "database" in error_msg.lower():
+                raise BadRequest("Database does not exist. Please check the database name.") from e
+            raise BadRequest(f"PostgreSQL connection test failed: {error_msg}") from e

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/shared_kernel/data_warehouse_handlers/connections/redshift_warehouse_connection.py

@@ -11,7 +11,7 @@ from sqlalchemy.engine import Engine
 from sqlalchemy.exc import InterfaceError, OperationalError, ProgrammingError
 
 from shared_kernel.dataclasses.warehouse_configs import RedshiftConfig
-from shared_kernel.exceptions.http_exceptions import BadRequest
+from shared_kernel.exceptions.http_exceptions import BadRequest, Unauthorized
 from shared_kernel.interfaces.warehouse_connection import DataWarehouseConnection, cancel_check_connection
 from shared_kernel.logger import Logger
 from shared_kernel.config import Config
@@ -194,9 +194,10 @@ class RedshiftWarehouseConnection(DataWarehouseConnection):
                         f"redshift+redshift_connector://{cfg.username}:{cfg.password}"
                         f"@{cfg.host}:{cfg.port}/{cfg.database}"
                     )
+                    pool_size = int(Config.get("REDSHIFT_POOL_SIZE", 10))
                     self._engines[key] = create_engine(
                         url,
-                        pool_size=10,
+                        pool_size=pool_size,
                         max_overflow=5,
                         pool_timeout=30,
                         pool_recycle=1800,
@@ -283,21 +284,18 @@ class RedshiftWarehouseConnection(DataWarehouseConnection):
         return True
 
     def test_connection(self) -> bool:
-        """Verify the connection is reachable. Raises ConnectionError on failure."""
+        """Verify the connection is reachable. Raises Unauthorized/BadRequest on failure."""
         try:
-            with self.get_connection():
+            with self.get_connection(retries=1):
                 return True
         except Exception as 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
+            if "password authentication failed" in error_msg.lower():
+                raise Unauthorized("Authentication failed. Please check your username and password.") from e
+            if "name or service not known" in error_msg.lower():
+                raise BadRequest("Host not found. Please check the host address.") from e
+            if "connection refused" in error_msg.lower() or "timeout" in error_msg.lower():
+                raise BadRequest("Connection refused. Please check the host and port.") from e
+            if "database" in error_msg.lower() and "does not exist" in error_msg.lower():
+                raise BadRequest("Database does not exist. Please check the database name.") from e
+            raise BadRequest(f"Redshift connection test failed: {error_msg}") from e

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/shared_kernel/data_warehouse_handlers/connections/snowflake_warehouse_connection.py

@@ -18,7 +18,7 @@ from snowflake.connector.errors import (
 
 from shared_kernel.data_warehouse_handlers.utils import extract_snowflake_error_message
 from shared_kernel.dataclasses.warehouse_configs import SnowflakeConfig
-from shared_kernel.exceptions.http_exceptions import BadRequest
+from shared_kernel.exceptions.http_exceptions import BadRequest, Unauthorized
 from shared_kernel.interfaces.warehouse_connection import DataWarehouseConnection, cancel_check_connection
 from shared_kernel.logger import Logger
 from shared_kernel.config import Config
@@ -156,7 +156,7 @@ class SnowflakeWarehouseConnection(DataWarehouseConnection):
             raise Exception("Snowflake connection validation failed.")
 
     def test_connection(self) -> bool:
-        """Verify the connection is reachable."""
+        """Verify the connection is reachable. Raises Unauthorized/BadRequest on failure."""
         try:
             self._create_connection()
             self.close_connection()
@@ -164,10 +164,10 @@ class SnowflakeWarehouseConnection(DataWarehouseConnection):
         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}")
+                raise Unauthorized("Invalid username or password") from e
+            raise BadRequest(f"Snowflake connection test failed: {error_message}") from e
         except InterfaceError as e:
             error_message = extract_snowflake_error_message(str(e))
-            raise ConnectionError(f"Cannot connect to database server: {error_message}")
+            raise BadRequest(f"Cannot connect to database server: {error_message}") from e
         except Exception as e:
-            raise ConnectionError(f"Connection failed: {str(e)}")
+            raise BadRequest(f"Snowflake connection test failed: {str(e)}") from e

{fdc_shared_kernel-0.0.195 → fdc_shared_kernel-0.0.197}/shared_kernel/data_warehouse_handlers/utils.py

@@ -61,12 +61,22 @@ def extract_sql_server_error_message(error) -> str:
     """
     try:
         if isinstance(error, str):
-            if "HYT00" in error:
+            if (
+                "failed to open the explicitly specified database" in error.lower()
+                or "cannot open database" in error.lower()
+                or "database was not found" in error.lower()
+            ):
+                message = "the specified database could not be opened. Please verify the database name."
+            elif "HYT00" in error:
                 message = "login timeout. Please verify the provided credentials."
             elif "42000" in error:
                 message = "the target database being unavailable or misconfigured. Please verify the provided credentials."
             elif "28000" in error:
                 message = "login error. Please ensure the specified SQL Server username & password are correct."
+            elif "08S01" in error:
+                message = "connection refused. Please check the host and port."
+            else:
+                message = error
             return message
         
         return str(error)