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

berryworld/__init__.py

@@ -24,4 +24,4 @@ from .teams_logging import TeamsLogging
 from .vivantio_logging import VivantioLogging
 from .snowflake_conn import SnowflakeConn
 from .logging import PythonLogs
-from .sql_connenction import SQLConnection, SQLConnectionPool, SQLPoolEngine
+from .sql_connection import SQLConnection, SQLConnectionPool, SQLPoolEngine

berryworld/python_logs.py

@@ -1,8 +1,8 @@
 import time
 import math
 import datetime
-from uuid import uuid4
 import pandas as pd
+from uuid import uuid4
 from threading import Thread
 
 
@@ -29,18 +29,20 @@ class ErrorLogs:
         self.guid = str(uuid4())
         self.pipeline = pipeline
         self.failure_type = []
+        self.completed = False
         Thread(target=self.start_threading).start()
 
     def start_threading(self):
         """ Start a threading to update on failure if the script breaks or the pipeline gets blocked
         """
-        time_range = math.ceil(self.timeout / 10)
+        step = 10
+        time_range = math.ceil(self.timeout / step)
         for times in range(time_range):
-            time.sleep(10)
-            if len(self.failure_type) > 0:
+            time.sleep(step)
+            if self.completed is True:
                 break
 
-        if len(self.failure_type) == 0:
+        if self.completed is False:
             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')
@@ -49,14 +51,14 @@ class ErrorLogs:
         """ Update log on success
         :param pipeline: Pipeline name being run. It must identify the process being executed uniquely
         """
-        if not any(self.failure_type):
+        if self.completed is False:
             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.failure_type.append(True)
+            self.completed = True
 
             Thread(target=self.trigger_merge_stored_procedure).start()
 
@@ -68,27 +70,20 @@ class ErrorLogs:
         :param critical: Indicate whether it should avoid sending successful logs
         :param proposed_solution: Proposed solution to the error message
         """
-        save_failure = True
-        if section is not None:
-            if ((('prod' not in str(self.sql_con.server)) | ('prd' not in str(self.sql_con.server)))
-                    & (('connection' in str(section).lower()) & ('dw' in str(section).lower()))):
-                print('Avoiding to report a connection DW error in a non-production environment')
-                save_failure = False
+        if pipeline is not None:
+            self.pipeline = pipeline
+        unsuccessful_columns = {'Successful': 0, 'Section': section, 'Pipeline': self.pipeline,
+                                'GuidKey': self.guid, 'Critical': 1 if critical is True else 0,
+                                'FinishedDate': datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f"),
+                                'ErrorMessage': str(error_message).replace("'", '"')}
+        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.failure_type.append(self.completed)
 
-        if save_failure:
-            if pipeline is not None:
-                self.pipeline = pipeline
-            unsuccessful_columns = {'Successful': 0, 'Section': section, 'Pipeline': self.pipeline,
-                                    'GuidKey': self.guid, 'Critical': 1 if critical is True else 0,
-                                    'FinishedDate': datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S.%f"),
-                                    'ErrorMessage': str(error_message).replace("'", '"')}
-            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.failure_type.append(critical)
-
-            Thread(target=self.trigger_merge_stored_procedure).start()
+        Thread(target=self.trigger_merge_stored_procedure).start()
 
     def trigger_merge_stored_procedure(self):
         """ Trigger the merge stored procedure to aggregate logs

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

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

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

@@ -1,4 +1,4 @@
-berryworld/__init__.py,sha256=xYQwJeCZ2di85E0_O3Sx8AUsRhoT6USUxcPGJyCr-gY,1175
+berryworld/__init__.py,sha256=yqZzic5XpvvMEd_JkQHSYN-a0rV2XbW76C_4NTV3Fck,1174
 berryworld/aks_logs.py,sha256=Gb2_cokiZbEX01Yoptd0MxpDociaug-GrXdwliyxFBo,2293
 berryworld/allocation_solver.py,sha256=asFtaCAze6-eHUGWXA0kAp67UBS-Upj1KKdrVLj_ttQ,8513
 berryworld/app_logs.py,sha256=MKzKPYd3JuPfOQNAapIgaeZeFHw1z_w2mbn9I6QCADE,4180
@@ -16,23 +16,23 @@ 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=xl7ckgsOnlCmvrDHYEoM3fTp2tC2MmQ8cetVnV4Gdpc,5966
+berryworld/python_logs.py,sha256=zmuj5Ztcj03qiqqrzquikPCCl2KuziYiXXQVcNPEpO8,5567
 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
-berryworld/sql_connenction.py,sha256=IJAOsQ7p0tMFEEucazmmkS3lNonf_YFWftyZ_kGPHj8,104150
+berryworld/sql_connection.py,sha256=IJAOsQ7p0tMFEEucazmmkS3lNonf_YFWftyZ_kGPHj8,104150
 berryworld/teams_logging.py,sha256=8NwXyWr4fLj7W6GzAm2nRQCGFDxibQpAHDHHD24FrP8,6997
 berryworld/transportation_solver.py,sha256=tNc1JJk71azIBccdWVHbqcvXWhalOdKffv6HmBD6tG0,5014
 berryworld/verify_keys.py,sha256=X7VUHqYDklWPDO0bGVHIOXeLq5Qi4fZRZbHYw5x7UnA,4356
 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.199233.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.199316.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.199233.dist-info/METADATA,sha256=vitesuC1gZEZt6P-FmOGV18VVG4IB7GX8KTLTJJOJo4,1445
-berryworld-1.0.0.199233.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.199233.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.199233.dist-info/RECORD,,
+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,,