cwyodmodules 0.3.28__py3-none-any.whl → 0.3.30__py3-none-any.whl

cwyodmodules/batch/utilities/helpers/azure_identity_helper.py

@@ -1,9 +1,11 @@
+import os
 from azure.identity import (
     ChainedTokenCredential,
     ManagedIdentityCredential,
     EnvironmentCredential,
     TokenCachePersistenceOptions,
-    get_bearer_token_provider
+    get_bearer_token_provider,
+    DefaultAzureCredential
 )
 
 from logging import getLogger
@@ -22,6 +24,8 @@ class AzureIdentityHelper:
         # Configure in-memory token cache persistence
         # For in-memory, unencrypted storage is typically allowed for simplicity during development.
         # In production, especially with shared environments, consider the security implications.
+        client_secret_available =  os.getenv("AZURE_CLIENT_SECRET") is not None
+        
         token_cache_options = TokenCachePersistenceOptions(allow_unencrypted_storage=True)
 
         # Create individual credential instances
@@ -31,15 +35,28 @@ class AzureIdentityHelper:
         environment_credential = EnvironmentCredential(
             token_cache_persistence_options=token_cache_options
         )
+        
 
         # Create a chain of credentials
         # The chain will try credentials in the order they are provided.
-        self._credential = ChainedTokenCredential(
-            managed_identity_credential,
-            environment_credential
-        )
+        if client_secret_available:
+            logger.info("Using Environment Credential first with token cache persistence.")
+            self._credential = ChainedTokenCredential(
+                environment_credential,
+                managed_identity_credential
+            )
+        else:
+            logger.info("Using Managed Identity Credential first with token cache persistence.")
+            # self._credential = ChainedTokenCredential(
+
+            #     managed_identity_credential,
+            #     environment_credential
+            # )
+            self._credential = DefaultAzureCredential(
+                token_cache_persistence_options=token_cache_options
+            )
 
-    def get_credential(self) -> ChainedTokenCredential:
+    def get_credential(self):
         """
         Returns the configured ChainedTokenCredential.
         """

cwyodmodules/batch/utilities/helpers/azure_search_helper.py

@@ -1,5 +1,5 @@
 import logging
-from azure.identity import ChainedTokenCredential
+from azure.identity import ChainedTokenCredential, DefaultAzureCredential
 from typing import Union
 from langchain_community.vectorstores import AzureSearch
 from azure.core.credentials import AzureKeyCredential
