jaaql-middleware-python 5.3.3__py3-none-any.whl → 5.3.5__py3-none-any.whl

jaaql/constants.py

@@ -218,5 +218,5 @@ ROLE__dba = "dba"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "5.3.3"
+VERSION = "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)
@@ -77,6 +82,11 @@ class DBInterface(ABC):
             logging.warning(exc, exc_info=False)
 
     def __attempt_commit_rollback(self, conn, err):
+        # Returns the commit failure rather than swallowing it. A failed commit means the transaction
+        # did NOT persist, so the caller must not report success. Silently swallowing it turned lost
+        # writes into a misleading downstream error - e.g. create_account's CREATE ROLE lost on a
+        # connection killed by a \wipe dbms reboot, then "GRANT registered TO <role>" failing with
+        # "role does not exist" on the very next statement.
         try:
             if err is None:
                 self.commit(conn)
@@ -84,9 +94,11 @@ class DBInterface(ABC):
                 self.rollback(conn)
         except Exception as ex:
             if err is None:
-                self.log_warning(ex)  # error committing. User stuffed up the SQL
+                self.log_warning(ex)  # commit failed - the transaction did not persist
+                return ex
             else:
                 self.log_critical(ex)  # error rolling back. It is serious
+        return None
 
     def __err_to_exception(self, err, echo):
         if err is not None:
@@ -101,19 +113,35 @@ 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):
-        self.__attempt_commit_rollback(conn, err)
+        commit_err = self.__attempt_commit_rollback(conn, err)
+        if err is None and commit_err is not None:
+            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):
+        commit_err = None
         if not skip_rollback_commit:
-            self.__attempt_commit_rollback(conn, err)
+            commit_err = self.__attempt_commit_rollback(conn, err)
 
         try:
             self.put_conn(conn)
         except Exception as ex:
             self.log_warning(ex)
 
+        if err is None and commit_err is not None:
+            self.__raise_commit_failure(commit_err)
+
         self.__err_to_exception(err, echo)
 
     @abstractmethod

jaaql/db/db_pg_interface.py

@@ -147,6 +147,21 @@ class DBPGInterface(DBInterface):
         DBPGInterface.HOST_POOLS = {}
         DBPGInterface.HOST_POOLS_QUEUES = {}
 
+    @staticmethod
+    def check_all_pools():
+        # Force a synchronous liveness check of every pooled connection, discarding and replacing any
+        # that are broken. clean() reboots Postgres, and background activity (the per-minute cron, the
+        # auth verifier) can re-open pools DURING the reboot/reinstall window, caching connections to
+        # the old postmaster. psycopg_pool only detects those lazily, so the first real request after
+        # the wipe (e.g. \register @dba) gets handed a dead connection whose commit then fails "the
+        # connection is lost". Calling this once Postgres is stable makes the refresh deterministic.
+        for _, user_pool_dict in DBPGInterface.HOST_POOLS.items():
+            for _, pool in user_pool_dict.items():
+                try:
+                    pool.check()
+                except Exception:
+                    pass
+
     @staticmethod
     def _process_returned_conn(username: str, db_name: str, conn, do_reset: bool):
         if isinstance(conn, JaaqlPGConnection) and conn.jaaql_has_pending_auth():
@@ -415,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/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/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/mvc/model.py

@@ -1457,6 +1457,11 @@ WHERE
             self.vault.get_obj(VAULT_KEY__jaaql_db_password)
         )
 
+        # Postgres was just rebooted and reinstalled. Discard any connections opened against the old
+        # postmaster during that window (by the cron/verifier/install) so the next request cannot be
+        # handed a dead connection whose commit silently fails. Runs once per wipe - no per-request cost.
+        DBPGInterface.check_all_pools()
+
     def execute_migrations(self, connection: DBInterface):
         self.is_super_admin(connection)
 

