rasa-pro 3.13.0.dev7__py3-none-any.whl → 3.13.0.dev8__py3-none-any.whl

rasa/tracing/instrumentation/attribute_extractors.py

@@ -767,8 +767,8 @@ def extract_attrs_for_intentless_policy_generate_llm_answer(
     return extend_attributes_with_prompt_tokens_length(self, attributes, prompt)
 
 
-def extract_attrs_for_enterprise_search_generate_llm_answer(
-    self: "EnterpriseSearchPolicy", llm: "BaseLLM", prompt: str
+def extract_attrs_for_enterprise_search_invoke_llm(
+    self: "EnterpriseSearchPolicy", prompt: str
 ) -> Dict[str, Any]:
     from rasa.core.policies.enterprise_search_policy import (
         DEFAULT_EMBEDDINGS_CONFIG,
@@ -784,6 +784,14 @@ def extract_attrs_for_enterprise_search_generate_llm_answer(
     return extend_attributes_with_prompt_tokens_length(self, attributes, prompt)
 
 
+def extract_attrs_for_enterprise_search_parse_llm_relevancy_check_response(
+    self: "EnterpriseSearchPolicy", llm_answer: str
+) -> Dict[str, Any]:
+    return {
+        "llm_answer": llm_answer,
+    }
+
+
 def extract_current_context_attribute(stack: DialogueStack) -> Dict[str, Any]:
     """Utility function to extract the current context from the dialogue stack."""
     current_context = stack.current_context()

rasa/tracing/instrumentation/instrumentation.py

@@ -44,6 +44,7 @@ from rasa.dialogue_understanding.generator import (
     CompactLLMCommandGenerator,
     LLMCommandGenerator,
     MultiStepLLMCommandGenerator,
+    SearchReadyLLMCommandGenerator,
     SingleStepLLMCommandGenerator,
 )
 from rasa.dialogue_understanding.generator.flow_retrieval import FlowRetrieval
@@ -66,9 +67,11 @@ from rasa.tracing.instrumentation.intentless_policy_instrumentation import (
 from rasa.tracing.instrumentation.metrics import (
     record_callable_duration_metrics,
     record_compact_llm_command_generator_metrics,
+    record_enterprise_search_policy_metrics,
     record_llm_command_generator_metrics,
     record_multi_step_llm_command_generator_metrics,
     record_request_size_in_bytes,
+    record_search_ready_llm_command_generator_metrics,
     record_single_step_llm_command_generator_metrics,
 )
 from rasa.utils.endpoints import EndpointConfig, concat_url
@@ -291,6 +294,9 @@ SingleStepLLMCommandGeneratorType = TypeVar(
 CompactLLMCommandGeneratorType = TypeVar(
     "CompactLLMCommandGeneratorType", bound=CompactLLMCommandGenerator
 )
+SearchReadyLLMCommandGeneratorType = TypeVar(
+    "SearchReadyLLMCommandGeneratorType", bound=SearchReadyLLMCommandGenerator
+)
 MultiStepLLMCommandGeneratorType = TypeVar(
     "MultiStepLLMCommandGeneratorType", bound=MultiStepLLMCommandGenerator
 )
@@ -326,6 +332,9 @@ def instrument(
     compact_llm_command_generator_class: Optional[
         Type[CompactLLMCommandGeneratorType]
     ] = None,
+    search_ready_llm_command_generator_class: Optional[
+        Type[SearchReadyLLMCommandGeneratorType]
+    ] = None,
     multi_step_llm_command_generator_class: Optional[
         Type[MultiStepLLMCommandGeneratorType]
     ] = None,
@@ -379,6 +388,9 @@ def instrument(
     :param compact_llm_command_generator_class: The `CompactLLMCommandGenerator`
         to be instrumented. If `None` is given, no `CompactLLMCommandGenerator` will
         be instrumented.
+    :param search_ready_llm_command_generator_class: The`SearchReadyLLMCommandGenerator`
+        to be instrumented. If `None` is given, no `SearchReadyLLMCommandGenerator` will
+        be instrumented.
     :param multi_step_llm_command_generator_class: The `MultiStepLLMCommandGenerator`
         to be instrumented. If `None` is given, no `MultiStepLLMCommandGenerator` will
         be instrumented.
@@ -527,6 +539,37 @@ def instrument(
         )
         mark_class_as_instrumented(compact_llm_command_generator_class)
 
+    if (
+        search_ready_llm_command_generator_class is not None
+        and not class_is_instrumented(search_ready_llm_command_generator_class)
+    ):
+        _instrument_method(
+            tracer_provider.get_tracer(
+                search_ready_llm_command_generator_class.__module__
+            ),
+            search_ready_llm_command_generator_class,
+            "invoke_llm",
+            attribute_extractors.extract_attrs_for_llm_based_command_generator,
+            metrics_recorder=record_search_ready_llm_command_generator_metrics,
+        )
+        _instrument_method(
+            tracer_provider.get_tracer(
+                search_ready_llm_command_generator_class.__module__
+            ),
+            search_ready_llm_command_generator_class,
+            "_check_commands_against_startable_flows",
+            attribute_extractors.extract_attrs_for_check_commands_against_startable_flows,
+        )
+        _instrument_perform_health_check_method_for_component(
+            tracer_provider.get_tracer(
+                search_ready_llm_command_generator_class.__module__
+            ),
+            search_ready_llm_command_generator_class,
+            "perform_llm_health_check",
+            attribute_extractors.extract_attrs_for_performing_health_check,
+        )
+        mark_class_as_instrumented(search_ready_llm_command_generator_class)
+
     if multi_step_llm_command_generator_class is not None and not class_is_instrumented(
         multi_step_llm_command_generator_class
     ):
@@ -562,6 +605,7 @@ def instrument(
                 llm_command_generator_class,
                 single_step_llm_command_generator_class,
                 compact_llm_command_generator_class,
+                search_ready_llm_command_generator_class,
                 multi_step_llm_command_generator_class,
             )
         )
@@ -847,8 +891,15 @@ def _instrument_enterprise_search_policy(
     _instrument_method(
         tracer,
         policy_class,
-        "_generate_llm_answer",
-        attribute_extractors.extract_attrs_for_enterprise_search_generate_llm_answer,
+        "_invoke_llm",
+        attribute_extractors.extract_attrs_for_enterprise_search_invoke_llm,
+        metrics_recorder=record_enterprise_search_policy_metrics,
+    )
+    _instrument_method(
+        tracer,
+        policy_class,
+        "_parse_llm_relevancy_check_response",
+        attribute_extractors.extract_attrs_for_enterprise_search_parse_llm_relevancy_check_response,
     )
     _instrument_perform_health_check_method_for_component(
         tracer_provider.get_tracer(policy_class.__module__),

rasa/tracing/instrumentation/metrics.py

@@ -9,6 +9,7 @@ from rasa.dialogue_understanding.generator import (
     CompactLLMCommandGenerator,
     LLMCommandGenerator,
     MultiStepLLMCommandGenerator,
+    SearchReadyLLMCommandGenerator,
     SingleStepLLMCommandGenerator,
 )
 from rasa.tracing.constants import (
@@ -17,7 +18,10 @@ from rasa.tracing.constants import (
     COMPACT_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME,
     COMPACT_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
     CONTEXTUAL_RESPONSE_REPHRASER_LLM_RESPONSE_DURATION_METRIC_NAME,
+    ENTERPRISE_SEARCH_POLICY_CPU_USAGE_METRIC_NAME,
     ENTERPRISE_SEARCH_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME,
+    ENTERPRISE_SEARCH_POLICY_MEMORY_USAGE_METRIC_NAME,
+    ENTERPRISE_SEARCH_POLICY_PROMPT_TOKEN_USAGE_METRIC_NAME,
     INTENTLESS_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME,
     LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME,
     LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME,
@@ -31,6 +35,10 @@ from rasa.tracing.constants import (
     RASA_CLIENT_REQUEST_BODY_SIZE_METRIC_NAME,
     RASA_CLIENT_REQUEST_DURATION_METRIC_NAME,
     REQUEST_BODY_SIZE_IN_BYTES_ATTRIBUTE_NAME,
+    SEARCH_READY_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME,
+    SEARCH_READY_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME,
+    SEARCH_READY_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME,
+    SEARCH_READY_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
     SINGLE_STEP_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME,
     SINGLE_STEP_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME,
     SINGLE_STEP_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME,
@@ -40,7 +48,7 @@ from rasa.tracing.metric_instrument_provider import MetricInstrumentProvider
 from rasa.utils.endpoints import EndpointConfig
 
 
-def record_llm_based_command_generator_cpu_usage(
+def record_llm_based_component_cpu_usage(
     metric_instrument_provider: MetricInstrumentProvider,
     metric_name: str,
 ) -> None:
@@ -60,8 +68,10 @@ def record_llm_based_command_generator_cpu_usage(
     cpu_usage = psutil.cpu_percent()
     metric_instrument.record(amount=cpu_usage)
 
+    return None
 
-def record_llm_based_command_generator_memory_usage(
+
+def record_llm_based_component_memory_usage(
     metric_instrument_provider: MetricInstrumentProvider,
     metric_name: str,
 ) -> None:
@@ -81,8 +91,10 @@ def record_llm_based_command_generator_memory_usage(
     memory_usage = psutil.virtual_memory().percent
     metric_instrument.record(amount=memory_usage)
 
+    return None
+
 
-def record_llm_based_command_generator_prompt_token(
+def record_llm_based_component_prompt_token(
     metric_instrument_provider: MetricInstrumentProvider,
     attributes: Dict[str, Any],
     metric_name: str,
@@ -116,6 +128,8 @@ def record_llm_based_command_generator_prompt_token(
         amount=prompt_tokens_len,
     )
 
+    return None
+
 
 def record_llm_command_generator_metrics(attributes: Dict[str, Any]) -> None:
     """
@@ -132,17 +146,18 @@ def record_llm_command_generator_metrics(attributes: Dict[str, Any]) -> None:
     if not instrument_provider.instruments:
         return None
 
-    record_llm_based_command_generator_cpu_usage(
+    record_llm_based_component_cpu_usage(
         instrument_provider, LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME
     )
-    record_llm_based_command_generator_memory_usage(
+    record_llm_based_component_memory_usage(
         instrument_provider, LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME
     )
-    record_llm_based_command_generator_prompt_token(
+    record_llm_based_component_prompt_token(
         instrument_provider,
         attributes,
         LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
     )
+    return None
 
 
 def record_single_step_llm_command_generator_metrics(
@@ -162,17 +177,18 @@ def record_single_step_llm_command_generator_metrics(
     if not instrument_provider.instruments:
         return None
 
-    record_llm_based_command_generator_cpu_usage(
+    record_llm_based_component_cpu_usage(
         instrument_provider, SINGLE_STEP_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME
     )
-    record_llm_based_command_generator_memory_usage(
+    record_llm_based_component_memory_usage(
         instrument_provider, SINGLE_STEP_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME
     )
-    record_llm_based_command_generator_prompt_token(
+    record_llm_based_component_prompt_token(
         instrument_provider,
         attributes,
         SINGLE_STEP_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
     )
+    return None
 
 
 def record_compact_llm_command_generator_metrics(
@@ -192,17 +208,49 @@ def record_compact_llm_command_generator_metrics(
     if not instrument_provider.instruments:
         return None
 
-    record_llm_based_command_generator_cpu_usage(
+    record_llm_based_component_cpu_usage(
         instrument_provider, COMPACT_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME
     )
-    record_llm_based_command_generator_memory_usage(
+    record_llm_based_component_memory_usage(
         instrument_provider, COMPACT_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME
     )
-    record_llm_based_command_generator_prompt_token(
+    record_llm_based_component_prompt_token(
         instrument_provider,
         attributes,
         COMPACT_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
     )
+    return None
+
+
+def record_search_ready_llm_command_generator_metrics(
+    attributes: Dict[str, Any],
+) -> None:
+    """
+    Record measurements for SearchReadyLLMCommandGenerator specific metrics.
+
+    The recording is done by the opentelemetry.metrics.Histogram instruments.
+    These instruments are registered to the MetricInstrumentProvider internal singleton.
+
+    :param attributes: Extracted tracing attributes
+    :return: None
+    """
+    instrument_provider = MetricInstrumentProvider()
+
+    if not instrument_provider.instruments:
+        return None
+
+    record_llm_based_component_cpu_usage(
+        instrument_provider, SEARCH_READY_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME
+    )
+    record_llm_based_component_memory_usage(
+        instrument_provider, SEARCH_READY_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME
+    )
+    record_llm_based_component_prompt_token(
+        instrument_provider,
+        attributes,
+        SEARCH_READY_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
+    )
+    return None
 
 
 def record_multi_step_llm_command_generator_metrics(attributes: Dict[str, Any]) -> None:
@@ -220,17 +268,47 @@ def record_multi_step_llm_command_generator_metrics(attributes: Dict[str, Any])
     if not instrument_provider.instruments:
         return None
 
-    record_llm_based_command_generator_cpu_usage(
+    record_llm_based_component_cpu_usage(
         instrument_provider, MULTI_STEP_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME
     )
-    record_llm_based_command_generator_memory_usage(
+    record_llm_based_component_memory_usage(
         instrument_provider, MULTI_STEP_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME
     )
-    record_llm_based_command_generator_prompt_token(
+    record_llm_based_component_prompt_token(
         instrument_provider,
         attributes,
         MULTI_STEP_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
     )
+    return None
+
+
+def record_enterprise_search_policy_metrics(attributes: Dict[str, Any]) -> None:
+    """
+    Record measurements for EnterpriseSearchPolicy specific metrics.
+
+    The recording is done by the opentelemetry.metrics.Histogram instruments.
+    These instruments are registered to the MetricInstrumentProvider internal singleton.
+
+    :param attributes: Extracted tracing attributes
+    :return: None
+    """
+    instrument_provider = MetricInstrumentProvider()
+
+    if not instrument_provider.instruments:
+        return None
+
+    record_llm_based_component_cpu_usage(
+        instrument_provider, ENTERPRISE_SEARCH_POLICY_CPU_USAGE_METRIC_NAME
+    )
+    record_llm_based_component_memory_usage(
+        instrument_provider, ENTERPRISE_SEARCH_POLICY_MEMORY_USAGE_METRIC_NAME
+    )
+    record_llm_based_component_prompt_token(
+        instrument_provider,
+        attributes,
+        ENTERPRISE_SEARCH_POLICY_PROMPT_TOKEN_USAGE_METRIC_NAME,
+    )
+    return None
 
 
 def record_callable_duration_metrics(
@@ -276,6 +354,11 @@ def record_callable_duration_metrics(
             COMPACT_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME
         )
 
+    if type(self) == SearchReadyLLMCommandGenerator:
+        metric_instrument = instrument_provider.get_instrument(
+            SEARCH_READY_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME
+        )
+
     if type(self) == MultiStepLLMCommandGenerator:
         metric_instrument = instrument_provider.get_instrument(
             MULTI_STEP_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME

rasa/tracing/metric_instrument_provider.py

@@ -10,7 +10,10 @@ from rasa.tracing.constants import (
     COMPACT_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
     CONTEXTUAL_RESPONSE_REPHRASER_LLM_RESPONSE_DURATION_METRIC_NAME,
     DURATION_UNIT_NAME,
+    ENTERPRISE_SEARCH_POLICY_CPU_USAGE_METRIC_NAME,
     ENTERPRISE_SEARCH_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME,
+    ENTERPRISE_SEARCH_POLICY_MEMORY_USAGE_METRIC_NAME,
+    ENTERPRISE_SEARCH_POLICY_PROMPT_TOKEN_USAGE_METRIC_NAME,
     INTENTLESS_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME,
     LLM_BASED_COMMAND_GENERATOR_CPU_MEMORY_USAGE_UNIT_NAME,
     LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME,
@@ -23,6 +26,10 @@ from rasa.tracing.constants import (
     MULTI_STEP_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
     RASA_CLIENT_REQUEST_BODY_SIZE_METRIC_NAME,
     RASA_CLIENT_REQUEST_DURATION_METRIC_NAME,
+    SEARCH_READY_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME,
+    SEARCH_READY_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME,
+    SEARCH_READY_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME,
+    SEARCH_READY_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
     SINGLE_STEP_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME,
     SINGLE_STEP_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME,
     SINGLE_STEP_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME,
@@ -48,7 +55,9 @@ class MetricInstrumentProvider(metaclass=Singleton):
             **self._create_llm_command_generator_instruments(meter),
             **self._create_single_step_llm_command_generator_instruments(meter),
             **self._create_compact_llm_command_generator_instruments(meter),
+            **self._create_search_ready_llm_command_generator_instruments(meter),
             **self._create_multi_step_llm_command_generator_instruments(meter),
+            **self._create_enterprise_search_policy_instruments(meter),
             **self._create_llm_response_duration_instruments(meter),
             **self._create_client_request_instruments(meter),
         }
@@ -162,6 +171,41 @@ class MetricInstrumentProvider(metaclass=Singleton):
             COMPACT_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME: compact_llm_response_duration_llm_command_generator,  # noqa: E501
         }
 
+    @staticmethod
+    def _create_search_ready_llm_command_generator_instruments(
+        meter: Meter,
+    ) -> Dict[str, Any]:
+        search_ready_llm_command_generator_cpu_usage = meter.create_histogram(
+            name=SEARCH_READY_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME,
+            description="CPU percentage for SearchReadyLLMCommandGenerator",
+            unit=LLM_BASED_COMMAND_GENERATOR_CPU_MEMORY_USAGE_UNIT_NAME,
+        )
+
+        search_ready_llm_command_generator_memory_usage = meter.create_histogram(
+            name=SEARCH_READY_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME,
+            description="RAM memory usage for SearchReadyLLMCommandGenerator",
+            unit=LLM_BASED_COMMAND_GENERATOR_CPU_MEMORY_USAGE_UNIT_NAME,
+        )
+
+        search_ready_llm_command_generator_prompt_token_usage = meter.create_histogram(
+            name=SEARCH_READY_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME,
+            description="SearchReadyLLMCommandGenerator prompt token length",
+            unit="1",
+        )
+
+        search_ready_llm_response_duration_command_generator = meter.create_histogram(
+            name=SEARCH_READY_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME,
+            description="The duration of SearchReadyLLMCommandGenerator's LLM call",
+            unit=DURATION_UNIT_NAME,
+        )
+
+        return {
+            SEARCH_READY_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME: search_ready_llm_command_generator_cpu_usage,  # noqa: E501
+            SEARCH_READY_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME: search_ready_llm_command_generator_memory_usage,  # noqa: E501
+            SEARCH_READY_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME: search_ready_llm_command_generator_prompt_token_usage,  # noqa: E501
+            SEARCH_READY_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME: search_ready_llm_response_duration_command_generator,  # noqa: E501
+        }
+
     @staticmethod
     def _create_multi_step_llm_command_generator_instruments(
         meter: Meter,
@@ -198,13 +242,42 @@ class MetricInstrumentProvider(metaclass=Singleton):
         }
 
     @staticmethod
-    def _create_llm_response_duration_instruments(meter: Meter) -> Dict[str, Any]:
-        llm_response_duration_enterprise_search = meter.create_histogram(
+    def _create_enterprise_search_policy_instruments(
+        meter: Meter,
+    ) -> Dict[str, Any]:
+        enterprise_search_policy_cpu_usage = meter.create_histogram(
+            name=ENTERPRISE_SEARCH_POLICY_CPU_USAGE_METRIC_NAME,
+            description="CPU percentage for EnterpriseSearchPolicy",
+            unit=LLM_BASED_COMMAND_GENERATOR_CPU_MEMORY_USAGE_UNIT_NAME,
+        )
+
+        enterprise_search_policy_memory_usage = meter.create_histogram(
+            name=ENTERPRISE_SEARCH_POLICY_MEMORY_USAGE_METRIC_NAME,
+            description="RAM memory usage for EnterpriseSearchPolicy",
+            unit=LLM_BASED_COMMAND_GENERATOR_CPU_MEMORY_USAGE_UNIT_NAME,
+        )
+
+        enterprise_search_policy_prompt_token_usage = meter.create_histogram(
+            name=ENTERPRISE_SEARCH_POLICY_PROMPT_TOKEN_USAGE_METRIC_NAME,
+            description="EnterpriseSearchPolicy prompt token length",
+            unit="1",
+        )
+
+        enterprise_search_policy_llm_response_duration = meter.create_histogram(
             name=ENTERPRISE_SEARCH_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME,
             description="The duration of EnterpriseSearchPolicy's LLM call",
             unit=DURATION_UNIT_NAME,
         )
 
+        return {
+            ENTERPRISE_SEARCH_POLICY_CPU_USAGE_METRIC_NAME: enterprise_search_policy_cpu_usage,  # noqa: E501
+            ENTERPRISE_SEARCH_POLICY_MEMORY_USAGE_METRIC_NAME: enterprise_search_policy_memory_usage,  # noqa: E501
+            ENTERPRISE_SEARCH_POLICY_PROMPT_TOKEN_USAGE_METRIC_NAME: enterprise_search_policy_prompt_token_usage,  # noqa: E501
+            ENTERPRISE_SEARCH_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME: enterprise_search_policy_llm_response_duration,  # noqa: E501
+        }
+
+    @staticmethod
+    def _create_llm_response_duration_instruments(meter: Meter) -> Dict[str, Any]:
         llm_response_duration_intentless = meter.create_histogram(
             name=INTENTLESS_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME,
             description="The duration of IntentlessPolicy's LLM call",
@@ -218,7 +291,6 @@ class MetricInstrumentProvider(metaclass=Singleton):
         )
 
         return {
-            ENTERPRISE_SEARCH_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME: llm_response_duration_enterprise_search,  # noqa: E501
             INTENTLESS_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME: llm_response_duration_intentless,  # noqa: E501
             CONTEXTUAL_RESPONSE_REPHRASER_LLM_RESPONSE_DURATION_METRIC_NAME: llm_response_duration_contextual_nlg,  # noqa: E501
         }

rasa/utils/common.py

@@ -29,7 +29,6 @@ import numpy as np
 
 import rasa.shared.utils.io
 import rasa.utils.io
-from rasa.anonymization import ENV_LOG_LEVEL_FAKER, ENV_LOG_LEVEL_PRESIDIO
 from rasa.constants import (
     DEFAULT_LOG_LEVEL_LIBRARIES,
     ENV_LOG_LEVEL_KAFKA,
@@ -53,7 +52,7 @@ EXPECTED_WARNINGS: List[Tuple[Type[Warning], str]] = [
         np.VisibleDeprecationWarning,
         "Creating an ndarray from ragged nested sequences.*",
     ),
-    # raised by pycountry (rasa-plus anonymization), magic_filter, google rpc
+    # raised by magic_filter, google rpc
     # and probably other dependencies that use pkg_resources instead of importlib
     (DeprecationWarning, ".*pkg_resources.*"),
     # This warning is triggered by sanic-cors 2.0.0 and by langchain -> faiss.
@@ -281,8 +280,6 @@ def configure_library_logging() -> None:
     update_matplotlib_log_level(library_log_level)
     update_kafka_log_level(library_log_level)
     update_rabbitmq_log_level(library_log_level)
-    update_presidio_log_level(library_log_level)
-    update_faker_log_level(library_log_level)
 
 
 def update_apscheduler_log_level() -> None:
@@ -407,29 +404,6 @@ def update_rabbitmq_log_level(library_log_level: Text) -> None:
     logging.getLogger("aiormq").setLevel(log_level)
 
 
-def update_presidio_log_level(library_log_level: Text) -> None:
-    """Set the log level of presidio.
-
-    Uses the library specific log level or the general libraries log level.
-    """
-    log_level = os.environ.get(ENV_LOG_LEVEL_PRESIDIO, library_log_level)
-    presidio_loggers = ["presidio_analyzer", "presidio_anonymizer"]
-
-    for logger_name in presidio_loggers:
-        logging.getLogger(logger_name).setLevel(log_level)
-        logging.getLogger(logger_name).propagate = False
-
-
-def update_faker_log_level(library_log_level: Text) -> None:
-    """Set the log level of faker.
-
-    Uses the library specific log level or the general libraries log level.
-    """
-    log_level = os.environ.get(ENV_LOG_LEVEL_FAKER, library_log_level)
-    logging.getLogger("faker").setLevel(log_level)
-    logging.getLogger("faker").propagate = False
-
-
 def sort_list_of_dicts_by_first_key(dicts: List[Dict]) -> List[Dict]:
     """Sorts a list of dictionaries by their first key."""
     return sorted(dicts, key=lambda d: next(iter(d.keys())))

rasa/utils/log_utils.py

@@ -3,14 +3,13 @@ from __future__ import annotations
 import logging
 import os
 import sys
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 import structlog
 from structlog.dev import ConsoleRenderer
 from structlog.typing import EventDict, WrappedLogger
 from structlog_sentry import SentryProcessor
 
-from rasa.plugin import plugin_manager
 from rasa.shared.constants import (
     DEFAULT_LOG_LEVEL,
     DEFAULT_LOG_LEVEL_LLM,
@@ -35,48 +34,6 @@ class HumanConsoleRenderer(ConsoleRenderer):
         return super().__call__(logger, name, event_dict)
 
 
-def _anonymizer(
-    _: structlog.BoundLogger, __: str, event_dict: Dict[str, Any]
-) -> Dict[str, Any]:
-    """Anonymizes event dict."""
-    anonymizable_keys = [
-        "text",
-        "response_text",
-        "user_text",
-        "slots",
-        "parse_data_text",
-        "parse_data_entities",
-        "prediction_events",
-        "tracker_latest_message",
-        "prefilled_slots",
-        "message",
-        "response",
-        "slot_candidates",
-        "rasa_event",
-        "rasa_events",
-        "tracker_states",
-        "current_states",
-        "old_states",
-        "current_states",
-        "successes",
-        "current_entity",
-        "next_entity",
-        "states",
-        "entity",
-        "token_text",
-        "user_message",
-        "json_message",
-    ]
-    anonymization_pipeline = plugin_manager().hook.get_anonymization_pipeline()
-
-    if anonymization_pipeline:
-        for key in anonymizable_keys:
-            if key in event_dict:
-                anonymized_value = anonymization_pipeline.log_run(event_dict[key])
-                event_dict[key] = anonymized_value
-    return event_dict
-
-
 def configure_structlog(
     log_level: Optional[int] = None,
     include_time: bool = False,
@@ -95,7 +52,6 @@ def configure_structlog(
     )
 
     shared_processors = [
-        _anonymizer,
         # Processors that have nothing to do with output,
         # e.g., add timestamps or log level names.
         # If log level is too low, abort pipeline and throw away log entry.

rasa/validator.py

@@ -1014,11 +1014,6 @@ class Validator:
             for sv in slot_value
         ]
         if not all(slot_values_validity):
-            invalid_slot_values = [
-                sv
-                for (sv, slot_value_valid) in zip(slot_value, slot_values_validity)
-                if not slot_value_valid
-            ]
             structlogger.error(
                 "validator.verify_predicates.link.invalid_condition",
                 step=step_id,
@@ -1027,8 +1022,7 @@ class Validator:
                 event_info=(
                     f"Detected invalid condition '{link_condition}' "
                     f"at step '{step_id}' for flow id '{flow_id}'. "
-                    f"Values {invalid_slot_values} are not valid values "
-                    f"for slot {slot_name}. "
+                    f"The condition contains invalid values for slot {slot_name}. "
                     f"Please make sure that all conditions are valid."
                 ),
             )
@@ -1998,7 +1992,7 @@ class Validator:
                         "validator.validate_conditional_response_variation_predicates.invalid_slot",
                         utter=utter_name,
                         event_info=(
-                            f"Detected invalid slot '{slot_namespace[1]}' in "
+                            f"Detected invalid slot '{slot_namespace[0]}' in "
                             f"condition '{condition}' for response variation "
                             f"'{utter_name}'. Please make sure that all slots "
                             f"are specified in the domain file."

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.13.0.dev7"
+__version__ = "3.13.0.dev8"