jaaql-middleware-python 5.3.15__tar.gz → 5.3.19__tar.gz

{jaaql_middleware_python-5.3.15 → jaaql_middleware_python-5.3.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.15
+Version: 5.3.19
 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.15 → jaaql_middleware_python-5.3.19}/jaaql/constants.py

@@ -218,5 +218,5 @@ ROLE__dba = "dba"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "5.3.15"
+VERSION = "5.3.19"
 

{jaaql_middleware_python-5.3.15 → jaaql_middleware_python-5.3.19}/jaaql/db/db_interface.py

@@ -120,9 +120,18 @@ class DBInterface(ABC):
         # 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))
+        translated = self.translate_commit_error(commit_err)
+        if translated is not None:
+            raise translated
         raise HttpStatusException("Commit failed, transaction not persisted: " + str(commit_err),
                                   HTTPStatus.INTERNAL_SERVER_ERROR)
 
+    def translate_commit_error(self, commit_err):
+        # A deferred constraint trigger raises at COMMIT rather than during its statement. When what it
+        # raises is an error the statement path would have handed back as a handled error, a subclass
+        # returns that error here so the caller sees the same response either way; None keeps the 500
+        return None
+
     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:

{jaaql_middleware_python-5.3.15 → jaaql_middleware_python-5.3.19}/jaaql/db/db_pg_interface.py

@@ -12,7 +12,7 @@ from jaaql.constants import ERR__invalid_token
 from jaaql.db.db_interface import DBInterface, ECHO__none, CHAR__newline
 from jaaql.exceptions.http_status_exception import *
 from jaaql.exceptions.custom_http_status import CustomHTTPStatus
-from jaaql.exceptions.jaaql_interpretable_handled_errors import UserUnauthorized
+from jaaql.exceptions.jaaql_interpretable_handled_errors import UserUnauthorized, handled_procedure_error_from_raise
 from jaaql.constants import KEY__database
 
 ERR__connect_db = "Could not create connection to database!"
@@ -443,6 +443,11 @@ class DBPGInterface(DBInterface):
         # persisted nothing, so the operation is safe to retry on a fresh connection.
         return isinstance(ex, OperationalError)
 
+    def translate_commit_error(self, commit_err):
+        if not isinstance(commit_err, psycopg.Error):
+            return None
+        return handled_procedure_error_from_raise(commit_err)
+
     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.15 → jaaql_middleware_python-5.3.19}/jaaql/exceptions/jaaql_interpretable_handled_errors.py

@@ -1,3 +1,6 @@
+import json
+
+from jaaql.constants import SQLStateJaaql
 from jaaql.exceptions.http_status_exception import JaaqlInterpretableHandledError
 
 
@@ -43,6 +46,19 @@ class HandledProcedureError(JaaqlInterpretableHandledError):
         )
 
 
+def handled_procedure_error_from_raise(ex):
+    # A JQ000 raise carries a JSON array of error records, whether it surfaced during its statement or at
+    # COMMIT from a deferred trigger; one that does not is left to the caller as an unhandled error
+    diag = getattr(ex, "diag", None)
+    if diag is None or diag.sqlstate != SQLStateJaaql:
+        return None
+    try:
+        descriptor = json.loads(diag.message_primary)
+    except (TypeError, ValueError):
+        return None
+    return HandledProcedureError(message=None, index=None, table_name=None, descriptor=descriptor)
+
+
 class UnhandledQueryError(JaaqlInterpretableHandledError):
     def __init__(self, message, _set, table_name=None, column_name=None, descriptor=None):
         super().__init__(

{jaaql_middleware_python-5.3.15 → jaaql_middleware_python-5.3.19}/jaaql/interpreter/interpret_jaaql.py

@@ -14,8 +14,8 @@ import json
 from jaaql.db.db_interface import DBInterface, ECHO__none
 from psycopg.errors import OperationalError, Error
 from jaaql.constants import KEY__position, KEY__file, KEY__application, KEY__error, KEY__error_row_number, KEY__error_query, \
-    KEY__error_set, KEY__error_index, SQLStateJaaql, KEY__restrictions, REGEX__dmbs_object_name
-from jaaql.exceptions.jaaql_interpretable_handled_errors import DatabaseOperationalError, HandledProcedureError, UnhandledQueryError, UnhandledProcedureError, \
+    KEY__error_set, KEY__error_index, KEY__restrictions, REGEX__dmbs_object_name
+from jaaql.exceptions.jaaql_interpretable_handled_errors import handled_procedure_error_from_raise, DatabaseOperationalError, HandledProcedureError, UnhandledQueryError, UnhandledProcedureError, \
     SingletonExpected
 from typing import Union
 from functools import lru_cache
@@ -605,8 +605,9 @@ ORDER BY d.column_name;
                     }
                 )
             elif isinstance(ex, Error):
