berryworld 1.0.0.183171__py3-none-any.whl → 1.0.0.184575__py3-none-any.whl

berryworld/power_automate.py

@@ -418,68 +418,85 @@ class PowerAutomate:
             except KeyError:
                 raise KeyError('Please provide a value to enrich the response with')
 
-        flow_url = f'{self.base_flow_url}/scopes/admin/environments/{self.environment_id}/flows?{self.api_version}'
+        flow_url = f'{self.base_flow_url}/scopes/admin/environments/{self.environment_id}/v2/flows?{self.api_version}'
         flows_df = self.session_request("GET", flow_url)
-        flows_df.rename(columns={'name': 'FlowId', 'properties': 'FlowProperties'}, inplace=True)
-
-        if enrich_owners:
-            flows_df = self.enrich_owners(flows_df)
-            flows_df.drop_duplicates(subset=['FlowId'], inplace=True)
-
-        if enrich_info:
-            flows_df = self.enrich_info(flows_df)
-
-        if enrich_run_history:
-            flows_df = self.enrich_run_history(flows_df)
-
-        if enrich_connections:
-            flows_df = self.enrich_connections(flows_df)
-
-        if enrich_flow_url:
-            flows_df = self.enrich_flow_url(flows_df)
-
-        flows_df.rename(
-            columns={
-                'displayName': 'FlowName', 'definition': 'JsonDefinition', 'state': 'State',
-                'createdTime': 'CreatedDate', 'lastModifiedTime': 'LastModifiedDate',
-                'flowSuspensionReason': 'FlowSuspensionReason', 'flowSuspensionTime': 'FlowSuspensionTime',
-                'flowSuspensionReasonDetails': 'FlowSuspensionReasonDetails',
-                'AuthenticatedUserName': 'ConnectionAuthenticatedUserName'
-            }, inplace=True
-        )
-
-        if relevant_columns & enrich:
-            flows_final_df = flows_df[['FlowId', 'FlowName', 'id', 'FlowUrl', 'JsonDefinition', 'State', 'CreatedBy',
-                                       'Owners', 'CreatedDate', 'LastModifiedDate', 'FlowSuspensionReason',
-                                       'ErrorCount', 'ErrorMessage', 'RunCount', 'RunProperties', 'LastRun',
-                                       'LastRunStatus', 'ConnectionAccountName', 'ConnectionStatus',
-                                       'ConnectionLastModifiedTime', 'ConnectionsCount',
-                                       'ConnectionAuthenticatedUserName']]
-
-            if 'FlowSuspensionReasonDetails' in flows_df.columns:
-                flows_final_df = flows_final_df.assign(
-                    **{'FlowSuspensionReasonDetails': flows_df['FlowSuspensionReasonDetails']})
-            if 'FlowSuspensionTime' in flows_df.columns:
-                flows_final_df = flows_final_df.assign(**{'FlowSuspensionTime': flows_df['FlowSuspensionTime']})
-            if 'ConnectionErrorCode' in flows_df.columns:
-                flows_final_df = flows_final_df.assign(**{'ConnectionErrorCode': flows_df['ConnectionErrorCode']})
-            if 'ConnectionErrorMessage' in flows_df.columns:
-                flows_final_df = flows_final_df.assign(**{'ConnectionErrorMessage': flows_df['ConnectionErrorMessage']})
-        else:
-            flows_final_df = flows_df
 
