jaaql-middleware-python 4.8.1__tar.gz → 4.8.2__tar.gz

{jaaql-middleware-python-4.8.1 → jaaql-middleware-python-4.8.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.8.1
+Version: 4.8.2
 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-4.8.1 → jaaql-middleware-python-4.8.2}/jaaql/constants.py

@@ -128,5 +128,5 @@ ROLE__postgres = "postgres"
 
 PROTOCOL__postgres = "postgresql://"
 
-VERSION = "4.8.1"
+VERSION = "4.8.2"
 

{jaaql-middleware-python-4.8.1 → jaaql-middleware-python-4.8.2}/jaaql/db/db_interface.py

@@ -4,6 +4,7 @@ from datetime import datetime
 import logging
 from jaaql.exceptions.http_status_exception import *
 from typing import Optional
+from jaaql.utilities.utils_no_project_imports import objectify
 import queue
 
 ERR__unknown_echo = "Unknown echo type '%s'. Please use either %s"
@@ -158,13 +159,10 @@ class DBInterface(ABC):
             ret[RET__echo] = query
 
         if as_objects:
-            return self.objectify(ret)
+            return objectify(ret)
         else:
             return ret
 
-    def objectify(self, data):
-        return [dict(zip(data['columns'], row)) for row in data['rows']]
-
     def execute_script_file(self, conn, file_loc: str = None, as_content: str = None, as_individual=False, commit=True):
         ret = None
         err = None

{jaaql-middleware-python-4.8.1 → jaaql-middleware-python-4.8.2}/jaaql/mvc/model.py

@@ -8,6 +8,7 @@ from os.path import join
 from jaaql.constants import *
 from jaaql.mvc.response import JAAQLResponse
 from jaaql.utilities.utils import get_jaaql_root, get_base_url
+from jaaql.utilities.utils_no_project_imports import objectify
 from jaaql.db.db_utils import create_interface, jaaql__encrypt
 from jaaql.db.db_utils_no_circ import submit
 from jaaql.utilities import crypt_utils
@@ -667,6 +668,11 @@ WHERE
             KG__security_event__event_lock: reg_env_ins[KG__security_event__event_lock]
         }
 
-    def submit(self, inputs: dict, account_id: str, verification_hook: Queue = None):
-        return submit(self.vault, self.config, self.get_db_crypt_key(), self.jaaql_lookup_connection, inputs, account_id, verification_hook,
-                      self.cached_canned_query_service)
+    def submit(self, inputs: dict, account_id: str, verification_hook: Queue = None, as_objects: bool = False, singleton: bool = False):
+        ret = submit(self.vault, self.config, self.get_db_crypt_key(), self.jaaql_lookup_connection, inputs, account_id, verification_hook,
+                     self.cached_canned_query_service)
+
+        if as_objects:
+            ret = objectify(ret, singleton=singleton)
+
+        return ret

{jaaql-middleware-python-4.8.1 → jaaql-middleware-python-4.8.2}/jaaql/utilities/utils_no_project_imports.py

@@ -10,6 +10,13 @@ import re
 ALLOWABLE_FILE_PATH = r'^[a-z0-9_\-\/]+(\.[a-zA-Z0-9]+)?$'
 
 
+def objectify(data, singleton: bool = False):
+    if singleton:
+        return dict(zip(data['columns'], data['rows'][0]))
+    else:
+        return [dict(zip(data['columns'], row)) for row in data['rows']]
+
+
 def time_delta_ms(start_time: datetime, end_time: datetime) -> int:
     return int(round((end_time - start_time).total_seconds() * 1000))
 

{jaaql-middleware-python-4.8.1 → jaaql-middleware-python-4.8.2}/jaaql_middleware_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jaaql-middleware-python
-Version: 4.8.1
+Version: 4.8.2
 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