berryworld 1.0.0.189012__py3-none-any.whl → 1.0.0.189413__py3-none-any.whl

berryworld/power_automate.py

@@ -158,11 +158,16 @@ class PowerAutomate:
                    f'owners?{self.api_version}'
 
         flow_owners_response = self.session_request("GET", flow_url).to_dict(orient='records')
-        flow_user_ids = [owner['name'] for owner in flow_owners_response if
-                         owner['properties']['principal']['type'] == 'User']
+        flow_user_ids = []
+        flow_group_ids = []
 
-        flow_group_ids = [owner['name'] for owner in flow_owners_response if
-                          owner['properties']['principal']['type'] == 'Group']
+        for owner in flow_owners_response:
+            if 'principal' in owner['properties']:
+                principal_type = owner['properties']['principal'].get('type', None)
+                if principal_type == 'User':
+                    flow_user_ids.append(owner['name'])
+                elif principal_type == 'Group':
+                    flow_group_ids.append(owner['name'])
 
         return flow_user_ids, flow_group_ids
 
@@ -171,17 +176,36 @@ class PowerAutomate:
         :param account_type: Type of account to get the information from
         :param account_ids: IDs of the accounts to get the information from
         """
-        graph_url = f'https://graph.microsoft.com/v1.0/{account_type.lower()}?$top=999'
-
         accounts_df = pd.DataFrame()
-        if graph_url is not None:
-            if account_ids is not None:
-                graph_url = graph_url + '&$filter=' + ' or '.join([f'id eq \'{user_id}\'' for user_id in account_ids])
 
+        if account_ids is not None:
             headers = self.generate_bearer_token(grant_type='client_credentials',
                                                  scope='https://graph.microsoft.com/.default')
 
-            accounts_df = self.session_request("GET", graph_url, headers=headers)
+            remaining_ids = [user_id for user_id in account_ids if user_id]
+
+            while remaining_ids:
+                graph_url = f'https://graph.microsoft.com/v1.0/{account_type.lower()}?$top=999'
+                graph_url += '&$filter=' + ' or '.join([f"id eq '{user_id}'" for user_id in remaining_ids])
+
+                try:
+                    result = self.session_request("GET", graph_url, headers=headers)
+                    if isinstance(result, pd.DataFrame):
+                        accounts_df = pd.concat([accounts_df, result], ignore_index=True)
+                    else:
+                        accounts_df = pd.concat([accounts_df, pd.DataFrame(result)], ignore_index=True)
+                    break
+                except Exception as e:
+                    error_message = str(e)
+                    if '404' in error_message and 'Request_ResourceNotFound' in error_message and len(remaining_ids) > 1:
+                        for user_id in remaining_ids.copy():
+                            try:
+                                single_url = f"https://graph.microsoft.com/v1.0/{account_type.lower()}?$filter=id eq '{user_id}'"
+                                self.session_request("GET", single_url, headers=headers)
+                            except Exception as error_message1:
+                                if '404' in str(error_message1) and 'Request_ResourceNotFound' in error_message1:
+                                    remaining_ids.remove(user_id)
+                                    break
 
         return accounts_df
 
@@ -219,7 +243,8 @@ class PowerAutomate:
                 accounts_df = pd.concat([accounts_df, self.list_graph_accounts('groups', batch_group_ids)])
 
         # Get Creator
-        flows_df['CreatedById'] = flows_df['FlowProperties'].apply(lambda x: x['creator']['userId'])
+        flows_df['CreatedById'] = flows_df['FlowProperties'].apply(
+            lambda x: x['creator']['userId'] if 'creator' in x else None)
         flows_df = flows_df.merge(
             accounts_df[['displayName', 'id']].rename(columns={'id': 'CreatedById'}).drop_duplicates(),
             how='left', on='CreatedById')
@@ -467,12 +492,14 @@ class PowerAutomate:
             )
 
             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']]
+                required_columns = ['FlowId', 'FlowName', 'id', 'FlowUrl', 'JsonDefinition', 'State', 'CreatedBy',
+                                    'Owners', 'CreatedDate', 'LastModifiedDate', 'FlowSuspensionReason',
+                                    'ErrorCount', 'ErrorMessage', 'RunCount', 'RunProperties', 'LastRun',
+                                    'LastRunStatus', 'ConnectionAccountName', 'ConnectionStatus',
+                                    'ConnectionLastModifiedTime', 'ConnectionsCount', 'ConnectionAuthenticatedUserName']
+
+                existing_columns = [col for col in required_columns if col in flows_df.columns]
+                flows_final_df = flows_df[existing_columns]
 
                 if 'FlowSuspensionReasonDetails' in flows_df.columns:
                     flows_final_df = flows_final_df.assign(

{berryworld-1.0.0.189012.dist-info → berryworld-1.0.0.189413.dist-info}/METADATA

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

{berryworld-1.0.0.189012.dist-info → berryworld-1.0.0.189413.dist-info}/RECORD

@@ -15,7 +15,7 @@ berryworld/logic_apps.py,sha256=a0uU4tNO3v2w7grdBv-OOx4hUf7VBIerJpwZ9U-29dQ,1459
 berryworld/microsoft_teams.py,sha256=8uPo0yku-euBj2VdzBoZCeX3IcsCCOqISLqaVZUVxfA,16030
 berryworld/persistent_storage.py,sha256=KQA57ez8eVTUCtudYkHPg_S5lcOEa_E7xXcaN1DYMMc,8601
 berryworld/pickle_management.py,sha256=5o6UuXBpTj23Jgpz6sj9V-vdcdWBK1xMEckWxT-Whj4,2436
-berryworld/power_automate.py,sha256=Y11GoeDEwd3Y2RdvtPPhBSFK65APEceAQKtNo4gVLK4,26464
+berryworld/power_automate.py,sha256=V86QEGG9H36DrDvod9Q6yp8OUu307hfYcXJhw06pYrA,27912
 berryworld/sharepoint_con.py,sha256=TuH-Vxk1VxjTi7x80KFssf_J8YPLRXpV27RBaFZi37U,22254
 berryworld/snowflake_conn.py,sha256=go5ZJjnhz5SkG83B0G0XZSwKgU6tg7AFTBso59oRG5M,2434
 berryworld/sql_conn.py,sha256=r2rAVRc3Mes0m6_62J4uFg5GLBNMr7Vkme9Ip6jT3aA,47283
@@ -25,12 +25,12 @@ berryworld/verify_keys.py,sha256=X4Nuz3o0XbRDYofbJGvxIDeN5gfWj19PN7lhO6T3hR8,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.189012.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.189413.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.189012.dist-info/METADATA,sha256=G_C7noVeA6eQTLZN_aevjCibBaGJ0dj3dk6mawRqrlY,1362
-berryworld-1.0.0.189012.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-berryworld-1.0.0.189012.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.189012.dist-info/RECORD,,
+berryworld-1.0.0.189413.dist-info/METADATA,sha256=Ax85B6zJC5_Ge49j02LHE3xfFvvGVZG7BnumShjq7e8,1362
+berryworld-1.0.0.189413.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+berryworld-1.0.0.189413.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.189413.dist-info/RECORD,,

{berryworld-1.0.0.189012.dist-info → berryworld-1.0.0.189413.dist-info}/WHEEL

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