-        if 'FlowName' in flows_final_df.columns:
-            flows_final_df = flows_final_df.sort_values(by=['FlowName'])
+        # After first call, we use the IDs to get the flows properties from a separate call
+        flows_data = pd.DataFrame()
+        failed_flows_df = pd.DataFrame()
+        flows_final_df = pd.DataFrame()
+        if flows_df.shape[0] > 0 and 'name' in flows_df.columns:
+            for flow_id in flows_df['name']:
+                flow_url = f'{self.base_flow_url}/environments/{self.environment_id}/flows/{flow_id}?api-version=2016-11-01'
+                try:
+                    flow_data = self.session_request("GET", flow_url)
+                    flows_data = pd.concat([flows_data, flow_data], ignore_index=True)
+                except Exception as e:
+                    failed_flow = flows_df[flows_df['name'] == flow_id].copy()
+                    failed_flow['ErrorMessage'] = str(e)
+
+                    failed_flows_df = pd.concat([failed_flows_df, failed_flow], ignore_index=True)
+
+            flows_data.rename(columns={'name': 'FlowId', 'properties': 'FlowProperties'}, inplace=True)
+            flows_df = flows_data.copy()
+
+            if enrich_owners:
+                flows_df = self.enrich_owners(flows_df)
+                flows_df.drop_duplicates(subset=['FlowId'], inplace=True)
+
+            if enrich_info:
+                flows_df = self.enrich_info(flows_df)
+
+            if enrich_run_history:
+                flows_df = self.enrich_run_history(flows_df)
+
+            if enrich_connections:
+                flows_df = self.enrich_connections(flows_df)
+
+            if enrich_flow_url:
+                flows_df = self.enrich_flow_url(flows_df)
+
+            flows_df.rename(
+                columns={
+                    'displayName': 'FlowName', 'definition': 'JsonDefinition', 'state': 'State',
+                    'createdTime': 'CreatedDate', 'lastModifiedTime': 'LastModifiedDate',
+                    'flowSuspensionReason': 'FlowSuspensionReason', 'flowSuspensionTime': 'FlowSuspensionTime',
+                    'flowSuspensionReasonDetails': 'FlowSuspensionReasonDetails',
+                    'AuthenticatedUserName': 'ConnectionAuthenticatedUserName'
+                }, inplace=True
+            )
+
+            if relevant_columns & enrich:
+                flows_final_df = flows_df[['FlowId', 'FlowName', 'id', 'FlowUrl', 'JsonDefinition', 'State', 'CreatedBy',
+                                           'Owners', 'CreatedDate', 'LastModifiedDate', 'FlowSuspensionReason',
+                                           'ErrorCount', 'ErrorMessage', 'RunCount', 'RunProperties', 'LastRun',
+                                           'LastRunStatus', 'ConnectionAccountName', 'ConnectionStatus',
+                                           'ConnectionLastModifiedTime', 'ConnectionsCount',
+                                           'ConnectionAuthenticatedUserName']]
+
+                if 'FlowSuspensionReasonDetails' in flows_df.columns:
+                    flows_final_df = flows_final_df.assign(
+                        **{'FlowSuspensionReasonDetails': flows_df['FlowSuspensionReasonDetails']})
+                if 'FlowSuspensionTime' in flows_df.columns:
+                    flows_final_df = flows_final_df.assign(**{'FlowSuspensionTime': flows_df['FlowSuspensionTime']})
+                if 'ConnectionErrorCode' in flows_df.columns:
+                    flows_final_df = flows_final_df.assign(**{'ConnectionErrorCode': flows_df['ConnectionErrorCode']})
+                if 'ConnectionErrorMessage' in flows_df.columns:
+                    flows_final_df = flows_final_df.assign(**{'ConnectionErrorMessage': flows_df['ConnectionErrorMessage']})
+            else:
+                flows_final_df = flows_df
+
+            if 'FlowName' in flows_final_df.columns:
+                flows_final_df = flows_final_df.sort_values(by=['FlowName'])
 
-        return flows_final_df.reset_index(drop=True)
+        return flows_final_df.reset_index(drop=True), failed_flows_df
 
     def update_flow(self, flow_id, payload):
         """ Update a flow
         :param flow_id: ID of the flow to be updated
         :param payload: Payload to be sent to the API
         """
-        flow_url = f'{self.base_flow_url}/scopes/admin/environments/{self.environment_id}/' \
-                   f'flows/{flow_id}?{self.api_version}'
+        flow_url = f'{self.base_flow_url}/environments/{self.environment_id}/flows/{flow_id}?{self.api_version}'
 
         # currently no support to patch flow owners, can only be done via flow UI or admin center (09/2023)
         if isinstance(payload, dict):
@@ -496,8 +513,7 @@ class PowerAutomate:
         """ Delete a flow
         :param flow_id: ID of the flow to be deleted
         """
-        flow_url = f'{self.base_flow_url}/scopes/admin/environments/{self.environment_id}/' \
-                   f'flows/{flow_id}?{self.api_version}'
+        flow_url = f'{self.base_flow_url}/environments/{self.environment_id}/flows/{flow_id}?{self.api_version}'
 
         flow_delete_response = self.session.request("DELETE", flow_url, headers=self.headers)
 

berryworld/verify_keys.py

@@ -14,9 +14,11 @@ load_dotenv(os.path.join(os.getcwd(), '.env'))
 class Verify:
     """ Encrypt and Verify keys """
 
-    def __init__(self, key_name: str = 'SECRET_KEY'):
+    def __init__(self, key_name: str = 'SECRET_KEY', key_override: str = None):
         """ Initialize the class """
         self.key = os.environ.get(key_name)
