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

rasa/telemetry.py

@@ -23,7 +23,6 @@ import structlog
 from terminaltables import SingleTable
 
 import rasa
-import rasa.anonymization.utils
 import rasa.shared.utils.io
 import rasa.utils.io
 from rasa import model
@@ -34,6 +33,7 @@ from rasa.constants import (
     CONFIG_TELEMETRY_ID,
 )
 from rasa.engine.storage.local_model_storage import LocalModelStorage
+from rasa.privacy.privacy_config import AnonymizationType, PrivacyConfig
 from rasa.shared.constants import (
     ASSISTANT_ID_KEY,
     CONFIG_LANGUAGE_KEY,
@@ -62,10 +62,10 @@ from rasa.utils import common as rasa_utils
 
 if typing.TYPE_CHECKING:
     from rasa.core.agent import Agent
+    from rasa.core.available_endpoints import AvailableEndpoints
     from rasa.core.brokers.broker import EventBroker
     from rasa.core.channels.channel import InputChannel
-    from rasa.core.tracker_store import TrackerStore
-    from rasa.core.utils import AvailableEndpoints
+    from rasa.core.tracker_stores.tracker_store import TrackerStore
     from rasa.e2e_test.e2e_test_case import Fixture, Metadata, TestCase
     from rasa.shared.importers.importer import TrainingDataImporter
     from rasa.shared.nlu.training_data.training_data import TrainingData
@@ -149,6 +149,7 @@ TELEMETRY_ENTERPRISE_SEARCH_POLICY_TRAINING_COMPLETED_EVENT = (
 TELEMETRY_ENTERPRISE_SEARCH_POLICY_PREDICT_EVENT = "Enterprise Search Policy Predicted"
 TELEMETRY_VALIDATION_ERROR_LOG_EVENT = "Validation Error Logged"
 TELEMETRY_UPLOAD_TO_STUDIO_FAILED_EVENT = "Upload to Studio Failed"
+TELEMETRY_PRIVACY_ENABLED_EVENT = "PII Management in CALM Enabled"
 
 # licensing events
 TELEMETRY_CONVERSATION_COUNT = "Conversation Count"
@@ -915,7 +916,7 @@ def initialize_error_reporting() -> None:
             OSError,
         ],
         in_app_include=["rasa"],  # only submit errors in this package
-        with_locals=False,  # don't submit local variables
+        include_local_variables=False,  # don't submit local variables
         release=f"rasa-{rasa.__version__}",
         default_integrations=False,
         environment="development" if in_continuous_integration() else "production",
@@ -1129,6 +1130,7 @@ def _get_llm_command_generator_config(config: Dict[str, Any]) -> Optional[Dict]:
         LLMBasedCommandGenerator,
         LLMCommandGenerator,
         MultiStepLLMCommandGenerator,
+        SearchReadyLLMCommandGenerator,
         SingleStepLLMCommandGenerator,
     )
     from rasa.dialogue_understanding.generator.constants import (
@@ -1156,6 +1158,7 @@ def _get_llm_command_generator_config(config: Dict[str, Any]) -> Optional[Dict]:
                 SingleStepLLMCommandGenerator.__name__,
                 MultiStepLLMCommandGenerator.__name__,
                 CompactLLMCommandGenerator.__name__,
+                SearchReadyLLMCommandGenerator.__name__,
             ]:
                 return component
         return None
@@ -1167,6 +1170,7 @@ def _get_llm_command_generator_config(config: Dict[str, Any]) -> Optional[Dict]:
             SingleStepLLMCommandGenerator.__name__: SingleStepLLMCommandGenerator,
             MultiStepLLMCommandGenerator.__name__: MultiStepLLMCommandGenerator,
             CompactLLMCommandGenerator.__name__: CompactLLMCommandGenerator,
+            SearchReadyLLMCommandGenerator.__name__: SearchReadyLLMCommandGenerator,
         }
         llm_config = component.get(LLM_CONFIG_KEY, {})
         # Config at this stage is not yet resolved, so read from `model_group`
