brynq-sdk-azure 2.0.3__tar.gz → 3.0.1__tar.gz

{brynq_sdk_azure-2.0.3 → brynq_sdk_azure-3.0.1}/PKG-INFO

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

{brynq_sdk_azure-2.0.3 → brynq_sdk_azure-3.0.1}/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.3 → brynq_sdk_azure-3.0.1}/brynq_sdk_azure/entra.py

@@ -8,35 +8,40 @@ 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)
-        tenant_id = credentials['tenant_id']
-        client_id = credentials['client_id']
-        client_secret = credentials['client_secret']
-        authority = f"https://login.microsoftonline.com/{tenant_id}"
+    def __get_headers(self, system_type):
+        credentials = self.interfaces.credentials.get(system='azure-entra-o-auth-2', system_type=system_type)
+        credentials = credentials.get('data')
+        if credentials.get("type") == 'custom':
+            tenant_id = credentials['tenant_id']
+            client_id = credentials['client_id']
+            client_secret = credentials['client_secret']
+            authority = f"https://login.microsoftonline.com/{tenant_id}"
+            # Create a ConfidentialClientApplication for authentication
+            app = ConfidentialClientApplication(
+                client_id,
+                authority=authority,
+                client_credential=client_secret,
+            )
 
-        # Create a ConfidentialClientApplication for authentication
-        app = ConfidentialClientApplication(
-            client_id,
-            authority=authority,
-            client_credential=client_secret,
-        )
+            # Get an access token for the Graph API
+            result = app.acquire_token_for_client(scopes=["https://graph.microsoft.com/.default"])
+            access_token = result.get('access_token')
+        elif credentials.get("type") == 'oauth2':
+            access_token = credentials.get('access_token')
 
-        # Get an access token for the Graph API
-        result = app.acquire_token_for_client(scopes=["https://graph.microsoft.com/.default"])
         headers = {
-            'Authorization': f"Bearer {result['access_token']}",
+            'Authorization': f"Bearer {access_token}",
             'Content-Type': 'application/json'
         }
 

{brynq_sdk_azure-2.0.3 → brynq_sdk_azure-3.0.1}/brynq_sdk_azure.egg-info/PKG-INFO

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

{brynq_sdk_azure-2.0.3 → brynq_sdk_azure-3.0.1}/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.3 → brynq_sdk_azure-3.0.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_azure',
-    version='2.0.3',
+    version='3.0.1',
     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'