rasa-pro 3.10.16__py3-none-any.whl → 3.10.18__py3-none-any.whl

rasa/nlu/classifiers/fallback_classifier.py

@@ -1,5 +1,4 @@
 from __future__ import annotations
-import copy
 import logging
 from typing import Any, List, Text, Dict, Type, Union, Tuple, Optional
 
@@ -185,8 +184,6 @@ def undo_fallback_prediction(prediction: Dict[Text, Any]) -> Dict[Text, Any]:
     if len(intent_ranking) < 2:
         return prediction
 
-    prediction = copy.deepcopy(prediction)
     prediction[INTENT] = intent_ranking[1]
     prediction[INTENT_RANKING_KEY] = prediction[INTENT_RANKING_KEY][1:]
-
     return prediction

rasa/shared/core/constants.py

@@ -165,3 +165,5 @@ POLICY_NAME_RULE = "RulePolicy"
 CLASSIFIER_NAME_FALLBACK = "FallbackClassifier"
 
 POLICIES_THAT_EXTRACT_ENTITIES = {"TEDPolicy"}
+
+ERROR_CODE_KEY = "error_code"

rasa/shared/core/events.py

@@ -31,15 +31,16 @@ from typing import Union
 
 from rasa.shared.constants import DOCS_URL_TRAINING_DATA
 from rasa.shared.core.constants import (
-    LOOP_NAME,
-    EXTERNAL_MESSAGE_PREFIX,
+    ACTION_LISTEN_NAME,
     ACTION_NAME_SENDER_ID_CONNECTOR_STR,
+    ACTION_SESSION_START_NAME,
+    ENTITY_LABEL_SEPARATOR,
+    ERROR_CODE_KEY,
+    EXTERNAL_MESSAGE_PREFIX,
     IS_EXTERNAL,
-    USE_TEXT_FOR_FEATURIZATION,
     LOOP_INTERRUPTED,
-    ENTITY_LABEL_SEPARATOR,
-    ACTION_SESSION_START_NAME,
-    ACTION_LISTEN_NAME,
+    USE_TEXT_FOR_FEATURIZATION,
+    LOOP_NAME,
 )
 from rasa.shared.exceptions import UnsupportedFeatureException
 from rasa.shared.nlu.constants import (
@@ -2528,3 +2529,69 @@ class FlowCancelled(SkipEventInMDStoryMixin):
             )
         except KeyError as e:
             raise ValueError(f"Failed to parse flow_cancelled event. {e}")
+
+
+class ErrorHandled(Event):
+    """An error occurred during the conversation.
+
+    The error message is stored in the metadata of the event.
+    """
+
+    type_name = "error"
+
+    def __init__(
+        self,
+        error_code: int,
+        timestamp: Optional[float] = None,
+        metadata: Optional[Dict[str, Any]] = None,
+    ) -> None:
+        """Creates event for an error.
+
+        Args:
+            error_code: Error int code.
+            timestamp: When the event was created.
+            metadata: Additional event metadata.
+        """
+        self.error_code = error_code
+        super().__init__(timestamp, metadata)
+
+    def __str__(self) -> Text:
+        """Returns text representation of event."""
+        return f"ErrorHandled({self.error_code})"
+
+    def __repr__(self) -> Text:
+        """Returns event as string for debugging."""
+        return f"ErrorHandled({self.error_code}, {self.timestamp}, {self.metadata})"
+
+    def __hash__(self) -> int:
+        """Returns unique hash for event."""
+        return hash(self.error_code)
+
+    def __eq__(self, other: Any) -> bool:
+        """Compares object with other object."""
+        if not isinstance(other, ErrorHandled):
+            return NotImplemented
+
+        return self.error_code == other.error_code
+
+    def as_story_string(self) -> Text:
+        """Returns text representation of event."""
+        props = json.dumps({ERROR_CODE_KEY: self.error_code})
+        return f"{ErrorHandled.type_name}{props}"
+
+    @classmethod
+    def _from_story_string(cls, parameters: Dict[Text, Any]) -> List["ErrorHandled"]:
+        """Called to convert a parsed story line into an event."""
+        return [
+            ErrorHandled(
+                parameters.get(ERROR_CODE_KEY),
+                parameters.get("timestamp"),
+                parameters.get("metadata"),
+            )
+        ]
+
+    def as_dict(self) -> Dict[Text, Any]:
+        """Returns serialized event."""
+        serialized = super().as_dict()
+        serialized.update({ERROR_CODE_KEY: self.error_code})
+        return serialized

