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

cwyodmodules/api/chat_history.py

@@ -16,10 +16,11 @@ from logging_config import logger
 bp_chat_history_response = Blueprint("chat_history", __name__)
 
 env_helper: EnvHelper = EnvHelper()
+log_execution = env_helper.LOG_EXECUTION
 log_args = env_helper.LOG_ARGS
 log_result = env_helper.LOG_RESULT
 
-@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 init_database_client():
     try:
         conversation_client = DatabaseFactory.get_conversation_client()
@@ -28,7 +29,7 @@ def init_database_client():
         logger.exception("Exception in database initialization: %s", e)
         raise e
 
-@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 init_openai_client():
     try:
         if env_helper.is_auth_type_keys():
@@ -50,7 +51,7 @@ def init_openai_client():
 
 
 @bp_chat_history_response.route("/history/list", methods=["GET"])
-@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)
 async def list_conversations():
     config = ConfigHelper.get_active_config_or_default()
     if not config.enable_chat_history:
@@ -90,7 +91,7 @@ async def list_conversations():
 
 
 @bp_chat_history_response.route("/history/rename", methods=["POST"])
-@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)
 async def rename_conversation():
     config = ConfigHelper.get_active_config_or_default()
     if not config.enable_chat_history:
@@ -153,7 +154,7 @@ async def rename_conversation():
 
 
 @bp_chat_history_response.route("/history/read", methods=["POST"])
-@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)
 async def get_conversation():
     config = ConfigHelper.get_active_config_or_default()
     if not config.enable_chat_history:
@@ -226,7 +227,7 @@ async def get_conversation():
 
 
 @bp_chat_history_response.route("/history/delete", methods=["DELETE"])
-@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)
 async def delete_conversation():
     config = ConfigHelper.get_active_config_or_default()
     if not config.enable_chat_history:
@@ -287,7 +288,7 @@ async def delete_conversation():
 
 
 @bp_chat_history_response.route("/history/delete_all", methods=["DELETE"])
-@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)
 async def delete_all_conversations():
     config = ConfigHelper.get_active_config_or_default()
 
@@ -359,7 +360,7 @@ async def delete_all_conversations():
 
 
 @bp_chat_history_response.route("/history/update", methods=["POST"])
-@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)
 async def update_conversation():
     config = ConfigHelper.get_active_config_or_default()
     if not config.enable_chat_history:
@@ -461,7 +462,7 @@ async def update_conversation():
 
 
 @bp_chat_history_response.route("/history/frontend_settings", methods=["GET"])
-@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_frontend_settings():
     try:
         # Clear the cache for the config helper method

cwyodmodules/batch/utilities/chat_history/auth_utils.py

@@ -4,10 +4,11 @@ import json
 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
 
-@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_authenticated_user_details(request_headers):
     user_object = {}
 
@@ -30,7 +31,7 @@ def get_authenticated_user_details(request_headers):
 
     return user_object
 
-@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_tenantid(client_principal_b64):
     tenant_id = ""
     if client_principal_b64:

cwyodmodules/batch/utilities/chat_history/cosmosdb.py

@@ -6,6 +6,7 @@ from .database_client_base import DatabaseClientBase
 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
 
@@ -48,15 +49,15 @@ class CosmosConversationClient(DatabaseClientBase):
         except exceptions.CosmosResourceNotFoundError:
             raise ValueError("Invalid CosmosDB container name")
 
-    @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)
     async def connect(self):
         pass
 
-    @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)
     async def close(self):
         pass
 
-    @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)
     async def ensure(self):
         if (
             not self.cosmosdb_client
@@ -79,7 +80,7 @@ class CosmosConversationClient(DatabaseClientBase):
 
         return True, "CosmosDB client initialized successfully"
 
-    @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)
     async def create_conversation(self, user_id, conversation_id, title=""):
         conversation = {
             "id": conversation_id,
@@ -97,7 +98,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return False
 
-    @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)
     async def upsert_conversation(self, conversation):
         resp = await self.container_client.upsert_item(conversation)
         if resp:
@@ -105,7 +106,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return False
 
