cwyodmodules 0.3.35__py3-none-any.whl → 0.3.37__py3-none-any.whl

cwyodmodules/batch/utilities/helpers/azure_postgres_helper_light_rag.py

@@ -7,6 +7,7 @@ from ..helpers.azure_identity_helper import AzureIdentityHelper
 
 from logging_config import logger
 env_helper: EnvHelper = EnvHelper()
+log_execution = env_helper.LOG_EXECUTION
 log_args = env_helper.LOG_ARGS
 log_result = env_helper.LOG_RESULT
 
@@ -19,7 +20,7 @@ class AzurePostgresHelper:
         self.azure_identity_helper = AzureIdentityHelper()
         self.conn = None
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def _create_search_client(self):
         """
         Establishes a connection to Azure PostgreSQL using AAD authentication.
@@ -49,7 +50,7 @@ class AzurePostgresHelper:
             logger.error(f"Error establishing a connection to PostgreSQL: {e}")
             raise
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_search_client(self):
         """
         Provides a reusable database connection.
@@ -58,7 +59,7 @@ class AzurePostgresHelper:
             self.conn = self._create_search_client()
         return self.conn
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_vector_store(self, embedding_array):
         """
         Fetches search indexes from PostgreSQL based on an embedding vector.
@@ -87,7 +88,7 @@ class AzurePostgresHelper:
         finally:
             conn.close()
 
-    @logger.trace_function(log_args=False, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=log_result)
     def create_vector_store(self, documents_to_upload):
         """
         Inserts documents into the `vector_store` table in batch mode.
@@ -131,7 +132,7 @@ class AzurePostgresHelper:
         finally:
             conn.close()
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_files(self):
         """
         Fetches distinct titles from the PostgreSQL database.
@@ -164,7 +165,7 @@ class AzurePostgresHelper:
         finally:
             conn.close()
 
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def delete_documents(self, ids_to_delete):
         """
         Deletes documents from the PostgreSQL database based on the provided ids.
@@ -212,7 +213,7 @@ class AzurePostgresHelper:
         finally:
             conn.close()
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def perform_search(self, title):
         """
         Fetches search results from PostgreSQL based on the title.
@@ -239,7 +240,7 @@ class AzurePostgresHelper:
         finally:
             conn.close()
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_unique_files(self):
         """
         Fetches unique titles from PostgreSQL.
@@ -264,7 +265,7 @@ class AzurePostgresHelper:
         finally:
             conn.close()
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def search_by_blob_url(self, blob_url):
         """
         Fetches unique titles from PostgreSQL based on a given blob URL.
@@ -291,7 +292,7 @@ class AzurePostgresHelper:
         finally:
             conn.close()
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def store_with_lightrag(self, documents_to_upload):
         """
         Stores documents using LightRAG for enhanced vector and text storage capabilities.

cwyodmodules/batch/utilities/helpers/azure_search_helper.py

@@ -30,6 +30,7 @@ from ..helpers.llm_helper import LLMHelper
 from ..helpers.env_helper import EnvHelper
 from logging_config import logger
 env_helper: EnvHelper = EnvHelper()
+log_execution = env_helper.LOG_EXECUTION
 log_args = env_helper.LOG_ARGS
 log_result = env_helper.LOG_RESULT
 
@@ -47,7 +48,7 @@ class AzureSearchHelper:
         self.search_index_client = self._create_search_index_client(search_credential)
         self.azure_computer_vision_client = AzureComputerVisionClient(self.env_helper)
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def _search_credential(self):
         if self.env_helper.is_auth_type_keys():
             return AzureKeyCredential(self.env_helper.AZURE_SEARCH_KEY)
@@ -55,7 +56,7 @@ class AzureSearchHelper:
             credential = self.azure_identity_helper.get_credential()
             return credential
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def _create_search_client(
         self, search_credential: Union[AzureKeyCredential, ChainedTokenCredential, DefaultAzureCredential]
     ) -> SearchClient:
@@ -65,7 +66,7 @@ class AzureSearchHelper:
             credential=search_credential,
         )
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def _create_search_index_client(
         self, search_credential: Union[AzureKeyCredential, ChainedTokenCredential, DefaultAzureCredential]
     ):