rasa/shared/core/flows/flow.py

@@ -77,7 +77,7 @@ class Flow:
         Returns:
             A Flow object.
         """
-        step_sequence = FlowStepSequence.from_json(data.get("steps"))
+        step_sequence = FlowStepSequence.from_json(flow_id, data.get("steps"))
         nlu_triggers = NLUTriggers.from_json(data.get("nlu_trigger"))
 
         if file_path and isinstance(file_path, Path):
@@ -180,13 +180,13 @@ class Flow:
             return None
 
         if step_id == START_STEP:
-            return StartFlowStep(self.first_step_in_flow().id)
+            return StartFlowStep(self.id, self.first_step_in_flow().id)
 
         if step_id == END_STEP:
-            return EndFlowStep()
+            return EndFlowStep(self.id)
 
         if step_id.startswith(CONTINUE_STEP_PREFIX):
-            return ContinueFlowStep(step_id[len(CONTINUE_STEP_PREFIX) :])
+            return ContinueFlowStep(self.id, step_id[len(CONTINUE_STEP_PREFIX) :])
 
         for step in self.steps_with_calls_resolved:
             if step.id == step_id:

rasa/shared/core/flows/flow_step.py

@@ -20,10 +20,11 @@ if TYPE_CHECKING:
 structlogger = structlog.get_logger()
 
 
-def step_from_json(data: Dict[Text, Any]) -> FlowStep:
+def step_from_json(flow_id: Text, data: Dict[Text, Any]) -> FlowStep:
     """Create a specific FlowStep from serialized data.
 
     Args:
+        flow_id: The id of the flow that contains the step.
         data: data for a specific FlowStep object in a serialized data format.
 
     Returns:
@@ -39,17 +40,17 @@ def step_from_json(data: Dict[Text, Any]) -> FlowStep:
     )
 
     if "action" in data:
-        return ActionFlowStep.from_json(data)
+        return ActionFlowStep.from_json(flow_id, data)
     if "collect" in data:
-        return CollectInformationFlowStep.from_json(data)
+        return CollectInformationFlowStep.from_json(flow_id, data)
     if "link" in data:
-        return LinkFlowStep.from_json(data)
+        return LinkFlowStep.from_json(flow_id, data)
     if "call" in data:
-        return CallFlowStep.from_json(data)
+        return CallFlowStep.from_json(flow_id, data)
     if "set_slots" in data:
-        return SetSlotsFlowStep.from_json(data)
+        return SetSlotsFlowStep.from_json(flow_id, data)
     if "noop" in data:
-        return NoOperationFlowStep.from_json(data)
+        return NoOperationFlowStep.from_json(flow_id, data)
     raise RasaException(f"Failed to parse step from json. Unknown type for {data}.")
 
 
@@ -67,12 +68,15 @@ class FlowStep:
     """Additional, unstructured information about this flow step."""
     next: FlowStepLinks
     """The next steps of the flow step."""
+    flow_id: Text
+    """The id of the flow that contains the step."""
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> FlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> FlowStep:
         """Create a FlowStep object from data in a serialized format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: The data for a FlowStep object in a serialized format.
 
         Returns:
@@ -87,7 +91,8 @@ class FlowStep:
             custom_id=data.get("id"),
             description=data.get("description"),
             metadata=data.get("metadata", {}),
-            next=FlowStepLinks.from_json(data.get("next", [])),
+            next=FlowStepLinks.from_json(flow_id, data.get("next", [])),
+            flow_id=flow_id,
         )
 
     def does_allow_for_next_step(self) -> bool:
@@ -125,7 +130,7 @@ class FlowStep:
     @property
     def default_id(self) -> str:
         """Returns the default id of the flow step."""
-        return f"{self.idx}_{self.default_id_postfix}"
+        return f"{self.flow_id}_{self.idx}_{self.default_id_postfix}"
 
     @property
     def default_id_postfix(self) -> str:

rasa/shared/core/flows/flow_step_links.py

@@ -17,10 +17,13 @@ class FlowStepLinks:
     links: List[FlowStepLink]
 
     @staticmethod
-    def from_json(data: Union[str, List[Dict[Text, Any]]]) -> FlowStepLinks:
+    def from_json(
+        flow_id: Text, data: Union[str, List[Dict[Text, Any]]]
+    ) -> FlowStepLinks:
         """Create a FlowStepLinks object from a serialized data format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a FlowStepLinks object in a serialized format.
 
         Returns:
