cwyodmodules 0.3.27__tar.gz → 0.3.29__tar.gz

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/PKG-INFO

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

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/api/chat_history.py

@@ -14,7 +14,7 @@ from ..batch.utilities.chat_history.database_factory import DatabaseFactory
 
 # load_dotenv()
 bp_chat_history_response = Blueprint("chat_history", __name__)
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 logger.setLevel(level=os.environ.get("LOGLEVEL", "INFO").upper())
 
 env_helper: EnvHelper = EnvHelper()

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/chat_history/auth_utils.py

@@ -27,7 +27,7 @@ def get_authenticated_user_details(request_headers):
 
 
 def get_tenantid(client_principal_b64):
-    logger = logging.getLogger(__name__ + ".base_package")
+    logger = logging.getLogger("__main__")
     tenant_id = ""
     if client_principal_b64:
         try:

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py

@@ -7,7 +7,7 @@ from requests import Response
 
 from .env_helper import EnvHelper
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class AzureComputerVisionClient:
@@ -56,7 +56,9 @@ class AzureComputerVisionClient:
             if self.use_keys:
                 headers["Ocp-Apim-Subscription-Key"] = self.key
             else:
-                access_information = self.azure_identity_helper.get_token_provider(scopes=self.__TOKEN_SCOPE)
+                access_information = self.azure_identity_helper.get_token_provider(
+                    scopes=self.__TOKEN_SCOPE
+                )
                 headers["Authorization"] = "Bearer " + access_information()
 
             return requests.post(

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/azure_form_recognizer_helper.py

@@ -6,7 +6,7 @@ import html
 import traceback
 from .env_helper import EnvHelper
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class AzureFormRecognizerClient:

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/azure_identity_helper.py

@@ -1,3 +1,4 @@
+import os
 from azure.identity import (
     ChainedTokenCredential,
     ManagedIdentityCredential,
@@ -22,6 +23,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
@@ -34,10 +37,18 @@ class AzureIdentityHelper:
 
         # 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
+            )
 
     def get_credential(self) -> ChainedTokenCredential:
         """
@@ -62,10 +73,3 @@ class AzureIdentityHelper:
         with tracer.start_as_current_span("AzureIdentityHelper.get_token_provider"):
             logger.info("Retrieving ChainedTokenCredential provider.")
         return get_bearer_token_provider(self._credential, scopes)
-    
-
-# Example usage (optional, for testing or demonstration):
-if __name__ == "__main__":
-    helper = AzureIdentityHelper()
-    credential = helper.get_credential()
-    print("Successfully created ChainedTokenCredential.")

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py

@@ -5,7 +5,7 @@ from ..helpers.azure_identity_helper import AzureIdentityHelper
 from .llm_helper import LLMHelper
 from .env_helper import EnvHelper
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class AzurePostgresHelper:
@@ -25,12 +25,12 @@ class AzurePostgresHelper:
             dbname = self.env_helper.POSTGRESQL_DATABASE
 
             # Acquire the access token
-            access_information = self.azure_identity_helper.get_token(scopes="https://ossrdbms-aad.database.windows.net/.default")
+            access_information = self.azure_identity_helper.get_token(
+                scopes="https://ossrdbms-aad.database.windows.net/.default"
+            )
             token = access_information.token
             # Use the token in the connection string
-            conn_string = (
-                f"host={host} user={user} dbname={dbname} password={token}"
-            )
+            conn_string = f"host={host} user={user} dbname={dbname} password={token}"
             keepalive_kwargs = {
                 "keepalives": 1,
                 "keepalives_idle": 30,
@@ -277,7 +277,7 @@ class AzurePostgresHelper:
             raise
         finally:
             conn.close()
-            
+
     def store_with_lightrag(self, documents_to_upload):
         """
         Stores documents using LightRAG for enhanced vector and text storage capabilities.
@@ -290,4 +290,4 @@ class AzurePostgresHelper:
             logger.error(f"Error storing documents with LightRAG: {e}")
             raise
         finally:
-            conn.close()
+            conn.close()

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py

@@ -6,7 +6,7 @@ from .env_helper import EnvHelper
 from .lightrag_helper import LightRAGHelper
 from ..helpers.azure_identity_helper import AzureIdentityHelper
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class AzurePostgresHelper:
@@ -27,12 +27,12 @@ class AzurePostgresHelper:
             dbname = self.env_helper.POSTGRESQL_DATABASE
 
             # Acquire the access token
-            access_information = self.azure_identity_helper.get_token(scopes="https://ossrdbms-aad.database.windows.net/.default")
+            access_information = self.azure_identity_helper.get_token(
+                scopes="https://ossrdbms-aad.database.windows.net/.default"
+            )
             token = access_information.token
             # Use the token in the connection string
-            conn_string = (
-                f"host={host} user={user} dbname={dbname} password={token}"
-            )
+            conn_string = f"host={host} user={user} dbname={dbname} password={token}"
             keepalive_kwargs = {
                 "keepalives": 1,
                 "keepalives_idle": 30,
@@ -292,4 +292,4 @@ class AzurePostgresHelper:
             logger.error(f"Error storing documents with LightRAG: {e}")
             raise
         finally:
-            conn.close()
+            conn.close()

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/azure_search_helper.py

@@ -30,7 +30,7 @@ from ..helpers.azure_computer_vision_client import AzureComputerVisionClient
 from .llm_helper import LLMHelper
 from .env_helper import EnvHelper
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class AzureSearchHelper:
@@ -41,7 +41,7 @@ class AzureSearchHelper:
         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)

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/config/config_helper.py

@@ -18,7 +18,7 @@ from .database_type import DatabaseType
 CONFIG_CONTAINER_NAME = "config"
 CONFIG_FILE_NAME = "active.json"
 ADVANCED_IMAGE_PROCESSING_FILE_TYPES = ["jpeg", "jpg", "png", "tiff", "bmp"]
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class Config:

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/embedders/integrated_vectorization_embedder.py

@@ -8,7 +8,7 @@ from ...integrated_vectorization.azure_search_skillset import AzureSearchSkillse
 from ..config.config_helper import ConfigHelper
 import logging
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class IntegratedVectorizationEmbedder(EmbedderBase):

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/embedders/postgres_embedder.py

@@ -15,7 +15,7 @@ from ..document_loading_helper import DocumentLoading
 from ..document_chunking_helper import DocumentChunking
 from ...common.source_document import SourceDocument
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class PostgresEmbedder(EmbedderBase):

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/embedders/push_embedder.py

@@ -19,7 +19,7 @@ from ..document_loading_helper import DocumentLoading
 from ..document_chunking_helper import DocumentChunking
 from ...common.source_document import SourceDocument
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class PushEmbedder(EmbedderBase):

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/lightrag_helper.py

@@ -3,7 +3,8 @@ import psycopg2
 from psycopg2.extras import execute_values, RealDictCursor
 from ..helpers.azure_identity_helper import AzureIdentityHelper
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
+
 
 class LightRAGHelper:
     def __init__(self, env_helper):
@@ -21,12 +22,12 @@ class LightRAGHelper:
             dbname = self.env_helper.POSTGRESQL_DATABASE
 
             # Acquire the access token
-            access_information = self.azure_identity_helper.get_token(scopes="https://ossrdbms-aad.database.windows.net/.default")
-            token = access_information.token    
-            # Use the token in the connection string
-            conn_string = (
-                f"host={host} user={user} dbname={dbname} password={token}"
+            access_information = self.azure_identity_helper.get_token(
+                scopes="https://ossrdbms-aad.database.windows.net/.default"
             )
+            token = access_information.token
+            # Use the token in the connection string
+            conn_string = f"host={host} user={user} dbname={dbname} password={token}"
             keepalive_kwargs = {
                 "keepalives": 1,
                 "keepalives_idle": 30,
@@ -83,7 +84,7 @@ class LightRAGHelper:
                     ORDER BY vector <=> %s::vector
                     LIMIT %s
                     """,
-                    (query_vector, top_k)
+                    (query_vector, top_k),
                 )
                 results = cur.fetchall()
                 logger.info(f"Retrieved {len(results)} vectors.")
@@ -92,4 +93,4 @@ class LightRAGHelper:
             logger.error(f"Error retrieving vectors: {e}")
             raise
         finally:
-            conn.close()
+            conn.close()

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/llm_helper.py

@@ -11,7 +11,7 @@ from azure.ai.ml import MLClient
 from ..helpers.azure_identity_helper import AzureIdentityHelper
 from .env_helper import EnvHelper
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class LLMHelper:
@@ -19,7 +19,7 @@ class LLMHelper:
         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
 

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/helpers/secret_helper.py

@@ -2,7 +2,7 @@ import logging
 from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.keyvault.secrets import SecretClient
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class SecretHelper:

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/integrated_vectorization/azure_search_index.py

@@ -25,7 +25,7 @@ from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.core.credentials import AzureKeyCredential
 from ..helpers.llm_helper import LLMHelper
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class AzureSearchIndex:
@@ -35,7 +35,7 @@ class AzureSearchIndex:
         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,
             (

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/integrated_vectorization/azure_search_indexer.py

@@ -5,14 +5,14 @@ from ..helpers.env_helper import EnvHelper
 from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.core.credentials import AzureKeyCredential
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 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,
             (

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/integrated_vectorization/azure_search_skillset.py

@@ -18,7 +18,7 @@ from ..helpers.env_helper import EnvHelper
 from ..helpers.azure_identity_helper import AzureIdentityHelper
 from azure.core.credentials import AzureKeyCredential
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class AzureSearchSkillset:
@@ -29,7 +29,7 @@ class AzureSearchSkillset:
     ):
         self.env_helper = env_helper
         self.azure_identity_helper = AzureIdentityHelper()
-        
+
         self.indexer_client = SearchIndexerClient(
             self.env_helper.AZURE_SEARCH_SERVICE,
             (

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/orchestrator/lang_chain_agent.py

@@ -13,7 +13,7 @@ from ..tools.question_answer_tool import QuestionAnswerTool
 from ..tools.text_processing_tool import TextProcessingTool
 from ..common.answer import Answer
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class LangChainAgent(OrchestratorBase):

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/orchestrator/open_ai_functions.py

@@ -10,7 +10,7 @@ from ..tools.question_answer_tool import QuestionAnswerTool
 from ..tools.text_processing_tool import TextProcessingTool
 from ..common.answer import Answer
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class OpenAIFunctionsOrchestrator(OrchestratorBase):

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/orchestrator/orchestrator_base.py

@@ -7,7 +7,7 @@ from ..helpers.config.config_helper import ConfigHelper
 from ..parser.output_parser_tool import OutputParserTool
 from ..tools.content_safety_checker import ContentSafetyChecker
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class OrchestratorBase(ABC):
@@ -46,7 +46,11 @@ class OrchestratorBase(ABC):
 
     @abstractmethod
     async def orchestrate(
-        self, user_message: str, chat_history: List[dict], request_headers, **kwargs: dict
+        self,
+        user_message: str,
+        chat_history: List[dict],
+        request_headers,
+        **kwargs: dict,
     ) -> list[dict]:
         """
         Abstract method to orchestrate the conversation. This method must be implemented by subclasses.
@@ -133,7 +137,9 @@ class OrchestratorBase(ABC):
         Returns:
             dict: The result of the orchestration as a dictionary.
         """
-        result = await self.orchestrate(user_message, chat_history, request_headers, **kwargs)
+        result = await self.orchestrate(
+            user_message, chat_history, request_headers, **kwargs
+        )
         if str(self.config.logging.log_tokens).lower() == "true":
             custom_dimensions = {
                 "conversation_id": conversation_id,

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/orchestrator/prompt_flow.py

@@ -9,7 +9,7 @@ from ..common.source_document import SourceDocument
 from ..helpers.llm_helper import LLMHelper
 from ..helpers.env_helper import EnvHelper
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class PromptFlowOrchestrator(OrchestratorBase):

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/search/azure_search_handler.py

@@ -10,7 +10,7 @@ import json
 from azure.search.documents.models import VectorizedQuery
 import tiktoken
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class AzureSearchHandler(SearchHandlerBase):

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/search/azure_search_handler_light_rag.py

@@ -5,7 +5,7 @@ from .search_handler_base import SearchHandlerBase
 from ..common.source_document import SourceDocument
 import json
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
 
 
 class AzureSearchHandlerLightRag(SearchHandlerBase):
@@ -82,4 +82,4 @@ class AzureSearchHandlerLightRag(SearchHandlerBase):
                     page_number=source.get("page_number"),
                 )
             )
-        return source_documents
+        return source_documents

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules/batch/utilities/search/lightrag_search_handler.py

@@ -4,7 +4,8 @@ from ..helpers.lightrag_helper import LightRAGHelper
 from .search_handler_base import SearchHandlerBase
 from ..common.source_document import SourceDocument
 
-logger = logging.getLogger(__name__ + ".base_package")
+logger = logging.getLogger("__main__")
+
 
 class LightRAGSearchHandler(SearchHandlerBase):
     def __init__(self, env_helper):
@@ -56,4 +57,4 @@ class LightRAGSearchHandler(SearchHandlerBase):
 
     def get_unique_files(self):
         logger.info("Fetching unique files from LightRAG.")
-        return self.lightrag_helper.get_unique_files()
+        return self.lightrag_helper.get_unique_files()

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/cwyodmodules.egg-info/PKG-INFO

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

{cwyodmodules-0.3.27 → cwyodmodules-0.3.29}/pyproject.toml

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