rasa-pro 3.11.3a1.dev6__py3-none-any.whl → 3.11.4__py3-none-any.whl

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/nlu/constants.py

@@ -2,11 +2,6 @@ TEXT = "text"
 TEXT_TOKENS = "text_tokens"
 INTENT = "intent"
 COMMANDS = "commands"
-PREDICTED_COMMANDS = "predicted_commands"
-PROMPTS = "prompts"
-KEY_USER_PROMPT = "user_prompt"
-KEY_SYSTEM_PROMPT = "system_prompt"
-KEY_LLM_RESPONSE_METADATA = "llm_response_metadata"
 LLM_COMMANDS = "llm_commands"  # needed for fine-tuning
 LLM_PROMPT = "llm_prompt"  # needed for fine-tuning
 FLOWS_FROM_SEMANTIC_SEARCH = "flows_from_semantic_search"

rasa/shared/providers/llm/llm_response.py

@@ -1,8 +1,5 @@
 from dataclasses import dataclass, field, asdict
-from typing import Dict, List, Optional, Text, Any, Union
-import structlog
-
-structlogger = structlog.get_logger()
+from typing import Dict, List, Optional
 
 
 @dataclass
@@ -19,18 +16,6 @@ class LLMUsage:
     def __post_init__(self) -> None:
         self.total_tokens = self.prompt_tokens + self.completion_tokens
 
-    @classmethod
-    def from_dict(cls, data: Dict[Text, Any]) -> "LLMUsage":
-        """
-        Creates an LLMUsage object from a dictionary.
-        If any keys are missing, they will default to zero
-        or whatever default you prefer.
-        """
-        return cls(
-            prompt_tokens=data.get("prompt_tokens"),
-            completion_tokens=data.get("completion_tokens"),
-        )
-
     def to_dict(self) -> dict:
         """Converts the LLMUsage dataclass instance into a dictionary."""
         return asdict(self)
@@ -57,32 +42,6 @@ class LLMResponse:
     """Optional dictionary for storing additional information related to the
     completion that may not be covered by other fields."""
 
-    @classmethod
-    def from_dict(cls, data: Dict[Text, Any]) -> "LLMResponse":
-        """
-        Creates an LLMResponse from a dictionary.
-        """
-        usage_data = data.get("usage", {})
-        usage_obj = LLMUsage.from_dict(usage_data) if usage_data else None
-
-        return cls(
-            id=data["id"],
-            choices=data["choices"],
-            created=data["created"],
-            model=data.get("model"),
-            usage=usage_obj,
-            additional_info=data.get("additional_info"),
-        )
-
-    @classmethod
-    def ensure_llm_response(cls, response: Union[str, "LLMResponse"]) -> "LLMResponse":
-        if isinstance(response, LLMResponse):
-            return response
-
-        structlogger.warn("llm_response.deprecated_response_type", response=response)
-        data = {"id": None, "choices": [response], "created": None}
-        return LLMResponse.from_dict(data)
-
     def to_dict(self) -> dict:
         """Converts the LLMResponse dataclass instance into a dictionary."""
         result = asdict(self)

rasa/shared/utils/llm.py

@@ -73,7 +73,7 @@ DEFAULT_OPENAI_GENERATE_MODEL_NAME = "gpt-3.5-turbo"
 
 DEFAULT_OPENAI_CHAT_MODEL_NAME = "gpt-3.5-turbo"
 
-DEFAULT_OPENAI_CHAT_MODEL_NAME_ADVANCED = "gpt-4"
+DEFAULT_OPENAI_CHAT_MODEL_NAME_ADVANCED = "gpt-4-0613"
 
 DEFAULT_OPENAI_EMBEDDING_MODEL_NAME = "text-embedding-ada-002"
 

rasa/shared/utils/schemas/events.py

@@ -161,7 +161,7 @@ FLOW_CANCELLED = {
     }
 }
 DIALOGUE_STACK_UPDATED = {
-    "properties": {"event": {"const": "stack"}, "update": {"type": "string"}}
+    "properties": {"event": {"const": "stack"}, "update": {"type": "array"}}
 }
 ROUTING_SESSION_ENDED = {"properties": {"event": {"const": "routing_session_ended"}}}
 

