rasa-pro 3.12.18.dev1__py3-none-any.whl → 3.13.0a1.dev2__py3-none-any.whl

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,
@@ -48,11 +47,12 @@ T = TypeVar("T")
 
 EXPECTED_WARNINGS: List[Tuple[Type[Warning], str]] = [
     # TODO (issue #9932)
+    #  DM1 warnings
     (
         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.
@@ -94,6 +94,41 @@ EXPECTED_WARNINGS: List[Tuple[Type[Warning], str]] = [
         DeprecationWarning,
         "https://importlib-resources.readthedocs.io/en/latest/using.html#migrating-from-legacy",
     ),
+    # CALM warnings
+    # Ignore deprecation warning for ml_dtypes.float8_e4m3b11
+    (
+        DeprecationWarning,
+        "ml_dtypes.float8_e4m3b11 is deprecated. Use ml_dtypes.float8_e4m3b11fnuz",
+    ),
+    # Ignore deprecation warning for the load_module() method
+    (
+        DeprecationWarning,
+        "the load_module\\(\\) method is deprecated and slated for removal*",
+    ),
+    # Ignore deprecation warning for the rule-based policy
+    (
+        UserWarning,
+        "Found a rule-based policy in your configuration but no rule-based training*",
+    ),
+    # Ignore deprecation warning for the TEDPolicy
+    (
+        UserWarning,
+        "Skipping training of `TEDPolicy` as no data was provided.*",
+    ),
+    # Ignore deprecation warning for the LexicalSyntacticFeaturizer
+    (
+        UserWarning,
+        "No lexical syntactic features could be extracted from the training data.*",
+    ),
+    # Ignore deprecation warning for the LexicalSyntacticFeaturizer2
+    (
+        UserWarning,
+        "The LexicalSyntacticFeaturizer run_LexicalSyntacticFeaturizer2 has not been*",
+    ),
+    (
+        FutureWarning,
+        "'request_timeout' is deprecated and will be removed in 4.0.0. Use 'timeout'*",
+    ),
 ]
 
 PYTHON_LOGGING_SCHEMA_DOCS = (
@@ -245,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:
@@ -371,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/endpoints.py

@@ -190,7 +190,13 @@ class EndpointConfig:
         sslcontext = None
         if self.cafile:
             try:
-                sslcontext = ssl.create_default_context(cafile=self.cafile)
+                # create a SSL context with the provided CA file
+                # and set the minimum TLS version to 1.2
+                # Purpose is set to SERVER_AUTH to verify the server's certificate
+                sslcontext = ssl.create_default_context(
+                    purpose=ssl.Purpose.SERVER_AUTH, cafile=self.cafile
+                )
+                sslcontext.minimum_version = ssl.TLSVersion.TLSv1_2
             except FileNotFoundError as e:
                 raise FileNotFoundException(
                     f"Failed to find certificate file, "
@@ -233,6 +239,21 @@ class EndpointConfig:
             **self.kwargs,
         )
 
+    def to_dict(self) -> Dict[Text, Any]:
+        """Convert the endpoint config to a dictionary."""
+        data = {
+            "url": self.url,
+            "params": self.params,
+            "headers": self.headers,
+            "basic_auth": self.basic_auth,
+            "token": self.token,
+            "token_name": self.token_name,
+            "cafile": self.cafile,
+            "actions_module": self.actions_module,
+        }
+        data.update(self.kwargs)
+        return data
+
     def __eq__(self, other: Any) -> bool:
         if isinstance(self, type(other)):
             return (

rasa/utils/licensing.py

@@ -15,12 +15,10 @@ from dotenv import dotenv_values
 from sanic import Sanic
 
 from rasa import telemetry
-from rasa.core import jobs
 from rasa.shared.utils.cli import print_error_and_exit
 
 if typing.TYPE_CHECKING:
-    from rasa.core.tracker_store import TrackerStore
-
+    from rasa.core.tracker_stores.tracker_store import TrackerStore
 
 LICENSE_ENV_VAR = "RASA_PRO_LICENSE"
 ALGORITHM = "RS256"
@@ -506,6 +504,7 @@ async def _schedule_conversation_counting(
     app: Sanic, tracker_store: Optional["TrackerStore"], max_number_conversations: int
 ) -> None:
     """Schedule a job counting the number of conversations in the current month."""
+    from rasa.core import jobs
 
     async def conversation_counting_job(
         app: Sanic,

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

@@ -630,11 +630,14 @@ class Validator:
         flow_id: str,
     ) -> bool:
         """Validates that a collect step can have either an action or an utterance.
+
         Also logs an error if neither an action nor an utterance is defined.
 
         Args:
             collect: the name of the slot to collect
             all_good: boolean value indicating the validation status
+            domain_slots: the slots of the domain
+            flow_id: the id of the flow
 
         Returns:
             False, if validation failed, true, otherwise
@@ -683,9 +686,10 @@ class Validator:
                 has_action_defined=has_action_defined,
                 flow=flow_id,
                 event_info=(
-                    f"The collect step '{collect.collect}' has neither an utterance "
-                    f"nor an action defined, or an initial value defined in the domain."
-                    f"You need to define either an utterance or an action."
+                    f"The collect step '{collect.collect}' has neither a response "
+                    f"nor an action defined, nor an initial value defined in the "
+                    f"domain. You can fix this by adding a response named "
+                    f"'{collect.utter}' used in the collect step."
                 ),
             )
             all_good = False
@@ -1014,11 +1018,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 +1026,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 +1996,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.12.18.dev1"
+__version__ = "3.13.0a1.dev2"