-    @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)
     async def delete_conversation(self, user_id, conversation_id):
         conversation = await self.container_client.read_item(
             item=conversation_id, partition_key=user_id
@@ -118,7 +119,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return True
 
-    @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)
     async def delete_messages(self, conversation_id, user_id):
         # get a list of all the messages in the conversation
         messages = await self.get_messages(user_id, conversation_id)
@@ -131,7 +132,7 @@ class CosmosConversationClient(DatabaseClientBase):
                 response_list.append(resp)
             return response_list
 
-    @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)
     async def get_conversations(self, user_id, limit, sort_order="DESC", offset=0):
         parameters = [{"name": "@userId", "value": user_id}]
         query = f"SELECT * FROM c where c.userId = @userId and c.type='conversation' order by c.updatedAt {sort_order}"
@@ -146,7 +147,7 @@ class CosmosConversationClient(DatabaseClientBase):
 
         return conversations
 
-    @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)
     async def get_conversation(self, user_id, conversation_id):
         parameters = [
             {"name": "@conversationId", "value": conversation_id},
@@ -165,7 +166,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return conversations[0]
 
-    @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)
     async def create_message(self, uuid, conversation_id, user_id, input_message: dict):
         message = {
             "id": uuid,
@@ -193,7 +194,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return False
 
-    @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)
     async def update_message_feedback(self, user_id, message_id, feedback):
         message = await self.container_client.read_item(
             item=message_id, partition_key=user_id
@@ -205,7 +206,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return False
 
-    @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)
     async def get_messages(self, user_id, conversation_id):
         parameters = [
             {"name": "@conversationId", "value": conversation_id},

cwyodmodules/batch/utilities/chat_history/postgresdbservice.py

@@ -6,6 +6,7 @@ from .database_client_base import DatabaseClientBase
 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
 
@@ -22,7 +23,7 @@ class PostgresConversationClient(DatabaseClientBase):
         self.enable_message_feedback = enable_message_feedback
         self.conn = None
 
-    @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)
     async def connect(self):
         try:
             access_information = self.azure_identity_helper.get_token(scopes="https://ossrdbms-aad.database.windows.net/.default")
@@ -40,13 +41,13 @@ class PostgresConversationClient(DatabaseClientBase):
             logger.error("Failed to connect to PostgreSQL: %s", e, exc_info=True)
             raise
 
-    @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)
     async def close(self):
         if self.conn:
             await self.conn.close()
             logger.info("PostgreSQL connection closed")
 
-    @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)
     async def ensure(self):
         if not self.conn:
             logger.warning("PostgreSQL client not initialized correctly")
@@ -54,7 +55,7 @@ class PostgresConversationClient(DatabaseClientBase):
         logger.info("PostgreSQL client initialized successfully")
         return True, "PostgreSQL client initialized successfully"
 
-    @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)
     async def create_conversation(self, conversation_id, user_id, title=""):
         utc_now = datetime.now(timezone.utc)
         createdAt = utc_now.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
@@ -82,7 +83,7 @@ class PostgresConversationClient(DatabaseClientBase):
             )
             raise
 
