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

cwyodmodules/batch/utilities/tools/content_safety_checker.py

@@ -7,97 +7,85 @@ from ..helpers.env_helper import EnvHelper
 from .answer_processing_base import AnswerProcessingBase
 from ..common.answer import Answer
 
-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__")
+from logging_config import logger
+env_helper: EnvHelper = EnvHelper()
+log_args = env_helper.LOG_ARGS
+log_result = env_helper.LOG_RESULT
 
 
 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,
-                    credential,
-                )
-            else:
-                logger.info(
-                    "Initializing ContentSafetyClient with AzureKeyCredential authentication."
-                )
-                self.content_safety_client = ContentSafetyClient(
-                    env_helper.AZURE_CONTENT_SAFETY_ENDPOINT,
-                    AzureKeyCredential(env_helper.AZURE_CONTENT_SAFETY_KEY),
-                )
+        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,
+                credential,
+            )
+        else:
+            logger.info(
+                "Initializing ContentSafetyClient with AzureKeyCredential authentication."
+            )
+            self.content_safety_client = ContentSafetyClient(
+                env_helper.AZURE_CONTENT_SAFETY_ENDPOINT,
+                AzureKeyCredential(env_helper.AZURE_CONTENT_SAFETY_KEY),
+            )
 
+    @logger.trace_function(log_args=False, log_result=False)
     def process_answer(self, answer: Answer, **kwargs: dict) -> Answer:
-        with tracer.start_as_current_span("ContentSafetyChecker.process_answer"):
-            logger.info("Processing answer.")
-            response_template = kwargs["response_template"]
-            answer.answer = self._filter_text_and_replace(
-                answer.answer, response_template
-            )
-            return answer
+        logger.info("Processing answer.")
+        response_template = kwargs["response_template"]
+        answer.answer = self._filter_text_and_replace(
+            answer.answer, response_template
+        )
+        return answer
 
+    @logger.trace_function(log_args=False, log_result=False)
     def validate_input_and_replace_if_harmful(self, text):
-        with tracer.start_as_current_span(
-            "ContentSafetyChecker.validate_input_and_replace_if_harmful"
-        ):
-            logger.info("Validating input text for harmful content")
-            response_template = f'{"Unfortunately, I am not able to process your question, as I have detected sensitive content that I am not allowed to process. This might be a mistake, so please try rephrasing your question."}'
-            return self.process_answer(
-                Answer(question="", answer=text, source_documents=[]),
-                response_template=response_template,
-            ).answer
+        logger.info("Validating input text for harmful content")
+        response_template = f'{"Unfortunately, I am not able to process your question, as I have detected sensitive content that I am not allowed to process. This might be a mistake, so please try rephrasing your question."}'
+        return self.process_answer(
+            Answer(question="", answer=text, source_documents=[]),
+            response_template=response_template,
+        ).answer
 
+    @logger.trace_function(log_args=False, log_result=False)
     def validate_output_and_replace_if_harmful(self, text):
-        with tracer.start_as_current_span(
-            "ContentSafetyChecker.validate_output_and_replace_if_harmful"
-        ):
-            logger.info("Validating output text for harmful content")
-            response_template = f'{"Unfortunately, I have detected sensitive content in my answer, which I am not allowed to show you. This might be a mistake, so please try again and maybe rephrase your question."}'
-            return self.process_answer(
-                Answer(question="", answer=text, source_documents=[]),
-                response_template=response_template,
-            ).answer
+        logger.info("Validating output text for harmful content")
+        response_template = f'{"Unfortunately, I have detected sensitive content in my answer, which I am not allowed to show you. This might be a mistake, so please try again and maybe rephrase your question."}'
+        return self.process_answer(
+            Answer(question="", answer=text, source_documents=[]),
+            response_template=response_template,
+        ).answer
 
+    @logger.trace_function(log_args=False, log_result=False)
     def _filter_text_and_replace(self, text, response_template):
-        with tracer.start_as_current_span(
-            "ContentSafetyChecker._filter_text_and_replace"
-        ):
-            logger.info("Analyzing text for harmful content")
-            request = AnalyzeTextOptions(text=text)
-            try:
-                response = self.content_safety_client.analyze_text(request)
-            except HttpResponseError as e:
-                if e.error:
-                    logger.error(
-                        f"Analyze text failed. Error code: {e.error.code}. Error message: {e.error.message}."
-                    )
-                    raise
-                logger.exception("Analyze text failed.")
+        logger.info("Analyzing text for harmful content")
+        request = AnalyzeTextOptions(text=text)
+        try:
+            response = self.content_safety_client.analyze_text(request)
+        except HttpResponseError as e:
+            if e.error:
+                logger.error(
+                    f"Analyze text failed. Error code: {e.error.code}. Error message: {e.error.message}."
+                )
                 raise
+            logger.exception("Analyze text failed.")
+            raise
 