rasa/shared/utils/yaml.py

@@ -104,12 +104,6 @@ def _add_yaml_constructor_to_replace_environment_variables() -> None:
     def env_var_constructor(loader: BaseConstructor, node: ScalarNode) -> str:
         """Process environment variables found in the YAML."""
         value = loader.construct_scalar(node)
-
-        # get key of current node
-        key_node = list(loader.constructed_objects)[-1]
-        if isinstance(key_node, ScalarNode) and key_node.value in SENSITIVE_DATA:
-            return value
-
         expanded_vars = os.path.expandvars(value)
         not_expanded = [
             w for w in expanded_vars.split() if w.startswith("$") and w in value
@@ -121,6 +115,11 @@ def _add_yaml_constructor_to_replace_environment_variables() -> None:
                 f"Please make sure to also set these "
                 f"environment variables: '{not_expanded}'."
             )
+
+        # get key of current node
+        key_node = list(loader.constructed_objects)[-1]
+        if isinstance(key_node, ScalarNode) and key_node.value in SENSITIVE_DATA:
+            return value
         return expanded_vars
 
     yaml.SafeConstructor.add_constructor("!env_var", env_var_constructor)

rasa/studio/upload.py

@@ -2,7 +2,7 @@ import argparse
 import base64
 import re
 import sys
-from typing import Any, Dict, Iterable, List, Set, Text, Tuple, Union
+from typing import Dict, Iterable, List, Set, Text, Tuple, Union, Any
 
 import questionary
 import requests
@@ -13,19 +13,13 @@ import rasa.cli.utils
 import rasa.shared.utils.cli
 import rasa.shared.utils.io
 from rasa.shared.constants import (
-    CONFIG_LANGUAGE_KEY,
-    CONFIG_LLM_KEY,
-    CONFIG_MODEL_NAME_KEY,
-    CONFIG_PIPELINE_KEY,
-    CONFIG_POLICIES_KEY,
-    CONFIG_RECIPE_KEY,
-    DEFAULT_CONFIG_PATH,
     DEFAULT_DOMAIN_PATHS,
+    DEFAULT_CONFIG_PATH,
 )
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.flows.yaml_flows_io import YAMLFlowsReader, YamlFlowsWriter
 from rasa.shared.exceptions import RasaException
-from rasa.shared.importers.importer import FlowSyncImporter, TrainingDataImporter
+from rasa.shared.importers.importer import TrainingDataImporter, FlowSyncImporter
 from rasa.shared.nlu.training_data.formats.rasa_yaml import (
     RasaYAMLReader,
     RasaYAMLWriter,
@@ -137,11 +131,13 @@ def handle_upload(args: argparse.Namespace) -> None:
         rasa.shared.utils.cli.print_error_and_exit(
             "No GraphQL endpoint found in config. Please run `rasa studio config`."
         )
+        return
 
     if not is_auth_working(endpoint, verify):
         rasa.shared.utils.cli.print_error_and_exit(
             "Authentication is invalid or expired. Please run `rasa studio login`."
         )
+        return
 
     structlogger.info("rasa.studio.upload.loading_data", event_info="Loading data...")
 
@@ -164,16 +160,6 @@ def handle_upload(args: argparse.Namespace) -> None:
         upload_nlu_assistant(args, endpoint, verify=verify)
 
 
-config_keys = [
-    CONFIG_RECIPE_KEY,
-    CONFIG_POLICIES_KEY,
-    CONFIG_PIPELINE_KEY,
-    CONFIG_LANGUAGE_KEY,
-    CONFIG_LLM_KEY,
-    CONFIG_MODEL_NAME_KEY,
-]
-
-
 def extract_values(data: Dict, keys: List[Text]) -> Dict:
     """Extracts values for given keys from a dictionary."""
     return {key: data.get(key) for key in keys if data.get(key)}