-                if ex.diag.sqlstate == SQLStateJaaql:
-                    err = HandledProcedureError(message=None, index=None, table_name=None, descriptor=json.loads(ex.diag.message_primary))
+                handled = handled_procedure_error_from_raise(ex)
+                if handled is not None:
+                    err = handled
                 elif query_key == "_jaaql_procedure":
                     err = UnhandledProcedureError(
                         message=str(ex),

{jaaql_middleware_python-5.3.15 → jaaql_middleware_python-5.3.19}/jaaql/mvc/model.py

@@ -27,6 +27,7 @@ from jaaql.exceptions.jaaql_interpretable_handled_errors import *
 from jaaql.db.db_pg_interface import DBPGInterface, QUERY__dba_query_external
 from jaaql.email.email_manager_service import EmailAttachment
 from jaaql.mvc.base_model import BaseJAAQLModel, VAULT_KEY__jwt_crypt_key
+from jaaql.utilities.bootstrap_secrets import get_or_seed_vault_secret
 from jaaql.exceptions.http_status_exception import HttpStatusException, ERR__already_installed, HttpSingletonStatusException
 from os.path import join
 from jaaql.interpreter.interpret_jaaql import KEY_query, KEY_parameters
@@ -1489,7 +1490,7 @@ WHERE
             master_pid = os.getppid()
 
             def _deterministic_restart():
-                time.sleep(1)  # let /internal/clean's 200 reach the caller before we bounce the server
+                time.sleep(0.2)  # let /internal/clean's 200 reach the caller before we bounce the server
                 os.kill(master_pid, signal.SIGQUIT)
 
             threading.Thread(target=_deterministic_restart, daemon=True).start()
@@ -1519,6 +1520,21 @@ WHERE
         sql = self._lookup_cached_query(QUERY_CACHE_REF__health)
         execute_supplied_statement_singleton(self.jaaql_lookup_connection, sql, as_objects=True)
 
+    def install_on_bootup(self):
+        # Called from the gunicorn master (docker/gunicorn_config.py, when_ready) while preload_app has
+        # built this model and no worker has forked yet, so every worker starts already installed. The
+        # migrations manager still installs over HTTP if this does not run, but that path installs inside
+        # one worker and then has to bounce the whole master (child_exit) before the others can see it.
+        if not self.is_container or self.has_installed:
+            return
+        super_db_password = get_or_seed_vault_secret(self.vault, VAULT_KEY__super_db_password, "SUPER_PASSWORD", generate_if_missing=True)
+        jaaql_password = get_or_seed_vault_secret(self.vault, VAULT_KEY__jaaql_password, "JAAQL_PASSWORD", generate_if_missing=True)
+        self.install(None, jaaql_password, super_db_password, self.install_key, True, do_reboot=False)
+        # Nothing may carry a pooled connection across the fork; each worker opens its own in post_worker_init
+        if self.jaaql_lookup_connection is not None:
+            self.jaaql_lookup_connection.close()
+        DBPGInterface.close_all_pools()
+
     def install(self, db_connection_string: str, jaaql_password: str, super_db_password: str, install_key: str, allow_uninstall: bool,
                 do_reboot: bool = True, jaaql_db_password: str = None):
         if self.jaaql_lookup_connection is None:

{jaaql_middleware_python-5.3.15 → jaaql_middleware_python-5.3.19}/jaaql_middleware_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jaaql-middleware-python
-Version: 5.3.15
+Version: 5.3.19
 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