{jaaql_middleware_python-5.3.3.dist-info → jaaql_middleware_python-5.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.3
+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.3.dist-info → jaaql_middleware_python-5.3.5.dist-info}/RECORD

@@ -1,6 +1,6 @@
 jaaql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaaql/config_constants.py,sha256=puoR6jfbXw8oXXEfbYNn2ysGwgiGTyuDjOj7F8acsTE,470
-jaaql/constants.py,sha256=ocgDdVs0zked7wQ2_gh_LHKk9KO4rujsTTnNc2mI_Qc,7355
+jaaql/constants.py,sha256=OgkEu5fPTtBRNfs7xo-b6m4tyeC7S4Uc39CDkGaOqlI,7355
 jaaql/generated_constants.py,sha256=pxmpTux7rrjJH6iqLb-R8RKJ4t0CeoGdnspjH5DiWgU,11327
 jaaql/jaaql.py,sha256=bfiEW9A8PlZIVjDJd_LOhCLBL8flc_f7w0umR6EWbU4,6614
 jaaql/patch.py,sha256=VE4B6jA492NCIxNIewbynh92jxVulmRFtB9hNEe6q94,149
@@ -9,9 +9,9 @@ jaaql/config/config-docker.ini,sha256=2UNtdwHQWZhANgxnrHvtxnDW0C0MuX042IZITMXNsZ
 jaaql/config/config-test.ini,sha256=ap9OFqCCbYdWqmUKq0p9GD1IkM4CzeTXDV5gbQGQZoQ,283
 jaaql/config/config.ini,sha256=o1orXNYRFgf09MKzZBQ3v0oMzWn7N6KwvX5YV0WJtns,321
 jaaql/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jaaql/db/db_interface.py,sha256=n4pwRHeGpkbmTOvZDe8VvqFf2l4QsE9GbhUBzW335m0,7702
-jaaql/db/db_pg_interface.py,sha256=zBZUkfbbmN8WU6gz0vLiZv10QKd1e7muhx0zP6yekt4,21098
-jaaql/db/db_utils.py,sha256=xZCdtWT9semzLL-NAiwMFx_38Wv96BBv60pfPYNDnCc,7761
+jaaql/db/db_interface.py,sha256=Zc6ajjjGMEZGH0BU6kIOhanvQEHSXlNIAgPwdvSaIdQ,9436
+jaaql/db/db_pg_interface.py,sha256=heaOexurUHjZDgsfOGPiChE_cTJCipw2gOJp93tC6SY,22367
+jaaql/db/db_utils.py,sha256=vi5V9FCybv1Yeef9glJmJrj6Ca_oQiJoOQ1rAN1uGKc,8623
 jaaql/db/db_utils_no_circ.py,sha256=WLhk6EwsnTdLGUAjq3RZBH3FzgwEumh45A24WWysWmQ,4666
 jaaql/documentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaaql/documentation/documentation_internal.py,sha256=_tU92TI4Sd8AXj3b7-UOKCN1h4VR7SaakIv2ATC45Bo,22783
@@ -23,7 +23,7 @@ jaaql/email/email_manager_service.py,sha256=if8SnD1VdN2pKBwVsj8Y0aYgV3wiFJrHqZvA
 jaaql/email/patch_ems.py,sha256=WGAUI6hSjsQFfLz-naM_0xy3o0DGYXuQTs-TDXFgJaI,234
 jaaql/exceptions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jaaql/exceptions/custom_http_status.py,sha256=k-8Uabjtl7NgeFxyNPAsMk4HkKMz0Z6SZwwweFbxqyg,417