@@ -55,7 +55,7 @@ class AzureSearchHelper:
             return credential
 
     def _create_search_client(
-        self, search_credential: Union[AzureKeyCredential, ChainedTokenCredential]
+        self, search_credential: Union[AzureKeyCredential, ChainedTokenCredential, DefaultAzureCredential]
     ) -> SearchClient:
         return SearchClient(
             endpoint=self.env_helper.AZURE_SEARCH_SERVICE,
@@ -64,7 +64,7 @@ class AzureSearchHelper:
         )
 
     def _create_search_index_client(
-        self, search_credential: Union[AzureKeyCredential, ChainedTokenCredential]
+        self, search_credential: Union[AzureKeyCredential, ChainedTokenCredential, DefaultAzureCredential]
     ):
         return SearchIndexClient(
             endpoint=self.env_helper.AZURE_SEARCH_SERVICE, credential=search_credential

{cwyodmodules-0.3.28.dist-info → cwyodmodules-0.3.30.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cwyodmodules
-Version: 0.3.28
+Version: 0.3.30
 Summary: Add your description here
 Author-email: Patrik <patrikhartl@gmail.com>
 Classifier: Operating System :: OS Independent

{cwyodmodules-0.3.28.dist-info → cwyodmodules-0.3.30.dist-info}/RECORD

@@ -30,10 +30,10 @@ cwyodmodules/batch/utilities/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 cwyodmodules/batch/utilities/helpers/azure_blob_storage_client.py,sha256=FN2XnEThmtbWnwSi1sEfgekuPH7aJBOAU5n2DBmQ9ww,10315
 cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py,sha256=5qhxriTEaKkRc8K4E9oKQjCOzV_JSkad37z1FskCpOg,3661
 cwyodmodules/batch/utilities/helpers/azure_form_recognizer_helper.py,sha256=kN9pjanKj_IsGM0XQA8QwICuLaB0yBdtRMINmhSD_mU,6699
-cwyodmodules/batch/utilities/helpers/azure_identity_helper.py,sha256=IN8BLSXybByi85ZU1F2T-nTTLyxcnS3lN_DplpzC24A,2583
+cwyodmodules/batch/utilities/helpers/azure_identity_helper.py,sha256=lq10tDgH4kMKnmj5cAUj97-P_RIdav-Mbac93WZVE8U,3264
 cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py,sha256=RV2jcqFuTofbz1gk8CDYdECPgl_ypH3K84Yeu3kjU7o,10823
 cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py,sha256=DLgJ7KNK71qSUlRHTWgRgp6-4ufnC8frL_pOWE-oKgM,10915
-cwyodmodules/batch/utilities/helpers/azure_search_helper.py,sha256=vZk4u8uegDnBI_zgixtQgb8PWpptIA3zlOzNsvkvGfE,10401
+cwyodmodules/batch/utilities/helpers/azure_search_helper.py,sha256=GniJ8JhRTBdzI1kN0yHtyR8ocZBav5C635uFfD1eHrc,10473
 cwyodmodules/batch/utilities/helpers/document_chunking_helper.py,sha256=2MZOjW-fHXgYijP3m9O-nizOlk96Yg0axyxT0K6fTnM,725
 cwyodmodules/batch/utilities/helpers/document_loading_helper.py,sha256=2HBEl3vW-_PKbX5pPntTC_R5eToTk2Qb-q3M4Mt6hCU,603
 cwyodmodules/batch/utilities/helpers/env_helper.py,sha256=l0kRDKEzYcPyKm6USVRKDtk-NXHrr7hbq8CxWlPvfm0,15893
@@ -108,8 +108,8 @@ cwyodmodules/graphrag/query/generate.py,sha256=xBnZs2U9xFWtPk4AfAZgYKbHdcxNcIO6Q
 cwyodmodules/graphrag/query/graph_search.py,sha256=95h3ecSWx4864XgKABtG0fh3Nk8HkqJVzoCrO8daJ-Y,7724
 cwyodmodules/graphrag/query/types.py,sha256=1Iq1dp4I4a56_cuFjOZ0NTgd0A2_MpVFznp_czgt6cI,617
 cwyodmodules/graphrag/query/vector_search.py,sha256=9Gwu9LPjtoAYUU8WKqCvbCHAIg3dpk71reoYd1scLnQ,1807
-cwyodmodules-0.3.28.dist-info/licenses/LICENSE,sha256=UqBDTipijsSW2ZSOXyTZnMsXmLoEHTgNEM0tL4g-Sso,1150
-cwyodmodules-0.3.28.dist-info/METADATA,sha256=2UOwmOhMeIJ-8rsAjWyAfAtmkFZDX5FB1rByafDA04w,1969
-cwyodmodules-0.3.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cwyodmodules-0.3.28.dist-info/top_level.txt,sha256=99RENLbkdRX-qpJvsxZ5AfmTL5s6shSaKOWYpz1vwzg,13
-cwyodmodules-0.3.28.dist-info/RECORD,,
+cwyodmodules-0.3.30.dist-info/licenses/LICENSE,sha256=UqBDTipijsSW2ZSOXyTZnMsXmLoEHTgNEM0tL4g-Sso,1150
+cwyodmodules-0.3.30.dist-info/METADATA,sha256=3dkF8so-qsIVsLXqNoG4lrUMJP8Q3OsHoIbYef58F5k,1969
+cwyodmodules-0.3.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cwyodmodules-0.3.30.dist-info/top_level.txt,sha256=99RENLbkdRX-qpJvsxZ5AfmTL5s6shSaKOWYpz1vwzg,13
+cwyodmodules-0.3.30.dist-info/RECORD,,