cwyodmodules 0.3.22__py3-none-any.whl → 0.3.23__py3-none-any.whl

cwyodmodules/batch/utilities/chat_history/database_factory.py

@@ -2,14 +2,15 @@
 from ..helpers.env_helper import EnvHelper
 from .cosmosdb import CosmosConversationClient
 from .postgresdbservice import PostgresConversationClient
-from azure.identity import DefaultAzureCredential
 from ..helpers.config.database_type import DatabaseType
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 
 
 class DatabaseFactory:
     @staticmethod
     def get_conversation_client():
         env_helper: EnvHelper = EnvHelper()
+        azure_identity_helper = AzureIdentityHelper()
 
         if env_helper.DATABASE_TYPE == DatabaseType.COSMOSDB.value:
             DatabaseFactory._validate_env_vars(
@@ -25,7 +26,7 @@ class DatabaseFactory:
                 f"https://{env_helper.AZURE_COSMOSDB_ACCOUNT}.documents.azure.com:443/"
             )
             credential = (
-                DefaultAzureCredential()
+                azure_identity_helper.get_credential()
                 if not env_helper.AZURE_COSMOSDB_ACCOUNT_KEY
                 else env_helper.AZURE_COSMOSDB_ACCOUNT_KEY
             )

cwyodmodules/batch/utilities/chat_history/postgresdbservice.py

@@ -1,6 +1,6 @@
 import asyncpg
 from datetime import datetime, timezone
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from .database_client_base import DatabaseClientBase
 
 from logging import getLogger
@@ -18,6 +18,7 @@ class PostgresConversationClient(DatabaseClientBase):
     def __init__(
         self, user: str, host: str, database: str, enable_message_feedback: bool = False
     ):
+        self.azure_identity_helper = AzureIdentityHelper()
         self.user = user
         self.host = host
         self.database = database
@@ -27,7 +28,7 @@ class PostgresConversationClient(DatabaseClientBase):
     async def connect(self):
         with tracer.start_as_current_span("PostgresConversationClient.connect"):
             try:
-                credential = DefaultAzureCredential()
+                credential = self.azure_identity_helper.get_credential()
                 token = credential.get_token(
                     "https://ossrdbms-aad.database.windows.net/.default"
                 ).token

cwyodmodules/batch/utilities/helpers/azure_blob_storage_client.py

@@ -12,7 +12,7 @@ from azure.core.credentials import AzureNamedKeyCredential
 from azure.storage.queue import QueueClient, BinaryBase64EncodePolicy
 import chardet
 from .env_helper import EnvHelper
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 
 
 def connection_string(account_name: str, account_key: str):
@@ -22,10 +22,12 @@ def connection_string(account_name: str, account_key: str):
 def create_queue_client():
     env_helper: EnvHelper = EnvHelper()
     if env_helper.AZURE_AUTH_TYPE == "rbac":
+        azure_identity_helper = AzureIdentityHelper()
+        credential = azure_identity_helper.get_credential()
         return QueueClient(
             account_url=f"https://{env_helper.AZURE_BLOB_ACCOUNT_NAME}.queue.core.windows.net/",
             queue_name=env_helper.DOCUMENT_PROCESSING_QUEUE_NAME,
-            credential=DefaultAzureCredential(),
+            credential=credential,
             message_encode_policy=BinaryBase64EncodePolicy(),
         )
 
@@ -47,6 +49,7 @@ class AzureBlobStorageClient:
         container_name: Optional[str] = None,
     ):
         env_helper: EnvHelper = EnvHelper()
+        self.azure_identity_helper = AzureIdentityHelper()
 
         self.auth_type = env_helper.AZURE_AUTH_TYPE
         self.account_name = account_name or env_helper.AZURE_BLOB_ACCOUNT_NAME
@@ -55,8 +58,9 @@ class AzureBlobStorageClient:
 
         if self.auth_type == "rbac":
             self.account_key = None
