berryworld 1.0.0.189396__py3-none-any.whl → 1.0.0.189823__py3-none-any.whl

berryworld/power_automate.py

@@ -176,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
 

berryworld/sql_conn.py

@@ -13,7 +13,7 @@ from .credentials import SQLCredentials
 class SQLConn:
     """ Connect to Microsoft SQL """
 
-    def __init__(self, server_creds=None, master=False, trusted_certificate=True,
+    def __init__(self, server_creds=None, master=False, trusted_certificate=True, encrypt=True,
                  multi_db=False, **kwargs):
         """ Initialize the class
         -----------------------------
@@ -31,6 +31,7 @@ class SQLConn:
         :param server_creds: Dictionary containing the info to connect to the Server
         :param master: Indicate whether the connection will be done to master or to a specific database
         :param trusted_certificate: Indicate whether the connection will be done using the TrustServerCertificate
+        :param encrypt: Indicate whether the connection will use SSL/TLS encryption
         :param multi_db: Indicate whether the connection will be done to a specific database or to multiple databases
         :param kwargs: Additional parameters to be passed to the connection
         """
@@ -43,6 +44,10 @@ class SQLConn:
             self.trusted_certificate = '&TrustServerCertificate=yes'
         else:
             self.trusted_certificate = ''
+        if encrypt:
+            self.encrypt = '&Encrypt=yes'
+        else:
+            self.encrypt = ''
 
         if kwargs != {}:
             try:
@@ -89,11 +94,12 @@ class SQLConn:
 
         if self.master:
             self.con_string = 'mssql+pyodbc://' + self.user_name + ':%s@' + self.server + '/master' + \
-                              '?driver=' + self.driver + '&trusted_connection=yes' + self.trusted_certificate
+                              '?driver=' + self.driver + '&trusted_connection=yes' + self.trusted_certificate + \
+                              self.encrypt
             self.engine = sa.create_engine(self.con_string % parse.quote_plus(self.password))
         else:
             self.con_string = 'mssql+pyodbc://' + self.user_name + ':%s@' + self.server + '/' + database + \
-                              '?driver=' + self.driver + self.trusted_certificate
+                              '?driver=' + self.driver + self.trusted_certificate + self.encrypt
             self.engine = sa.create_engine(self.con_string % parse.quote_plus(self.password))
         if not commit_as_transaction:
             self.engine = self.engine.execution_options(isolation_level="AUTOCOMMIT")
@@ -105,7 +111,7 @@ class SQLConn:
         :return: The opened connection
         """
         constring = 'mssql+pyodbc://' + self.user_name + ':%s@' + self.server + '/' + self.db_name + \
-                    '?driver=' + self.driver + self.trusted_certificate
+                    '?driver=' + self.driver + self.trusted_certificate + self.encrypt
         self.engine = sa.create_engine(constring % parse.quote_plus(self.password))
         if not commit_as_transaction:
             self.engine = self.engine.execution_options(isolation_level="AUTOCOMMIT")

{berryworld-1.0.0.189396.dist-info → berryworld-1.0.0.189823.dist-info}/METADATA

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

{berryworld-1.0.0.189396.dist-info → berryworld-1.0.0.189823.dist-info}/RECORD

@@ -15,22 +15,22 @@ 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=IWLXdc4-HPM0Eq9VwlaXcr17vQKh6LOmtqo-CztUzJY,26713
+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
+berryworld/sql_conn.py,sha256=tYKgD8ja7NQuvLB1WBjdsJbPcm3eX1Y76QPTEgx8R8Q,47564
 berryworld/teams_logging.py,sha256=8NwXyWr4fLj7W6GzAm2nRQCGFDxibQpAHDHHD24FrP8,6997
 berryworld/transportation_solver.py,sha256=tNc1JJk71azIBccdWVHbqcvXWhalOdKffv6HmBD6tG0,5014
 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
-berryworld-1.0.0.189396.dist-info/licenses/LICENSE,sha256=vtkVCJM6E2af2gnsi2XxKPr4WY-uIbvzVLXieFND0UU,1074
+berryworld-1.0.0.189823.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.189396.dist-info/METADATA,sha256=T8GbmSXFhWFhwvXBzh9W7XhduBes63nHmH_p5Bi4ZkI,1362
-berryworld-1.0.0.189396.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-berryworld-1.0.0.189396.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
-berryworld-1.0.0.189396.dist-info/RECORD,,
+berryworld-1.0.0.189823.dist-info/METADATA,sha256=0VIdQ1tBiCaDM3CHc3tHB7_jhAgG4h_EsZY0tFSaEVQ,1362
+berryworld-1.0.0.189823.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+berryworld-1.0.0.189823.dist-info/top_level.txt,sha256=GIZ5qy-P5oxfEH755vA1IMFeTVdX3-40JxMe6nOe5I8,17
+berryworld-1.0.0.189823.dist-info/RECORD,,

{berryworld-1.0.0.189396.dist-info → berryworld-1.0.0.189823.dist-info}/WHEEL

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