brynq-sdk-task-scheduler 4.0.6__tar.gz → 4.0.8__tar.gz

brynq_sdk_task_scheduler-4.0.8/PKG-INFO

@@ -0,0 +1,19 @@
+Metadata-Version: 2.4
+Name: brynq_sdk_task_scheduler
+Version: 4.0.8
+Summary: Code to execute tasks in BrynQ.com with the task scheduler
+Author: BrynQ
+Author-email: support@brynq.com
+License: BrynQ License
+Requires-Dist: brynq-sdk-brynq<5,>=4
+Requires-Dist: brynq-sdk-functions<3,>=2
+Requires-Dist: brynq-sdk-mysql<4,>=3
+Requires-Dist: brynq-sdk-mandrill<4,>=2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
+
+Code to execute tasks in the BrynQ.com platform with the task scheduler

{brynq_sdk_task_scheduler-4.0.6 → brynq_sdk_task_scheduler-4.0.8}/brynq_sdk_task_scheduler/task_scheduler.py

@@ -254,8 +254,12 @@ class TaskScheduler:
                                       filter=f'WHERE `reload_id` = {self.run_id}')
                     if self.email_after_errors:
                         self.email_errors(failed=True)
-                    # Remove the temp values from the variables table
-                    self.mysql.raw_query(f'UPDATE `task_variables` SET temp_value = null WHERE task_id = {self.task_id}', insert=True)
+
+                    # Remove the temp values from the variables table (legacy), if it doesn't exist, ignore the error. In that case it will already be flushed by the API endpoint
+                    try:
+                        self.mysql.raw_query(f'UPDATE `task_variables` SET temp_value = null WHERE task_id = {self.task_id}', insert=True)
+                    except Exception as e:
+                        pass
 
                     # Start the chained tasks if it there are tasks which should start if this one is failed
                     self.start_chained_tasks(finished_task_status='FAILED')
@@ -308,21 +312,25 @@ class TaskScheduler:
                                   values=['FinishedSuccess', f'{datetime.datetime.now()}'],
                                   filter=f'WHERE `reload_id` = {self.run_id}')
 
-            # Remove the temp values from the variables table
-            self.mysql.raw_query(f'UPDATE `task_variables` SET temp_value = null WHERE task_id = {self.task_id}', insert=True)
+            # Remove the temp values from the variables table if it exists (legacy)
+            try:
+                self.mysql.raw_query(f'UPDATE `task_variables` SET temp_value = null WHERE task_id = {self.task_id}', insert=True)
+            except Exception as e:
+                pass
 
             # Start the new task if it there is a task which should start if this one is finished
             self.start_chained_tasks(finished_task_status='SUCCESS')
 
             # Clean up execution log
             # set this date filter above the actual delete filter because of the many uncooperative quotation marks involved in the whole filter
-            log_date_limit_filter = f"AND created_at >= \'{log_date_limit.strftime('%Y-%m-%d')}\'" if log_date_limit is not None else None
+            print(f"Deleting logs with filters: Date limit: {log_date_limit}, Max no. of entries: {log_limit} INFO logs")
+            log_date_limit_filter = f"AND created_at >= \'{log_date_limit.strftime('%Y-%m-%d')}\'" if log_date_limit is not None else ''
+            log_limit_filter = f"LIMIT {log_limit}" if log_limit is not None else ""
             delete_filter = f"WHERE task_id = {self.task_id} " \
+                            f"AND log_level NOT IN ('CRITICAL', 'ERROR') " \
                             f"AND reload_id NOT IN (SELECT reload_id FROM (SELECT reload_id FROM `task_execution_log` WHERE task_id = {self.task_id} " \
-                            f"AND log_level != 'CRITICAL' " \
-                            f"AND log_level != 'ERROR' " \
-                            f"{log_date_limit_filter if log_date_limit_filter is not None else ''} " \
-                            f"ORDER BY created_at DESC {f' LIMIT {log_limit} ' if log_limit is not None else ''}) temp)"
+                            f"{log_date_limit_filter} " \
+                            f"ORDER BY created_at DESC {log_limit_filter}) temp)"
             resp = self.mysql.delete(table="task_execution_log", filter=delete_filter)
             print(resp)
         print(f'{datetime.datetime.now()} - Task finished')
@@ -381,7 +389,7 @@ class TaskScheduler:
                 logs = []
             logs.append(payload)
             with open(log_file_path, 'w') as f:
-                json.dump(logs, f)
+                json.dump(logs, f, default=str)
         except Exception as e:
             print(f"Error saving log locally: {e}")
 

brynq_sdk_task_scheduler-4.0.8/brynq_sdk_task_scheduler.egg-info/PKG-INFO

@@ -0,0 +1,19 @@
+Metadata-Version: 2.4
+Name: brynq_sdk_task_scheduler
+Version: 4.0.8
+Summary: Code to execute tasks in BrynQ.com with the task scheduler
+Author: BrynQ
+Author-email: support@brynq.com
+License: BrynQ License
+Requires-Dist: brynq-sdk-brynq<5,>=4
+Requires-Dist: brynq-sdk-functions<3,>=2
+Requires-Dist: brynq-sdk-mysql<4,>=3
+Requires-Dist: brynq-sdk-mandrill<4,>=2
+Dynamic: author
+Dynamic: author-email
+Dynamic: description
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
+
+Code to execute tasks in the BrynQ.com platform with the task scheduler

{brynq_sdk_task_scheduler-4.0.6 → brynq_sdk_task_scheduler-4.0.8}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_task_scheduler',
-    version='4.0.6',
+    version='4.0.8',
     description='Code to execute tasks in BrynQ.com with the task scheduler',
     long_description='Code to execute tasks in the BrynQ.com platform with the task scheduler',
     author='BrynQ',

brynq_sdk_task_scheduler-4.0.6/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: brynq_sdk_task_scheduler
-Version: 4.0.6
-Summary: Code to execute tasks in BrynQ.com with the task scheduler
-Home-page: UNKNOWN
-Author: BrynQ
-Author-email: support@brynq.com
-License: BrynQ License
-Description: Code to execute tasks in the BrynQ.com platform with the task scheduler
-Platform: UNKNOWN

brynq_sdk_task_scheduler-4.0.6/brynq_sdk_task_scheduler.egg-info/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: brynq-sdk-task-scheduler
-Version: 4.0.6
-Summary: Code to execute tasks in BrynQ.com with the task scheduler
-Home-page: UNKNOWN
-Author: BrynQ
-Author-email: support@brynq.com
-License: BrynQ License
-Description: Code to execute tasks in the BrynQ.com platform with the task scheduler
-Platform: UNKNOWN