rasa-pro 3.14.0.dev2__py3-none-any.whl → 3.14.0.dev4__py3-none-any.whl

rasa/core/training/story_conflict.py

@@ -14,7 +14,7 @@ from rasa.shared.core.constants import (
 from rasa.shared.core.domain import Domain, State
 from rasa.shared.core.events import ActionExecuted, Event
 from rasa.shared.core.generator import TrackerWithCachedStates
-from rasa.shared.nlu.constants import TEXT
+from rasa.shared.nlu.constants import INTENT, TEXT
 from rasa.shared.nlu.training_data.message import Message
 
 logger = logging.getLogger(__name__)
@@ -362,12 +362,12 @@ def _get_previous_event(
         previous_event_type = "bot utterance"
         previous_event_name = state[PREVIOUS_ACTION]["action_text"]
     elif USER in state.keys():
-        if "intent" in state[USER]:
+        if INTENT in state[USER]:
             previous_event_type = "intent"
-            previous_event_name = state[USER]["intent"]
-        elif "text" in state[USER]:
+            previous_event_name = state[USER][INTENT]
+        elif TEXT in state[USER]:
             previous_event_type = "user utterance"
-            previous_event_name = state[USER]["text"]
+            previous_event_name = state[USER][TEXT]
 
     if not isinstance(previous_event_name, (str, type(None))):
         # While the Substate type doesn't restrict the value of `action_text` /

rasa/dialogue_understanding/commands/start_flow_command.py

@@ -21,7 +21,9 @@ from rasa.dialogue_understanding.stack.frames.flow_stack_frame import (
     FlowStackFrameType,
     UserFlowStackFrame,
 )
+from rasa.dialogue_understanding.stack.frames.pattern_frame import PatternFlowStackFrame
 from rasa.dialogue_understanding.stack.utils import (
+    is_continue_interrupted_flow_active,
     top_user_flow_frame,
     user_flows_on_the_stack,
 )
@@ -97,13 +99,26 @@ class StartFlowCommand(Command):
         # if the original top flow is the same as the flow to start, the flow is
         # already active, do nothing
         if original_top_flow is not None and original_top_flow.id == self.flow:
-            return []
+            # in case continue_interrupted is not active, skip the already active start
+            # flow command
+            if not is_continue_interrupted_flow_active(stack):
+                return []
+
+            # if the continue interrupted flow is active, and the command generator
+            # predicted a start flow command for the flow which is on top of the stack,
+            # we just need to remove the pattern_continue_interrupted frame(s) from the
+            # stack
+            stack = _remove_pattern_continue_interrupted_frames(stack)
+            return applied_events + tracker.create_stack_updated_events(stack)
 
         # if the flow is already on the stack, resume it
         if (
             self.flow in user_flows_on_the_stack(stack)
             and original_user_frame is not None
         ):
+            # if pattern_continue_interrupted is active, we need to remove it
+            # from the stack before resuming the flow
+            stack = _remove_pattern_continue_interrupted_frames(stack)
             return self.resume_flow(tracker, stack, original_user_frame)
 
         frame_type = FlowStackFrameType.REGULAR
@@ -265,3 +280,23 @@ class StartFlowCommand(Command):
                 frames_to_resume.append(frame)
 
         return list(frames_to_resume), frame_to_resume
+
+
+def _remove_pattern_continue_interrupted_frames(stack: DialogueStack) -> DialogueStack:
+    """Remove pattern_continue_interrupted frames from the stack."""
+    if not is_continue_interrupted_flow_active(stack):
+        return stack
+
+    # remove pattern_continue_interrupted from the stack
+    top_frame = stack.top()
+    while isinstance(top_frame, PatternFlowStackFrame):
+        # If the top frame is a pattern frame, we need to remove it
+        # before continuing with the active user flow frame.
+        # This prevents the pattern frame
+        # from being left on the stack when the flow is started
+        # which would prevent pattern_completed to be triggered
+        # once the user flow is completed.
+        stack.pop()
+        top_frame = stack.top()
+
+    return stack

rasa/dialogue_understanding/generator/llm_command_generator.py

@@ -1,7 +1,7 @@
 from typing import Any, Dict, List, Optional, Text, Union
 
 import structlog
-from deprecated import deprecated  # type: ignore[import]
+from deprecated import deprecated  # type: ignore[import-untyped]
 
 from rasa.dialogue_understanding.generator.single_step.single_step_llm_command_generator import (  # noqa: E501
     SingleStepLLMCommandGenerator,

rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py

@@ -2,7 +2,7 @@ import importlib.resources
 from typing import Any, Dict, List, Optional, Text, Tuple, Union
 
 import structlog
-from deprecated import deprecated  # type: ignore[import]
+from deprecated import deprecated  # type: ignore[import-untyped]
 from jinja2 import Template
 
 import rasa.shared.utils.io

rasa/dialogue_understanding/patterns/default_flows_for_patterns.yml

@@ -135,13 +135,13 @@ slots:
     type: bool
     initial_value: false
   confirmation_continue_interrupted_flow:
-      type: bool
-      initial_value: null
-      mappings:
-        - type: controlled
+    type: bool
+    mappings:
+      - type: from_llm
   interrupted_flow_to_continue:
     type: text
-    initial_value: null
+    mappings:
+      - type: from_llm
 
 flows:
   pattern_cancel_flow:

rasa/dialogue_understanding/processor/command_processor.py

@@ -37,6 +37,7 @@ from rasa.dialogue_understanding.stack.frames import (
     BaseFlowStackFrame,
 )
 from rasa.dialogue_understanding.stack.utils import (
+    is_continue_interrupted_flow_active,
     top_flow_frame,
     top_user_flow_frame,
 )
@@ -428,22 +429,9 @@ def clean_up_commands(
             )
 
         elif isinstance(command, StartFlowCommand):
-            top_user_frame = top_user_flow_frame(
-                tracker.stack, ignore_call_and_link_frames=False
+            clean_commands = clean_up_start_flow_command(
+                clean_commands, tracker, command
             )
-            top_flow_id = top_user_frame.flow_id if top_user_frame else ""
-
-            if top_flow_id == command.flow:
-                # drop a start flow command if the starting flow is equal
-                # to the currently active flow
-                structlogger.debug(
-                    "command_processor.clean_up_commands."
-                    "skip_command_flow_already_active",
-                    command=command,
-                )
-                continue
-
-            clean_commands.append(command)
 
         # handle chitchat command differently from other free-form answer commands
         elif isinstance(command, ChitChatAnswerCommand):
@@ -529,6 +517,34 @@ def ensure_max_number_of_command_type(
     return filtered
 
 
+def clean_up_start_flow_command(
+    clean_commands: List[Command],
+    tracker: DialogueStateTracker,
+    command: StartFlowCommand,
+) -> List[Command]:
+    """Clean up a start flow command."""
+    continue_interrupted_flow_active = is_continue_interrupted_flow_active(
+        tracker.stack
+    )
+
+    top_user_frame = top_user_flow_frame(
+        tracker.stack, ignore_call_and_link_frames=False
+    )
+    top_flow_id = top_user_frame.flow_id if top_user_frame else ""
+
+    if top_flow_id == command.flow and not continue_interrupted_flow_active:
+        # drop a start flow command if the starting flow is equal
+        # to the currently active flow
+        structlogger.debug(
+            "command_processor.clean_up_commands." "skip_command_flow_already_active",
+            command=command,
+        )
+        return clean_commands
+
+    clean_commands.append(command)
+    return clean_commands
+
+
 def clean_up_clarify_command(
     commands_so_far: List[Command],
     all_commands: List[Command],

rasa/dialogue_understanding/stack/utils.py

@@ -231,3 +231,17 @@ def get_collect_steps_excluding_ask_before_filling_for_active_flow(
         for step in active_flow.get_collect_steps()
         if not step.ask_before_filling
     )
+
+
+def is_continue_interrupted_flow_active(stack: DialogueStack) -> bool:
+    """Check if the continue interrupted flow is active."""
+    from rasa.dialogue_understanding.patterns.continue_interrupted import (
+        ContinueInterruptedPatternFlowStackFrame,
+    )
+
+    for frame in reversed(stack.frames):
+        if isinstance(frame, ContinueInterruptedPatternFlowStackFrame):
+            return True
+        if isinstance(frame, UserFlowStackFrame):
+            return False
+    return False

rasa/e2e_test/e2e_test_runner.py

@@ -747,7 +747,7 @@ class E2ETestRunner:
             test_result = test_turns[index]
             if index in failure_points:
                 diff_test_text, diff_actual_text = cls._handle_fail_diff(
-                    test_result,  # type: ignore[arg-type]
+                    test_result,
                     latest_response,
                     cls._select_bot_utter_turns(test_turns, index),
                 )  # test_result can only be TestStep in failure_points
@@ -811,7 +811,12 @@ class E2ETestRunner:
         """
         # This will only be used when the TestCase is not started
         # with a user step
-        latest_response: ActualStepOutput = test_turns[-1]  # type: ignore[assignment]
+        latest_response_event = test_turns[-1]
+        if not isinstance(latest_response_event, ActualStepOutput):
+            raise ValueError(
+                f"Expected ActualStepOutput, got {type(latest_response_event)}"
+            )
+        latest_response: ActualStepOutput = latest_response_event
         failures = []
         match = None
         for position in range(last_user_step_position, len(test_turns) - 1):

rasa/engine/caching.py

@@ -5,7 +5,7 @@ import logging
 import shutil
 from datetime import datetime
 from pathlib import Path
-from typing import Any, List, Optional, Text, Tuple
+from typing import Any, List, Optional, Text, Tuple, Union
 
 import sqlalchemy as sa
 import sqlalchemy.orm
@@ -294,7 +294,7 @@ class LocalTrainingCache(TrainingCache):
 
     def _cache_output_to_disk(
         self, output: Cacheable, model_storage: ModelStorage
-    ) -> Tuple[Optional[Text], Optional[Text]]:
+    ) -> Tuple[Optional[Union[Path, Text]], Optional[Text]]:
         tempdir_name = rasa.utils.common.get_temp_dir_name()
 
         # Use `TempDirectoryPath` instead of `tempfile.TemporaryDirectory` as this

rasa/engine/recipes/default_components.py

@@ -1,10 +1,7 @@
 from rasa.core.policies.enterprise_search_policy import EnterpriseSearchPolicy
 from rasa.core.policies.flow_policy import FlowPolicy
 from rasa.core.policies.intentless_policy import IntentlessPolicy
-from rasa.core.policies.memoization import AugmentedMemoizationPolicy, MemoizationPolicy
-from rasa.core.policies.rule_policy import RulePolicy
-from rasa.core.policies.ted_policy import TEDPolicy
-from rasa.core.policies.unexpected_intent_policy import UnexpecTEDIntentPolicy
+from rasa.core.policies.memoization import AugmentedMemoizationPolicy
 from rasa.dialogue_understanding.coexistence.intent_based_router import (
     IntentBasedRouter,
 )
@@ -13,7 +10,6 @@ from rasa.dialogue_understanding.generator import (
     LLMCommandGenerator,
 )
 from rasa.dialogue_understanding.generator.nlu_command_adapter import NLUCommandAdapter
-from rasa.nlu.classifiers.diet_classifier import DIETClassifier
 from rasa.nlu.classifiers.fallback_classifier import FallbackClassifier
 from rasa.nlu.classifiers.keyword_intent_classifier import KeywordIntentClassifier
 from rasa.nlu.classifiers.logistic_regression_classifier import (
@@ -21,14 +17,11 @@ from rasa.nlu.classifiers.logistic_regression_classifier import (
 )
 from rasa.nlu.classifiers.mitie_intent_classifier import MitieIntentClassifier
 from rasa.nlu.classifiers.sklearn_intent_classifier import SklearnIntentClassifier
-from rasa.nlu.extractors.crf_entity_extractor import CRFEntityExtractor
 from rasa.nlu.extractors.duckling_entity_extractor import DucklingEntityExtractor
 from rasa.nlu.extractors.entity_synonyms import EntitySynonymMapper
 from rasa.nlu.extractors.mitie_entity_extractor import MitieEntityExtractor
 from rasa.nlu.extractors.regex_entity_extractor import RegexEntityExtractor
 from rasa.nlu.extractors.spacy_entity_extractor import SpacyEntityExtractor
-from rasa.nlu.featurizers.dense_featurizer.convert_featurizer import ConveRTFeaturizer
-from rasa.nlu.featurizers.dense_featurizer.lm_featurizer import LanguageModelFeaturizer
 from rasa.nlu.featurizers.dense_featurizer.mitie_featurizer import MitieFeaturizer
 from rasa.nlu.featurizers.dense_featurizer.spacy_featurizer import SpacyFeaturizer
 from rasa.nlu.featurizers.sparse_featurizer.count_vectors_featurizer import (
@@ -38,7 +31,6 @@ from rasa.nlu.featurizers.sparse_featurizer.lexical_syntactic_featurizer import
     LexicalSyntacticFeaturizer,
 )
 from rasa.nlu.featurizers.sparse_featurizer.regex_featurizer import RegexFeaturizer
-from rasa.nlu.selectors.response_selector import ResponseSelector
 from rasa.nlu.tokenizers.jieba_tokenizer import JiebaTokenizer
 from rasa.nlu.tokenizers.mitie_tokenizer import MitieTokenizer
 from rasa.nlu.tokenizers.spacy_tokenizer import SpacyTokenizer
@@ -48,7 +40,7 @@ from rasa.nlu.utils.spacy_utils import SpacyNLP
 
 DEFAULT_COMPONENTS = [
     # Message Classifiers
-    DIETClassifier,
+    # DIETClassifier,
     FallbackClassifier,
     KeywordIntentClassifier,
     MitieIntentClassifier,
@@ -59,9 +51,9 @@ DEFAULT_COMPONENTS = [
     LLMBasedRouter,
     IntentBasedRouter,
     # Response Selectors
-    ResponseSelector,
+    # ResponseSelector,
     # Message Entity Extractors
-    CRFEntityExtractor,
+    # CRFEntityExtractor,
     DucklingEntityExtractor,
     EntitySynonymMapper,
     MitieEntityExtractor,
@@ -69,11 +61,11 @@ DEFAULT_COMPONENTS = [
     RegexEntityExtractor,
     # Message Feauturizers
     LexicalSyntacticFeaturizer,
-    ConveRTFeaturizer,
+    # ConveRTFeaturizer,
     MitieFeaturizer,
     SpacyFeaturizer,
     CountVectorsFeaturizer,
-    LanguageModelFeaturizer,
+    # LanguageModelFeaturizer,
     RegexFeaturizer,
     # Tokenizers
     JiebaTokenizer,
@@ -84,10 +76,10 @@ DEFAULT_COMPONENTS = [
     MitieNLP,
     SpacyNLP,
     # Dialogue Management Policies
-    TEDPolicy,
-    UnexpecTEDIntentPolicy,
-    RulePolicy,
-    MemoizationPolicy,
+    # TEDPolicy,
+    # UnexpecTEDIntentPolicy,
+    # RulePolicy,
+    # MemoizationPolicy,
     AugmentedMemoizationPolicy,
     FlowPolicy,
     EnterpriseSearchPolicy,