berryworld 1.0.0.178885__py3-none-any.whl → 1.0.0.179097__py3-none-any.whl

berryworld/email_con.py

@@ -275,8 +275,7 @@ class EmailConnection:
             return emails_df.shape[0] != 0
 
         except Exception as e:
-            print(traceback.format_exc())
-            raise Exception(e)
+            print(e)
 
     @staticmethod
     def get_mimetype(file_path):
@@ -284,8 +283,6 @@ class EmailConnection:
         :param file_path: Path of the file to be attached
         """
         # Get mimetype
-        mimetype = None
-        extension = None
         if ('.jpg' in file_path) | ('.jpeg' in file_path):
             mimetype = "image/jpeg"
             extension = '.jpeg'

berryworld/logic_apps.py

@@ -5,6 +5,56 @@ from requests.adapters import HTTPAdapter
 from urllib3.util.retry import Retry
 
 
+def format_create_payload(payload):
+    """ Format the payload to create a workflow in Azure Portal
+    :param payload: Properties and Definition of the workflow
+    """
+    # Reshape the payload to fit the required format
+    json_dict = json.loads(payload)
+
+    # Check if definition key is in json payload
+    if not ('definition' in json_dict['properties'].keys()):
+        json_dict = {
+            "properties": {
+                "definition": json_dict['properties']
+            }
+        }
+
+    # Check if location key is in json payload
+    location_flag = False
+    location_dict = {}
+    if 'location' in json_dict['properties']['definition'].keys():
+        location_dict = json_dict['properties']['definition']['location']
+        json_dict = {
+            "properties": {
+                "definition": {key: val for key, val in json_dict['properties']['definition'].items() if
+                               key != 'location'}
+            }
+        }
+        location_flag = True
+
+    # Check if tags key is in json payload
+    tags_flag = False
+    tags_dict = {}
+    if 'tags' in json_dict['properties']['definition'].keys():
+        tags_dict = json_dict['properties']['definition']['tags']
+        json_dict = {
+            "properties": {
+                "definition": {key: val for key, val in json_dict['properties']['definition'].items() if
+                               key != 'tags'}
+            }
+        }
+        tags_flag = True
+        json_dict = {**json_dict, **{'tags': tags_dict}}
+
+    if tags_flag:
+        json_dict = {**json_dict, **{'tags': tags_dict}}
+    if location_flag:
+        json_dict = {**json_dict, **{'location': location_dict}}
+
+    return json.dumps(json_dict)
+
+
 class LogicApps:
     def __init__(self, **kwargs):
         """
@@ -187,7 +237,8 @@ class LogicApps:
         :param resource_group: Resource group Name to get the workflows from
         :param workflow_name: New name of the workflow
         :param payload: Payload to create the workflow. It usually comes under properties in the workflow response
-        which we must add "location" and "tags" keys.
+        which we must add "location" and "tags" keys. It should be in the same format that the Logic Apps are stored in
+        the Azure DevOps repository.
         Payload example:
         {
           "properties": {
@@ -246,6 +297,11 @@ class LogicApps:
                      f"providers/Microsoft.Logic/workflows/{workflow_name}?" + self.api_version
         headers_ = self.headers
         headers_['Content-Type'] = 'application/json'
+
         create_resp = req.put(create_url, headers=self.headers, data=payload)
-        if create_resp.status_code != 200:
-            raise Exception(f'Cannot create the workflow {workflow_name}. Error: {create_resp.text}')
+        if not str(create_resp.status_code).startswith('2'):
+            print('Try to reform the payload to fit the required format in the Azure Portal')
+            payload = format_create_payload(payload)
+            create_resp = req.put(create_url, headers=self.headers, data=payload)
+            if not str(create_resp.status_code).startswith('2'):
+                raise Exception(f'Cannot create the workflow {workflow_name}. Error: {create_resp.text}')

{berryworld-1.0.0.178885.dist-info → berryworld-1.0.0.179097.dist-info}/METADATA

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

{berryworld-1.0.0.178885.dist-info → berryworld-1.0.0.179097.dist-info}/RECORD

@@ -6,11 +6,11 @@ berryworld/app_logs_query.py,sha256=U94b-z3X9cuY_KFozupUcfaYciXWBn7p_RHkoRsfROU,
 berryworld/cache_data.py,sha256=2cStWbFQHimon_lHMbcM_0vU7lt-FCge96D-T9YXaxQ,2242
 berryworld/credentials.py,sha256=Knxo4gssLT7sbaBjOTFe3mX5k70G2e0M_6CdtlddjtA,10200
 berryworld/devops.py,sha256=BAsVonVwCXoApUOovkt-BCzwc6KnXjxRDGff_ejSGw8,9719
-berryworld/email_con.py,sha256=lAadyJCTXdXJQeS9WDaTErtKxT1c9DKPJ-LpWNmWa98,14549
+berryworld/email_con.py,sha256=uSBzs_Ijz9pUPWt9e7U3TCB7i6q7hU1bB5vhsTB_tmw,14448
 berryworld/email_logging.py,sha256=ebZ-PHZ9tCU3q-vkNnOT3-mTG7pCAmewnzzJZ9lnOjI,4476
 berryworld/generate_env.py,sha256=Tk9Z_u7cA4Ve8YYTyLH2qwmLVAuYoTIWoFc0h8Va8lY,7842
 berryworld/handy_mix.py,sha256=SLCAdl2xaWEewWkECzcVFUDODDEkvUgpmJjTiccyVwU,9771
-berryworld/logic_apps.py,sha256=hFi4wAOTgL9xirU6cR4rkOYTFBdDNes_aU3-aS9MsN0,12457
+berryworld/logic_apps.py,sha256=a0uU4tNO3v2w7grdBv-OOx4hUf7VBIerJpwZ9U-29dQ,14591
 berryworld/microsoft_teams.py,sha256=Mhj83-tQWRR58YfBUPUTQKQ-qJD1Y5FBPpjU70gP6UU,15964
 berryworld/persistent_storage.py,sha256=_lGdXa7IyxfMF3xNF9y26X_z9RDb2Ah7R0oF61HR8Gc,5764
 berryworld/pickle_management.py,sha256=O49ojVtTqYCT510rVRTbZWWaur_-5q3HSVG03Azn8mQ,2393
@@ -28,8 +28,8 @@ 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.178885.dist-info/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
-berryworld-1.0.0.178885.dist-info/METADATA,sha256=f8pKCUKdq0Dtk7T1jmtepXYhbh1I1LIuaem2lzNDKkw,1091
-berryworld-1.0.0.178885.dist-info/WHEEL,sha256=Mdi9PDNwEZptOjTlUcAth7XJDFtKrHYaQMPulZeBCiQ,91
-berryworld-1.0.0.178885.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.178885.dist-info/RECORD,,
+berryworld-1.0.0.179097.dist-info/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.179097.dist-info/METADATA,sha256=E9GLcy3lZWJ9HNHqXqx_56WHvu5RUqoW8qy-4w7Qxes,1091
+berryworld-1.0.0.179097.dist-info/WHEEL,sha256=UvcQYKBHoFqaQd6LKyqHw9fxEolWLQnlzP0h_LgJAfI,91
+berryworld-1.0.0.179097.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.179097.dist-info/RECORD,,

{berryworld-1.0.0.178885.dist-info → berryworld-1.0.0.179097.dist-info}/WHEEL

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