brynq-sdk-azure 2.0.2__tar.gz → 3.0.0__tar.gz

{brynq_sdk_azure-2.0.2 → brynq_sdk_azure-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_azure
-Version: 2.0.2
+Version: 3.0.0
 Summary: Azure wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_azure-2.0.2 → brynq_sdk_azure-3.0.0}/brynq_sdk_azure/blob_storage.py

@@ -1,16 +1,17 @@
 from brynq_sdk_brynq import BrynQ
 from azure.storage.blob import BlobServiceClient, BlobClient, ContainerClient, generate_account_sas, ResourceTypes, AccountSasPermissions
-from typing import Union, List, Tuple
+from typing import Union, List, Tuple, Literal, Optional
 from datetime import datetime, timedelta
 
 
 class BlobStorage(BrynQ):
-    def __init__(self, label: Union[str, List]):
+    def __init__(self, system_type: Optional[Literal['source', 'target']] = None):
         super().__init__()
-        self.blob_service_client = self.__get_authentication(label=label)
+        self.blob_service_client = self._get_authentication(system_type)
 
-    def __get_authentication(self, label):
-        credentials = self.get_system_credential(system='azure-blob-storage', label=label)
+    def _get_authentication(self, system_type):
+        credentials = self.interfaces.credentials.get(system='azure-blob-storage', system_type=system_type)
+        credentials = credentials.get('data')
         storage_account_name = credentials['storage_account_name']
         storage_account_key = credentials['storage_account_key']
         sas_token = generate_account_sas(

{brynq_sdk_azure-2.0.2 → brynq_sdk_azure-3.0.0}/brynq_sdk_azure/entra.py

@@ -8,18 +8,20 @@ import json
 import pandas as pd
 from pandas import json_normalize
 from msal import ConfidentialClientApplication
-from typing import Union, List
+from typing import Union, List, Literal, Optional
 import os
 
 class Entra(BrynQ):
 
-    def __init__(self, label: Union[str, List], debug: bool = False):
+    def __init__(self, system_type: Optional[Literal['source', 'target']] = None, debug: bool = False):
         super().__init__()
-        self.headers = self.__get_headers(label=label)
+        self.headers = self.__get_headers(system_type)
         self.endpoint = "https://graph.microsoft.com/v1.0"
+        self.timeout = 3600
 
-    def __get_headers(self, label):
-        credentials = self.get_system_credential(system='azure-entra-token', label=label)
+    def __get_headers(self, system_type):
+        credentials = self.interfaces.credentials.get(system='azure-entra-token', system_type=system_type)
+        credentials = credentials.get('data')
         tenant_id = credentials['tenant_id']
         client_id = credentials['client_id']
         client_secret = credentials['client_secret']
@@ -44,7 +46,7 @@ class Entra(BrynQ):
     def __add_attribute_information(self, payload, custom_attributes):
         # First get the official name of the custom attribute and all the other information
         payload.update({"customSecurityAttributes": {}})
-        metadata = requests.get('https://graph.microsoft.com/v1.0/directory/customSecurityAttributeDefinitions', headers=self.headers).json()
+        metadata = requests.get('https://graph.microsoft.com/v1.0/directory/customSecurityAttributeDefinitions', headers=self.headers, timeout=self.timeout).json()
         # Now loop through the given metadata and add the corresponding metadata and the values itself to the payload
         for attr, value in custom_attributes.items():
             for meta in metadata["value"]:
@@ -106,7 +108,7 @@ class Entra(BrynQ):
         loop = True
         url = f"{endpoint}/groups"
         while loop:
-            response = requests.get(url, headers=self.headers)
+            response = requests.get(url, headers=self.headers, timeout=self.timeout)
             groups = response.json()['value']
             df_temp = pd.json_normalize(groups)
             df = pd.concat([df, df_temp], ignore_index=True)
@@ -126,7 +128,7 @@ class Entra(BrynQ):
         group_url = "https://graph.microsoft.com/v1.0/groups/"
         df = pd.DataFrame()
         while group_url:
-            graph_r = requests.get(group_url, headers=self.headers)
+            graph_r = requests.get(group_url, headers=self.headers, timeout=self.timeout)
             graph_json = graph_r.json()
             groups = graph_json.get('value')
             for group in groups:
@@ -134,7 +136,7 @@ class Entra(BrynQ):
                 # Get users in each group
                 next_url_members = f"https://graph.microsoft.com/v1.0/groups/{group['id']}/members"
                 while next_url_members:
-                    members_r = requests.get(next_url_members, headers=self.headers)
+                    members_r = requests.get(next_url_members, headers=self.headers, timeout=self.timeout)
                     members_json = members_r.json()
                     members = members_json.get('value')
                     df_temp = pd.json_normalize(members)
@@ -167,7 +169,7 @@ class Entra(BrynQ):
             "mailNickname": f"{mail_nickname}",
             "securityEnabled": security_enabled
         }
-        response = requests.post(endpoint, headers=self.headers, json=payload)
+        response = requests.post(endpoint, headers=self.headers, json=payload, timeout=self.timeout)
         return response
 
     def update_group(self, id: int, name: str = '', description: str = '', mail_enabled: bool = False, mail_nickname: str = '', security_enabled: bool = True):
@@ -189,7 +191,7 @@ class Entra(BrynQ):
             "mailNickname": f"{mail_nickname}",
             "securityEnabled": security_enabled
         }
