berryworld 1.0.0.199316__py3-none-any.whl → 1.0.0.199373__py3-none-any.whl

berryworld/python_logs.py

@@ -39,10 +39,10 @@ class ErrorLogs:
         time_range = math.ceil(self.timeout / step)
         for times in range(time_range):
             time.sleep(step)
-            if self.completed is True:
+            if self.completed:
                 break
 
-        if self.completed is False:
+        if not self.completed:
             elapsed_time = str(datetime.timedelta(seconds=round(self.timeout)))[2:]
             self.on_failure(error_message=f'The pipeline failed to succeed after running '
                                           f'for {elapsed_time} minutes')
@@ -51,16 +51,14 @@ class ErrorLogs:
         """ Update log on success
         :param pipeline: Pipeline name being run. It must identify the process being executed uniquely
         """
-        if self.completed is False:
+        if not self.completed:
             if pipeline is not None:
                 self.pipeline = pipeline
             successful_columns = {'Successful': 1, 'Resolved': 1, 'Pipeline': self.pipeline, 'GuidKey': self.guid,
                                   'FinishedDate': datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f")}
             self.log_df = self.log_df.assign(**successful_columns)
-            self.sql_con.insert(self.log_df, 'Staging', 'Logs', print_sql=self.print_sql)
             self.completed = True
-
-            Thread(target=self.trigger_merge_stored_procedure).start()
+            self.sql_con.insert(self.log_df, 'Staging', 'Logs', print_sql=self.print_sql)
 
     def on_failure(self, error_message, pipeline=None, section=None, critical=True, proposed_solution=None):
         """ Update log on failure
@@ -79,18 +77,10 @@ class ErrorLogs:
         self.log_df = self.log_df.assign(**unsuccessful_columns)
         if proposed_solution is not None:
             self.log_df = self.log_df.assign(**{'ProposedSolution': proposed_solution})
-        self.sql_con.insert(self.log_df, 'Staging', 'Logs', print_sql=self.print_sql)
         self.completed = True
+        self.sql_con.insert(self.log_df, 'Staging', 'Logs', print_sql=self.print_sql)
         self.failure_type.append(self.completed)
 
-        Thread(target=self.trigger_merge_stored_procedure).start()
-
-    def trigger_merge_stored_procedure(self):
-        """ Trigger the merge stored procedure to aggregate logs
-        """
-        stored_procedure = 'Logging.spLogsMerge'
-        self.sql_con.run_statement(f"EXEC {stored_procedure}")
-
     @staticmethod
     def register_failure(email_log, section, error_, solutions=None, pipeline=None):
         """Register a failure in the email log

{berryworld-1.0.0.199316.dist-info → berryworld-1.0.0.199373.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: berryworld
-Version: 1.0.0.199316
+Version: 1.0.0.199373
 Summary: Handy classes to improve ETL processes
 Home-page: https://www.berryworld.com
 Author: BerryWorld ltd

{berryworld-1.0.0.199316.dist-info → berryworld-1.0.0.199373.dist-info}/RECORD

@@ -16,7 +16,7 @@ berryworld/microsoft_teams.py,sha256=8uPo0yku-euBj2VdzBoZCeX3IcsCCOqISLqaVZUVxfA
 berryworld/persistent_storage.py,sha256=L15kLyzN42T6UB1WAg8rFXJq3Mdb1M8Sw4P5YQaUN84,8711
 berryworld/pickle_management.py,sha256=5o6UuXBpTj23Jgpz6sj9V-vdcdWBK1xMEckWxT-Whj4,2436
 berryworld/power_automate.py,sha256=V86QEGG9H36DrDvod9Q6yp8OUu307hfYcXJhw06pYrA,27912
-berryworld/python_logs.py,sha256=zmuj5Ztcj03qiqqrzquikPCCl2KuziYiXXQVcNPEpO8,5567
+berryworld/python_logs.py,sha256=FVPK1rtFvwRRxtDnBVc9SinyAkt6K2G1HIzIvtS7WWE,5173
 berryworld/sharepoint_con.py,sha256=nmyZJIcaAKJ6Y-ti4gQbvzA_rRbrMGIxTDXe4eP-tiI,44950
 berryworld/snowflake_conn.py,sha256=L0ePgTKa3tvaxj88BZmsjS6cFp3ZU3rytw7S2jkuA-U,3161
 berryworld/sql_conn.py,sha256=6kUR3oLXweakz2IBc4zI1ZMqRoN8K6nbQneHhenM-7I,47668
@@ -27,12 +27,12 @@ berryworld/verify_keys.py,sha256=X7VUHqYDklWPDO0bGVHIOXeLq5Qi4fZRZbHYw5x7UnA,435
 berryworld/vivantio.py,sha256=QfZo0UKqkzVRg_LyiwivNd3aEup4TH57x4KxLZkCJwc,10627
 berryworld/vivantio_logging.py,sha256=ciy7gA4u3FrgUIpEBnMgocbNPp6jcu9TPoy-kLcrTZU,5736
 berryworld/xml_parser.py,sha256=HWD71NaTN3DaIOGT6Wzxs4CEsroFhGQwe9iPLIL80Co,957
-berryworld-1.0.0.199316.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.199373.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/test_allocation_config.py,sha256=e12l6fE9U57eSPS35g6ekJ_hol7-RHg89JV60_m1BlE,4633
 tests/test_handy_mix_config.py,sha256=Un56mz9KJmdn4K4OwzHAHLSRzDU1Xv2nFrONNuzOG04,2594
 tests/test_xml_parser.py,sha256=3QTlhFEd6KbK6nRFKZnc35tad6wqukTbe4QrFi8mr_8,859
-berryworld-1.0.0.199316.dist-info/METADATA,sha256=EjHOVChJQB-PAZ-P7MQPQAvjwx_xB3wC7OL2qU40bsU,1445
-berryworld-1.0.0.199316.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.199316.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.199316.dist-info/RECORD,,
+berryworld-1.0.0.199373.dist-info/METADATA,sha256=qwpYYA_x5BmX0fwgUN-8FnPPfdXREqeUm5Rpg5LCxn8,1445
+berryworld-1.0.0.199373.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+berryworld-1.0.0.199373.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.199373.dist-info/RECORD,,