cwyodmodules 0.3.22__tar.gz → 0.3.24__tar.gz

{cwyodmodules-0.3.22 → cwyodmodules-0.3.24}/PKG-INFO

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

{cwyodmodules-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.24/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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
@@ -59,6 +61,7 @@ class SemanticKernelOrchestrator(OrchestratorBase):
             system_message = self.env_helper.SEMENTIC_KERNEL_SYSTEM_PROMPT
             language = self.env_helper.AZURE_MAIN_CHAT_LANGUAGE
             if not system_message:
+                logger.info("No system message provided, using default")
                 # system_message = """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.
@@ -66,8 +69,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,27 +79,26 @@ 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),
                     plugin_name="OutlookCalendar",
                 )
-                filters.append("ChaOutlookCalendart")
+                filters.append("OutlookCalendar")
             settings = self.llm_helper.get_sk_service_settings(self.chat_service)
             settings.function_call_behavior = FunctionCallBehavior.EnableFunctions(
                 filters={"included_plugins": filters}

{cwyodmodules-0.3.22 → cwyodmodules-0.3.24}/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-0.3.22 → cwyodmodules-0.3.24}/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 → cwyodmodules-0.3.24}/cwyodmodules.egg-info/PKG-INFO

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

{cwyodmodules-0.3.22 → cwyodmodules-0.3.24}/cwyodmodules.egg-info/SOURCES.txt

@@ -38,6 +38,7 @@ cwyodmodules/batch/utilities/helpers/__init__.py
 cwyodmodules/batch/utilities/helpers/azure_blob_storage_client.py
 cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py
 cwyodmodules/batch/utilities/helpers/azure_form_recognizer_helper.py
+cwyodmodules/batch/utilities/helpers/azure_identity_helper.py
 cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py
 cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py
 cwyodmodules/batch/utilities/helpers/azure_search_helper.py

{cwyodmodules-0.3.22 → cwyodmodules-0.3.24}/pyproject.toml

@@ -3,7 +3,7 @@ name = "cwyodmodules"
 authors = [
   { name="Patrik", email="patrikhartl@gmail.com" },
 ]
-version = '0.3.22'
+version = '0.3.24'
 description = "Add your description here"
 readme = "README.md"
 requires-python = "==3.11.11"