jaaql-middleware-python 5.3.9__py3-none-any.whl → 5.3.10__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- jaaql/constants.py +1 -1
- jaaql/db/db_utils_no_circ.py +19 -7
- {jaaql_middleware_python-5.3.9.dist-info → jaaql_middleware_python-5.3.10.dist-info}/METADATA +1 -1
- {jaaql_middleware_python-5.3.9.dist-info → jaaql_middleware_python-5.3.10.dist-info}/RECORD +7 -7
- {jaaql_middleware_python-5.3.9.dist-info → jaaql_middleware_python-5.3.10.dist-info}/WHEEL +0 -0
- {jaaql_middleware_python-5.3.9.dist-info → jaaql_middleware_python-5.3.10.dist-info}/licenses/LICENSE.txt +0 -0
- {jaaql_middleware_python-5.3.9.dist-info → jaaql_middleware_python-5.3.10.dist-info}/top_level.txt +0 -0
jaaql/constants.py
CHANGED
jaaql/db/db_utils_no_circ.py
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
from jaaql.mvc.exception_queries import QUERY__fetch_application_schemas, KG__application_schema__application, KG__application__is_live, \
|
|
2
2
|
KG__application_schema__name, KEY__is_default
|
|
3
3
|
from queue import Queue
|
|
4
|
-
from jaaql.db.db_utils import execute_supplied_statement, create_interface_for_db, ERR__schema_invalid
|
|
5
|
-
from jaaql.exceptions.http_status_exception import HttpStatusException
|
|
4
|
+
from jaaql.db.db_utils import execute_supplied_statement, create_interface_for_db, ERR__schema_invalid, CONN_LOST__max_attempts
|
|
5
|
+
from jaaql.exceptions.http_status_exception import HttpStatusException, ConnectionLostError
|
|
6
6
|
from jaaql.interpreter.interpret_jaaql import InterpretJAAQL
|
|
7
7
|
from jaaql.constants import KEY__application, KEY__database, KEY__schema, KEY__role, DB__jaaql, \
|
|
8
8
|
KEY__read_only, KEY__prevent_unused_parameters
|
|
@@ -76,11 +76,23 @@ def submit(vault, config, db_crypt_key, jaaql_connection: DBInterface, inputs: d
|
|
|
76
76
|
|
|
77
77
|
prevent_unused = inputs.pop(KEY__prevent_unused_parameters) if KEY__prevent_unused_parameters in inputs else True
|
|
78
78
|
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
79
|
+
# A lost connection committed nothing, so re-running on a fresh connection is safe. \wipe dbms kills
|
|
80
|
+
# pooled connections, so a request landing on one dies at commit ("the connection is lost") - retry
|
|
81
|
+
# it. Only when transform owns the connection (conn is None); otherwise the caller manages the
|
|
82
|
+
# transaction and must handle the loss itself.
|
|
83
|
+
attempts = 0
|
|
84
|
+
while True:
|
|
85
|
+
attempts += 1
|
|
86
|
+
try:
|
|
87
|
+
ret = InterpretJAAQL(required_db, jaaql_connection
|
|
88
|
+
).transform(inputs, skip_commit=inputs.get(KEY__read_only), wait_hook=verification_hook,
|
|
89
|
+
encryption_key=db_crypt_key, conn=conn,
|
|
90
|
+
canned_query_service=cached_canned_query_service, prevent_unused_parameters=prevent_unused,
|
|
91
|
+
and_return_connection_mid_transaction=keep_alive_conn, prepare_statements=prepare_statements)
|
|
92
|
+
break
|
|
93
|
+
except ConnectionLostError:
|
|
94
|
+
if conn is not None or attempts >= CONN_LOST__max_attempts:
|
|
95
|
+
raise
|
|
84
96
|
|
|
85
97
|
if as_objects:
|
|
86
98
|
ret = objectify(ret, singleton=singleton)
|
{jaaql_middleware_python-5.3.9.dist-info → jaaql_middleware_python-5.3.10.dist-info}/METADATA
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: jaaql-middleware-python
|
|
3
|
-
Version: 5.3.
|
|
3
|
+
Version: 5.3.10
|
|
4
4
|
Summary: The jaaql package, allowing for rapid development and deployment of RESTful HTTP applications
|
|
5
5
|
Home-page: https://github.com/JAAQL/JAAQL-middleware-python
|
|
6
6
|
Author: Software Quality Measurement and Improvement bv
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
jaaql/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
2
2
|
jaaql/config_constants.py,sha256=puoR6jfbXw8oXXEfbYNn2ysGwgiGTyuDjOj7F8acsTE,470
|
|
3
|
-
jaaql/constants.py,sha256=
|
|
3
|
+
jaaql/constants.py,sha256=MSK-UafvG3mqqGKjWCStxlYcxoA1kdWQnBmYlfgpf7w,7356
|
|
4
4
|
jaaql/generated_constants.py,sha256=pxmpTux7rrjJH6iqLb-R8RKJ4t0CeoGdnspjH5DiWgU,11327
|
|
5
5
|
jaaql/jaaql.py,sha256=bfiEW9A8PlZIVjDJd_LOhCLBL8flc_f7w0umR6EWbU4,6614
|
|
6
6
|
jaaql/patch.py,sha256=VE4B6jA492NCIxNIewbynh92jxVulmRFtB9hNEe6q94,149
|
|
@@ -12,7 +12,7 @@ jaaql/db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
|
12
12
|
jaaql/db/db_interface.py,sha256=Zc6ajjjGMEZGH0BU6kIOhanvQEHSXlNIAgPwdvSaIdQ,9436
|
|
13
13
|
jaaql/db/db_pg_interface.py,sha256=heaOexurUHjZDgsfOGPiChE_cTJCipw2gOJp93tC6SY,22367
|
|
14
14
|
jaaql/db/db_utils.py,sha256=vi5V9FCybv1Yeef9glJmJrj6Ca_oQiJoOQ1rAN1uGKc,8623
|
|
15
|
-
jaaql/db/db_utils_no_circ.py,sha256=
|
|
15
|
+
jaaql/db/db_utils_no_circ.py,sha256=xkEJCtjvaGVjO7L1YG7Ad-E31IrN1SzP9rBzZzOCqWI,5327
|
|
16
16
|
jaaql/documentation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
17
17
|
jaaql/documentation/documentation_internal.py,sha256=_tU92TI4Sd8AXj3b7-UOKCN1h4VR7SaakIv2ATC45Bo,22783
|
|
18
18
|
jaaql/documentation/documentation_public.py,sha256=XU1Smw-1heWhCs-FDqTCTVCkAI2COHEy6fk2fhrwFN4,10932
|
|
@@ -66,8 +66,8 @@ jaaql/utilities/options.py,sha256=75M7-oSeY4wmHGz3-su_c36yf_Csv9HxvTG7aRlGR0A,49
|
|
|
66
66
|
jaaql/utilities/utils.py,sha256=nVYVhuHtWSjdaJaXe9eC1Usja56NO-V9SoBIlcHAK8Q,5166
|
|
67
67
|
jaaql/utilities/utils_no_project_imports.py,sha256=YwcskR15dAqKdEiuF8zGx-tzwWkclSGil_zm_qZ8ylU,4626
|
|
68
68
|
jaaql/utilities/vault.py,sha256=DudyQNtMtaRLL71IGQX0AI16Tg1id98BHTCQPyUNkmE,2243
|
|
69
|
-
jaaql_middleware_python-5.3.
|
|
70
|
-
jaaql_middleware_python-5.3.
|
|
71
|
-
jaaql_middleware_python-5.3.
|
|
72
|
-
jaaql_middleware_python-5.3.
|
|
73
|
-
jaaql_middleware_python-5.3.
|
|
69
|
+
jaaql_middleware_python-5.3.10.dist-info/licenses/LICENSE.txt,sha256=wr50eN0TnkrCSuNwyiI81FLZqmrW3q0JqRlVVQIrGA0,18134
|
|
70
|
+
jaaql_middleware_python-5.3.10.dist-info/METADATA,sha256=k2DeO7btn6uP3nSL_Ac8dt9DpcpoPOTQSrDNcTg69gE,1977
|
|
71
|
+
jaaql_middleware_python-5.3.10.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
|
|
72
|
+
jaaql_middleware_python-5.3.10.dist-info/top_level.txt,sha256=k5aKVQy77bPyfyNHITvo5m3FqdSAiiXbjT5S9D9KzgU,6
|
|
73
|
+
jaaql_middleware_python-5.3.10.dist-info/RECORD,,
|
|
File without changes
|
|
File without changes
|
{jaaql_middleware_python-5.3.9.dist-info → jaaql_middleware_python-5.3.10.dist-info}/top_level.txt
RENAMED
|
File without changes
|