-            filtered_text = text
+        filtered_text = text
 
-            # if response.hate_result.severity > 0 or response.self_harm_result.severity > 0 or response.sexual_result.severity > 0 or response.violence_result.severity > 0:
-            #     filtered_text = response_template
-            for result in response.categories_analysis:
-                if result.severity > 0:
-                    logger.warning(
-                        f"Harmful content detected: Severity: {result.severity}. Replacing text."
-                    )
-                    filtered_text = response_template
+        # if response.hate_result.severity > 0 or response.self_harm_result.severity > 0 or response.sexual_result.severity > 0 or response.violence_result.severity > 0:
+        #     filtered_text = response_template
+        for result in response.categories_analysis:
+            if result.severity > 0:
+                logger.warning(
+                    f"Harmful content detected: Severity: {result.severity}. Replacing text."
+                )
+                filtered_text = response_template
 
-            return filtered_text
+        return filtered_text

cwyodmodules/batch/utilities/tools/post_prompt_tool.py

@@ -2,75 +2,63 @@ from ..common.answer import Answer
 from ..helpers.llm_helper import LLMHelper
 from ..helpers.config.config_helper import ConfigHelper
 
-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__")
+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 PostPromptTool:
     def __init__(self) -> None:
         pass
 
+    @logger.trace_function(log_args=False, log_result=False)
     def validate_answer(self, answer: Answer) -> Answer:
-        with tracer.start_as_current_span("PostPromptTool.validate_answer") as span:
-            logger.info("Validating answer using post-answering prompt.")
-            config = ConfigHelper.get_active_config_or_default()
-            llm_helper = LLMHelper()
+        logger.info("Validating answer using post-answering prompt.")
+        config = ConfigHelper.get_active_config_or_default()
+        llm_helper = LLMHelper()
 
-            sources = "\n".join(
-                [
-                    f"[doc{i+1}]: {source.content}"
-                    for i, source in enumerate(answer.source_documents)
-                ]
+        sources = "\n".join(
+            [
+                f"[doc{i+1}]: {source.content}"
+                for i, source in enumerate(answer.source_documents)
+            ]
+        )
+        message = config.prompts.post_answering_prompt.format(
+            question=answer.question,
+            answer=answer.answer,
+            sources=sources,
+        )
+        logger.debug(f"Post-answering prompt message: {message}")
+        response = llm_helper.get_chat_completion(
+            [
+                {
+                    "role": "user",
+                    "content": message,
+                }
+            ]
+        )
+        result = response.choices[0].message.content
+        logger.debug(f"LLM response content: {result}")
+        was_message_filtered = result.lower() not in ["true", "yes"]
+        logger.debug(f"Was message filtered: {was_message_filtered}")
+        # Return filtered answer or just the original one
+        if was_message_filtered:
+            logger.info("Message was filtered; returning filtered answer.")
+            return Answer(
+                question=answer.question,
+                answer=config.messages.post_answering_filter,
+                source_documents=[],
+                prompt_tokens=response.usage.prompt_tokens,
+                completion_tokens=response.usage.completion_tokens,
             )
-
-            message = config.prompts.post_answering_prompt.format(
+        else:
+            logger.info("Message was not filtered; returning original answer.")
+            return Answer(
                 question=answer.question,
                 answer=answer.answer,
-                sources=sources,
+                source_documents=answer.source_documents,
+                prompt_tokens=response.usage.prompt_tokens,
+                completion_tokens=response.usage.completion_tokens,
             )
-
-            logger.debug(f"Post-answering prompt message: {message}")
-            span.set_attribute("prompt_message", message)
-
-            response = llm_helper.get_chat_completion(
-                [
-                    {
-                        "role": "user",
-                        "content": message,
-                    }
-                ]
-            )
-
-            result = response.choices[0].message.content
-            logger.debug(f"LLM response content: {result}")
-            span.set_attribute("llm_response", result)
-
-            was_message_filtered = result.lower() not in ["true", "yes"]
-            logger.debug(f"Was message filtered: {was_message_filtered}")
-            span.set_attribute("message_filtered", was_message_filtered)
-
-            # Return filtered answer or just the original one
-            if was_message_filtered:
-                logger.info("Message was filtered; returning filtered answer.")
-                return Answer(
-                    question=answer.question,
-                    answer=config.messages.post_answering_filter,
-                    source_documents=[],
-                    prompt_tokens=response.usage.prompt_tokens,
-                    completion_tokens=response.usage.completion_tokens,
-                )
-            else:
-                logger.info("Message was not filtered; returning original answer.")
-                return Answer(
-                    question=answer.question,
-                    answer=answer.answer,
-                    source_documents=answer.source_documents,
-                    prompt_tokens=response.usage.prompt_tokens,
-                    completion_tokens=response.usage.completion_tokens,
-                )