berryworld 1.0.0.199448__py3-none-any.whl → 1.0.0.200414__py3-none-any.whl

berryworld/email_con.py

@@ -1,3 +1,4 @@
+import os
 import ast
 import base64
 import json
@@ -136,6 +137,10 @@ class EmailConnection:
         :param extension_files: Indicate the file extensions to download and skip others
         :param emails_to_query: Number of emails to be queried when the method is called
         """
+        '''
+        folder_name = 'Ingestion/CircanaExports'
+        '''
+
         header = copy.copy(self.headers)
         folder_id = self.get_folder_id(folder_name)
 
@@ -182,6 +187,7 @@ class EmailConnection:
                 attachments_df = pd.DataFrame(response.json()['value'])[['id', 'name', 'contentBytes']]
                 attachments_df = attachments_df.assign(**{'MessageId': msg["id"]})
                 attachments_df = attachments_df.loc[attachments_df['name'].str.contains('|'.join(extension_files))]
+                attachments_df['name'] = attachments_df['name'].str.replace(r'[\\/*?:"<>|]', "", regex=True)
                 all_attachments = pd.concat([all_attachments, attachments_df])
                 for _, attachment in attachments_df.iterrows():
                     f = open(attachment['name'], 'w+b')
@@ -321,37 +327,42 @@ class EmailConnection:
         :param file_path: Path of the file to be attached
         """
         # Get mimetype
-        if ('.jpg' in file_path) | ('.jpeg' in file_path):
+        ext = os.path.splitext(file_path)[1].lower()
+        if ext in ('.jpg', '.jpeg'):
             mimetype = "image/jpeg"
             extension = '.jpeg'
-        elif '.png' in file_path:
+        elif ext == '.png':
             mimetype = "image/png"
             extension = '.png'
-        elif '.doc' in file_path:
+        elif ext == '.doc':
             mimetype = "application/msword"
             extension = '.doc'
-        elif '.docx' in file_path:
+        elif ext == '.docx':
             mimetype = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
             extension = '.docx'
-        elif '.pdf' in file_path:
+        elif ext == '.pdf':
             mimetype = "application/pdf"
             extension = '.pdf'
-        elif '.txt' in file_path:
+        elif ext == '.txt':
             mimetype = "text/plain"
             extension = '.txt'
-        elif '.csv' in file_path:
+        elif ext == '.csv':
             mimetype = "text/csv"
             extension = '.csv'
-        elif '.xls' in file_path:
+        elif ext == '.xls':
             mimetype = "application/vnd.ms-excel"
             extension = '.xls'
-        elif '.xlsx' in file_path:
-            mimetype = "application/vnd.ms-excel"
+        elif ext == '.xlsx':
+            mimetype = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
             extension = '.xlsx'
-        elif '.html' in file_path:
-            mimetype = "application/vnd.ms-excel"
-            extension = 'text/html'
+        elif ext in ('.html', '.htm'):
+            mimetype = "text/html"
+            extension = ext
+        elif ext == '.zip':
+            mimetype = "application/zip"
+            extension = '.zip'
         else:
-            raise Exception('File mime type not found')
+            mimetype = "application/octet-stream"
+            extension = ext
 
         return mimetype, extension

berryworld/sql_connection.py

@@ -1007,7 +1007,7 @@ class SQLConnection:
         :param string: String variable to parse
         :return: Parsed string
         """
-        string = re.sub(r"Decimal\(\s*'\"['\"]\s*\)", r"\1", string)
+        string = re.sub(r"Decimal\('\s*([^)]+?)\s*'\)", r'\1', string)
         return string
 
     @staticmethod

{berryworld-1.0.0.199448.dist-info → berryworld-1.0.0.200414.dist-info}/METADATA

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

{berryworld-1.0.0.199448.dist-info → berryworld-1.0.0.200414.dist-info}/RECORD

@@ -6,7 +6,7 @@ berryworld/app_logs_query.py,sha256=U94b-z3X9cuY_KFozupUcfaYciXWBn7p_RHkoRsfROU,
 berryworld/cache_data.py,sha256=AWAhV4PPkilZ4Xb1pUXuuu6UdHICAx8QqDtb9rVnjDM,2254
 berryworld/credentials.py,sha256=sF77pWfMxHMyULiBgBeQzXXRJscPRA_ncRAGOeGYDAw,5754
 berryworld/devops.py,sha256=7mRbyZPGzk5ox-6J2etv3NxCcfP4cprG0_Xelh7prn8,9776
-berryworld/email_con.py,sha256=CVyEDVnc_iVeRTwJgIU31ToFgyix7L2yn4Ih9Wu7I5s,15806
+berryworld/email_con.py,sha256=1dsj4KtThuvhbcKYgbZcGLCX9mkrV0fMD2a1zDW99F8,16126
 berryworld/email_logging.py,sha256=LeSrTExhQhar49gJR2wGC1dS0lqsNpFl9pS3eYWqnuo,4936
 berryworld/generate_env.py,sha256=LrqUH8AjCI6P0uU6BMBRYC9cnmyKkYcpXF1KKIzxkZ8,15900
 berryworld/handy_mix.py,sha256=SqJ3UjIjmIOgjbp-_1eyKQJ3OJLN7OfpDQIASvjNZ_Q,9672
@@ -20,19 +20,19 @@ berryworld/python_logs.py,sha256=FVPK1rtFvwRRxtDnBVc9SinyAkt6K2G1HIzIvtS7WWE,517
 berryworld/sharepoint_con.py,sha256=nmyZJIcaAKJ6Y-ti4gQbvzA_rRbrMGIxTDXe4eP-tiI,44950
 berryworld/snowflake_conn.py,sha256=L0ePgTKa3tvaxj88BZmsjS6cFp3ZU3rytw7S2jkuA-U,3161
 berryworld/sql_conn.py,sha256=7MjtymH4_NvLbxnmoVY6ViiNKSp4jPkGluOfgEZ8txA,47645
-berryworld/sql_connection.py,sha256=KOA8y8SJgRIB6DXqIYqakydLZqYbmZAreUOi-Ii4hr0,104104
+berryworld/sql_connection.py,sha256=XXrau3HwrLTMqKXOsBz533ZDBXj4NLYvFdGp71dwbls,104106
 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.199448.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.200414.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.199448.dist-info/METADATA,sha256=bJsVwnk0PBddGk6C6nbyH5oxlrvKHiaMU1HEUueLZc0,1445
-berryworld-1.0.0.199448.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-berryworld-1.0.0.199448.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.199448.dist-info/RECORD,,
+berryworld-1.0.0.200414.dist-info/METADATA,sha256=_i6gXJbrq9E6lWx2AVxs8LTkaTUdj4AuoCA0wLfCyos,1445
+berryworld-1.0.0.200414.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+berryworld-1.0.0.200414.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.200414.dist-info/RECORD,,

{berryworld-1.0.0.199448.dist-info → berryworld-1.0.0.200414.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any