rasa-pro 3.14.0.dev5__py3-none-any.whl → 3.14.0.dev7__py3-none-any.whl

rasa/dialogue_understanding/stack/utils.py

@@ -17,6 +17,9 @@ from rasa.shared.core.flows.steps.constants import END_STEP
 from rasa.shared.core.flows.steps.continuation import ContinueFlowStep
 
 if typing.TYPE_CHECKING:
+    from rasa.dialogue_understanding.patterns.continue_interrupted import (
+        ContinueInterruptedPatternFlowStackFrame,
+    )
     from rasa.shared.core.trackers import DialogueStateTracker
 
 
@@ -171,10 +174,40 @@ def user_flows_on_the_stack(dialogue_stack: DialogueStack) -> Set[str]:
     All user flows that are currently on the stack.
     """
     return {
-        f.flow_id for f in dialogue_stack.frames if isinstance(f, UserFlowStackFrame)
+        frame.flow_id
+        for frame in user_frames_on_the_stack(
+            dialogue_stack, ignore_call_and_link_frames=False
+        )
     }
 
 
+def user_frames_on_the_stack(
+    dialogue_stack: DialogueStack, ignore_call_and_link_frames: bool = True
+) -> List[UserFlowStackFrame]:
+    """Get all user frames that are currently on the stack.
+
+    Args:
+        dialogue_stack: The dialogue stack.
+        ignore_call_and_link_frames: Whether to ignore user frames of type `call`
+            and `link`. By default, these frames are ignored.
+
+    Returns:
+    All user frames that are currently on the stack.
+    """
+    return [
+        frame
+        for frame in dialogue_stack.frames
+        if isinstance(frame, UserFlowStackFrame)
+        and (
+            not ignore_call_and_link_frames
+            or (
+                frame.frame_type != FlowStackFrameType.CALL
+                and frame.frame_type != FlowStackFrameType.LINK
+            )
+        )
+    ]
+
+
 def end_top_user_flow(stack: DialogueStack) -> DialogueStack:
     """Ends all frames on top of the stack including the topmost user frame.
 
@@ -198,8 +231,9 @@ def end_top_user_flow(stack: DialogueStack) -> DialogueStack:
 def get_collect_steps_excluding_ask_before_filling_for_active_flow(
     dialogue_stack: DialogueStack, all_flows: FlowsList
 ) -> Set[str]:
-    """Get all collect steps that are part of the current flow, without
-    considering the collect steps that has to be asked before filling.
+    """Get all collect steps that are part of the current flow.
+
+    Collect steps that have to be asked before filling are not considered.
 
     Args:
         dialogue_stack: The dialogue stack.
@@ -230,3 +264,23 @@ 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."""
+    return get_active_continue_interrupted_pattern_frame(stack) is not None
+
+
+def get_active_continue_interrupted_pattern_frame(
+    stack: DialogueStack,
+) -> Optional["ContinueInterruptedPatternFlowStackFrame"]:
+    from rasa.dialogue_understanding.patterns.continue_interrupted import (
+        ContinueInterruptedPatternFlowStackFrame,
+    )
+
+    for frame in reversed(stack.frames):
+        if isinstance(frame, ContinueInterruptedPatternFlowStackFrame):
+            return frame
+        if isinstance(frame, UserFlowStackFrame):
+            return None
+    return None

rasa/dialogue_understanding/utils.py

@@ -1,9 +1,9 @@
+import typing
 from contextlib import contextmanager
 from typing import Any, Dict, Generator, List, Optional, Text
 
 import structlog
 
-from rasa.dialogue_understanding.commands import Command, NoopCommand, SetSlotCommand
 from rasa.dialogue_understanding.constants import (
     RASA_RECORD_COMMANDS_AND_PROMPTS_ENV_VAR_NAME,
 )
@@ -23,6 +23,9 @@ from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.providers.llm.llm_response import LLMResponse
 from rasa.utils.common import get_bool_env_variable
 
+if typing.TYPE_CHECKING:
+    from rasa.dialogue_understanding.commands import Command
+
 record_commands_and_prompts = get_bool_env_variable(
     RASA_RECORD_COMMANDS_AND_PROMPTS_ENV_VAR_NAME, False
 )
@@ -41,7 +44,7 @@ def set_record_commands_and_prompts() -> Generator:
 
 
 def add_commands_to_message_parse_data(
-    message: Message, component_name: str, commands: List[Command]
+    message: Message, component_name: str, commands: List["Command"]
 ) -> None:
     """Add commands to the message parse data.
 