+        if key_override is not None:
+            self.key = key_override
         self.iterations = 100_000
 
     def decrypt(self, token: str) -> str:

{berryworld-1.0.0.183171.dist-info → berryworld-1.0.0.184575.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: berryworld
-Version: 1.0.0.183171
+Version: 1.0.0.184575
 Summary: Handy classes to improve ETL processes
 Home-page: https://www.berryworld.com
 Author: BerryWorld ltd
@@ -22,13 +22,22 @@ Requires-Dist: pyodbc>=4.0.39
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: PyYAML>=6.0
 Requires-Dist: requests>=2.31.0
-Requires-Dist: scipy>=1.11.1
+Requires-Dist: scipy>=1.14.1
 Requires-Dist: setuptools>=61.2.0
 Requires-Dist: SQLAlchemy>=1.4.32
 Requires-Dist: snowflake-connector-python>=3.12.2
 Requires-Dist: snowflake>=0.12.1
 Requires-Dist: cffi>=1.15.1
 Requires-Dist: beautifulsoup4>=4.12.2
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # BerryWorld
 

{berryworld-1.0.0.183171.dist-info → berryworld-1.0.0.184575.dist-info}/RECORD

@@ -16,13 +16,13 @@ berryworld/microsoft_teams.py,sha256=8uPo0yku-euBj2VdzBoZCeX3IcsCCOqISLqaVZUVxfA
 berryworld/persistent_storage.py,sha256=KQA57ez8eVTUCtudYkHPg_S5lcOEa_E7xXcaN1DYMMc,8601
 berryworld/pickle_management.py,sha256=5o6UuXBpTj23Jgpz6sj9V-vdcdWBK1xMEckWxT-Whj4,2436
 berryworld/postgres_connection.py,sha256=whKDnchd5Feqpmxpoh2vlyn36EKHR-dVEULYq0N_4wA,8287
-berryworld/power_automate.py,sha256=9rDuRy0v-Ttq-SThid4lOB_tD4ibkyEmobiROpa--g4,25414
+berryworld/power_automate.py,sha256=Y11GoeDEwd3Y2RdvtPPhBSFK65APEceAQKtNo4gVLK4,26464
 berryworld/sharepoint_con.py,sha256=TuH-Vxk1VxjTi7x80KFssf_J8YPLRXpV27RBaFZi37U,22254
 berryworld/snowflake_conn.py,sha256=52ugfkyVCbR_Xr8YiZtNwPrwe93_1uE9uRy_VNPT6Gs,2428
 berryworld/sql_conn.py,sha256=3_uPrn3rJjVr7-9wcXkh0CSitFD2ncQGGZjttFl6ELM,47803
 berryworld/teams_logging.py,sha256=8NwXyWr4fLj7W6GzAm2nRQCGFDxibQpAHDHHD24FrP8,6997
 berryworld/transportation_solver.py,sha256=gdlHRgl2wlp5EV0uhKIOYtkkbAlHaFHGktnMgvuENWE,5022
-berryworld/verify_keys.py,sha256=J2J505PcmBsQ9bj0XSRtXjpY-8qwpPU1A5LQdFRicFU,4257
+berryworld/verify_keys.py,sha256=X4Nuz3o0XbRDYofbJGvxIDeN5gfWj19PN7lhO6T3hR8,4356
 berryworld/vivantio.py,sha256=QfZo0UKqkzVRg_LyiwivNd3aEup4TH57x4KxLZkCJwc,10627
 berryworld/vivantio_logging.py,sha256=ciy7gA4u3FrgUIpEBnMgocbNPp6jcu9TPoy-kLcrTZU,5736
 berryworld/xml_parser.py,sha256=HWD71NaTN3DaIOGT6Wzxs4CEsroFhGQwe9iPLIL80Co,957
@@ -30,8 +30,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.183171.dist-info/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
-berryworld-1.0.0.183171.dist-info/METADATA,sha256=9Fkg4NysntUtoU-6iu1cXIQbYTm5_-BlytJOIVzVPm8,1174
-berryworld-1.0.0.183171.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-berryworld-1.0.0.183171.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.183171.dist-info/RECORD,,
+berryworld-1.0.0.184575.dist-info/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.184575.dist-info/METADATA,sha256=1OrVvY4YkefURNgG63cb4pQAGmpIUCN-9m7uFZuMJgU,1371
+berryworld-1.0.0.184575.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+berryworld-1.0.0.184575.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.184575.dist-info/RECORD,,

{berryworld-1.0.0.183171.dist-info → berryworld-1.0.0.184575.dist-info}/WHEEL

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