@@ -73,13 +74,13 @@ class AzureSearchHelper:
             endpoint=self.env_helper.AZURE_SEARCH_SERVICE, credential=search_credential
         )
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_search_client(self) -> SearchClient:
         self.create_index()
         return self.search_client
 
     @property
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def search_dimensions(self) -> int:
         if AzureSearchHelper._search_dimension is None:
             AzureSearchHelper._search_dimension = len(
@@ -88,7 +89,7 @@ class AzureSearchHelper:
         return AzureSearchHelper._search_dimension
 
     @property
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def image_search_dimensions(self) -> int:
         if AzureSearchHelper._image_search_dimension is None:
             AzureSearchHelper._image_search_dimension = len(
@@ -96,7 +97,7 @@ class AzureSearchHelper:
             )
         return AzureSearchHelper._image_search_dimension
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def create_index(self):
         fields = [
             SimpleField(
@@ -211,13 +212,13 @@ class AzureSearchHelper:
             )
             self.search_index_client.create_index(index)
 
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def _index_not_exists(self, index_name: str) -> bool:
         return index_name not in [
             name for name in self.search_index_client.list_index_names()
         ]
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_conversation_logger(self):
         fields = [
             SimpleField(

cwyodmodules/batch/utilities/helpers/config/config_helper.py

@@ -20,6 +20,7 @@ ADVANCED_IMAGE_PROCESSING_FILE_TYPES = ["jpeg", "jpg", "png", "tiff", "bmp"]
 
 from logging_config import logger
 env_helper: EnvHelper = EnvHelper()
+log_execution = env_helper.LOG_EXECUTION
 log_args = env_helper.LOG_ARGS
 log_result = env_helper.LOG_RESULT
 
@@ -59,7 +60,7 @@ class Config:
             "conversational_flow", self.env_helper.CONVERSATION_FLOW
         )
 
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def get_available_document_types(self) -> list[str]:
         document_types = {
             "txt",
@@ -78,27 +79,27 @@ class Config:
 
         return sorted(document_types)
 
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def get_advanced_image_processing_image_types(self):
         return ADVANCED_IMAGE_PROCESSING_FILE_TYPES
 
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def get_available_chunking_strategies(self):
         return [c.value for c in ChunkingStrategy]
 
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def get_available_loading_strategies(self):
         return [c.value for c in LoadingStrategy]
 
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def get_available_orchestration_strategies(self):
         return [c.value for c in OrchestrationStrategy]
 
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def get_available_ai_assistant_types(self):
         return [c.value for c in AssistantStrategy]
 
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def get_available_conversational_flows(self):
         return [c.value for c in ConversationFlow]
 
@@ -149,7 +150,7 @@ class ConfigHelper:
     _default_config = None
 
     @staticmethod
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def _set_new_config_properties(config: dict, default_config: dict):
         """
         Function used to set newer properties that will not be present in older configs.
@@ -200,7 +201,7 @@ class ConfigHelper:
 
     @staticmethod
     @functools.cache
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_active_config_or_default():
         logger.info("Method get_active_config_or_default started")
         env_helper = EnvHelper()
@@ -226,13 +227,13 @@ class ConfigHelper:
 
     @staticmethod
     @functools.cache
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_default_assistant_prompt():
         config = ConfigHelper.get_default_config()
         return config["prompts"]["answering_user_prompt"]
 
     @staticmethod
-    @logger.trace_function(log_args=False, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=log_result)
     def save_config_as_active(config):
         ConfigHelper.validate_config(config)
         blob_client = AzureBlobStorageClient(container_name=CONFIG_CONTAINER_NAME)
@@ -244,7 +245,7 @@ class ConfigHelper:
         ConfigHelper.get_active_config_or_default.cache_clear()
 
     @staticmethod
-    @logger.trace_function(log_args=False, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=log_result)
     def validate_config(config: dict):
         for document_processor in config.get("document_processors"):
             document_type = document_processor.get("document_type")
@@ -260,7 +261,7 @@ class ConfigHelper:
                 )
 
     @staticmethod
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_default_config():
         if ConfigHelper._default_config is None:
             env_helper = EnvHelper()
@@ -292,7 +293,7 @@ class ConfigHelper:
 
     @staticmethod
     @functools.cache
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_default_contract_assistant():
         contract_file_path = os.path.join(
             os.path.dirname(__file__), "default_contract_assistant_prompt.txt"
@@ -305,7 +306,7 @@ class ConfigHelper:
 
     @staticmethod
     @functools.cache
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_default_employee_assistant():
         employee_file_path = os.path.join(
             os.path.dirname(__file__), "default_employee_assistant_prompt.txt"
@@ -317,13 +318,13 @@ class ConfigHelper:
         return "".join([str(elem) for elem in employee_assistant])
 
     @staticmethod
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def clear_config():
         ConfigHelper._default_config = None
         ConfigHelper.get_active_config_or_default.cache_clear()
 
     @staticmethod
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def _append_advanced_image_processors():
         image_file_types = ["jpeg", "jpg", "png", "tiff", "bmp"]
         ConfigHelper._remove_processors_for_file_types(image_file_types)
@@ -335,7 +336,7 @@ class ConfigHelper:
         )
 
     @staticmethod
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def _remove_processors_for_file_types(file_types: list[str]):
         document_processors = ConfigHelper._default_config["document_processors"]
         document_processors = [
@@ -346,7 +347,7 @@ class ConfigHelper:
         ConfigHelper._default_config["document_processors"] = document_processors
 
     @staticmethod
-    @logger.trace_function(log_args=log_args, log_result=log_result)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def delete_config():
         blob_client = AzureBlobStorageClient(container_name=CONFIG_CONTAINER_NAME)
         blob_client.delete_file(CONFIG_FILE_NAME)

cwyodmodules/batch/utilities/helpers/embedders/integrated_vectorization_embedder.py

@@ -1,3 +1,4 @@
+import azure.functions as func
 from .embedder_base import EmbedderBase
 from ..env_helper import EnvHelper
 from ..llm_helper import LLMHelper
@@ -6,9 +7,14 @@ from ...integrated_vectorization.azure_search_indexer import AzureSearchIndexer
 from ...integrated_vectorization.azure_search_datasource import AzureSearchDatasource
 from ...integrated_vectorization.azure_search_skillset import AzureSearchSkillset
 from ..config.config_helper import ConfigHelper
-import logging
 
-logger = logging.getLogger("__main__")
+from logging_config import logger
+env_helper: EnvHelper = EnvHelper()
+log_execution = env_helper.LOG_EXECUTION
+log_args = env_helper.LOG_ARGS
+log_result = env_helper.LOG_RESULT
+
+bp_add_url_embeddings = func.Blueprint()
 
 
 class IntegratedVectorizationEmbedder(EmbedderBase):
@@ -16,13 +22,15 @@ class IntegratedVectorizationEmbedder(EmbedderBase):
         self.env_helper = env_helper
         self.llm_helper: LLMHelper = LLMHelper()
         logger.info("Initialized IntegratedVectorizationEmbedder.")
-
+     
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def embed_file(self, source_url: str, file_name: str = None):
         logger.info(
             f"Starting embed_file for source_url: {source_url}, file_name: {file_name}."
         )
         self.process_using_integrated_vectorization(source_url=source_url)
 
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def process_using_integrated_vectorization(self, source_url: str):
         logger.info(f"Starting integrated vectorization for source_url: {source_url}.")
         config = ConfigHelper.get_active_config_or_default()
@@ -46,6 +54,7 @@ class IntegratedVectorizationEmbedder(EmbedderBase):
             logger.error(f"Error processing {source_url}: {e}")
             raise e
 
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def reprocess_all(self):
         logger.info("Starting reprocess_all operation.")
         search_indexer = AzureSearchIndexer(self.env_helper)

cwyodmodules/batch/utilities/helpers/embedders/postgres_embedder.py

@@ -1,5 +1,4 @@
 import json
-import logging
 from typing import List
 
 from ...helpers.llm_helper import LLMHelper
@@ -15,7 +14,11 @@ from ..document_loading_helper import DocumentLoading
 from ..document_chunking_helper import DocumentChunking
 from ...common.source_document import SourceDocument
 
-logger = logging.getLogger("__main__")
+from logging_config import logger
+env_helper: EnvHelper = EnvHelper()
+log_execution = env_helper.LOG_EXECUTION
+log_args = env_helper.LOG_ARGS
+log_result = env_helper.LOG_RESULT
 
 
 class PostgresEmbedder(EmbedderBase):
@@ -33,6 +36,7 @@ class PostgresEmbedder(EmbedderBase):
             ext = processor.document_type.lower()
             self.embedding_configs[ext] = processor
 
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def embed_file(self, source_url: str, file_name: str):
         logger.info(f"Embedding file: {file_name} from source: {source_url}")
         file_extension = file_name.split(".")[-1].lower()
@@ -47,6 +51,7 @@ class PostgresEmbedder(EmbedderBase):
                 file_name, {"embeddings_added": "true"}
             )
 
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=log_result)
     def __embed(
         self, source_url: str, file_extension: str, embedding_config: EmbeddingConfig
     ):
@@ -84,6 +89,7 @@ class PostgresEmbedder(EmbedderBase):
         else:
             logger.warning("No documents to upload.")
 
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def __convert_to_search_document(self, document: SourceDocument):
         logger.info(f"Generating embeddings for document ID: {document.id}")
         embedded_content = self.llm_helper.generate_embeddings(document.content)

cwyodmodules/batch/utilities/helpers/embedders/push_embedder.py

@@ -1,6 +1,5 @@
 import hashlib
 import json
-import logging
 from typing import List
 from urllib.parse import urlparse
 
@@ -19,7 +18,11 @@ from ..document_loading_helper import DocumentLoading
 from ..document_chunking_helper import DocumentChunking
 from ...common.source_document import SourceDocument
 
-logger = logging.getLogger("__main__")
+from logging_config import logger
+env_helper: EnvHelper = EnvHelper()
+log_execution = env_helper.LOG_EXECUTION
+log_args = env_helper.LOG_ARGS
+log_result = env_helper.LOG_RESULT
 
 
 class PushEmbedder(EmbedderBase):
@@ -40,6 +43,7 @@ class PushEmbedder(EmbedderBase):
             self.embedding_configs[ext] = processor
         logger.info("Document processors loaded")
 
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def embed_file(self, source_url: str, file_name: str):
         logger.info(f"Embedding file: {file_name} from URL: {source_url}")
         file_extension = file_name.split(".")[-1].lower()
@@ -55,6 +59,7 @@ class PushEmbedder(EmbedderBase):
                 file_name, {"embeddings_added": "true"}
             )
 
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=log_result)
     def __embed(
         self, source_url: str, file_extension: str, embedding_config: EmbeddingConfig
     ):
@@ -101,6 +106,7 @@ class PushEmbedder(EmbedderBase):
         else:
             logger.warning("No documents to upload.")
 
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def __generate_image_caption(self, source_url):
         logger.info(f"Generating image caption for URL: {source_url}")
         model = self.env_helper.AZURE_OPENAI_VISION_MODEL
@@ -129,6 +135,7 @@ If the image is mostly text, use OCR to extract the text as it is displayed in t
         logger.info("Caption generation completed")
         return caption
 
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def __convert_to_search_document(self, document: SourceDocument):
         logger.info(f"Converting document ID {document.id} to search document format")
         embedded_content = self.llm_helper.generate_embeddings(document.content)
@@ -152,10 +159,12 @@ If the image is mostly text, use OCR to extract the text as it is displayed in t
             self.env_helper.AZURE_SEARCH_OFFSET_COLUMN: document.offset,
         }
 
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=log_result)
     def __generate_document_id(self, source_url: str) -> str:
         hash_key = hashlib.sha1(f"{source_url}_1".encode("utf-8")).hexdigest()
         return f"doc_{hash_key}"
 
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def __create_image_document(
         self,
         source_url: str,

cwyodmodules/batch/utilities/helpers/env_helper.py

@@ -25,7 +25,7 @@ class EnvHelper:
                 cls._instance = instance
             return cls._instance
         
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def __load_config(self, **kwargs) -> None:
         # load_dotenv()
 
@@ -48,6 +48,9 @@ class EnvHelper:
         # )
 
         self.LOGLEVEL = self.secretHelper.get_secret("logging-level")
+        self.LOG_EXECUTION = self.get_env_var_bool(
+                "LOG_EXECUTION", "True"
+            )
         self.LOG_ARGS = self.get_env_var_bool(
                 "LOG_ARGS", "True"
             )

cwyodmodules/batch/utilities/helpers/lightrag_helper.py

@@ -5,6 +5,7 @@ from ..helpers.azure_identity_helper import AzureIdentityHelper
 from ...utilities.helpers.env_helper import EnvHelper
 from logging_config import logger
 env_helper: EnvHelper = EnvHelper()
+log_execution = env_helper.LOG_EXECUTION
 log_args = env_helper.LOG_ARGS
 log_result = env_helper.LOG_RESULT
 
@@ -15,7 +16,7 @@ class LightRAGHelper:
         self.azure_identity_helper = AzureIdentityHelper()
         self.conn = None
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def _create_connection(self):
         """
         Establishes a connection to PostgreSQL using AAD authentication.
@@ -45,7 +46,7 @@ class LightRAGHelper:
             logger.error(f"Error establishing a connection to PostgreSQL: {e}")
             raise
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_connection(self):
         """
         Provides a reusable database connection.
@@ -54,7 +55,7 @@ class LightRAGHelper:
             self.conn = self._create_connection()
         return self.conn
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def store_vector_and_text(self, vector, text, metadata):
         """
         Stores a vector and associated text in the PostgreSQL database.
@@ -76,7 +77,7 @@ class LightRAGHelper:
         finally:
             conn.close()
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def retrieve_vectors(self, query_vector, top_k):
         """
         Retrieves the top K vectors similar to the provided query vector.

cwyodmodules/batch/utilities/helpers/llm_helper.py

@@ -12,6 +12,7 @@ from .env_helper import EnvHelper
 
 from logging_config import logger
 env_helper: EnvHelper = EnvHelper()
+log_execution = env_helper.LOG_EXECUTION
 log_args = env_helper.LOG_ARGS
 log_result = env_helper.LOG_RESULT
 
@@ -48,7 +49,7 @@ class LLMHelper:
 
         logger.info("Initializing LLMHelper completed")
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_llm(self):
         if self.auth_type_keys:
             return AzureChatOpenAI(
@@ -70,7 +71,7 @@ class LLMHelper:
             )
 
     # TODO: This needs to have a custom callback to stream back to the UI
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_streaming_llm(self):
         if self.auth_type_keys:
             return AzureChatOpenAI(
@@ -96,7 +97,7 @@ class LLMHelper:
                 azure_ad_token_provider=self.token_provider,
             )
 
-    @logger.trace_function(log_args=log_args, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=log_args, log_result=False)
     def get_embedding_model(self):
         if self.auth_type_keys:
             return AzureOpenAIEmbeddings(
@@ -113,7 +114,7 @@ class LLMHelper:
                 azure_ad_token_provider=self.token_provider,
             )
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def generate_embeddings(self, input: Union[str, list[int]]) -> List[float]:
         return (
             self.openai_client.embeddings.create(
@@ -123,7 +124,7 @@ class LLMHelper:
             .embedding
         )
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_chat_completion_with_functions(
         self, messages: list[dict], functions: list[dict], function_call: str = "auto"
     ):
@@ -134,7 +135,7 @@ class LLMHelper:
             function_call=function_call,
         )
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_chat_completion(
         self, messages: list[dict], model: str | None = None, **kwargs
     ):
@@ -145,7 +146,7 @@ class LLMHelper:
             **kwargs,
         )
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_sk_chat_completion_service(self, service_id: str):
         if self.auth_type_keys:
             return AzureChatCompletion(
@@ -175,7 +176,7 @@ class LLMHelper:
                 ad_token_provider=self.token_provider,
             )
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_sk_service_settings(self, service: AzureChatCompletion):
         return cast(
             AzureChatPromptExecutionSettings,
@@ -186,7 +187,7 @@ class LLMHelper:
             ),
         )
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_ml_client(self):
         if not hasattr(self, "_ml_client"):
             credential = self.azure_identity_helper.get_credential()

cwyodmodules/batch/utilities/helpers/secret_helper.py

@@ -30,7 +30,7 @@ class SecretHelper:
                 connection_verify=True,
             )
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_secret(self, secret_name: str) -> str:
         """
         Retrieves the value of a secret from the environment variables or Azure Key Vault.
@@ -48,7 +48,7 @@ class SecretHelper:
         secret_value = self.secret_client.get_secret(name=secret_name).value
         return secret_value
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def set_secret(self, secret_name: str, secret_value: str) -> None:
         """
         Sets the value of a secret in Azure Key Vault only if it doesn't exist or has a different value.
@@ -76,7 +76,7 @@ class SecretHelper:
             logger.warning(f"Secret {secret_name} has been created")
 
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def get_secret_from_json(self, secret_name: str) -> str:
         secret_value = self.secret_client.get_secret(secret_name).value
         return secret_value