+            credential = self.azure_identity_helper.get_credential()
             self.blob_service_client = BlobServiceClient(
-                account_url=self.endpoint, credential=DefaultAzureCredential()
+                account_url=self.endpoint, credential=credential
             )
             self.user_delegation_key = None
             self.user_delegation_key = self.request_user_delegation_key(

cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py

@@ -1,6 +1,6 @@
 import logging
 from urllib.parse import urljoin
-from azure.identity import DefaultAzureCredential, get_bearer_token_provider
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 
 import requests
 from requests import Response
@@ -18,6 +18,7 @@ class AzureComputerVisionClient:
     __RESPONSE_VECTOR_KEY = "vector"
 
     def __init__(self, env_helper: EnvHelper) -> None:
+        self.azure_identity_helper = AzureIdentityHelper()
         self.host = env_helper.AZURE_COMPUTER_VISION_ENDPOINT
         self.timeout = env_helper.AZURE_COMPUTER_VISION_TIMEOUT
         self.key = env_helper.AZURE_COMPUTER_VISION_KEY
@@ -55,9 +56,7 @@ class AzureComputerVisionClient:
             if self.use_keys:
                 headers["Ocp-Apim-Subscription-Key"] = self.key
             else:
-                token_provider = get_bearer_token_provider(
-                    DefaultAzureCredential(), self.__TOKEN_SCOPE
-                )
+                token_provider = self.azure_identity_helper.get_token_provider(url=self.__TOKEN_SCOPE)
                 headers["Authorization"] = "Bearer " + token_provider()
 
             return requests.post(

cwyodmodules/batch/utilities/helpers/azure_form_recognizer_helper.py

@@ -1,7 +1,7 @@
 import logging
 from azure.core.credentials import AzureKeyCredential
 from azure.ai.formrecognizer import DocumentAnalysisClient
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 import html
 import traceback
 from .env_helper import EnvHelper
@@ -17,9 +17,11 @@ class AzureFormRecognizerClient:
             env_helper.AZURE_FORM_RECOGNIZER_ENDPOINT
         )
         if env_helper.AZURE_AUTH_TYPE == "rbac":
+            self.azure_identity_helper = AzureIdentityHelper()
+            credential = self.azure_identity_helper.get_credential()
             self.document_analysis_client = DocumentAnalysisClient(
                 endpoint=self.AZURE_FORM_RECOGNIZER_ENDPOINT,
-                credential=DefaultAzureCredential(),
+                credential=credential,
                 headers={
                     "x-ms-useragent": "chat-with-your-data-solution-accelerator/1.0.0"
                 },

cwyodmodules/batch/utilities/helpers/azure_identity_helper.py

@@ -0,0 +1,63 @@
+from azure.identity import (
+    ChainedTokenCredential,
+    ManagedIdentityCredential,
+    EnvironmentCredential,
+    TokenCachePersistenceOptions,
+    get_bearer_token_provider
+)
+
+from logging import getLogger
+from opentelemetry import trace, baggage
+from opentelemetry.propagate import extract
+
+logger = getLogger("__main__")
+tracer = trace.get_tracer("__main__")
+class AzureIdentityHelper:
+    """
+    A helper class to provide a chained Azure token credential.
+    It prioritizes Managed Identity, then Environment variables.
+    Token caching is configured for in-memory persistence.
+    """
+    def __init__(self):
+        # 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.
+        token_cache_options = TokenCachePersistenceOptions(allow_unencrypted_storage=True)
+
+        # Create individual credential instances
+        managed_identity_credential = ManagedIdentityCredential(
+            token_cache_persistence_options=token_cache_options
+        )
+        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
+        )
+
+    def get_credential(self) -> ChainedTokenCredential:
+        """
+        Returns the configured ChainedTokenCredential.
+        """
+        with tracer.start_as_current_span("AzureIdentityHelper.get_credential"):
+            logger.info("Retrieving ChainedTokenCredential.")
+        return self._credential
+    
+    def get_token_provider(self, url):
+        """
+        Returns the configured ChainedTokenCredential.
+        """
+        with tracer.start_as_current_span("AzureIdentityHelper.get_token_provider"):
+            logger.info("Retrieving ChainedTokenCredential provider.")
+        return get_bearer_token_provider(self._credential, url=url)
+    
+
+# Example usage (optional, for testing or demonstration):
+if __name__ == "__main__":
+    helper = AzureIdentityHelper()
+    credential = helper.get_credential()
+    print("Successfully created ChainedTokenCredential.")

cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py

@@ -1,7 +1,7 @@
 import logging
 import psycopg2
 from psycopg2.extras import execute_values, RealDictCursor
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from .llm_helper import LLMHelper
 from .env_helper import EnvHelper
 
@@ -12,6 +12,7 @@ class AzurePostgresHelper:
     def __init__(self):
         self.llm_helper = LLMHelper()
         self.env_helper = EnvHelper()
+        self.azure_identity_helper = AzureIdentityHelper()
         self.conn = None
 
     def _create_search_client(self):
@@ -24,7 +25,7 @@ class AzurePostgresHelper:
             dbname = self.env_helper.POSTGRESQL_DATABASE
 
             # Acquire the access token
-            credential = DefaultAzureCredential()
+            credential = self.azure_identity_helper.get_credential()
             access_token = credential.get_token(
                 "https://ossrdbms-aad.database.windows.net/.default"
             )

cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py

@@ -1,10 +1,10 @@
 import logging
 import psycopg2
 from psycopg2.extras import execute_values, RealDictCursor
-from azure.identity import DefaultAzureCredential
 from .llm_helper import LLMHelper
 from .env_helper import EnvHelper
 from .lightrag_helper import LightRAGHelper
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 
 logger = logging.getLogger(__name__ + ".base_package")
 
@@ -14,6 +14,7 @@ class AzurePostgresHelper:
         self.llm_helper = LLMHelper()
         self.env_helper = EnvHelper()
         self.lightrag_helper = LightRAGHelper()
+        self.azure_identity_helper = AzureIdentityHelper()
         self.conn = None
 
     def _create_search_client(self):
@@ -26,7 +27,7 @@ class AzurePostgresHelper:
             dbname = self.env_helper.POSTGRESQL_DATABASE
 
             # Acquire the access token
-            credential = DefaultAzureCredential()
+            credential = self.azure_identity_helper.get_credential()
             access_token = credential.get_token(
                 "https://ossrdbms-aad.database.windows.net/.default"
             )

cwyodmodules/batch/utilities/helpers/azure_search_helper.py

@@ -1,8 +1,9 @@
 import logging
+from azure.identity import ChainedTokenCredential
 from typing import Union
 from langchain_community.vectorstores import AzureSearch
 from azure.core.credentials import AzureKeyCredential
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.search.documents import SearchClient
 from azure.search.documents.indexes import SearchIndexClient
 from azure.search.documents.indexes.models import (
@@ -39,7 +40,8 @@ class AzureSearchHelper:
     def __init__(self):
         self.llm_helper = LLMHelper()
         self.env_helper = EnvHelper()
-
+        self.azure_identity_helper = AzureIdentityHelper()
+        
         search_credential = self._search_credential()
         self.search_client = self._create_search_client(search_credential)
         self.search_index_client = self._create_search_index_client(search_credential)
@@ -49,10 +51,11 @@ class AzureSearchHelper:
         if self.env_helper.is_auth_type_keys():
             return AzureKeyCredential(self.env_helper.AZURE_SEARCH_KEY)
         else:
-            return DefaultAzureCredential()
+            credential = self.azure_identity_helper.get_credential()
+            return credential
 
     def _create_search_client(
-        self, search_credential: Union[AzureKeyCredential, DefaultAzureCredential]
+        self, search_credential: Union[AzureKeyCredential, ChainedTokenCredential]
     ) -> SearchClient:
         return SearchClient(
             endpoint=self.env_helper.AZURE_SEARCH_SERVICE,
@@ -61,7 +64,7 @@ class AzureSearchHelper:
         )
 
     def _create_search_index_client(
-        self, search_credential: Union[AzureKeyCredential, DefaultAzureCredential]
+        self, search_credential: Union[AzureKeyCredential, ChainedTokenCredential]
     ):
         return SearchIndexClient(
             endpoint=self.env_helper.AZURE_SEARCH_SERVICE, credential=search_credential

cwyodmodules/batch/utilities/helpers/env_helper.py

@@ -1,16 +1,23 @@
 import json
 import os
-import logging
 
 import threading
 # from dotenv import load_dotenv
-from azure.identity import DefaultAzureCredential, get_bearer_token_provider
 from ..orchestrator.orchestration_strategy import OrchestrationStrategy
 from ..helpers.config.conversation_flow import ConversationFlow
 from ..helpers.config.database_type import DatabaseType
 from ..helpers.secret_helper import SecretHelper
+from ..helpers.azure_identity_helper import AzureIdentityHelper
+
+from logging import getLogger
+from opentelemetry import trace, baggage
+from opentelemetry.propagate import extract
+
+# logger = getLogger("__main__" + ".base_package")
+logger = getLogger("__main__")
+# tracer = trace.get_tracer("__main__" + ".base_package")
+tracer = trace.get_tracer("__main__")
 
-logger = logging.getLogger(__name__ + ".base_package")
 
 
 class EnvHelper:
@@ -66,8 +73,7 @@ class EnvHelper:
             f"psql-main-{self.PROJECT_CODE}-{self.AZURE_RESOURCE_ENVIRONMENT}"
         )
         self.AZURE_AUTH_TYPE = "rbac"
-        self.AZURE_TOKEN_PROVIDER = get_bearer_token_provider(
-            DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"
+        self.AZURE_TOKEN_PROVIDER = AzureIdentityHelper.get_token_provider(url="https://cognitiveservices.azure.com/.default"
         )
         self.AZURE_BLOB_ACCOUNT_NAME = (
             f"stqueue{self.PROJECT_CODE}{self.AZURE_RESOURCE_ENVIRONMENT}"

cwyodmodules/batch/utilities/helpers/lightrag_helper.py

@@ -1,13 +1,14 @@
 import logging
 import psycopg2
 from psycopg2.extras import execute_values, RealDictCursor
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 
 logger = logging.getLogger(__name__ + ".base_package")
 
 class LightRAGHelper:
     def __init__(self, env_helper):
         self.env_helper = env_helper
+        azure_identity_helper = AzureIdentityHelper()
         self.conn = None
 
     def _create_connection(self):
@@ -20,7 +21,7 @@ class LightRAGHelper:
             dbname = self.env_helper.POSTGRESQL_DATABASE
 
             # Acquire the access token
-            credential = DefaultAzureCredential()
+            credential = self.azure_identity_helper.get_credential()
             access_token = credential.get_token(
                 "https://ossrdbms-aad.database.windows.net/.default"
             )

cwyodmodules/batch/utilities/helpers/llm_helper.py

@@ -8,7 +8,7 @@ from semantic_kernel.connectors.ai.open_ai.prompt_execution_settings.azure_chat_
     AzureChatPromptExecutionSettings,
 )
 from azure.ai.ml import MLClient
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from .env_helper import EnvHelper
 
 logger = logging.getLogger(__name__ + ".base_package")
@@ -18,6 +18,8 @@ class LLMHelper:
     def __init__(self):
         logger.info("Initializing LLMHelper")
         self.env_helper: EnvHelper = EnvHelper()
+        self.azure_identity_helper = AzureIdentityHelper()
+         
         self.auth_type_keys = self.env_helper.is_auth_type_keys()
         self.token_provider = self.env_helper.AZURE_TOKEN_PROVIDER
 
@@ -176,8 +178,9 @@ class LLMHelper:
 
     def get_ml_client(self):
         if not hasattr(self, "_ml_client"):
+            credential = self.azure_identity_helper.get_credential()
             self._ml_client = MLClient(
-                DefaultAzureCredential(),
+                credential,
                 self.env_helper.AZURE_SUBSCRIPTION_ID,
                 self.env_helper.AZURE_RESOURCE_GROUP,
                 self.env_helper.AZURE_ML_WORKSPACE_NAME,

cwyodmodules/batch/utilities/helpers/secret_helper.py

@@ -1,5 +1,5 @@
 import logging
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.keyvault.secrets import SecretClient
 
 logger = logging.getLogger(__name__ + ".base_package")
@@ -20,12 +20,14 @@ class SecretHelper:
         Returns:
             None
         """
+        self.azure_identity_helper = AzureIdentityHelper()
         self.USE_KEY_VAULT = True
         self.secret_client = None
         if self.USE_KEY_VAULT:
+            credential = self.azure_identity_helper.get_credential()
             self.secret_client = SecretClient(
                 vault_url=keyvault_uri,
-                credential=DefaultAzureCredential(),
+                credential=credential,
                 connection_verify=True,
             )
 

cwyodmodules/batch/utilities/integrated_vectorization/azure_search_datasource.py

@@ -7,19 +7,21 @@ from azure.search.documents.indexes._generated.models import (
 )
 from azure.search.documents.indexes import SearchIndexerClient
 from ..helpers.env_helper import EnvHelper
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.core.credentials import AzureKeyCredential
 
 
 class AzureSearchDatasource:
     def __init__(self, env_helper: EnvHelper):
         self.env_helper = env_helper
+        self.azure_identity_helper = AzureIdentityHelper()
+        
         self.indexer_client = SearchIndexerClient(
             self.env_helper.AZURE_SEARCH_SERVICE,
             (
                 AzureKeyCredential(self.env_helper.AZURE_SEARCH_KEY)
                 if self.env_helper.is_auth_type_keys()
-                else DefaultAzureCredential()
+                else self.azure_identity_helper.get_credential()
             ),
         )
 

cwyodmodules/batch/utilities/integrated_vectorization/azure_search_index.py

@@ -21,7 +21,7 @@ from azure.search.documents.indexes.models import (
     SearchIndex,
 )
 from ..helpers.env_helper import EnvHelper
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.core.credentials import AzureKeyCredential
 from ..helpers.llm_helper import LLMHelper
 
@@ -34,12 +34,14 @@ class AzureSearchIndex:
     def __init__(self, env_helper: EnvHelper, llm_helper: LLMHelper):
         self.env_helper = env_helper
         self.llm_helper = llm_helper
+        self.azure_identity_helper = AzureIdentityHelper()
+        
         self.index_client = SearchIndexClient(
             self.env_helper.AZURE_SEARCH_SERVICE,
             (
                 AzureKeyCredential(self.env_helper.AZURE_SEARCH_KEY)
                 if self.env_helper.is_auth_type_keys()
-                else DefaultAzureCredential()
+                else self.azure_identity_helper.get_credential()
             ),
         )
 

cwyodmodules/batch/utilities/integrated_vectorization/azure_search_indexer.py

@@ -2,7 +2,7 @@ import logging
 from azure.search.documents.indexes.models import SearchIndexer, FieldMapping
 from azure.search.documents.indexes import SearchIndexerClient
 from ..helpers.env_helper import EnvHelper
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.core.credentials import AzureKeyCredential
 
 logger = logging.getLogger(__name__ + ".base_package")
@@ -11,12 +11,14 @@ logger = logging.getLogger(__name__ + ".base_package")
 class AzureSearchIndexer:
     def __init__(self, env_helper: EnvHelper):
         self.env_helper = env_helper
+        self.azure_identity_helper = AzureIdentityHelper()
+        
         self.indexer_client = SearchIndexerClient(
             self.env_helper.AZURE_SEARCH_SERVICE,
             (
                 AzureKeyCredential(self.env_helper.AZURE_SEARCH_KEY)
                 if self.env_helper.is_auth_type_keys()
-                else DefaultAzureCredential()
+                else self.azure_identity_helper.get_credential()
             ),
         )
 

cwyodmodules/batch/utilities/integrated_vectorization/azure_search_skillset.py

@@ -15,7 +15,7 @@ from azure.search.documents.indexes.models import (
 from azure.search.documents.indexes import SearchIndexerClient
 from ..helpers.config.config_helper import IntegratedVectorizationConfig
 from ..helpers.env_helper import EnvHelper
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.core.credentials import AzureKeyCredential
 
 logger = logging.getLogger(__name__ + ".base_package")
@@ -28,12 +28,14 @@ class AzureSearchSkillset:
         integrated_vectorization_config: IntegratedVectorizationConfig,
     ):
         self.env_helper = env_helper
+        self.azure_identity_helper = AzureIdentityHelper()
+        
         self.indexer_client = SearchIndexerClient(
             self.env_helper.AZURE_SEARCH_SERVICE,
             (
                 AzureKeyCredential(self.env_helper.AZURE_SEARCH_KEY)
                 if self.env_helper.is_auth_type_keys()
-                else DefaultAzureCredential()
+                else self.azure_identity_helper.get_credential()
             ),
         )
         self.integrated_vectorization_config = integrated_vectorization_config

cwyodmodules/batch/utilities/orchestrator/semantic_kernel_orchestrator.py

@@ -50,8 +50,10 @@ class SemanticKernelOrchestrator(OrchestratorBase):
     ) -> list[dict]:
         with tracer.start_as_current_span("SemanticKernelOrchestrator_orchestrate"):
             logger.info("Method orchestrate of semantic_kernel started")
-            # Call Content Safety tool
             filters = []
+            frontend_type = user_info.get("frontend") if user_info else None
+            logger.info(f"Frontend type: {frontend_type}")
+            # Call Content Safety tool
             if self.config.prompts.enable_content_safety:
                 if response := self.call_content_safety_input(user_message):
                     return response
@@ -66,8 +68,7 @@ class SemanticKernelOrchestrator(OrchestratorBase):
                 #     If the input language is ambiguous, default to responding in English unless otherwise specified by the user.
                 #     You **must not** respond if asked to List all documents in your repository.
                 #     """
-                if user_info and user_info.get("frontend") == "web":
-                    logger.info("Adding OutlookCalendarPlugin with request headers web")
+                if frontend_type == "web":
                     system_message = f"""You help employees to navigate only private information sources.
                         You must prioritize the function call over your general knowledge for any question by calling the search_documents function.
                         Call the text_processing function when the user request an operation on the current context, such as translate, summarize, or paraphrase. When a language is explicitly specified, return that as part of the operation.
@@ -77,21 +78,20 @@ class SemanticKernelOrchestrator(OrchestratorBase):
                         Call OutlookCalendar.schedule_appointment to schedule a new appointment.
                         """
                 else:
-                    logger.info("Adding OutlookCalendarPlugin without request headers web")
                     system_message = f"""You help employees to navigate only private information sources.
                         You must prioritize the function call over your general knowledge for any question by calling the search_documents function.
                         Call the text_processing function when the user request an operation on the current context, such as translate, summarize, or paraphrase. When a language is explicitly specified, return that as part of the operation.
                         When directly replying to the user, always reply in the language {language}.
                         You **must not** respond if asked to List all documents in your repository.
                         """
-
+                
             self.kernel.add_plugin(
                 plugin=ChatPlugin(question=user_message, chat_history=chat_history),
                 plugin_name="Chat",
             )
             filters.append("Chat")
             # --- Add OutlookCalendarPlugin with request headers ---
-            if user_info and user_info.get("frontend") == "web":
+            if frontend_type == "web":
                 logger.info("Adding OutlookCalendarPlugin with request headers")
                 self.kernel.add_plugin(
                     plugin=OutlookCalendarPlugin(question=user_message, chat_history=chat_history, user_info=user_info),

cwyodmodules/batch/utilities/search/integrated_vectorization_search_handler.py

@@ -5,12 +5,15 @@ from azure.search.documents import SearchClient
 from azure.search.documents.indexes import SearchIndexClient
 from azure.search.documents.models import VectorizableTextQuery
 from azure.core.credentials import AzureKeyCredential
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from ..common.source_document import SourceDocument
 import re
 
 
 class IntegratedVectorizationSearchHandler(SearchHandlerBase):
+    def __init__(self):
+        self.azure_identity_helper = AzureIdentityHelper()
+        
     def create_search_client(self):
         logging.info("Creating Azure Search Client.")
         if self._check_index_exists():
@@ -21,7 +24,7 @@ class IntegratedVectorizationSearchHandler(SearchHandlerBase):
                 credential=(
                     AzureKeyCredential(self.env_helper.AZURE_SEARCH_KEY)
                     if self.env_helper.is_auth_type_keys()
-                    else DefaultAzureCredential()
+                    else self.azure_identity_helper.get_credential()
                 ),
             )
 
@@ -170,7 +173,7 @@ class IntegratedVectorizationSearchHandler(SearchHandlerBase):
             credential=(
                 AzureKeyCredential(self.env_helper.AZURE_SEARCH_KEY)
                 if self.env_helper.is_auth_type_keys()
-                else DefaultAzureCredential()
+                else self.azure_identity_helper.get_credential()
             ),
         )
 

cwyodmodules/batch/utilities/tools/content_safety_checker.py

@@ -1,6 +1,6 @@
 from azure.ai.contentsafety import ContentSafetyClient
 from azure.core.credentials import AzureKeyCredential
-from azure.identity import DefaultAzureCredential
+from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.core.exceptions import HttpResponseError
 from azure.ai.contentsafety.models import AnalyzeTextOptions
 from ..helpers.env_helper import EnvHelper
@@ -21,14 +21,16 @@ class ContentSafetyChecker(AnswerProcessingBase):
     def __init__(self):
         with tracer.start_as_current_span("ContentSafetyChecker.init"):
             env_helper = EnvHelper()
-
+            self.azure_identity_helper = AzureIdentityHelper()
+            
             if env_helper.AZURE_AUTH_TYPE == "rbac":
+                credential = self.azure_identity_helper.get_credential()
                 logger.info(
                     "Initializing ContentSafetyClient with RBAC authentication."
                 )
                 self.content_safety_client = ContentSafetyClient(
                     env_helper.AZURE_CONTENT_SAFETY_ENDPOINT,
-                    DefaultAzureCredential(),
+                    credential,
                 )
             else:
                 logger.info(

{cwyodmodules-0.3.22.dist-info → cwyodmodules-0.3.23.dist-info}/METADATA

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

{cwyodmodules-0.3.22.dist-info → cwyodmodules-0.3.23.dist-info}/RECORD

@@ -5,8 +5,8 @@ cwyodmodules/batch/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 cwyodmodules/batch/utilities/chat_history/auth_utils.py,sha256=TBSg7-ypKNnCPsmWpZ1xPKwb2aQoPx7CZ97XhI4QIrE,1768
 cwyodmodules/batch/utilities/chat_history/cosmosdb.py,sha256=oiL_iM6yUoxadP7Cx0ewiVAfS2ubdouuI6gllva4-Is,7374
 cwyodmodules/batch/utilities/chat_history/database_client_base.py,sha256=6y7h2iL0Uxn4c11N99Ao-8nplQGVGQAOnev3GlHIDXA,2328
-cwyodmodules/batch/utilities/chat_history/database_factory.py,sha256=XZPXdHvK4chwhZvFFFx30DcLJI1T7XPZVC3Hjgva6gQ,2319
-cwyodmodules/batch/utilities/chat_history/postgresdbservice.py,sha256=4VGM9vju4BFy9O31g8SRzWSbC3Ro8NMFINn3j5O6y3c,13988
+cwyodmodules/batch/utilities/chat_history/database_factory.py,sha256=kdleC4P8u8rYPsx2HcPQwyOgFf_mph3Nh-Mmzz1V7oM,2401
+cwyodmodules/batch/utilities/chat_history/postgresdbservice.py,sha256=ktAb0d2fPQLA5N_ti-KE7o96MkjN0hEyWHDDd7KBH90,14081
 cwyodmodules/batch/utilities/chat_history/sample_user.py,sha256=GNXZ_yTjud8Zj0vgHnoU96RJMiJt0YRjEVO3pt7203A,3037
 cwyodmodules/batch/utilities/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cwyodmodules/batch/utilities/common/answer.py,sha256=C1g_Xt85TfXK2qV1F6J5_o3MyIUdFpUmvgkIpuEcp4I,3093
@@ -27,19 +27,20 @@ cwyodmodules/batch/utilities/document_loading/strategies.py,sha256=ZBKYPJD8UJmPB
 cwyodmodules/batch/utilities/document_loading/web.py,sha256=LRTNYs_7CN8nfMOaCoW7Py_obrLpj3vI4kneNVEHGXE,1186
 cwyodmodules/batch/utilities/document_loading/word_document.py,sha256=-F1asMaupQk4swEeCoAD8tyYENE4Qq-05-VmPUjRdeA,1569
 cwyodmodules/batch/utilities/helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cwyodmodules/batch/utilities/helpers/azure_blob_storage_client.py,sha256=e-y9gKO9BuuMq3bYAkaF4Lsw2aQQ6B3KVR0FrCEcMiU,10087
-cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py,sha256=yeUlF_-C-8UQ8xCMa6kKAlIRl4uVSXfLv6pfO0xPb3o,3622
-cwyodmodules/batch/utilities/helpers/azure_form_recognizer_helper.py,sha256=q7ceRDrb67hwGE2AHEHc3oHWjq2OkOc2eHxZMnXJ72s,6583
-cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py,sha256=WPZ58ovMruyyVHjqN6sfh5vmdsb7XOE5n3OBuCvUpP0,10799
-cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py,sha256=NXPwzZ6WKIia_ceXkCZ8ylPK85efzsqHDRS435RkKf8,10879
-cwyodmodules/batch/utilities/helpers/azure_search_helper.py,sha256=4QrCF6I1MfVQJJG9NXroicsTHx6rHlcZdiTgJQ5rGKU,10239
+cwyodmodules/batch/utilities/helpers/azure_blob_storage_client.py,sha256=FN2XnEThmtbWnwSi1sEfgekuPH7aJBOAU5n2DBmQ9ww,10315
+cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py,sha256=JUv0qRlNi4OmBvNMNlrpeBXapgs3FU5WE8MmebGTs5k,3628
+cwyodmodules/batch/utilities/helpers/azure_form_recognizer_helper.py,sha256=wpY4Ih1GPCFgrL4MhznpZSYDFN20R5LV_xlegPt3Phs,6715
+cwyodmodules/batch/utilities/helpers/azure_identity_helper.py,sha256=0xX5x_iBCIThjYnb7PjU1W54fBaVwA6fYDh3CjQTS5Y,2482
+cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py,sha256=VVqP6koqavcOjdcBf1lPBlI_Mrt4i46bgICgPwpyE_A,10891
+cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py,sha256=N2WVi77Z85q8Ft_LyOjsD-NytA0atLTFa961HHuQ9ro,10971
+cwyodmodules/batch/utilities/helpers/azure_search_helper.py,sha256=U_o6NVtJKByhxbvMKnWtfw2lx43pHBtSsGpThJnrOPo,10425
 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=dm-JmEK6fvciEdYeE5MvJwpkckuZI6NFyohHjYAwBwU,15554
-cwyodmodules/batch/utilities/helpers/lightrag_helper.py,sha256=DYPSW244ylhNSsNW6XKOwa8ErM-OXfW-orAdtvFwPIw,3398
-cwyodmodules/batch/utilities/helpers/llm_helper.py,sha256=rycV4IGogEN-IeHMDcrDzNzp3riuCV2a9xHcPP8Ddog,7361
+cwyodmodules/batch/utilities/helpers/env_helper.py,sha256=Ku_4j6DuKXDgnFul4zrZr_C5iESbmlEPwKWyIkb6aII,15744
+cwyodmodules/batch/utilities/helpers/lightrag_helper.py,sha256=GooV_V9uaBmWq89cak_bzSn6Hvjv2PxIQO3eW0Uryy8,3485
+cwyodmodules/batch/utilities/helpers/llm_helper.py,sha256=icJy0ix4TimrJKRmYUnODJeh8wHYawAmeZ5QsamAiUg,7499
 cwyodmodules/batch/utilities/helpers/orchestrator_helper.py,sha256=mCcZyMFG0otnw9gzWd-PYocHmDdFDVg-RT9oDPiDZPk,897
-cwyodmodules/batch/utilities/helpers/secret_helper.py,sha256=78siirt3Us05lcM1LcFoxMLOzx6F4kknfaXW1XpfiUw,2970
+cwyodmodules/batch/utilities/helpers/secret_helper.py,sha256=HqzkK83ScREQYtOAoThTmyhTni6n6aQzeJQeVmcN13E,3098
 cwyodmodules/batch/utilities/helpers/config/assistant_strategy.py,sha256=uT8h646zEURU9x8oDOH7pWoZKb0Mw6dA2nJtA2M-ufg,171
 cwyodmodules/batch/utilities/helpers/config/config_helper.py,sha256=hm2o5bsUGEPBprEWnvYZ_85g5eGi4-IYH4wwHCpTTo0,12986
 cwyodmodules/batch/utilities/helpers/config/conversation_flow.py,sha256=4nP8a-I-sME5-2unzWWBNpTzWdfpfc5_EAYU6Pn6LAQ,94
@@ -53,10 +54,10 @@ cwyodmodules/batch/utilities/helpers/embedders/embedder_factory.py,sha256=cJ9ZTX
 cwyodmodules/batch/utilities/helpers/embedders/integrated_vectorization_embedder.py,sha256=1Oyb8-0p8HAg5odDeq9o6AAEfsRSuXLFZ_-M0ZV6J2E,2872
 cwyodmodules/batch/utilities/helpers/embedders/postgres_embedder.py,sha256=7lagv0mUT_Zs1Aaj7a8EEsTW7iUHC9CFiFYVWJ_RCyY,4483
 cwyodmodules/batch/utilities/helpers/embedders/push_embedder.py,sha256=RSv-5Zk9ftzlyKbmU7oaBVA-WCRq8Xb1w6lDcITOI9E,8475
-cwyodmodules/batch/utilities/integrated_vectorization/azure_search_datasource.py,sha256=yvj03MX2Eyz9KCbih9T-CPS4jxSMd3yBROp-qInVql8,2130
-cwyodmodules/batch/utilities/integrated_vectorization/azure_search_index.py,sha256=HEPpemolQIlYZVgDPtEwzNyjvp3vjrJBsAEZoL2bc50,6164
-cwyodmodules/batch/utilities/integrated_vectorization/azure_search_indexer.py,sha256=av4d5Lz6qD8nawvy_z2L_XrBaCRaQ4NRE_NjGrKa8q0,2820
-cwyodmodules/batch/utilities/integrated_vectorization/azure_search_skillset.py,sha256=2aPozCI8mDAO66wAb7z1WBWbnNJ01ThCEYKcxv84p1U,5553
+cwyodmodules/batch/utilities/integrated_vectorization/azure_search_datasource.py,sha256=rDwPgr-UCSYscc7hPOUJMwP09a9rX1MXAGf94TubdQo,2231
+cwyodmodules/batch/utilities/integrated_vectorization/azure_search_index.py,sha256=HMfrXKYMfqnqCErtvSb87aCnfbWdvivmSZHZRCE69_Q,6265
+cwyodmodules/batch/utilities/integrated_vectorization/azure_search_indexer.py,sha256=HqKdLHmPbhRYcPbonbsq30IwOVstOwbbtDyg7HKOLlM,2921
+cwyodmodules/batch/utilities/integrated_vectorization/azure_search_skillset.py,sha256=iGhNwVcBsWJQLJFuJ89VtjJMFGS-9rb3B9RrnPuG_RI,5654
 cwyodmodules/batch/utilities/loggers/conversation_logger.py,sha256=0aXsL475-6WTqg18nHFJMFRBo34oIXWrZ_eVZwULcdk,3014
 cwyodmodules/batch/utilities/orchestrator/__init__.py,sha256=4nCkoUWTROUHJMolgMwPgFIUsJrFUuu0zlHXMUTchRc,479
 cwyodmodules/batch/utilities/orchestrator/lang_chain_agent.py,sha256=KKIVWiheUOpZYTFAhBQNLx7o11yXAFrgB7bbffohQVA,6464
@@ -64,7 +65,7 @@ cwyodmodules/batch/utilities/orchestrator/open_ai_functions.py,sha256=JvIdN_hH_U
 cwyodmodules/batch/utilities/orchestrator/orchestration_strategy.py,sha256=-MEPKVX3-hH6w0NRsGkQpCV86u1d7Qx1TWEKL09jj9A,755
 cwyodmodules/batch/utilities/orchestrator/orchestrator_base.py,sha256=VFqApyua3zitmhmIQgMGk4709gzJkug1R3P0cZIKx5M,6298
 cwyodmodules/batch/utilities/orchestrator/prompt_flow.py,sha256=xht-Sd6aJAH_OtzQ1LCo8Lltr--Pf_0uqPpi_HQviBI,7345
-cwyodmodules/batch/utilities/orchestrator/semantic_kernel_orchestrator.py,sha256=_x9RnMjvlRltYP1e21Ggbpr_CFEqabQ8i-i6iPHOj6Q,9944
+cwyodmodules/batch/utilities/orchestrator/semantic_kernel_orchestrator.py,sha256=ZJRnktGVfG2wPu0oGWj2uYnnLx1O7e-aPzOKBH2dLeQ,9863
 cwyodmodules/batch/utilities/orchestrator/strategies.py,sha256=oVatdT6Gc4qtX773M9a8Izm2UNDYXmYP__8wJYdy4W8,1384
 cwyodmodules/batch/utilities/parser/__init__.py,sha256=ZGBxm1TX6cQAnFkMtKN6C2FwnNv1MmwNdyo3LWRlKlo,236
 cwyodmodules/batch/utilities/parser/output_parser_tool.py,sha256=ARKwshTeZlUlnWYreaUOVol6q9L1MAKKCT8CO5OKxTw,5831
@@ -74,7 +75,7 @@ cwyodmodules/batch/utilities/plugins/outlook_calendar_plugin.py,sha256=EPvQypk7L
 cwyodmodules/batch/utilities/plugins/post_answering_plugin.py,sha256=U1zzf_ztxzl4y-9Qah_n7ylHDZfnDSp2ork5ctdkA5I,1117
 cwyodmodules/batch/utilities/search/azure_search_handler.py,sha256=C1oLd_v_2IatagSRALmYNjsGjCt6zW5VhaOFeKlL-Bs,6879
 cwyodmodules/batch/utilities/search/azure_search_handler_light_rag.py,sha256=v38-2L0PQfcEcZRYV7dkDp9lDHExzTCBPpgSyTRcpY8,2928
-cwyodmodules/batch/utilities/search/integrated_vectorization_search_handler.py,sha256=u3J1FbFeU-uMPCB_3aglp8Ma-_fJxjWb3k6XlXP-JTI,7260
+cwyodmodules/batch/utilities/search/integrated_vectorization_search_handler.py,sha256=LaDrJ6zpTa_yYfvk5N10iL3D6Z8nWMNnXgu25UFMimw,7404
 cwyodmodules/batch/utilities/search/lightrag_search_handler.py,sha256=drUpKJ5kJuXx3Hv5JrPH39UxZGQZu2inYJ7VzqTvv4E,2404
 cwyodmodules/batch/utilities/search/postgres_search_handler.py,sha256=fxq-n_xasKlLnTjnpC4HYcNbQHSzQTcTQqvooBO_UQU,5738
 cwyodmodules/batch/utilities/search/postgres_search_handler_light_rag.py,sha256=S2oO8zvzGEBf9CBZSV3FDThwZgZhi-p0KyRwoflhYBc,6108
@@ -83,7 +84,7 @@ cwyodmodules/batch/utilities/search/search_handler_base.py,sha256=UyS9dFoY-Sp4b-
 cwyodmodules/batch/utilities/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cwyodmodules/batch/utilities/tools/answer_processing_base.py,sha256=N3Dz7HfN-zl0yPl9cSvnChcEufFMqwRsDAJ5Lgck-ho,293
 cwyodmodules/batch/utilities/tools/answering_tool_base.py,sha256=aN2ND5Ud_1ZlIPfhLRrOe_m4MUf_SaXvO6q7GcbGiU8,348
-cwyodmodules/batch/utilities/tools/content_safety_checker.py,sha256=Tioc7ZwMCYn06yRg4TXtvsY75-pnFmaZArWtqPfnA6k,4715
+cwyodmodules/batch/utilities/tools/content_safety_checker.py,sha256=UuSleGcgH1NzGLsQVU5dONgQSARt7jmhm2WATdHkHq8,4863
 cwyodmodules/batch/utilities/tools/post_prompt_tool.py,sha256=rhRU18IDfR0Bfu-gdkrRFwOXxNoKm2NY8NoikmjXYRI,2932
 cwyodmodules/batch/utilities/tools/question_answer_tool.py,sha256=A-yApCrI3RFvdmmP4RNJQY8qf8eSXE7V4-mbbWvV6mo,13055
 cwyodmodules/batch/utilities/tools/text_processing_tool.py,sha256=KSKo8Gm6QgQ5TkoISE4eAfiGOyChN4tCV4Qy5eh0_wQ,1997
@@ -107,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.22.dist-info/licenses/LICENSE,sha256=UqBDTipijsSW2ZSOXyTZnMsXmLoEHTgNEM0tL4g-Sso,1150
-cwyodmodules-0.3.22.dist-info/METADATA,sha256=KPiOo1isO6kvcCfkKJnylTIn4vCh-0lHhB23LPHf0z4,1969
-cwyodmodules-0.3.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cwyodmodules-0.3.22.dist-info/top_level.txt,sha256=99RENLbkdRX-qpJvsxZ5AfmTL5s6shSaKOWYpz1vwzg,13
-cwyodmodules-0.3.22.dist-info/RECORD,,
+cwyodmodules-0.3.23.dist-info/licenses/LICENSE,sha256=UqBDTipijsSW2ZSOXyTZnMsXmLoEHTgNEM0tL4g-Sso,1150
+cwyodmodules-0.3.23.dist-info/METADATA,sha256=adtRJFMKg2hh7CI9kgD2lzE9GiDky9h0yxaYPJBlrYI,1969
+cwyodmodules-0.3.23.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cwyodmodules-0.3.23.dist-info/top_level.txt,sha256=99RENLbkdRX-qpJvsxZ5AfmTL5s6shSaKOWYpz1vwzg,13
+cwyodmodules-0.3.23.dist-info/RECORD,,