@@ -1353,7 +1357,7 @@ def track_server_start(
         number_of_workers: number of used Sanic workers
         is_api_enabled: whether the rasa API server is enabled
     """
-    from rasa.core.utils import AvailableEndpoints
+    from rasa.core.available_endpoints import AvailableEndpoints
 
     def project_fingerprint_and_assistant_id_from_model(
         _model_directory: Optional[Text],
@@ -1745,7 +1749,6 @@ def identify_endpoint_config_traits(
 
     traits = append_tracing_trait(traits, endpoints_file)
     traits = append_metrics_trait(traits, endpoints_file)
-    traits = append_anonymization_trait(traits, endpoints_file)
 
     _identify(traits, context)
 
@@ -1784,27 +1787,6 @@ def append_metrics_trait(
     return traits
 
 
-def append_anonymization_trait(
-    traits: Dict[str, Any], endpoints_file: Optional[str]
-) -> Dict[str, Any]:
-    """Append the anonymization trait to the traits dictionary."""
-    from rasa.anonymization.anonymisation_rule_yaml_reader import (
-        KEY_ANONYMIZATION_RULES,
-    )
-
-    anonymization_config = rasa.anonymization.utils.read_endpoint_config(
-        endpoints_file, KEY_ANONYMIZATION_RULES
-    )
-
-    traits[KEY_ANONYMIZATION_RULES] = (
-        rasa.anonymization.utils.extract_anonymization_traits(
-            anonymization_config, KEY_ANONYMIZATION_RULES
-        )
-    )
-
-    return traits
-
-
 @ensure_telemetry_enabled
 def track_enterprise_search_policy_train_started() -> None:
     """Track when a user starts training Enterprise Search policy."""
@@ -1821,6 +1803,7 @@ def track_enterprise_search_policy_train_completed(
     llm_model: Optional[str],
     llm_model_group_id: Optional[str],
     citation_enabled: Optional[bool],
+    relevancy_check_enabled: Optional[bool],
 ) -> None:
     """Track when a user completes training Enterprise Search policy."""
     _track(
@@ -1834,6 +1817,7 @@ def track_enterprise_search_policy_train_completed(
             "llm_model": llm_model,
             "llm_model_group_id": llm_model_group_id,
             "citation_enabled": citation_enabled,
+            "relevancy_check_enabled": relevancy_check_enabled,
         },
     )
 
@@ -1848,6 +1832,7 @@ def track_enterprise_search_policy_predict(
     llm_model: Optional[str],
     llm_model_group_id: Optional[str],
     citation_enabled: Optional[bool],
+    relevancy_check_enabled: Optional[bool],
 ) -> None:
     """Track when a user predicts the next action using Enterprise Search policy."""
     _track(
@@ -1861,6 +1846,7 @@ def track_enterprise_search_policy_predict(
             "llm_model": llm_model,
             "llm_model_group_id": llm_model_group_id,
             "citation_enabled": citation_enabled,
+            "relevancy_check_enabled": relevancy_check_enabled,
         },
     )
 
@@ -1946,3 +1932,74 @@ def track_upload_to_studio_failed(response_json: Dict[str, Any]) -> None:
         TELEMETRY_UPLOAD_TO_STUDIO_FAILED_EVENT,
         {"studio_response_json": response_json},
     )
+
+
+def _extract_privacy_enabled_event_properties(
+    privacy_config: "PrivacyConfig",
+    stream_pii: bool,
+) -> Dict[str, Any]:
+    """Extract properties when PII management is enabled."""
+    number_of_total_rules = len(privacy_config.anonymization_rules)
+    count_of_redact = sum(
+        1
+        for rule in privacy_config.anonymization_rules.values()
+        if rule.method_type == AnonymizationType.REDACT
+    )
+    count_of_mask = sum(
+        1
+        for rule in privacy_config.anonymization_rules.values()
+        if rule.method_type == AnonymizationType.MASK
+    )
+
+    tracker_store_anonymization_enabled = (
+        privacy_config.tracker_store_settings is not None
+        and privacy_config.tracker_store_settings.anonymization_policy is not None
+    )
+    anonymization_cron_trigger = (
+        privacy_config.tracker_store_settings.anonymization_policy.cron  # type: ignore[union-attr]
+        if tracker_store_anonymization_enabled
+        else None
+    )
+
+    tracker_store_deletion_enabled = (
+        privacy_config.tracker_store_settings is not None
+        and privacy_config.tracker_store_settings.deletion_policy is not None
+    )
+
+    deletion_cron_trigger = (
+        privacy_config.tracker_store_settings.deletion_policy.cron  # type: ignore[union-attr]
+        if tracker_store_deletion_enabled
+        else None
+    )
+
+    return {
+        "num_total_rules": number_of_total_rules,
+        "redact_count": count_of_redact,
+        "mask_count": count_of_mask,
+        "stream_pii": stream_pii,
+        "tracker_store_anonymization_enabled": tracker_store_anonymization_enabled,
+        "tracker_store_deletion_enabled": tracker_store_deletion_enabled,
+        "anonymization_cron_trigger": str(anonymization_cron_trigger),
+        "deletion_cron_trigger": str(deletion_cron_trigger),
+    }
+
+
+def _extract_stream_pii(event_broker: Optional["EventBroker"]) -> bool:
+    """Extract whether un-anonymized PII streaming is enabled for the event broker."""
+    return (
+        event_broker.stream_pii
+        if event_broker is not None and hasattr(event_broker, "stream_pii")
+        else False
+    )
+
+
+@ensure_telemetry_enabled
+def track_privacy_enabled(
+    privacy_config: "PrivacyConfig", event_broker: Optional["EventBroker"]
+) -> None:
+    """Track when PII management capability is enabled"""
+    stream_pii = _extract_stream_pii(event_broker)
+    privacy_properties = _extract_privacy_enabled_event_properties(
+        privacy_config, stream_pii
+    )
+    _track(TELEMETRY_PRIVACY_ENABLED_EVENT, privacy_properties)

rasa/tracing/config.py

@@ -23,15 +23,13 @@ from rasa.core.actions.custom_action_executor import (
 from rasa.core.actions.grpc_custom_action_executor import GRPCCustomActionExecutor
 from rasa.core.agent import Agent
 from rasa.core.processor import MessageProcessor
-from rasa.core.tracker_store import TrackerStore
-from rasa.dialogue_understanding.commands import (
-    Command,
-    FreeFormAnswerCommand,
-)
+from rasa.core.tracker_stores.tracker_store import TrackerStore
+from rasa.dialogue_understanding.commands import Command, FreeFormAnswerCommand
 from rasa.dialogue_understanding.generator import (
     CompactLLMCommandGenerator,
     LLMCommandGenerator,
     MultiStepLLMCommandGenerator,
+    SearchReadyLLMCommandGenerator,
     SingleStepLLMCommandGenerator,
 )
 from rasa.dialogue_understanding.generator.flow_retrieval import FlowRetrieval
@@ -112,6 +110,7 @@ def configure_tracing(tracer_provider: Optional[TracerProvider]) -> None:
         grpc_custom_action_executor_class=GRPCCustomActionExecutor,
         single_step_llm_command_generator_class=SingleStepLLMCommandGenerator,
         compact_llm_command_generator_class=CompactLLMCommandGenerator,
+        search_ready_llm_command_generator_class=SearchReadyLLMCommandGenerator,
         multi_step_llm_command_generator_class=MultiStepLLMCommandGenerator,
         custom_action_executor_subclasses=custom_action_executor_subclasses,
         flow_retrieval_class=FlowRetrieval,

rasa/tracing/constants.py

@@ -44,6 +44,18 @@ COMPACT_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME = (
 COMPACT_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME = (
     "compact_llm_command_generator_llm_response_duration"
 )
+SEARCH_READY_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME = (
+    "search_ready_llm_command_generator_cpu_usage"
+)
+SEARCH_READY_LLM_COMMAND_GENERATOR_MEMORY_USAGE_METRIC_NAME = (
+    "search_ready_llm_command_generator_memory_usage"
+)
+SEARCH_READY_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME = (
+    "search_ready_llm_command_generator_prompt_token_usage"
+)
+SEARCH_READY_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME = (
+    "search_ready_llm_command_generator_llm_response_duration"
+)
 MULTI_STEP_LLM_COMMAND_GENERATOR_CPU_USAGE_METRIC_NAME = (
     "multi_step_llm_command_generator_cpu_usage"
 )
@@ -56,7 +68,13 @@ MULTI_STEP_LLM_COMMAND_GENERATOR_PROMPT_TOKEN_USAGE_METRIC_NAME = (
 MULTI_STEP_LLM_COMMAND_GENERATOR_LLM_RESPONSE_DURATION_METRIC_NAME = (
     "multi_step_llm_command_generator_llm_response_duration"
 )
-
+ENTERPRISE_SEARCH_POLICY_CPU_USAGE_METRIC_NAME = "enterprise_search_policy_cpu_usage"
+ENTERPRISE_SEARCH_POLICY_MEMORY_USAGE_METRIC_NAME = (
+    "enterprise_search_policy_memory_usage"
+)
+ENTERPRISE_SEARCH_POLICY_PROMPT_TOKEN_USAGE_METRIC_NAME = (
+    "enterprise_search_policy_prompt_token_usage"
+)
 ENTERPRISE_SEARCH_POLICY_LLM_RESPONSE_DURATION_METRIC_NAME = (
     "enterprise_search_policy_llm_response_duration"
 )

rasa/tracing/instrumentation/attribute_extractors.py

@@ -16,7 +16,7 @@ from rasa.core.channels import UserMessage
 from rasa.core.lock_store import LOCK_LIFETIME, LockStore
 from rasa.core.nlg.contextual_response_rephraser import ContextualResponseRephraser
 from rasa.core.processor import MessageProcessor
-from rasa.core.tracker_store import TrackerStore
+from rasa.core.tracker_stores.tracker_store import TrackerStore
 from rasa.dialogue_understanding.commands import Command
 from rasa.dialogue_understanding.generator import LLMBasedCommandGenerator
 from rasa.dialogue_understanding.generator.constants import FLOW_RETRIEVAL_KEY
@@ -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

@@ -38,12 +38,13 @@ from rasa.core.nlg import NaturalLanguageGenerator
 from rasa.core.policies.flows.flow_step_result import FlowActionPrediction
 from rasa.core.policies.policy import Policy, PolicyPrediction
 from rasa.core.processor import MessageProcessor
-from rasa.core.tracker_store import TrackerStore
+from rasa.core.tracker_stores.tracker_store import TrackerStore
 from rasa.dialogue_understanding.commands import Command
 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