@@ -144,6 +147,11 @@ def _handle_via_nlu_in_coexistence(
     tracker: Optional[DialogueStateTracker], message: Message
 ) -> bool:
     """Check if the message should be handled by the NLU subsystem in coexistence mode."""  # noqa: E501
+    from rasa.dialogue_understanding.commands import (
+        NoopCommand,
+        SetSlotCommand,
+    )
+
     if not tracker:
         return False
 
@@ -156,8 +164,7 @@ def _handle_via_nlu_in_coexistence(
             "utils.handle_via_nlu_in_coexistence"
             ".tracker_missing_route_session_to_calm_slot",
             event_info=(
-                f"Tracker doesn't have the '{ROUTE_TO_CALM_SLOT}' slot."
-                f"Routing to CALM."
+                f"Tracker doesn't have the '{ROUTE_TO_CALM_SLOT}' slot.Routing to CALM."
             ),
             route_session_to_calm=commands,
         )
@@ -218,3 +225,16 @@ def _handle_via_nlu_in_coexistence(
         commands=commands,
     )
     return False
+
+
+def assemble_options_string(names: List[str], conjunction: str = "and") -> str:
+    """Concatenate options to a human-readable string."""
+    option_message = ""
+    for i, name in enumerate(names):
+        if i == 0:
+            option_message += name
+        elif i == len(names) - 1:
+            option_message += f" {conjunction} {name}"
+        else:
+            option_message += f", {name}"
+    return option_message

rasa/dialogue_understanding_test/du_test_runner.py

@@ -1,10 +1,12 @@
 import asyncio
 import time
-from typing import Any, Dict, List, Optional, Text
+from pathlib import Path
+from typing import Any, Dict, List, Optional, Union
 
 import structlog
 from tqdm import tqdm
 
+from rasa.core.available_agents import AvailableAgents
 from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.core.channels import CollectingOutputChannel, UserMessage
 from rasa.core.exceptions import AgentNotReady
@@ -52,10 +54,11 @@ class DialogueUnderstandingTestRunner:
 
     def __init__(
         self,
-        model_path: Optional[Text] = None,
+        model_path: Optional[str] = None,
         model_server: Optional[EndpointConfig] = None,
         remote_storage: Optional[StorageType] = None,
         endpoints: Optional[AvailableEndpoints] = None,
+        sub_agents_path: Optional[Union[Path, str]] = None,
     ) -> None:
         """Initializes the Dialogue Understanding test suite runner.
 
@@ -68,6 +71,7 @@ class DialogueUnderstandingTestRunner:
         import rasa.core.agent
 
         self._check_action_server(endpoints)
+        sub_agents = AvailableAgents.get_instance(sub_agents_path)
 
         self.agent = asyncio.run(
             rasa.core.agent.load_agent(
@@ -75,6 +79,7 @@ class DialogueUnderstandingTestRunner:
                 model_server=model_server,
                 remote_storage=remote_storage,
                 endpoints=endpoints,
+                sub_agents=sub_agents,
             )
         )
         if not self.agent.is_ready():

rasa/e2e_test/e2e_test_runner.py

@@ -13,6 +13,7 @@ import structlog
 from tqdm import tqdm
 
 import rasa.shared.utils.io
+from rasa.core.available_agents import AvailableAgents
 from rasa.core.available_endpoints import AvailableEndpoints
 from rasa.core.channels import CollectingOutputChannel, UserMessage
 from rasa.core.constants import ACTIVE_FLOW_METADATA_KEY, STEP_ID_METADATA_KEY
@@ -65,6 +66,7 @@ class E2ETestRunner:
         model_server: Optional[EndpointConfig] = None,
         remote_storage: Optional[StorageType] = None,
         endpoints: Optional[AvailableEndpoints] = None,
+        sub_agents_path: Optional[Text] = None,
         **kwargs: Any,
     ) -> None:
         """Initializes the E2E test suite runner.