-jaaql/exceptions/http_status_exception.py,sha256=rTFegFibZ9C_G3BzdLCACOkZc3k1VNSHPjxZuutToAg,2200
+jaaql/exceptions/http_status_exception.py,sha256=lD-eI_C9kHmThFP94ARiGvBQdTjbEM2NecJ-RvR41ds,2789
 jaaql/exceptions/jaaql_interpretable_handled_errors.py,sha256=846c3MLeQ9VQjs9f4WM6H4rszh4tEGDLgBRd8nEMCc8,11180
 jaaql/exceptions/not_yet_implement_exception.py,sha256=T7QC-I7ciWuFFp7C_jIJRMDlpshVdy_01bVuEnu-Txs,321
 jaaql/interpreter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -38,7 +38,7 @@ jaaql/mvc/controller_interface.py,sha256=Wx8fA4lrqb_PPwkLNjJDxDloHB5JxmNt1Gv3SsD
 jaaql/mvc/exception_queries.py,sha256=lF65cj9KgJgRvyzxDjPDM05rHFSHF0jy1V8B77H9Rvo,7899
 jaaql/mvc/generated_queries.py,sha256=z1Jsyu-Y6D-Xd8LYvefzwv8C01NaBjHaHI7mcvv-WEk,72232
 jaaql/mvc/handmade_queries.py,sha256=kyXZ7L_AoxfcPR4u3r5So8khlRD6_sGQ39JnSAHDsEA,938
-jaaql/mvc/model.py,sha256=NAKI651kg8HdMY-4IaxkZbussKRo0b-M34cT3Bz2l-U,132860
+jaaql/mvc/model.py,sha256=pPAu4GregD-XxVSCMjdqxhnTRoGJh6iqXqXF0yba4OA,133209
 jaaql/mvc/model_interface.py,sha256=YgAjaAiIQL1UtIJYgvkl_C3r6PVo-8Z3MXtwzyIwKnc,257
 jaaql/mvc/response.py,sha256=F4WvR9h1JcWF3Y6cj3n5HpVIqnwiMpNqfE8D29ZHbSE,860
 jaaql/openapi/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -66,8 +66,8 @@ jaaql/utilities/options.py,sha256=75M7-oSeY4wmHGz3-su_c36yf_Csv9HxvTG7aRlGR0A,49
 jaaql/utilities/utils.py,sha256=nVYVhuHtWSjdaJaXe9eC1Usja56NO-V9SoBIlcHAK8Q,5166
 jaaql/utilities/utils_no_project_imports.py,sha256=YwcskR15dAqKdEiuF8zGx-tzwWkclSGil_zm_qZ8ylU,4626
 jaaql/utilities/vault.py,sha256=DudyQNtMtaRLL71IGQX0AI16Tg1id98BHTCQPyUNkmE,2243
-jaaql_middleware_python-5.3.3.dist-info/licenses/LICENSE.txt,sha256=wr50eN0TnkrCSuNwyiI81FLZqmrW3q0JqRlVVQIrGA0,18134
-jaaql_middleware_python-5.3.3.dist-info/METADATA,sha256=oEe5Uk6pBPUmldYY9N9IKLjQU-XWreZiDXBGCxkZusw,1976
-jaaql_middleware_python-5.3.3.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-jaaql_middleware_python-5.3.3.dist-info/top_level.txt,sha256=k5aKVQy77bPyfyNHITvo5m3FqdSAiiXbjT5S9D9KzgU,6
-jaaql_middleware_python-5.3.3.dist-info/RECORD,,
+jaaql_middleware_python-5.3.5.dist-info/licenses/LICENSE.txt,sha256=wr50eN0TnkrCSuNwyiI81FLZqmrW3q0JqRlVVQIrGA0,18134
+jaaql_middleware_python-5.3.5.dist-info/METADATA,sha256=VvWDwa-IeIYCx_HkIja6GyabnVLzHzx87FDb3tQ5dvY,1976
+jaaql_middleware_python-5.3.5.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+jaaql_middleware_python-5.3.5.dist-info/top_level.txt,sha256=k5aKVQy77bPyfyNHITvo5m3FqdSAiiXbjT5S9D9KzgU,6
+jaaql_middleware_python-5.3.5.dist-info/RECORD,,