rasa-pro 3.13.0.dev1__py3-none-any.whl → 3.13.0.dev3__py3-none-any.whl

rasa/shared/core/flows/flows_yaml_schema.json

@@ -217,15 +217,12 @@
                             "reset_after_flow_ends": {
                                 "type": "boolean"
                             },
-                            "ask_confirm_digressions": {
-                                "$ref": "#/$defs/ask_confirm_digressions"
-                            },
-                            "block_digressions": {
-                                "$ref": "#/$defs/block_digressions"
-                            },
                             "utter": {
                                 "type": "string"
                             },
+                            "force_slot_filling": {
+                                "type": "boolean"
+                            },
                             "rejections": {
                                 "type": "array",
                                 "schema_name": "list of rejections",
@@ -253,32 +250,6 @@
                 }
             }
         },
-        "ask_confirm_digressions": {
-            "oneOf": [
-                {
-                    "type": "boolean"
-                },
-                {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            ]
-        },
-        "block_digressions": {
-            "oneOf": [
-                {
-                    "type": "boolean"
-                },
-                {
-                    "type": "array",
-                    "items": {
-                        "type": "string"
-                    }
-                }
-            ]
-        },
         "flow": {
             "required": [
                 "steps",
@@ -340,12 +311,6 @@
                 "persisted_slots": {
                     "$ref": "#/$defs/persisted_slots"
                 },
-                "ask_confirm_digressions": {
-                    "$ref": "#/$defs/ask_confirm_digressions"
-                },
-                "block_digressions": {
-                    "$ref": "#/$defs/block_digressions"
-                },
                 "run_pattern_completed": {
                     "type": "boolean"
                 }

rasa/shared/core/flows/steps/collect.py

@@ -1,15 +1,10 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from dataclasses import dataclass
 from typing import Any, Dict, List, Set, Text
 
 from rasa.shared.constants import ACTION_ASK_PREFIX, UTTER_ASK_PREFIX
-from rasa.shared.core.constants import (
-    KEY_ASK_CONFIRM_DIGRESSIONS,
-    KEY_BLOCK_DIGRESSIONS,
-)
 from rasa.shared.core.flows.flow_step import FlowStep
-from rasa.shared.core.flows.utils import extract_digression_prop
 from rasa.shared.core.slots import SlotRejection
 
 
@@ -29,10 +24,8 @@ class CollectInformationFlowStep(FlowStep):
     """Whether to always ask the question even if the slot is already filled."""
     reset_after_flow_ends: bool = True
     """Whether to reset the slot value at the end of the flow."""
-    ask_confirm_digressions: List[str] = field(default_factory=list)
-    """The flow id digressions for which the assistant should ask for confirmation."""
-    block_digressions: List[str] = field(default_factory=list)
-    """The flow id digressions that should be blocked during the flow step."""
+    force_slot_filling: bool = False
+    """Whether to keep only the SetSlot command for the collected slot."""
 
     @classmethod
     def from_json(
@@ -60,10 +53,7 @@ class CollectInformationFlowStep(FlowStep):
                 SlotRejection.from_dict(rejection)
                 for rejection in data.get("rejections", [])
             ],
-            ask_confirm_digressions=extract_digression_prop(
-                KEY_ASK_CONFIRM_DIGRESSIONS, data
-            ),
-            block_digressions=extract_digression_prop(KEY_BLOCK_DIGRESSIONS, data),
+            force_slot_filling=data.get("force_slot_filling", False),
             **base.__dict__,
         )
 
@@ -79,10 +69,7 @@ class CollectInformationFlowStep(FlowStep):
         data["ask_before_filling"] = self.ask_before_filling
         data["reset_after_flow_ends"] = self.reset_after_flow_ends
         data["rejections"] = [rejection.as_dict() for rejection in self.rejections]
-        data["ask_confirm_digressions"] = self.ask_confirm_digressions
-        data["block_digressions"] = (
-            self.block_digressions if self.block_digressions else False
-        )
+        data["force_slot_filling"] = self.force_slot_filling
 
         return data
 

rasa/shared/core/flows/utils.py

@@ -1,4 +1,4 @@
-from typing import TYPE_CHECKING, Any, Dict, List, Set, Text
+from typing import TYPE_CHECKING, Any, Dict, Set, Text
 
 from rasa.shared.utils.io import raise_deprecation_warning
 
@@ -8,7 +8,6 @@ if TYPE_CHECKING:
 
 RESET_PROPERTY_NAME = "reset_after_flow_ends"
 PERSIST_PROPERTY_NAME = "persisted_slots"
-ALL_LABEL = "ALL"
 
 
 def warn_deprecated_collect_step_config() -> None:
@@ -45,20 +44,6 @@ def get_invalid_slot_persistence_config_error_message(
     )
 
 
-def extract_digression_prop(prop: str, data: Dict[str, Any]) -> List[str]:
-    """Extracts the digression property from the data.
-
-    There can be two types of properties: ask_confirm_digressions and
-    block_digressions.
-    """
-    digression_property = data.get(prop, [])
-
-    if isinstance(digression_property, bool):
-        digression_property = [ALL_LABEL] if digression_property else []
-
-    return digression_property
-
-
 def extract_translations(
     translation_data: Dict[Text, Any],
 ) -> Dict[Text, "FlowLanguageTranslation"]:

rasa/shared/core/slot_mappings.py

@@ -648,12 +648,14 @@ class SlotFillingManager:
         output_channel: "OutputChannel",
         nlg: "NaturalLanguageGenerator",
         recreate_tracker: bool = False,
+        slot_events: Optional[List[Event]] = None,
     ) -> List[Event]:
         from rasa.core.actions.action import RemoteAction
         from rasa.shared.core.trackers import DialogueStateTracker
         from rasa.utils.endpoints import ClientResponseError
 
-        slot_events: List[Event] = []
+        validated_slot_events: List[Event] = []
+        slot_events = slot_events if slot_events is not None else []
         remote_action = RemoteAction(custom_action, self._action_endpoint)
         disallowed_types = set()
 
@@ -673,9 +675,9 @@ class SlotFillingManager:
             )
             for event in custom_events:
                 if isinstance(event, SlotSet):