@@ -30,11 +33,11 @@ class FlowStepLinks:
             return FlowStepLinks(links=[])
 
         if isinstance(data, str):
-            return FlowStepLinks(links=[StaticFlowStepLink.from_json(data)])
+            return FlowStepLinks(links=[StaticFlowStepLink.from_json(flow_id, data)])
 
         return FlowStepLinks(
             links=[
-                BranchingFlowStepLink.from_json(link_config)
+                BranchingFlowStepLink.from_json(flow_id, link_config)
                 for link_config in data
                 if link_config
             ]
@@ -94,10 +97,11 @@ class FlowStepLink:
         raise NotImplementedError()
 
     @staticmethod
-    def from_json(data: Any) -> FlowStepLink:
+    def from_json(flow_id: Text, data: Any) -> FlowStepLink:
         """Create a FlowStepLink object from a serialized data format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a FlowStepLink object in a serialized format.
 
         Returns:
@@ -163,19 +167,20 @@ class BranchingFlowStepLink(FlowStepLink):
             return self.target_reference
 
     @staticmethod
-    def from_json(data: Dict[Text, Any]) -> BranchingFlowStepLink:
+    def from_json(flow_id: Text, data: Dict[Text, Any]) -> BranchingFlowStepLink:
         """Create a BranchingFlowStepLink object from a serialized data format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a BranchingFlowStepLink object in a serialized format.
 
         Returns:
             a BranchingFlowStepLink object.
         """
         if "if" in data:
-            return IfFlowStepLink.from_json(data)
+            return IfFlowStepLink.from_json(flow_id, data)
         else:
-            return ElseFlowStepLink.from_json(data)
+            return ElseFlowStepLink.from_json(flow_id, data)
 
     def depth_in_tree(self) -> int:
         """Returns the depth in the tree."""
@@ -198,10 +203,11 @@ class IfFlowStepLink(BranchingFlowStepLink):
     """The condition that needs to be satisfied to follow this flow step link."""
 
     @staticmethod
-    def from_json(data: Dict[Text, Any]) -> IfFlowStepLink:
+    def from_json(flow_id: Text, data: Dict[Text, Any]) -> IfFlowStepLink:
         """Create an IfFlowStepLink object from a serialized data format.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a IfFlowStepLink in a serialized format.
 
         Returns:
@@ -213,7 +219,7 @@ class IfFlowStepLink(BranchingFlowStepLink):
             return IfFlowStepLink(target_reference=data["then"], condition=data["if"])
         else:
             return IfFlowStepLink(
-                target_reference=FlowStepSequence.from_json(data["then"]),
+                target_reference=FlowStepSequence.from_json(flow_id, data["then"]),
                 condition=data["if"],
             )
 
@@ -238,10 +244,11 @@ class ElseFlowStepLink(BranchingFlowStepLink):
     """A flow step link that is taken when conditional flow step links weren't taken."""
 
     @staticmethod
-    def from_json(data: Dict[Text, Any]) -> ElseFlowStepLink:
+    def from_json(flow_id: Text, data: Dict[Text, Any]) -> ElseFlowStepLink:
         """Create an ElseFlowStepLink object from serialized data.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for an ElseFlowStepLink in a serialized format
 
         Returns:
@@ -253,7 +260,7 @@ class ElseFlowStepLink(BranchingFlowStepLink):
             return ElseFlowStepLink(target_reference=data["else"])
         else:
             return ElseFlowStepLink(
-                target_reference=FlowStepSequence.from_json(data["else"])
+                target_reference=FlowStepSequence.from_json(flow_id, data["else"])
             )
 
     def as_json(self) -> Dict[Text, Any]:
@@ -279,10 +286,11 @@ class StaticFlowStepLink(FlowStepLink):
     """The id of the linked step."""
 
     @staticmethod
-    def from_json(data: Text) -> StaticFlowStepLink:
+    def from_json(flow_id: Text, data: Text) -> StaticFlowStepLink:
         """Create a StaticFlowStepLink from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a StaticFlowStepLink in a serialized format
 
         Returns:

rasa/shared/core/flows/flow_step_sequence.py

@@ -14,17 +14,19 @@ class FlowStepSequence:
     child_steps: List[FlowStep]
 
     @staticmethod
-    def from_json(data: List[Dict[Text, Any]]) -> FlowStepSequence:
+    def from_json(flow_id: Text, data: List[Dict[Text, Any]]) -> FlowStepSequence:
         """Create a FlowStepSequence object from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a StepSequence in a serialized format
 
         Returns:
             A StepSequence object including its flow step objects.
         """
-
-        flow_steps: List[FlowStep] = [step_from_json(config) for config in data]
+        flow_steps: List[FlowStep] = [
+            step_from_json(flow_id, config) for config in data
+        ]
 
         return FlowStepSequence(child_steps=flow_steps)
 

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

@@ -15,16 +15,17 @@ class ActionFlowStep(FlowStep):
     """The action of the flow step."""
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> ActionFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> ActionFlowStep:
         """Create an ActionFlowStep object from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for an ActionFlowStep object in a serialized format
 
         Returns:
             An ActionFlowStep object
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return ActionFlowStep(
             action=data["action"],
             **base.__dict__,

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

@@ -18,16 +18,17 @@ class CallFlowStep(FlowStep):
     called_flow_reference: Optional["Flow"] = None
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> CallFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> CallFlowStep:
         """Used to read flow steps from parsed YAML.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: The parsed YAML as a dictionary.
 
         Returns:
             The parsed flow step.
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return CallFlowStep(
             call=data.get("call", ""),
             **base.__dict__,
@@ -47,7 +48,6 @@ class CallFlowStep(FlowStep):
         self, should_resolve_calls: bool = True
     ) -> Generator[FlowStep, None, None]:
         """Returns the steps in the tree of the flow step."""
-
         yield self
 
         if should_resolve_calls:

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

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Dict, Any, List, Set
+from typing import Dict, Any, List, Set, Text
 
 from rasa.shared.constants import UTTER_ASK_PREFIX, ACTION_ASK_PREFIX
 from rasa.shared.core.flows.flow_step import FlowStep
@@ -61,16 +61,19 @@ class CollectInformationFlowStep(FlowStep):
     """Whether to reset the slot value at the end of the flow."""
 
     @classmethod
-    def from_json(cls, data: Dict[str, Any]) -> CollectInformationFlowStep:
+    def from_json(
+        cls, flow_id: Text, data: Dict[str, Any]
+    ) -> CollectInformationFlowStep:
         """Create a CollectInformationFlowStep object from serialized data.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a CollectInformationFlowStep object in a serialized format
 
         Returns:
             A CollectInformationFlowStep object
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return CollectInformationFlowStep(
             collect=data["collect"],
             utter=data.get("utter", f"{UTTER_ASK_PREFIX}{data['collect']}"),

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

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from typing import Text
 
 from rasa.shared.core.flows.flow_step_links import FlowStepLinks, StaticFlowStepLink
 from rasa.shared.core.flows.steps.constants import (
@@ -14,7 +15,7 @@ from rasa.shared.core.flows.steps.internal import InternalFlowStep
 class ContinueFlowStep(InternalFlowStep):
     """A flow step that is dynamically introduced to jump to other flow steps."""
 
-    def __init__(self, target_step_id: str) -> None:
+    def __init__(self, flow_id: Text, target_step_id: str) -> None:
         """Initializes a continue-step flow step."""
         super().__init__(
             idx=UNSET_FLOW_STEP_ID,
@@ -29,6 +30,7 @@ class ContinueFlowStep(InternalFlowStep):
             # This is why the continue step links to the step that should be
             # continued.
             next=FlowStepLinks(links=[StaticFlowStepLink(target_step_id)]),
+            flow_id=flow_id,
         )
 
     @staticmethod

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

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from typing import Text
 
 from rasa.shared.core.flows.flow_step_links import FlowStepLinks
 from rasa.shared.core.flows.steps.constants import END_STEP, UNSET_FLOW_STEP_ID
@@ -11,7 +12,7 @@ from rasa.shared.core.flows.steps.internal import InternalFlowStep
 class EndFlowStep(InternalFlowStep):
     """A dynamically added flow step that marks the end of a flow."""
 
-    def __init__(self) -> None:
+    def __init__(self, flow_id: Text) -> None:
         """Initializes an end flow step."""
         super().__init__(
             idx=UNSET_FLOW_STEP_ID,
@@ -19,4 +20,5 @@ class EndFlowStep(InternalFlowStep):
             description=None,
             metadata={},
             next=FlowStepLinks(links=[]),
+            flow_id=flow_id,
         )

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

@@ -13,10 +13,11 @@ class InternalFlowStep(FlowStep):
     """
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> InternalFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> InternalFlowStep:
         """Create an InternalFlowStep object from serialized data.
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for an InternalFlowStep in a serialized format
 
         Returns:

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

@@ -16,20 +16,22 @@ class LinkFlowStep(FlowStep):
     def does_allow_for_next_step(self) -> bool:
         """Returns whether this step allows for following steps.
 
-        Link steps need to be terminal steps, so can't have a next step."""
+        Link steps need to be terminal steps, so can't have a next step.
+        """
         return False
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> LinkFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> LinkFlowStep:
         """Create a LinkFlowStep from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a LinkFlowStep in a serialized format
 
         Returns:
             a LinkFlowStep object
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return LinkFlowStep(
             link=data["link"],
             **base.__dict__,

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

@@ -11,22 +11,24 @@ class NoOperationFlowStep(FlowStep):
     """A step that doesn't do a thing.
 
     This is NOT a branching step (but it can branch - but in addition to that
-    it also does nothing)."""
+    it also does nothing).
+    """
 
     noop: Any
     """The id of the flow that should be started subsequently."""
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> NoOperationFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> NoOperationFlowStep:
         """Create a NoOperationFlowStep from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a NoOperationFlowStep in a serialized format
 
         Returns:
             a NoOperationFlowStep object
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         return NoOperationFlowStep(
             noop=data["noop"],
             **base.__dict__,

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

@@ -14,16 +14,17 @@ class SetSlotsFlowStep(FlowStep):
     """Slots and their values to set in the flow step."""
 
     @classmethod
-    def from_json(cls, data: Dict[Text, Any]) -> SetSlotsFlowStep:
+    def from_json(cls, flow_id: Text, data: Dict[Text, Any]) -> SetSlotsFlowStep:
         """Create a SetSlotsFlowStep from serialized data
 
         Args:
+            flow_id: The id of the flow that contains the step.
             data: data for a SetSlotsFlowStep in a serialized format
 
         Returns:
             a SetSlotsFlowStep object
         """
-        base = super().from_json(data)
+        base = super().from_json(flow_id, data)
         slots = [
             {"key": k, "value": v}
             for slot_sets in data["set_slots"]

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

@@ -15,10 +15,11 @@ from rasa.shared.core.flows.steps.internal import InternalFlowStep
 class StartFlowStep(InternalFlowStep):
     """A dynamically added flow step that represents the beginning of a flow."""
 
-    def __init__(self, start_step_id: Text) -> None:
+    def __init__(self, flow_id: Text, start_step_id: Text) -> None:
         """Initializes a start flow step.
 
         Args:
+            flow_id: The id of the flow that contains the step
             start_step_id: The step id of the first step of the flow
         """
         super().__init__(
@@ -27,4 +28,5 @@ class StartFlowStep(InternalFlowStep):
             description=None,
             metadata={},
             next=FlowStepLinks(links=[StaticFlowStepLink(start_step_id)]),
+            flow_id=flow_id,
         )

rasa/shared/utils/schemas/events.py

@@ -164,8 +164,7 @@ DIALOGUE_STACK_UPDATED = {
 }
 ROUTING_SESSION_ENDED = {"properties": {"event": {"const": "routing_session_ended"}}}
 
-
-ROUTING_SESSION_ENDED = {"properties": {"event": {"const": "routing_session_ended"}}}
+ERROR_HANDLED = {"properties": {"event": {"const": "error"}}}
 
 EVENT_SCHEMA = {
     "type": "object",
@@ -206,6 +205,7 @@ EVENT_SCHEMA = {
         FLOW_CANCELLED,
         DIALOGUE_STACK_UPDATED,
         ROUTING_SESSION_ENDED,
+        ERROR_HANDLED,
     ],
 }
 

rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.10.16"
+__version__ = "3.10.18"