cwyodmodules 0.3.32__py3-none-any.whl → 0.3.33__py3-none-any.whl

cwyodmodules/api/chat_history.py

@@ -1,5 +1,4 @@
 import os
-import logging
 from uuid import uuid4
 
 # from dotenv import load_dotenv
@@ -11,15 +10,16 @@ from ..batch.utilities.chat_history.auth_utils import (
 from ..batch.utilities.helpers.config.config_helper import ConfigHelper
 from ..batch.utilities.helpers.env_helper import EnvHelper
 from ..batch.utilities.chat_history.database_factory import DatabaseFactory
-
+from logging_config import logger
 # load_dotenv()
+
 bp_chat_history_response = Blueprint("chat_history", __name__)
-logger = logging.getLogger("__main__")
-logger.setLevel(level=os.environ.get("LOGLEVEL", "INFO").upper())
 
 env_helper: EnvHelper = EnvHelper()
+log_args = env_helper.LOG_ARGS
+log_result = env_helper.LOG_RESULT
 
-
+@logger.trace_function(log_args=log_args, log_result=log_result)
 def init_database_client():
     try:
         conversation_client = DatabaseFactory.get_conversation_client()
@@ -28,7 +28,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)
 def init_openai_client():
     try:
         if env_helper.is_auth_type_keys():
@@ -45,11 +45,12 @@ def init_openai_client():
             )
         return azure_openai_client
     except Exception as e:
-        logging.exception("Exception in Azure OpenAI initialization: %s", e)
+        logger.exception("Exception in Azure OpenAI initialization: %s", e)
         raise e
 
 
 @bp_chat_history_response.route("/history/list", methods=["GET"])
+@logger.trace_function(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:
@@ -89,6 +90,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)
 async def rename_conversation():
     config = ConfigHelper.get_active_config_or_default()
     if not config.enable_chat_history:
@@ -151,6 +153,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)
 async def get_conversation():
     config = ConfigHelper.get_active_config_or_default()
     if not config.enable_chat_history:
@@ -223,6 +226,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)
 async def delete_conversation():
     config = ConfigHelper.get_active_config_or_default()
     if not config.enable_chat_history:
@@ -283,6 +287,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)
 async def delete_all_conversations():
     config = ConfigHelper.get_active_config_or_default()
 
@@ -354,6 +359,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)
 async def update_conversation():
     config = ConfigHelper.get_active_config_or_default()
     if not config.enable_chat_history:
@@ -455,6 +461,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)
 def get_frontend_settings():
     try:
         # Clear the cache for the config helper method

cwyodmodules/batch/utilities/chat_history/auth_utils.py

@@ -1,8 +1,13 @@
 import base64
 import json
-import logging
 
+from ...utilities.helpers.env_helper import EnvHelper
+from logging_config import logger
+env_helper: EnvHelper = EnvHelper()
+log_args = env_helper.LOG_ARGS
+log_result = env_helper.LOG_RESULT
 
+@logger.trace_function(log_args=log_args, log_result=log_result)
 def get_authenticated_user_details(request_headers):
     user_object = {}
 
@@ -25,9 +30,8 @@ def get_authenticated_user_details(request_headers):
 
     return user_object
 
-
+@logger.trace_function(log_args=log_args, log_result=log_result)
 def get_tenantid(client_principal_b64):
-    logger = logging.getLogger("__main__")
     tenant_id = ""
     if client_principal_b64:
         try:

cwyodmodules/batch/utilities/chat_history/cosmosdb.py

@@ -3,7 +3,11 @@ from azure.cosmos.aio import CosmosClient
 from azure.cosmos import exceptions
 
 from .database_client_base import DatabaseClientBase
-
+from ...utilities.helpers.env_helper import EnvHelper
+from logging_config import logger
+env_helper: EnvHelper = EnvHelper()
+log_args = env_helper.LOG_ARGS
+log_result = env_helper.LOG_RESULT
 
 class CosmosConversationClient(DatabaseClientBase):
 
@@ -44,12 +48,15 @@ class CosmosConversationClient(DatabaseClientBase):
         except exceptions.CosmosResourceNotFoundError:
             raise ValueError("Invalid CosmosDB container name")
 
+    @logger.trace_function(log_args=log_args, log_result=log_result)
     async def connect(self):
         pass
 
+    @logger.trace_function(log_args=log_args, log_result=log_result)
     async def close(self):
         pass
 
+    @logger.trace_function(log_args=log_args, log_result=log_result)
     async def ensure(self):
         if (
             not self.cosmosdb_client
@@ -72,6 +79,7 @@ class CosmosConversationClient(DatabaseClientBase):
 
         return True, "CosmosDB client initialized successfully"
 
+    @logger.trace_function(log_args=log_args, log_result=log_result)
     async def create_conversation(self, user_id, conversation_id, title=""):
         conversation = {
             "id": conversation_id,
@@ -89,6 +97,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return False
 
+    @logger.trace_function(log_args=log_args, log_result=log_result)
     async def upsert_conversation(self, conversation):
         resp = await self.container_client.upsert_item(conversation)
         if resp:
@@ -96,6 +105,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return False
 
+    @logger.trace_function(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
@@ -108,6 +118,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return True
 
+    @logger.trace_function(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)
@@ -120,6 +131,7 @@ class CosmosConversationClient(DatabaseClientBase):
                 response_list.append(resp)
             return response_list
 
+    @logger.trace_function(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}"
@@ -134,6 +146,7 @@ class CosmosConversationClient(DatabaseClientBase):
 
         return conversations
 
+    @logger.trace_function(log_args=log_args, log_result=log_result)
     async def get_conversation(self, user_id, conversation_id):
         parameters = [
             {"name": "@conversationId", "value": conversation_id},
@@ -152,6 +165,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return conversations[0]
 
+    @logger.trace_function(log_args=log_args, log_result=log_result)
     async def create_message(self, uuid, conversation_id, user_id, input_message: dict):
         message = {
             "id": uuid,
@@ -179,6 +193,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return False
 
+    @logger.trace_function(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
@@ -190,6 +205,7 @@ class CosmosConversationClient(DatabaseClientBase):
         else:
             return False
 
+    @logger.trace_function(log_args=log_args, log_result=log_result)
     async def get_messages(self, user_id, conversation_id):
         parameters = [
             {"name": "@conversationId", "value": conversation_id},