PyPI - lesscode-flask - Versions diffs - 0.2.112__tar.gz → 0.2.114__tar.gz - Mend

@@ -12,7 +12,7 @@ class FlaskThread:
         self.name = name or target.__name__
-def wrapper(_func, _args, _kwargs, _result: list = None, _lock=None, _is_throw_error=True):
+def wrapper(_func, _args, _kwargs, _result: list = None, _lock=None, _exception: list = None):
     @copy_current_request_context
     def _thread_func():
         try:
@@ -24,8 +24,8 @@ def wrapper(_func, _args, _kwargs, _result: list = None, _lock=None, _is_throw_e
                 else:
                     _result.append(res)
         except Exception as e:
-            if _is_throw_error:
-                raise e
+            if isinstance(_exception, list):
+                _exception.append(e)
             else:
                 if _result is not None and isinstance(_result, list):
                     if _lock:
@@ -41,6 +41,7 @@ def run_in_thread(func_list: List[FlaskThread], is_throw_error=False, is_lock=Tr
     results = []
     threads = []
     result_locks = []
+    exceptions = []
     name_list = []
     for obj in func_list:
         target = obj.target
@@ -49,6 +50,7 @@ def run_in_thread(func_list: List[FlaskThread], is_throw_error=False, is_lock=Tr
         _name = obj.name
         name_list.append(_name)
         result = []
+        exception = []
         if is_lock:
             lock = threading.Lock()
             result_locks.append(lock)
@@ -56,22 +58,26 @@ def run_in_thread(func_list: List[FlaskThread], is_throw_error=False, is_lock=Tr
             lock = None
             result_locks.append(lock)
         thread_func = wrapper(_func=target, _args=args, _kwargs=kwargs, _result=result, _lock=lock,
-                              _is_throw_error=is_throw_error)
+                              _exception=exception)
         t = threading.Thread(target=thread_func)
         threads.append(t)
         results.append(result)
+        exceptions.append(exception)
         t.start()
     for t in threads:
         t.join()
+    if is_throw_error:
+        if isinstance(exceptions, list) and any(exceptions):
+            raise exceptions[0][0]
     final_results = []
     for result, lock in zip(results, result_locks):
         if is_lock:
             with lock:
-                final_results.append(result[0])
+                final_results.append(result[0] if result else None)
         else:
-            final_results.append(result[0])
+            final_results.append(result[0] if result else None)
     if return_type == "list":
         return final_results
     else:

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.112
+Version: 0.2.114
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

@@ -1,4 +1,4 @@
-__version__ = "0.2.112"
+__version__ = "0.2.114"
 import functools
 import logging

@@ -40,13 +40,13 @@ class QueryExecutor:
         try:
             data, error = self.query_runner.run_query(annotated_query, self.user)
             run_time = time.time() - started_at
-            logging.info(f"query finished in {run_time:.3f}s sql={annotated_query}")
+            logging.info(f"query finished in {run_time:.3f}s sql:\n{annotated_query}")
             if error:
                 raise QueryExecutionError(error)
             return data
         except Exception as e:
             run_time = time.time() - started_at
-            logging.error(f"query failed in {run_time:.3f}s sql={annotated_query}")
+            logging.error(f"query failed in {run_time:.3f}s sql:\n{annotated_query}")
             raise e
     def exec(self):
@@ -57,13 +57,13 @@ class QueryExecutor:
         try:
             data, error = self.query_runner.exec(annotated_query, self.user)
             run_time = time.time() - started_at
-            logging.info(f"query finished in {run_time:.3f}s sql={annotated_query}")
+            logging.info(f"query finished in {run_time:.3f}s sql:\n{annotated_query}")
             if error:
                 raise QueryExecutionError(error)
             return data
         except Exception as e:
             run_time = time.time() - started_at
-            logging.error(f"query failed in {run_time:.3f}s sql={annotated_query}")
+            logging.error(f"query failed in {run_time:.3f}s sql:\n{annotated_query}")
             raise e
         #

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lesscode-flask
-Version: 0.2.112
+Version: 0.2.114
 Summary: lesscode-flask 是基于flask的web开发脚手架项目，该项目初衷为简化开发过程，让研发人员更加关注业务。
 Home-page: https://lesscode-flask
 Author: Chao.yy

@@ -219,7 +219,6 @@ class ClickHouse(BaseSQLQueryRunner):
         return data, error
     def exec(self, query, user):
-        logger.debug("Clickhouse is about to execute query: %s", query)
         if query == "":
             json_data = None
             error = "Query is empty"

@@ -188,7 +188,6 @@ class DaMeng(BaseSQLQueryRunner):
             db = self.configuration.get("db", "")
             if db:
                 cursor.execute(f"SET SCHEMA {db}")
-            logger.debug("DaMeng running query: %s", query)
             cursor.execute(query)
             data = cursor.fetchall()

@@ -246,7 +246,6 @@ class KingBase(BaseSQLQueryRunner):
         return data, error
     def exec(self, query, user):
-        logger.debug("KingBase is about to execute query: %s", query)
         connection = self._get_connection()
         cursor = connection.cursor()

@@ -257,7 +257,6 @@ class Mysql(BaseSQLQueryRunner):
         try:
             connection = self._connection()
             cursor = connection.cursor()
-            logger.debug("MySQL running query: %s", query)
             cursor.execute(query)
         except (KeyboardInterrupt, InterruptException):
             self._cancel(thread_id)

lesscode-flask 0.2.112__tar.gz → 0.2.114__tar.gz

lesscode-flask 0.2.112tar.gz → 0.2.114tar.gz