brynq-sdk-task-scheduler 4.0.7__tar.gz → 4.0.10__tar.gz

brynq_sdk_task_scheduler-4.0.10/PKG-INFO

@@ -0,0 +1,19 @@
+Metadata-Version: 2.4
+Name: brynq_sdk_task_scheduler
+Version: 4.0.10
+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.7 → brynq_sdk_task_scheduler-4.0.10}/brynq_sdk_task_scheduler/task_scheduler.py

@@ -3,7 +3,7 @@ import os
 import datetime
 import inspect
 import time
-from typing import Literal, List, Optional
+from typing import Literal, List, Optional, Union
 import traceback
 import pandas as pd
 import json
@@ -19,11 +19,11 @@ import re
 
 class TaskScheduler:
 
-    def __init__(self, data_interface_id: int = None, loglevel: str = 'INFO', email_after_errors: bool = False):
+    def __init__(self, data_interface_id: Union[int, str] = None, loglevel: str = 'INFO', email_after_errors: bool = False):
         """
         The TaskScheduler is responsible for the logging to the database. Based on this logging, the next reload will
         start or not and warning will be given or not
-        :param data_interface_id: The ID from the task as saved in the task_scheduler table in the customer database
+        :param data_interface_id: The ID or GUID from the task as saved in the task_scheduler table in the customer database
         :param email_after_errors: a True or False value. When True, there will be send an email to a contactperson of the customer (as given in the database) with the number of errors
         :param loglevel: Chose on which level you want to store the logs. Default is INFO. that means that a logline
         :param disable_logging: If the interface is started from a local instance, logs will not be stored by default. If this is set to True, the logs will be stored in the database
@@ -323,13 +323,14 @@ class TaskScheduler:
 
             # 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')

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

@@ -0,0 +1,19 @@
+Metadata-Version: 2.4
+Name: brynq_sdk_task_scheduler
+Version: 4.0.10
+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.7 → brynq_sdk_task_scheduler-4.0.10}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_task_scheduler',
-    version='4.0.7',
+    version='4.0.10',
     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.7/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: brynq_sdk_task_scheduler
-Version: 4.0.7
-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.7/brynq_sdk_task_scheduler.egg-info/PKG-INFO

@@ -1,10 +0,0 @@
-Metadata-Version: 1.0
-Name: brynq-sdk-task-scheduler
-Version: 4.0.7
-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