-    @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)
     async def upsert_conversation(self, conversation):
         query = """
             INSERT INTO conversations (id, conversation_id, type, "createdAt", "updatedAt", user_id, title)
@@ -118,7 +119,7 @@ class PostgresConversationClient(DatabaseClientBase):
             )
             raise
 
-    @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)
     async def delete_conversation(self, user_id, conversation_id):
         query = (
             "DELETE FROM conversations WHERE conversation_id = $1 AND user_id = $2"
@@ -136,7 +137,7 @@ class PostgresConversationClient(DatabaseClientBase):
             )
             raise
 
-    @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)
     async def delete_messages(self, conversation_id, user_id):
         query = "DELETE FROM messages WHERE conversation_id = $1 AND user_id = $2 RETURNING *"
         try:
@@ -152,7 +153,7 @@ class PostgresConversationClient(DatabaseClientBase):
             )
             raise
 
-    @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)
     async def get_conversations(self, user_id, limit=None, sort_order="DESC", offset=0):
         try:
             offset = int(offset)  # Ensure offset is an integer
@@ -186,7 +187,7 @@ class PostgresConversationClient(DatabaseClientBase):
             )
         return [dict(conversation) for conversation in conversations]
 
-    @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)
     async def get_conversation(self, user_id, conversation_id):
         query = "SELECT * FROM conversations WHERE id = $1 AND user_id = $2 AND type = 'conversation'"
         try:
@@ -208,7 +209,7 @@ class PostgresConversationClient(DatabaseClientBase):
             )
             raise
 
-    @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)
     async def create_message(self, uuid, conversation_id, user_id, input_message: dict):
         message_id = uuid
         utc_now = datetime.now(timezone.utc)
@@ -252,7 +253,7 @@ class PostgresConversationClient(DatabaseClientBase):
             )
             raise
 
-    @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)
     async def update_message_feedback(self, user_id, message_id, feedback):
         query = "UPDATE messages SET feedback = $1 WHERE id = $2 AND user_id = $3 RETURNING *"
         try:
@@ -274,7 +275,7 @@ class PostgresConversationClient(DatabaseClientBase):
             )
             raise
 
-    @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)
     async def get_messages(self, user_id, conversation_id):
         query = 'SELECT * FROM messages WHERE conversation_id = $1 AND user_id = $2 ORDER BY "createdAt" ASC'
         try:

cwyodmodules/batch/utilities/common/source_document.py

@@ -7,6 +7,7 @@ from ..helpers.azure_blob_storage_client import AzureBlobStorageClient
 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
 
@@ -51,20 +52,20 @@ class SourceDocument:
             )
         return False
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def to_json(self):
         json_string = json.dumps(self, cls=SourceDocumentEncoder)
         logger.debug(f"Serialized SourceDocument to JSON: {json_string}")
         return json_string
 
     @classmethod
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def from_json(cls, json_string):
         source_document = json.loads(json_string, cls=SourceDocumentDecoder)
         return source_document
 
     @classmethod
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def from_dict(cls, dict_obj):
         logger.debug(f"Creating SourceDocument from dict: {dict_obj}")
         return cls(
@@ -79,7 +80,7 @@ class SourceDocument:
         )
 
     @classmethod
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def from_metadata(
         cls: Type["SourceDocument"],
         content: str,
@@ -113,7 +114,7 @@ class SourceDocument:
         )
         return source_document
 
-    @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_filename(self, include_path=False):
         filename = self.source.replace("_SAS_TOKEN_PLACEHOLDER_", "").replace(
             "http://", ""
@@ -127,7 +128,7 @@ class SourceDocument:
         )
         return filename
 
-    @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_markdown_url(self):
         url = quote(self.source, safe=":/")
         if "_SAS_TOKEN_PLACEHOLDER_" in url:
@@ -139,7 +140,7 @@ class SourceDocument:
 
 
 class SourceDocumentEncoder(json.JSONEncoder):
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def default(self, obj):
         if isinstance(obj, SourceDocument):
             logger.debug(f"Encoding SourceDocument: {obj}")
@@ -157,7 +158,7 @@ class SourceDocumentEncoder(json.JSONEncoder):
 
 
 class SourceDocumentDecoder(json.JSONDecoder):
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def decode(self, s, **kwargs):
         logger.debug(f"Decoding JSON string: {s}")
         obj = super().decode(s, **kwargs)

cwyodmodules/batch/utilities/document_chunking/fixed_size_overlap.py

@@ -6,6 +6,7 @@ from ..common.source_document import SourceDocument
 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
 
@@ -13,7 +14,7 @@ class FixedSizeOverlapDocumentChunking(DocumentChunkingBase):
     def __init__(self) -> None:
         pass
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def chunk(
         self, documents: List[SourceDocument], chunking: ChunkingSettings
     ) -> List[SourceDocument]:

cwyodmodules/batch/utilities/document_chunking/layout.py

@@ -6,6 +6,7 @@ from ..common.source_document import SourceDocument
 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
 
@@ -13,7 +14,7 @@ class LayoutDocumentChunking(DocumentChunkingBase):
     def __init__(self) -> None:
         pass
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def chunk(
         self, documents: List[SourceDocument], chunking: ChunkingSettings
     ) -> List[SourceDocument]:

cwyodmodules/batch/utilities/document_chunking/page.py

@@ -6,6 +6,7 @@ from ..common.source_document import SourceDocument
 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
 
@@ -13,7 +14,7 @@ class PageDocumentChunking(DocumentChunkingBase):
     def __init__(self) -> None:
         pass
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def chunk(
         self, documents: List[SourceDocument], chunking: ChunkingSettings
     ) -> List[SourceDocument]:

cwyodmodules/batch/utilities/document_loading/read.py

@@ -6,6 +6,7 @@ from ..common.source_document import SourceDocument
 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
 
@@ -14,7 +15,7 @@ class ReadDocumentLoading(DocumentLoadingBase):
     def __init__(self) -> None:
         super().__init__()
 
-    @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 load(self, document_url: str) -> List[SourceDocument]:
         logger.info(f"Loading document from URL: {document_url}")
         try:

cwyodmodules/batch/utilities/helpers/azure_computer_vision_client.py

@@ -7,6 +7,7 @@ from requests import Response
 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
 
@@ -29,7 +30,7 @@ class AzureComputerVisionClient:
             env_helper.AZURE_COMPUTER_VISION_VECTORIZE_IMAGE_MODEL_VERSION
         )
 
-    @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 vectorize_image(self, image_url: str) -> list[float]:
         logger.info(f"Making call to computer vision to vectorize image: {image_url}")
         response = self.__make_request(
@@ -41,7 +42,7 @@ class AzureComputerVisionClient:
         response_json = self.__get_json_body(response)
         return self.__get_vectors(response_json)
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def vectorize_text(self, text: str) -> list[float]:
         logger.debug(f"Making call to computer vision to vectorize text: {text}")
         response = self.__make_request(
@@ -53,7 +54,7 @@ class AzureComputerVisionClient:
         response_json = self.__get_json_body(response)
         return self.__get_vectors(response_json)
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def __make_request(self, path: str, body) -> Response:
         try:
             headers = {}
@@ -78,14 +79,14 @@ class AzureComputerVisionClient:
         except Exception as e:
             raise Exception("Call to Azure Computer Vision failed") from e
 
-    @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_response(self, response: Response):
         if response.status_code != 200:
             raise Exception(
                 f"Call to Azure Computer Vision failed with status: {response.status_code}, body: {response.text}"
             )
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def __get_json_body(self, response: Response) -> dict:
         try:
             return response.json()
@@ -94,7 +95,7 @@ class AzureComputerVisionClient:
                 f"Call to Azure Computer Vision returned malformed response body: {response.text}",
             ) from e
 
-    @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 __get_vectors(self, response_json: dict) -> list[float]:
         if self.__RESPONSE_VECTOR_KEY in response_json:
             return response_json[self.__RESPONSE_VECTOR_KEY]

cwyodmodules/batch/utilities/helpers/azure_form_recognizer_helper.py

@@ -7,6 +7,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
 
@@ -47,7 +48,7 @@ class AzureFormRecognizerClient:
         "paragraph": "p",
     }
 
-    @logger.trace_function(log_args=False, log_result=False)
+    @logger.trace_function(log_execution=log_execution, log_args=False, log_result=False)
     def _table_to_html(self, table):
         table_html = "<table>"
         rows = [
@@ -75,7 +76,7 @@ class AzureFormRecognizerClient:
         table_html += "</table>"
         return table_html
 
-    @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 begin_analyze_document_from_url(
         self, source_url: str, use_layout: bool = True, paragraph_separator: str = ""
     ):

cwyodmodules/batch/utilities/helpers/azure_postgres_helper.py

@@ -6,6 +6,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
 
@@ -17,7 +18,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.
@@ -47,7 +48,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.
@@ -56,7 +57,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.
@@ -85,7 +86,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.
@@ -129,7 +130,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 get_files(self):
         """
         Fetches distinct titles from the PostgreSQL database.
@@ -162,7 +163,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.
@@ -210,7 +211,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.
@@ -237,7 +238,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 get_unique_files(self):
         """
         Fetches unique titles from PostgreSQL.
@@ -262,7 +263,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 search_by_blob_url(self, blob_url):
         """
         Fetches unique titles from PostgreSQL based on a given blob URL.
@@ -289,7 +290,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 store_with_lightrag(self, documents_to_upload):
         """
         Stores documents using LightRAG for enhanced vector and text storage capabilities.