-                    slot_events.append(event)
+                    validated_slot_events.append(event)
                 elif isinstance(event, BotUttered):
-                    slot_events.append(event)
+                    validated_slot_events.append(event)
                 else:
                     disallowed_types.add(event.type_name)
         except (RasaException, ClientResponseError) as e:
@@ -699,7 +701,7 @@ class SlotFillingManager:
                 f"updated with this event.",
             )
 
-        return slot_events
+        return validated_slot_events
 
     async def execute_validation_action(
         self,
@@ -722,7 +724,11 @@ class SlotFillingManager:
             return cast(List[Event], slot_events)
 
         validate_events = await self._run_custom_action(
-            ACTION_VALIDATE_SLOT_MAPPINGS, output_channel, nlg, recreate_tracker=True
+            ACTION_VALIDATE_SLOT_MAPPINGS,
+            output_channel,
+            nlg,
+            recreate_tracker=True,
+            slot_events=cast(List[Event], slot_events),
         )
         validated_slot_names = [
             event.key for event in validate_events if isinstance(event, SlotSet)

rasa/shared/nlu/constants.py

@@ -55,4 +55,3 @@ SPLIT_ENTITIES_BY_COMMA_DEFAULT_VALUE = True
 SINGLE_ENTITY_ALLOWED_INTERLEAVING_CHARSET = {".", ",", " ", ";"}
 
 SET_SLOT_COMMAND = "set slot"
-HANDLE_DIGRESSIONS_COMMAND = "handle digressions"

rasa/shared/utils/common.py

@@ -7,7 +7,17 @@ import os
 import pkgutil
 import sys
 from types import ModuleType
-from typing import Any, Callable, Collection, Dict, List, Optional, Sequence, Text, Type
+from typing import (
+    Any,
+    Callable,
+    Collection,
+    Dict,
+    List,
+    Optional,
+    Sequence,
+    Text,
+    Type,
+)
 
 import rasa.shared.utils.io
 from rasa.exceptions import MissingDependencyException

rasa/shared/utils/constants.py

@@ -5,3 +5,6 @@ DEFAULT_READ_YAML_FILE_CACHE_MAXSIZE = 256
 RASA_PRO_BETA_PREDICATES_IN_RESPONSE_CONDITIONS_ENV_VAR_NAME = (
     "RASA_PRO_BETA_PREDICATES_IN_RESPONSE_CONDITIONS"
 )
+
+LOG_COMPONENT_SOURCE_METHOD_INIT = "init"
+LOG_COMPONENT_SOURCE_METHOD_FINGERPRINT_ADDON = "fingerprint_addon"

rasa/shared/utils/llm.py

@@ -1,5 +1,6 @@
 import importlib.resources
 import json
+import logging
 from copy import deepcopy
 from functools import wraps
 from typing import (
@@ -7,6 +8,7 @@ from typing import (
     Any,
     Callable,
     Dict,
+    Literal,
     Optional,
     Text,
     Type,
@@ -59,6 +61,7 @@ from rasa.shared.providers.mappings import (
     get_embedding_client_from_provider,
     get_llm_client_from_provider,
 )
+from rasa.shared.utils.constants import LOG_COMPONENT_SOURCE_METHOD_INIT
 
 if TYPE_CHECKING:
     from rasa.shared.core.trackers import DialogueStateTracker
@@ -654,35 +657,59 @@ def embedder_client_factory(
 
 
 def get_prompt_template(
-    jinja_file_path: Optional[Text], default_prompt_template: Text
+    jinja_file_path: Optional[Text],
+    default_prompt_template: Text,
+    *,
+    log_source_component: Optional[Text] = None,
+    log_source_method: Optional[Literal["init", "fingerprint_addon"]] = None,
 ) -> Text:
     """Returns the jinja template.
 
     Args:
-        jinja_file_path: the path to the jinja file
-        default_prompt_template: the default prompt template
+        jinja_file_path: The path to the jinja template file. If not provided, the
+            default template will be used.
+        default_prompt_template: The fallback prompt template to use if no file is
+            found or specified.
+        log_source_component: The name of the component emitting the log, used to
+            identify the source in structured logging.
+        log_source_method: The name of the method or function emitting the log for
+            better traceability.
 
     Returns:
         The prompt template.
     """
+
     try:
         if jinja_file_path is not None:
             prompt_template = rasa.shared.utils.io.read_file(jinja_file_path)
-            structlogger.info(
-                "utils.llm.get_prompt_template.custom_prompt_template_read_successfull",
+
+            log_level = (
+                logging.INFO
+                if log_source_method == LOG_COMPONENT_SOURCE_METHOD_INIT
+                else logging.DEBUG
+            )
+
+            structlogger.log(
+                log_level,
+                "utils.llm.get_prompt_template"
+                ".custom_prompt_template_read_successfully",
                 event_info=(
                     f"Custom prompt template read successfully from "
                     f"`{jinja_file_path}`."
                 ),
                 prompt_file_path=jinja_file_path,
+                log_source_component=log_source_component,
+                log_source_method=log_source_method,
             )
             return prompt_template
     except (FileIOException, FileNotFoundException):
         structlogger.warning(
-            "utils.llm.get_prompt_template.failed_to_read_custom_prompt_template",
+            "utils.llm.get_prompt_template" ".failed_to_read_custom_prompt_template",
             event_info=(
                 "Failed to read custom prompt template. Using default template instead."
             ),
+            log_source_component=log_source_component,
+            log_source_method=log_source_method,
         )
     return default_prompt_template
 
@@ -692,50 +719,66 @@ def get_default_prompt_template_based_on_model(
     model_prompt_mapping: Dict[str, Any],
     default_prompt_path: str,
     fallback_prompt_path: str,
+    *,
+    log_source_component: Optional[Text] = None,
+    log_source_method: Optional[Literal["init", "fingerprint_addon"]] = None,
 ) -> Text:
     """Returns the default prompt template based on the model name.
 
     Args:
         llm_config: The model config.
-        model_prompt_mapping: The mapping of model name to prompt template.
-        default_prompt_path: The default prompt path of the component.
-        fallback_prompt_path: The fallback prompt path for all other models
-            that do not have a mapping in the model_prompt_mapping.
+        model_prompt_mapping: The model name -> prompt template mapping.
+        default_prompt_path: The path to the default prompt template for the component.
+        fallback_prompt_path: The fallback prompt path for all other models that do not
+            have a mapping in the model_prompt_mapping.
+        log_source_component: The name of the component emitting the log, used to
+            identify the source in structured logging.
+        log_source_method: The name of the method or function emitting the log for
+            better traceability.
 
     Returns:
         The default prompt template.
     """
+    # Extract the provider and model name information from the configuration
     _llm_config = deepcopy(llm_config)
     if MODELS_CONFIG_KEY in _llm_config:
         _llm_config = _llm_config[MODELS_CONFIG_KEY][0]
     provider = _llm_config.get(PROVIDER_CONFIG_KEY)
     model = _llm_config.get(MODEL_CONFIG_KEY)
+
+    # If the model is not defined, we default to the default prompt template.
     if not model:
-        # If the model is not defined, we default to the default prompt template.
-        structlogger.info(
-            "utils.llm.get_default_prompt_template_based_on_model.using_default_prompt_template",
+        structlogger.debug(
+            "utils.llm.get_default_prompt_template_based_on_model"
+            ".using_default_prompt_template",
             event_info=(
                 f"Model not defined in the config. Default prompt template read from"
                 f" - `{default_prompt_path}`."
             ),
             default_prompt_path=default_prompt_path,
+            log_source_component=log_source_component,
+            log_source_method=log_source_method,
         )
         return importlib.resources.read_text(
             DEFAULT_PROMPT_PACKAGE_NAME, default_prompt_path
         )
 
-    model_name = model if provider and provider in model else f"{provider}/{model}"
-    if prompt_file_path := model_prompt_mapping.get(model_name):
-        # If the model is found in the mapping, we use the model-specific prompt
-        # template.
-        structlogger.info(
-            "utils.llm.get_default_prompt_template_based_on_model.using_model_specific_prompt_template",
+    full_model_name = model if provider and provider in model else f"{provider}/{model}"
+
+    # If the model is found in the mapping, we use the model-specific prompt
+    # template.
+    if prompt_file_path := model_prompt_mapping.get(full_model_name):
+        structlogger.debug(
+            "utils.llm.get_default_prompt_template_based_on_model"
+            ".using_model_specific_prompt_template",
             event_info=(
                 f"Using model-specific default prompt template. Default prompt "
                 f"template read from - `{prompt_file_path}`."
             ),
             default_prompt_path=prompt_file_path,
-            model_name=model_name,
+            model_name=full_model_name,
+            log_source_component=log_source_component,
+            log_source_method=log_source_method,
         )
         return importlib.resources.read_text(
             DEFAULT_PROMPT_PACKAGE_NAME, prompt_file_path
@@ -743,14 +786,17 @@ def get_default_prompt_template_based_on_model(
 
     # If the model is not found in the mapping, we default to the fallback prompt
     # template.
-    structlogger.info(
-        "utils.llm.get_default_prompt_template_based_on_model.using_fallback_prompt_template",
+    structlogger.debug(
+        "utils.llm.get_default_prompt_template_based_on_model"
+        ".using_fallback_prompt_template",
         event_info=(
             f"Model not found in the model prompt mapping. Fallback prompt template "
             f"read from - `{fallback_prompt_path}`."
         ),
         fallback_prompt_path=fallback_prompt_path,
-        model_name=model_name,
+        model_name=full_model_name,
+        log_source_component=log_source_component,
+        log_source_method=log_source_method,
     )
     return importlib.resources.read_text(
         DEFAULT_PROMPT_PACKAGE_NAME, fallback_prompt_path

rasa/validator.py

@@ -48,7 +48,7 @@ from rasa.shared.core.domain import (
     Domain,
 )
 from rasa.shared.core.events import ActionExecuted, ActiveLoop, UserUttered
-from rasa.shared.core.flows import Flow, FlowsList
+from rasa.shared.core.flows import FlowsList
 from rasa.shared.core.flows.constants import KEY_NAME, KEY_TRANSLATION
 from rasa.shared.core.flows.flow_step_links import IfFlowStepLink
 from rasa.shared.core.flows.steps.action import ActionFlowStep
@@ -56,7 +56,6 @@ from rasa.shared.core.flows.steps.collect import CollectInformationFlowStep
 from rasa.shared.core.flows.steps.link import LinkFlowStep
 from rasa.shared.core.flows.steps.set_slots import SetSlotsFlowStep
 from rasa.shared.core.flows.utils import (
-    ALL_LABEL,
     get_duplicate_slot_persistence_config_error_message,
     get_invalid_slot_persistence_config_error_message,
     warn_deprecated_collect_step_config,
@@ -1281,7 +1280,6 @@ class Validator:
             self.verify_unique_flows(),
             self.verify_predicates(),
             self.verify_slot_persistence_configuration(),
-            self.verify_digression_configuration(),
         ]
 
         all_good = all(flow_validation_conditions)
@@ -1830,126 +1828,6 @@ class Validator:
 
         return all_good
 
-    def verify_digression_configuration(self) -> bool:
-        """Validates the digression configuration in flows."""
-        all_good = True
-
-        for flow in self.flows.underlying_flows:
-            all_good = self._validate_ask_confirm_digressions(flow, all_good)
-            all_good = self._validate_block_digressions(flow, all_good)
-
-        return all_good
-
-    def _validate_ask_confirm_digressions(self, flow: Flow, all_good: bool) -> bool:
-        """Validates the ask_confirm_digressions configuration in a flow."""
-        for flow_id in flow.ask_confirm_digressions:
-            if flow_id == ALL_LABEL:
-                continue
-            if flow_id not in self.flows.flow_ids:
-                structlogger.error(
-                    "validator.verify_digression_configuration.ask_confirm_digressions",
-                    flow=flow.id,
-                    event_info=(
-                        f"The flow '{flow_id}' is listed in the "
-                        f"`ask_confirm_digressions` configuration of flow "
-                        f"'{flow.id}', but it is not found in the "
-                        f"flows file. Please make sure that the flow id is correct."
-                    ),
-                )
-                all_good = False
-
-            if flow_id in flow.block_digressions:
-                structlogger.error(
-                    "validator.verify_digression_configuration.overlap_digressions",
-                    flow=flow.id,
-                    event_info=(
-                        f"The flow '{flow_id}' is listed in both the "
-                        f"`ask_confirm_digressions` and `block_digressions` "
-                        f"configuration of flow '{flow.id}'. "
-                        f"Please make sure that the flow id is not listed in both "
-                        f"configurations."
-                    ),
-                )
-                all_good = False
-
-        for step in flow.get_collect_steps():
-            for flow_id in step.ask_confirm_digressions:
-                if flow_id == ALL_LABEL:
-                    continue
-
-                if flow_id not in self.flows.flow_ids:
-                    structlogger.error(
-                        "validator.verify_digression_configuration.ask_confirm_digressions",
-                        flow=flow.id,
-                        step_id=step.id,
-                        event_info=(
-                            f"The flow '{flow_id}' is listed in the "
-                            f"`ask_confirm_digressions` configuration of step "
-                            f"'{step.id}' in flow '{flow.id}', but it is "
-                            f"not found in the flows file. "
-                            f"Please make sure that the flow id is correct."
-                        ),
-                    )
-                    all_good = False
-
-                if flow_id in step.block_digressions:
-                    structlogger.error(
-                        "validator.verify_digression_configuration.overlap_digressions",
-                        flow=flow.id,
-                        step_id=step.id,
-                        event_info=(
-                            f"The flow '{flow_id}' is listed in both the "
-                            f"`ask_confirm_digressions` and `block_digressions` "
-                            f"configuration of step '{step.id}' in flow '{flow.id}'. "
-                            f"Please make sure that the flow id is not listed in both "
-                            f"configurations."
-                        ),
-                    )
-                    all_good = False
-
-        return all_good
-
-    def _validate_block_digressions(self, flow: Flow, all_good: bool) -> bool:
-        """Validates the block_digressions configuration in a flow."""
-        for flow_id in flow.block_digressions:
-            if flow_id == ALL_LABEL:
-                continue
-
-            if flow_id not in self.flows.flow_ids:
-                structlogger.error(
-                    "validator.verify_digression_configuration.block_digressions",
-                    flow=flow.id,
-                    event_info=(
-                        f"The flow '{flow_id}' is listed in the `block_digressions` "
-                        f"configuration of flow '{flow.id}', but it is not found "
-                        f"in the flows file. Please make sure that the flow id "
-                        f"is correct."
-                    ),
-                )
-                all_good = False
-
-        for step in flow.get_collect_steps():
-            for flow_id in step.block_digressions:
-                if flow_id == ALL_LABEL:
-                    continue
-
-                if flow_id not in self.flows.flow_ids:
-                    structlogger.error(
-                        "validator.verify_digression_configuration.block_digressions",
-                        flow=flow.id,
-                        step_id=step.id,
-                        event_info=(
-                            f"The flow '{flow_id}' is listed in the "
-                            f"`block_digressions` configuration of step "
-                            f"'{step.id}' in flow '{flow.id}', but it is "
-                            f"not found in the flows file. "
-                            f"Please make sure that the flow id is correct."
-                        ),
-                    )
-                    all_good = False
-
-        return all_good
-
     def verify_slot_validation(self) -> bool:
         """Validates the slot validation configuration in the domain file."""
         all_good = True

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.dev1"
+__version__ = "3.13.0.dev3"

{rasa_pro-3.13.0.dev1.dist-info → rasa_pro-3.13.0.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.13.0.dev1
+Version: 3.13.0.dev3
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH
@@ -100,7 +100,7 @@ Requires-Dist: pyyaml (>=6.0)
 Requires-Dist: qdrant-client (>=1.9.1,<1.10.0)
 Requires-Dist: questionary (>=1.10.0,<2.1.0)
 Requires-Dist: randomname (>=0.2.1,<0.3.0)
-Requires-Dist: rasa-sdk (==3.13.0.dev1)
+Requires-Dist: rasa-sdk (==3.12.0)
 Requires-Dist: redis (>=4.6.0,<6.0)
 Requires-Dist: regex (>=2024.7.24,<2024.8.0)
 Requires-Dist: requests (>=2.32.3,<2.33.0)