-        response = requests.patch(endpoint, headers=self.headers, json=payload)
+        response = requests.patch(endpoint, headers=self.headers, json=payload, timeout=self.timeout)
         return response
 
     def delete_group(self, group_id):
@@ -199,7 +201,7 @@ class Entra(BrynQ):
         :return: Response of the request
         """
         endpoint = f"https://graph.microsoft.com/v1.0/groups/{group_id}"
-        response = requests.delete(endpoint, headers=self.headers)
+        response = requests.delete(endpoint, headers=self.headers, timeout=self.timeout)
         return response
 
     def get_users(self, extra_fields: list = [], custom_attributes: bool = False, expand: str = '', expand_select: str = '') -> pd.DataFrame:
@@ -224,7 +226,7 @@ class Entra(BrynQ):
 
         df = pd.DataFrame()
         while endpoint:
-            response = requests.get(endpoint, headers=self.headers)
+            response = requests.get(endpoint, headers=self.headers, timeout=self.timeout)
             endpoint = response.json().get('@odata.nextLink')
             data = response.json().get('value')
             df_temp = json_normalize(data, sep='.')
@@ -265,7 +267,7 @@ class Entra(BrynQ):
         # If there are any custom attributes, add them to the payload. But since the endpoint needs extra metadata, we need to do some extra work
         if len(custom_attributes) > 0:
             payload = self.__add_attribute_information(payload, custom_attributes)
-        response = requests.post(endpoint, headers=self.headers, json=payload)
+        response = requests.post(endpoint, headers=self.headers, json=payload, timeout=self.timeout)
         return response
 
     def update_user(self, user_id, fields_to_update: dict = {}, custom_attributes: dict = {}, update_password: bool = False):
@@ -286,7 +288,7 @@ class Entra(BrynQ):
             }})
         if len(custom_attributes) > 0:
             payload = self.__add_attribute_information(payload, custom_attributes)
-        response = requests.patch(endpoint, headers=self.headers, json=payload)
+        response = requests.patch(endpoint, headers=self.headers, json=payload, timeout=self.timeout)
         return response
 
     def delete_user(self, user_id, delete=False):
@@ -297,10 +299,10 @@ class Entra(BrynQ):
         """
         endpoint = f"https://graph.microsoft.com/v1.0/users/{user_id}"
         if delete:
-            response = requests.delete(endpoint, headers=self.headers)
+            response = requests.delete(endpoint, headers=self.headers, timeout=self.timeout)
         else:
             payload = {"accountEnabled": False}
-            response = requests.patch(endpoint, headers=self.headers, data=json.dumps(payload))
+            response = requests.patch(endpoint, headers=self.headers, data=json.dumps(payload), timeout=self.timeout)
         return response
 
     def assign_user_to_group(self, user_id, group_id):
@@ -312,7 +314,7 @@ class Entra(BrynQ):
         """
         url = f"https://graph.microsoft.com/v1.0/groups/{group_id}/members/$ref"
         data = {"@odata.id": f"https://graph.microsoft.com/v1.0/directoryObjects/{user_id}"}
-        response = requests.post(url, headers=self.headers, data=json.dumps(data))
+        response = requests.post(url, headers=self.headers, data=json.dumps(data), timeout=self.timeout)
         return response
 
     def update_manager(self, user_id, manager_id):
@@ -324,7 +326,7 @@ class Entra(BrynQ):
         """
         url = f"https://graph.microsoft.com/v1.0/users/{user_id}/manager/$ref"
         content ={f"@odata.id": f"https://graph.microsoft.com/v1.0/users/{manager_id}"}
-        response = requests.put(url, headers=self.headers, data=json.dumps(content))
+        response = requests.put(url, headers=self.headers, data=json.dumps(content), timeout=self.timeout)
         return response
 
     def remove_user_from_group(self, user_id, group_id):
@@ -335,5 +337,5 @@ class Entra(BrynQ):
         return: response
         """
         url = f"https://graph.microsoft.com/v1.0/groups/{group_id}/members/{user_id}/$ref"
-        response = requests.delete(url, headers=self.headers)
+        response = requests.delete(url, headers=self.headers, timeout=self.timeout)
         return response

{brynq_sdk_azure-2.0.2 → brynq_sdk_azure-3.0.0}/brynq_sdk_azure.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-azure
-Version: 2.0.2
+Version: 3.0.0
 Summary: Azure wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_azure-2.0.2 → brynq_sdk_azure-3.0.0}/brynq_sdk_azure.egg-info/requires.txt

@@ -1,4 +1,4 @@
-brynq-sdk-brynq>=2
+brynq-sdk-brynq<5,>=4
 azure-storage-file-share>=12.6.0
 azure-storage-blob>=12.16.0
 msal==1.22.0

{brynq_sdk_azure-2.0.2 → brynq_sdk_azure-3.0.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_azure',
-    version='2.0.2',
+    version='3.0.0',
     description='Azure wrapper from BrynQ',
     long_description='Azure wrapper from BrynQ',
     author='BrynQ',
@@ -10,7 +10,7 @@ setup(
     packages=find_namespace_packages(include=['brynq_sdk*']),
     license='BrynQ License',
     install_requires=[
-        'brynq-sdk-brynq>=2',
+        'brynq-sdk-brynq>=4,<5',
         'azure-storage-file-share>=12.6.0',
         'azure-storage-blob>=12.16.0',
         'msal==1.22.0'