@@ -94,12 +96,15 @@ class E2ETestRunner:
         if endpoints and not are_custom_actions_stubbed:
             self._action_server_is_reachable(endpoints)
 
+        sub_agents = AvailableAgents.get_instance(sub_agents_path)
+
         self.agent = asyncio.run(
             rasa.core.agent.load_agent(
                 model_path=model_path,
                 model_server=model_server,
                 remote_storage=remote_storage,
                 endpoints=endpoints,
+                sub_agents=sub_agents,
             )
         )
 
@@ -742,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
@@ -806,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,

rasa/engine/storage/local_model_storage.py

@@ -1,16 +1,14 @@
 from __future__ import annotations
 
 import logging
-import os
 import shutil
 import sys
-import tarfile
 import tempfile
 import uuid
 from contextlib import contextmanager
 from datetime import datetime
 from pathlib import Path
-from typing import Callable, Generator, Optional, Text, Tuple, Union
+from typing import Generator, Optional, Text, Tuple, Union
 
 from tarsafe import TarSafe
 
@@ -59,35 +57,6 @@ def windows_safe_temporary_directory(
             yield temporary_directory
 
 
-def filter_normpath(member: tarfile.TarInfo, dest_path: str) -> tarfile.TarInfo:
-    """Normalize tar member paths for safe extraction"""
-    if member.name:
-        member.name = os.path.normpath(member.name)
-    return member
-
-
-FilterFunction = Callable[[tarfile.TarInfo, str], Optional[tarfile.TarInfo]]
-
-
-def create_combined_filter(existing_filter: Optional[FilterFunction]) -> FilterFunction:
-    """Create a filter that combines existing filter with path normalization"""
-
-    def combined_filter(
-        member: tarfile.TarInfo, dest_path: str
-    ) -> Optional[tarfile.TarInfo]:
-        """Apply existing filter first, then path normalization"""
-        if existing_filter is not None:
-            filtered_member = existing_filter(member, dest_path)
-            if filtered_member is None:
-                return None  # Rejected by existing filter
-            member = filtered_member  # Use the filtered result
-
-        # Apply our path normalization
-        return filter_normpath(member, dest_path)
-
-    return combined_filter
-
-
 class LocalModelStorage(ModelStorage):
     """Stores and provides output of `GraphComponents` on local disk."""
 
@@ -153,19 +122,7 @@ class LocalModelStorage(ModelStorage):
                 # this restriction in environments where it's not possible
                 # to override this behavior, mostly for internal policy reasons
                 # reference: https://stackoverflow.com/a/49102229
-                try:
-                    # Use extraction filter to normalize paths for compatibility
-                    # before trying the \\?\ prefix approach first
-                    prev_filter = getattr(tar, "extraction_filter", None)
-                    tar.extraction_filter = create_combined_filter(prev_filter)
-                    tar.extractall(f"\\\\?\\{temporary_directory}")
-                except Exception:
-                    # Fallback for Python versions with tarfile security fix
-                    logger.warning(
-                        "Failed to extract model archive with long path support. "
-                        "Falling back to regular extraction."
-                    )
-                    tar.extractall(temporary_directory)
+                tar.extractall(f"\\\\?\\{temporary_directory}")
             else:
                 tar.extractall(temporary_directory)
         LocalModelStorage._assert_not_rasa2_archive(temporary_directory)