archipy-postgres 5.24.0__tar.gz → 5.26.0__tar.gz

{archipy_postgres-5.24.0 → archipy_postgres-5.26.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.5
 Name: archipy-postgres
-Version: 5.24.0
+Version: 5.26.0
 Summary: ArchiPy postgres adapter.
 Author-email: Hossein Nejati <hosseinnejati14@gmail.com>
 License-Expression: Apache-2.0
 Requires-Python: <4,>=3.14
-Requires-Dist: archipy==5.24.0
+Requires-Dist: archipy==5.26.0
 Requires-Dist: psycopg[binary]>=3.3.6
 Description-Content-Type: text/markdown
 

{archipy_postgres-5.24.0 → archipy_postgres-5.26.0}/archipy/adapters/postgres/sqlalchemy/session_managers.py

@@ -15,6 +15,48 @@ from archipy.helpers.metaclasses.singleton import Singleton
 from archipy.models.errors import DatabaseConnectionError
 
 
+def _build_connect_args(configs: PostgresSQLAlchemyConfig) -> dict[str, Any]:
+    """Build the psycopg connection arguments from the configuration.
+
+    Args:
+        configs: PostgreSQL configuration.
+
+    Returns:
+        dict[str, Any]: Only the options that are configured (libpq defaults apply to the rest).
+    """
+    candidates = {
+        "connect_timeout": configs.CONNECT_TIMEOUT,
+        "sslmode": configs.SSL_MODE,
+        "sslrootcert": configs.SSL_ROOT_CERT,
+        "sslcert": configs.SSL_CERT,
+        "sslkey": configs.SSL_KEY,
+        "application_name": configs.APPLICATION_NAME,
+        "options": _build_server_options(configs),
+        "prepare_threshold": configs.PREPARE_THRESHOLD,
+    }
+    connect_args: dict[str, Any] = {name: value for name, value in candidates.items() if value is not None}
+    if configs.DISABLE_PREPARED_STATEMENTS:
+        connect_args["prepare_threshold"] = None  # psycopg: None never prepares
+    return connect_args
+
+
+def _build_server_options(configs: PostgresSQLAlchemyConfig) -> str | None:
+    """Build the libpq ``options`` string that sets the session timeouts.
+
+    Args:
+        configs: PostgreSQL configuration.
+
+    Returns:
+        str | None: e.g. ``-c statement_timeout=5000 -c lock_timeout=1000``, or None when neither is set.
+    """
+    settings = {
+        "statement_timeout": configs.STATEMENT_TIMEOUT_MS,
+        "lock_timeout": configs.LOCK_TIMEOUT_MS,
+    }
+    options = [f"-c {name}={value}" for name, value in settings.items() if value is not None]
+    return " ".join(options) or None
+
+
 class PostgresSQlAlchemySessionManager(BaseSQLAlchemySessionManager[PostgresSQLAlchemyConfig], metaclass=Singleton):
     """Synchronous SQLAlchemy session manager for PostgreSQL.
 
@@ -64,9 +106,9 @@ class PostgresSQlAlchemySessionManager(BaseSQLAlchemySessionManager[PostgresSQLA
         """Return the psycopg connection arguments.
 
         Returns:
-            dict[str, Any]: ``connect_timeout`` when configured, otherwise empty (libpq waits indefinitely).
+            dict[str, Any]: The configured connect timeout, TLS, application name, session timeout and prepare options.
         """
-        return {} if self._configs.CONNECT_TIMEOUT is None else {"connect_timeout": self._configs.CONNECT_TIMEOUT}
+        return _build_connect_args(self._configs)
 
     @override
     def _create_url(self, configs: PostgresSQLAlchemyConfig) -> URL:
@@ -85,7 +127,7 @@ class PostgresSQlAlchemySessionManager(BaseSQLAlchemySessionManager[PostgresSQLA
             return URL.create(
                 drivername=configs.DRIVER_NAME,
                 username=configs.USERNAME,
-                password=configs.PASSWORD,
+                password=configs.PASSWORD.get_secret_value() if configs.PASSWORD else None,
                 host=configs.HOST,
                 port=configs.PORT,
                 database=configs.DATABASE,
@@ -148,9 +190,9 @@ class AsyncPostgresSQlAlchemySessionManager(
         """Return the psycopg connection arguments.
 
         Returns:
-            dict[str, Any]: ``connect_timeout`` when configured, otherwise empty (libpq waits indefinitely).
+            dict[str, Any]: The configured connect timeout, TLS, application name, session timeout and prepare options.
         """
-        return {} if self._configs.CONNECT_TIMEOUT is None else {"connect_timeout": self._configs.CONNECT_TIMEOUT}
+        return _build_connect_args(self._configs)
 
     @override
     def _create_url(self, configs: PostgresSQLAlchemyConfig) -> URL:
@@ -169,7 +211,7 @@ class AsyncPostgresSQlAlchemySessionManager(
             return URL.create(
                 drivername=configs.DRIVER_NAME,
                 username=configs.USERNAME,
-                password=configs.PASSWORD,
+                password=configs.PASSWORD.get_secret_value() if configs.PASSWORD else None,
                 host=configs.HOST,
                 port=configs.PORT,
                 database=configs.DATABASE,

{archipy_postgres-5.24.0 → archipy_postgres-5.26.0}/pyproject.toml

@@ -5,10 +5,10 @@ authors = [
     { name = "Hossein Nejati", email = "hosseinnejati14@gmail.com" },
 ]
 readme = "README.md"
-version = "5.24.0" # This version is set on publish flow!
+version = "5.26.0" # This version is set on publish flow!
 requires-python = ">=3.14,<4"
 dependencies = [
-    "archipy==5.24.0", # Pinned to core version on publish flow!
+    "archipy==5.26.0", # Pinned to core version on publish flow!
     "psycopg[binary]>=3.3.6",
 ]
 license = "Apache-2.0"