jaaql-middleware-python 5.3.4__tar.gz → 5.3.5__tar.gz

{jaaql_middleware_python-5.3.4/jaaql_middleware_python.egg-info → jaaql_middleware_python-5.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.4
+Version: 5.3.5
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv

{jaaql_middleware_python-5.3.4 → jaaql_middleware_python-5.3.5}/jaaql/constants.py

@@ -218,5 +218,5 @@ ROLE__dba = "dba"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "5.3.4"
+VERSION = "5.3.5"
 

{jaaql_middleware_python-5.3.4 → jaaql_middleware_python-5.3.5}/jaaql/db/db_interface.py

@@ -68,6 +68,11 @@ class DBInterface(ABC):
     def get_conn(self):
         pass
 
+    def is_connection_error(self, ex) -> bool:
+        # Overridden by the concrete interface. True when a failure means the connection/backend went
+        # away (so nothing persisted and the operation is safe to retry on a fresh connection).
+        return False
+
     def log_warning(self, exc):
         if self.logging:
             logging.warning(exc, exc_info=False)
@@ -108,11 +113,20 @@ class DBInterface(ABC):
                     self.log_warning(ex)  # Serious error, connection failure to db or similar
                 raise ex
 
+    def __raise_commit_failure(self, commit_err):
+        # A failed commit persisted nothing; surface it (instead of the old silent swallow) so the
+        # caller cannot treat lost writes as success and hit a misleading error further on. A
+        # connection-loss failure is raised as a retriable marker so a self-contained caller can
+        # re-run on a fresh connection; any other commit failure is a genuine error.
+        if self.is_connection_error(commit_err):
+            raise ConnectionLostError(str(commit_err))
+        raise HttpStatusException("Commit failed, transaction not persisted: " + str(commit_err),
+                                  HTTPStatus.INTERNAL_SERVER_ERROR)
+
     def handle_error(self, conn, err, echo=ECHO__none):
         commit_err = self.__attempt_commit_rollback(conn, err)
         if err is None and commit_err is not None:
-            raise HttpStatusException("Commit failed, transaction not persisted: " + str(commit_err),
-                                      HTTPStatus.INTERNAL_SERVER_ERROR)
+            self.__raise_commit_failure(commit_err)
         self.__err_to_exception(err, echo)
 
     def put_conn_handle_error(self, conn, err, echo=ECHO__none, skip_rollback_commit: bool = False):
@@ -125,11 +139,8 @@ class DBInterface(ABC):
         except Exception as ex:
             self.log_warning(ex)
 
-        # A failed commit persisted nothing; surface it (instead of the old silent swallow) so the
-        # caller does not treat lost writes as success and hit a misleading error further on.
         if err is None and commit_err is not None:
-            raise HttpStatusException("Commit failed, transaction not persisted: " + str(commit_err),
-                                      HTTPStatus.INTERNAL_SERVER_ERROR)
+            self.__raise_commit_failure(commit_err)
 
         self.__err_to_exception(err, echo)
 

{jaaql_middleware_python-5.3.4 → jaaql_middleware_python-5.3.5}/jaaql/db/db_pg_interface.py

@@ -430,6 +430,12 @@ class DBPGInterface(DBInterface):
     def rollback(self, conn):
         conn.rollback()
 
+    def is_connection_error(self, ex) -> bool:
+        # psycopg raises OperationalError when the backend/connection went away (e.g. terminated by
+        # \wipe dbms). The same class the execute retry loop keys off; a commit that fails this way
+        # persisted nothing, so the operation is safe to retry on a fresh connection.
+        return isinstance(ex, OperationalError)
+
     def handle_db_error(self, err, echo):
         if isinstance(err, ProgrammingError) and hasattr(err, 'pgresult'):
             err = err.pgresult.error_message.decode("UTF-8")

{jaaql_middleware_python-5.3.4 → jaaql_middleware_python-5.3.5}/jaaql/db/db_utils.py

@@ -1,4 +1,4 @@
-from jaaql.exceptions.http_status_exception import HttpStatusException, HttpSingletonStatusException
+from jaaql.exceptions.http_status_exception import HttpStatusException, HttpSingletonStatusException, ConnectionLostError
 from jaaql.interpreter.interpret_jaaql import InterpretJAAQL
 from jaaql.constants import ENCODING__utf, VAULT_KEY__super_db_credentials
 from typing import Union
@@ -16,6 +16,10 @@ ERR__expected_single_row = "Expected single row response but received '%d' rows"
 ERR__unsupported_interface = "Unsupported interface '%s'. We only support %s"
 ERR__schema_invalid = "Schema invalid!"
 
+# A lost connection persisted nothing, so a self-contained statement is re-run on a fresh connection.
+# Bounded so a genuinely-down database still surfaces an error rather than looping.
+CONN_LOST__max_attempts = 3
+
 KEY_CONFIG__db = "DATABASE"
 KEY_CONFIG__interface = "interface"
 INTERFACE__postgres_key = "postgres"
@@ -104,9 +108,21 @@ def execute_supplied_statement(db_interface, query: str, parameters: dict = None
         "decrypt": decrypt_columns
     }
 
-    data = InterpretJAAQL(db_interface).transform(statement, skip_commit=skip_commit, encryption_key=encryption_key, autocommit=autocommit,
-                                                  do_prepare_only=do_prepare_only, attempt_fetch_domain_types=attempt_fetch_domain_types,
-                                                  psql=psql, pre_psql=pre_psql)
+    # Retry only on a lost connection: nothing committed, so re-running on a fresh connection is safe.
+    # This closes the gap the deferred-auth optimisation opened - \wipe dbms terminates every backend,
+    # and a pooled connection handed out afterwards has no checkout probe and can die at commit. Params
+    # are already encrypted above, so the retry re-runs the transform only (never re-encrypts).
+    attempts = 0
+    while True:
+        attempts += 1
+        try:
+            data = InterpretJAAQL(db_interface).transform(statement, skip_commit=skip_commit, encryption_key=encryption_key, autocommit=autocommit,
+                                                          do_prepare_only=do_prepare_only, attempt_fetch_domain_types=attempt_fetch_domain_types,
+                                                          psql=psql, pre_psql=pre_psql)
+            break
+        except ConnectionLostError:
+            if attempts >= CONN_LOST__max_attempts:
+                raise
 
     if as_objects:
         data = objectify(data)

{jaaql_middleware_python-5.3.4 → jaaql_middleware_python-5.3.5}/jaaql/exceptions/http_status_exception.py

@@ -34,6 +34,15 @@ class HttpSingletonStatusException(HttpStatusException):
         self.actual_count = actual_count
 
 
+class ConnectionLostError(HttpStatusException):
+    # Raised when a database operation failed because its connection was lost (e.g. the backend was
+    # terminated by \wipe dbms's pg_terminate_backend) BEFORE anything committed. Nothing persisted,
+    # so a self-contained operation may safely be retried on a fresh connection. Subclasses
+    # HttpStatusException so that if retries are exhausted it still surfaces as a clean 500.
+    def __init__(self, message: str):
+        super().__init__("Commit failed, transaction not persisted: " + message, HTTPStatus.INTERNAL_SERVER_ERROR)
+
+
 class JaaqlInterpretableHandledError(Exception):
     def __init__(self, error_code: int, http_response_code: int,
                  table_name: str | None, index: int | None, message: str,

{jaaql_middleware_python-5.3.4 → jaaql_middleware_python-5.3.5/jaaql_middleware_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.4
+Version: 5.3.5
 Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
 Home-page: https://github.com/JAAQL/JAAQL-middleware-python
 Author: Software Quality Measurement and Improvement bv