rasa-pro 3.11.4__py3-none-any.whl → 3.12.0__py3-none-any.whl

rasa/engine/validation.py

@@ -5,31 +5,32 @@ import re
 import sys
 import typing
 from typing import (
-    Optional,
+    Any,
     Callable,
+    Dict,
+    List,
+    Literal,
+    Optional,
+    Set,
     Text,
     Tuple,
-    Dict,
     Type,
-    Any,
-    Set,
-    Union,
     TypeVar,
-    List,
-    Literal,
+    Union,
 )
 
-import rasa.utils.common
 import structlog
 import typing_utils
-from rasa.core import IntentlessPolicy, ContextualResponseRephraser
+
+import rasa.utils.common
+from rasa.core import ContextualResponseRephraser, IntentlessPolicy
 from rasa.core.policies.policy import PolicyPrediction
 from rasa.core.utils import AvailableEndpoints
 from rasa.dialogue_understanding.coexistence.constants import (
-    NLU_ENTRY,
     CALM_ENTRY,
-    STICKY,
+    NLU_ENTRY,
     NON_STICKY,
+    STICKY,
 )
 from rasa.dialogue_understanding.coexistence.intent_based_router import (
     IntentBasedRouter,
@@ -39,55 +40,56 @@ from rasa.dialogue_understanding.generator import (
     LLMBasedCommandGenerator,
 )
 from rasa.dialogue_understanding.generator.constants import (
-    LLM_CONFIG_KEY,
     FLOW_RETRIEVAL_KEY,
+    LLM_CONFIG_KEY,
 )
 from rasa.dialogue_understanding.patterns.chitchat import FLOW_PATTERN_CHITCHAT
 from rasa.engine.constants import RESERVED_PLACEHOLDERS
 from rasa.engine.exceptions import GraphSchemaValidationException
 from rasa.engine.graph import (
-    GraphSchema,
-    GraphComponent,
-    SchemaNode,
     ExecutionContext,
+    GraphComponent,
     GraphModelConfiguration,
+    GraphSchema,
+    SchemaNode,
 )
 from rasa.engine.storage.resource import Resource
-from rasa.engine.storage.storage import ModelStorage, ModelMetadata
+from rasa.engine.storage.storage import ModelMetadata, ModelStorage
 from rasa.engine.training.fingerprinting import Fingerprintable
 from rasa.shared.constants import (
-    DOCS_URL_GRAPH_COMPONENTS,
-    ROUTE_TO_CALM_SLOT,
-    EMBEDDINGS_CONFIG_KEY,
     API_BASE_CONFIG_KEY,
-    DEPLOYMENT_CONFIG_KEY,
-    API_VERSION_CONFIG_KEY,
     API_KEY,
+    API_TYPE_CONFIG_KEY,
+    API_VERSION_CONFIG_KEY,
+    AWS_ACCESS_KEY_ID_CONFIG_KEY,
     AWS_REGION_NAME_CONFIG_KEY,
+    AWS_SECRET_ACCESS_KEY_CONFIG_KEY,
+    AWS_SESSION_TOKEN_CONFIG_KEY,
+    DEPLOYMENT_CONFIG_KEY,
+    DOCS_URL_GRAPH_COMPONENTS,
+    EMBEDDINGS_CONFIG_KEY,
+    MODEL_GROUP_CONFIG_KEY,
     MODEL_GROUP_ID_CONFIG_KEY,
-    ROUTER_CONFIG_KEY,
     MODELS_CONFIG_KEY,
-    MODEL_GROUP_CONFIG_KEY,
-    ROUTING_STRATEGY_CONFIG_KEY,
-    VALID_ROUTING_STRATEGIES,
-    ROUTING_STRATEGIES_REQUIRING_REDIS_CACHE,
-    ROUTING_STRATEGIES_NOT_REQUIRING_CACHE,
+    PROVIDER_CONFIG_KEY,
     REDIS_HOST_CONFIG_KEY,
-    AWS_ACCESS_KEY_ID_CONFIG_KEY,
-    AWS_SECRET_ACCESS_KEY_CONFIG_KEY,
-    AWS_SESSION_TOKEN_CONFIG_KEY,
+    ROUTE_TO_CALM_SLOT,
+    ROUTER_CONFIG_KEY,
+    ROUTING_STRATEGIES_NOT_REQUIRING_CACHE,
+    ROUTING_STRATEGIES_REQUIRING_REDIS_CACHE,
+    ROUTING_STRATEGY_CONFIG_KEY,
     SENSITIVE_DATA,
     USE_CHAT_COMPLETIONS_ENDPOINT_CONFIG_KEY,
-    API_TYPE_CONFIG_KEY,
     VALID_PROVIDERS_FOR_API_TYPE_CONFIG_KEY,
-    PROVIDER_CONFIG_KEY,
+    VALID_ROUTING_STRATEGIES,
 )
 from rasa.shared.core.constants import ACTION_RESET_ROUTING, ACTION_TRIGGER_CHITCHAT
 from rasa.shared.core.domain import Domain
-from rasa.shared.core.flows import FlowsList, Flow
+from rasa.shared.core.flows import Flow, FlowsList
 from rasa.shared.core.slots import Slot
 from rasa.shared.exceptions import RasaException
 from rasa.shared.nlu.training_data.message import Message
+from rasa.shared.utils.common import display_research_study_prompt
 
 TypeAnnotation = Union[TypeVar, Text, Type, Optional[AvailableEndpoints]]
 
@@ -1448,4 +1450,5 @@ def validate_api_type_config_key_usage(
                     f"For other providers, please use the '{PROVIDER_CONFIG_KEY}' key."
                 ),
             )
+            display_research_study_prompt()
             sys.exit(1)

rasa/exceptions.py

@@ -1,9 +1,10 @@
+from dataclasses import dataclass
 from typing import Text
+
 from packaging import version
-from dataclasses import dataclass
 
-from rasa.shared.exceptions import RasaException
 from rasa.constants import MINIMUM_COMPATIBLE_VERSION
+from rasa.shared.exceptions import RasaException
 
 
 @dataclass

rasa/graph_components/converters/nlu_message_converter.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
-from typing import Dict, Text, Any, List
 
-from rasa.core.channels.channel import UserMessage
+from typing import Any, Dict, List, Text
 
-from rasa.engine.graph import GraphComponent, ExecutionContext
+from rasa.core.channels.channel import UserMessage
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.nlu.constants import TEXT, TEXT_TOKENS

rasa/graph_components/providers/domain_for_core_training_provider.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
 import copy
-from typing import Dict, Text, Any
+from typing import Any, Dict, Text
 
-from rasa.engine.graph import GraphComponent, ExecutionContext
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.constants import REQUIRED_SLOTS_KEY
-from rasa.shared.core.domain import KEY_RESPONSES, Domain, SESSION_CONFIG_KEY, KEY_FORMS
+from rasa.shared.core.domain import KEY_FORMS, KEY_RESPONSES, SESSION_CONFIG_KEY, Domain
 
 
 class DomainForCoreTrainingProvider(GraphComponent):

rasa/graph_components/providers/domain_provider.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
-from typing import Dict, Text, Any, Optional
 
-from rasa.engine.graph import GraphComponent, ExecutionContext
+from typing import Any, Dict, Optional, Text
+
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.core.domain import Domain

rasa/graph_components/providers/flows_provider.py

@@ -5,10 +5,9 @@ from typing import Any, Dict, Text
 from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
-from rasa.shared.importers.importer import TrainingDataImporter
-from rasa.shared.core.flows.yaml_flows_io import YAMLFlowsReader, YamlFlowsWriter
-
 from rasa.shared.core.flows import FlowsList
+from rasa.shared.core.flows.yaml_flows_io import YAMLFlowsReader, YamlFlowsWriter
+from rasa.shared.importers.importer import TrainingDataImporter
 
 FLOWS_PERSISTENCE_FILE_NAME = "flows.yml"
 

rasa/graph_components/providers/forms_provider.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
-import dataclasses
 
-from typing import Dict, Text, Any
+import dataclasses
+from typing import Any, Dict, Text
 
-from rasa.engine.graph import GraphComponent, ExecutionContext
+import rasa.shared.utils.io
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.core.domain import Domain
-import rasa.shared.utils.io
 
 
 @dataclasses.dataclass

rasa/graph_components/providers/nlu_training_data_provider.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
-from typing import Dict, Text, Any
-from rasa.engine.graph import GraphComponent, ExecutionContext
+
+from typing import Any, Dict, Text
+
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.nlu.training_data.training_data import (
-    TrainingData,
     DEFAULT_TRAINING_DATA_OUTPUT_PATH,
+    TrainingData,
 )
 
 

rasa/graph_components/providers/responses_provider.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
-import dataclasses
 
-from typing import Dict, List, Text, Any
+import dataclasses
+from typing import Any, Dict, List, Text
 
-from rasa.engine.graph import GraphComponent, ExecutionContext
+import rasa.shared.utils.io
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.core.domain import Domain
-import rasa.shared.utils.io
 
 
 @dataclasses.dataclass

rasa/graph_components/providers/rule_only_provider.py

@@ -1,10 +1,11 @@
 from __future__ import annotations
+
 import dataclasses
 import logging
-from typing import Dict, Text, Any
+from typing import Any, Dict, Text
 
 import rasa.shared.utils.io
-from rasa.engine.graph import GraphComponent, ExecutionContext
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 

rasa/graph_components/providers/story_graph_provider.py

@@ -1,18 +1,18 @@
 from __future__ import annotations
-from typing import Dict, Text, Any, List
 
-from rasa.engine.graph import GraphComponent, ExecutionContext
+from typing import Any, Dict, List, Text
+
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
-from rasa.shared.core.training_data.structures import StoryGraph, StoryStep
-from rasa.shared.importers.importer import TrainingDataImporter
-from rasa.shared.core.training_data.story_writer.yaml_story_writer import (
-    YAMLStoryWriter,
-)
 from rasa.shared.core.training_data.story_reader.yaml_story_reader import (
     YAMLStoryReader,
 )
-
+from rasa.shared.core.training_data.story_writer.yaml_story_writer import (
+    YAMLStoryWriter,
+)
+from rasa.shared.core.training_data.structures import StoryGraph, StoryStep
+from rasa.shared.importers.importer import TrainingDataImporter
 
 STORIES_PERSISTENCE_FILE_NAME = "stories.yml"
 

rasa/graph_components/providers/training_tracker_provider.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
-from typing import Dict, Text, Any, List
 
-from rasa.engine.graph import GraphComponent, ExecutionContext
+from typing import Any, Dict, List, Text
+
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.core.domain import Domain

rasa/graph_components/validators/default_recipe_validator.py

@@ -1,31 +1,32 @@
 from __future__ import annotations
+
 from collections import defaultdict
-from typing import Iterable, List, Dict, Text, Any, Set, Type, cast
+from typing import Any, Dict, Iterable, List, Set, Text, Type, cast
 
+import rasa.shared.utils.io
+from rasa.core.constants import POLICY_PRIORITY
 from rasa.core.featurizers.precomputation import CoreFeaturizationInputConverter
+from rasa.core.policies.flow_policy import FlowPolicy
+from rasa.core.policies.memoization import AugmentedMemoizationPolicy, MemoizationPolicy
+from rasa.core.policies.policy import Policy, SupportedData
+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.engine.graph import ExecutionContext, GraphComponent, GraphSchema, SchemaNode
-from rasa.engine.storage.storage import ModelStorage
 from rasa.engine.storage.resource import Resource
-from rasa.nlu.featurizers.featurizer import Featurizer
-from rasa.nlu.extractors.mitie_entity_extractor import MitieEntityExtractor
-from rasa.nlu.extractors.regex_entity_extractor import RegexEntityExtractor
+from rasa.engine.storage.storage import ModelStorage
+from rasa.nlu.classifiers.diet_classifier import DIETClassifier
 from rasa.nlu.extractors.crf_entity_extractor import (
     CRFEntityExtractor,
     CRFEntityExtractorOptions,
 )
 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.featurizers.featurizer import Featurizer
 from rasa.nlu.featurizers.sparse_featurizer.regex_featurizer import RegexFeaturizer
-from rasa.nlu.classifiers.diet_classifier import DIETClassifier
 from rasa.nlu.selectors.response_selector import ResponseSelector
 from rasa.nlu.tokenizers.tokenizer import Tokenizer
-from rasa.core.policies.rule_policy import RulePolicy
-from rasa.core.policies.policy import Policy, SupportedData
-from rasa.core.policies.memoization import AugmentedMemoizationPolicy, MemoizationPolicy
-from rasa.core.policies.ted_policy import TEDPolicy
-from rasa.core.policies.flow_policy import FlowPolicy
-from rasa.core.constants import POLICY_PRIORITY
-from rasa.shared.core.training_data.structures import RuleStep, StoryGraph
 from rasa.shared.constants import (
     DEFAULT_CONFIG_PATH,
     DOCS_URL_COMPONENTS,
@@ -33,18 +34,17 @@ from rasa.shared.constants import (
     DOCS_URL_NLU_BASED_POLICIES,
     DOCS_URL_RULES,
 )
-from rasa.shared.core.domain import Domain, InvalidDomain
 from rasa.shared.core.constants import (
     ACTION_BACK_NAME,
     ACTION_RESTART_NAME,
     USER_INTENT_BACK,
     USER_INTENT_RESTART,
 )
+from rasa.shared.core.domain import Domain, InvalidDomain
+from rasa.shared.core.training_data.structures import RuleStep, StoryGraph
 from rasa.shared.exceptions import InvalidConfigException
 from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.nlu.training_data.training_data import TrainingData
-import rasa.shared.utils.io
-
 
 # TODO: Can we replace this with the registered types from the regitry?
 TRAINABLE_EXTRACTORS = [MitieEntityExtractor, CRFEntityExtractor, DIETClassifier]

rasa/graph_components/validators/finetuning_validator.py

@@ -1,21 +1,23 @@
 from __future__ import annotations
-from typing import Dict, Text, Any, Optional
+
 import copy
 import logging
+from typing import Any, Dict, Optional, Text
 
 from packaging import version
+
+import rasa.shared.utils.io
 from rasa.constants import MINIMUM_COMPATIBLE_VERSION
-from rasa.engine.graph import GraphComponent, ExecutionContext
-from rasa.engine.storage.storage import ModelStorage
+from rasa.engine.graph import ExecutionContext, GraphComponent
 from rasa.engine.storage.resource import Resource
-from rasa.shared.exceptions import InvalidConfigException
-from rasa.shared.core.domain import Domain
-from rasa.shared.importers.importer import TrainingDataImporter
-import rasa.shared.utils.io
-from rasa.utils.tensorflow.constants import EPOCHS
+from rasa.engine.storage.storage import ModelStorage
 from rasa.graph_components.providers.domain_for_core_training_provider import (
     DomainForCoreTrainingProvider,
 )
+from rasa.shared.core.domain import Domain
+from rasa.shared.exceptions import InvalidConfigException
+from rasa.shared.importers.importer import TrainingDataImporter
+from rasa.utils.tensorflow.constants import EPOCHS
 
 FINGERPRINT_CONFIG = "fingerprint-config"
 FINGERPRINT_CORE = "fingerprint-core"

rasa/hooks.py

@@ -1,23 +1,20 @@
 import argparse
 import logging
-from typing import Optional, TYPE_CHECKING, List, Text, Union
+from typing import TYPE_CHECKING, List, Optional, Text, Union
 
 import pluggy
-from rasa.cli import SubParsersAction
 
-from rasa.cli import x as rasa_x
-from rasa.utils.endpoints import EndpointConfig
-
-from rasa.core.auth_retry_tracker_store import AuthRetryTrackerStore
-from rasa.core.secrets_manager.factory import load_secret_manager
-
-from rasa.tracing import config
+# IMPORTANT: do not import anything from rasa here - use scoped imports
+#  this avoids circular imports, as the hooks are used in different places
+#  across the codebase.
 
 if TYPE_CHECKING:
+    from rasa.anonymization.anonymization_pipeline import AnonymizationPipeline
+    from rasa.cli import SubParsersAction
     from rasa.core.brokers.broker import EventBroker
     from rasa.core.tracker_store import TrackerStore
     from rasa.shared.core.domain import Domain
-    from rasa.anonymization.anonymization_pipeline import AnonymizationPipeline
+    from rasa.utils.endpoints import EndpointConfig
 
 hookimpl = pluggy.HookimplMarker("rasa")
 logger = logging.getLogger(__name__)
@@ -25,15 +22,15 @@ logger = logging.getLogger(__name__)
 
 @hookimpl  # type: ignore[misc]
 def refine_cli(
-    subparsers: SubParsersAction,
+    subparsers: "SubParsersAction",
     parent_parsers: List[argparse.ArgumentParser],
 ) -> None:
-    from rasa.cli import e2e_test, inspect, markers
-    from rasa.cli.studio import studio
-
+    from rasa.cli import dialogue_understanding_test, e2e_test, inspect, markers
     from rasa.cli import license as license_cli
+    from rasa.cli.studio import studio
 
     e2e_test.add_subparser(subparsers, parent_parsers)
+    dialogue_understanding_test.add_subparser(subparsers, parent_parsers)
     studio.add_subparser(subparsers, parent_parsers)
     license_cli.add_subparser(subparsers, parent_parsers)
     markers.add_subparser(subparsers, parent_parsers)
@@ -43,6 +40,9 @@ def refine_cli(
 
 @hookimpl  # type: ignore[misc]
 def configure_commandline(cmdline_arguments: argparse.Namespace) -> Optional[Text]:
+    from rasa.cli import x as rasa_x
+    from rasa.tracing import config
+
     endpoints_file = None
 
     if cmdline_arguments.func.__name__ == "rasa_x":
@@ -69,6 +69,8 @@ def init_telemetry(endpoints_file: Optional[Text]) -> None:
 
 @hookimpl  # type: ignore[misc]
 def init_managers(endpoints_file: Optional[Text]) -> None:
+    from rasa.core.secrets_manager.factory import load_secret_manager
+
     load_secret_manager(endpoints_file)
 
 
@@ -78,6 +80,9 @@ def create_tracker_store(
     domain: "Domain",
     event_broker: Optional["EventBroker"],
 ) -> "TrackerStore":
+    from rasa.core.auth_retry_tracker_store import AuthRetryTrackerStore
+    from rasa.utils.endpoints import EndpointConfig
+
     if isinstance(endpoint_config, EndpointConfig):
         return AuthRetryTrackerStore(
             endpoint_config=endpoint_config, domain=domain, event_broker=event_broker

rasa/jupyter.py

@@ -3,10 +3,10 @@ import pprint as pretty_print
 import typing
 from typing import Any, Dict, Optional, Text
 
-from rasa.shared.exceptions import RasaException
-from rasa.shared.utils.cli import print_success
 import rasa.core.agent
 import rasa.utils.common
+from rasa.shared.exceptions import RasaException
+from rasa.shared.utils.cli import print_success
 
 if typing.TYPE_CHECKING:
     from rasa.core.agent import Agent

rasa/llm_fine_tuning/annotation_module.py

@@ -1,17 +1,17 @@
 import asyncio
 from contextlib import contextmanager
-from typing import List, Generator, Optional, Tuple, Union
+from typing import Generator, List, Optional, Tuple, Union
 
 import structlog
 
 from rasa.dialogue_understanding.commands import Command
-from rasa.e2e_test.e2e_test_case import TestSuite, TestCase, ActualStepOutput, TestStep
-from rasa.e2e_test.e2e_test_runner import E2ETestRunner, TEST_TURNS_TYPE
+from rasa.e2e_test.e2e_test_case import ActualStepOutput, TestCase, TestStep, TestSuite
+from rasa.e2e_test.e2e_test_runner import TEST_TURNS_TYPE, E2ETestRunner
 from rasa.llm_fine_tuning.conversations import Conversation, ConversationStep
 from rasa.llm_fine_tuning.storage import StorageContext
 from rasa.shared.core.constants import USER
 from rasa.shared.core.trackers import DialogueStateTracker
-from rasa.shared.nlu.constants import LLM_PROMPT, LLM_COMMANDS
+from rasa.shared.nlu.constants import LLM_COMMANDS, LLM_PROMPT
 from rasa.shared.utils.llm import tracker_as_readable_transcript
 
 ANNOTATION_MODULE_STORAGE_LOCATION = "1_command_annotations"

rasa/llm_fine_tuning/conversations.py

@@ -1,17 +1,7 @@
 from dataclasses import dataclass, field
-from typing import List, Union, Iterator, Any, Dict, Optional
-
-from rasa.dialogue_understanding.commands import (
-    Command,
-    StartFlowCommand,
-    SetSlotCommand,
-    CancelFlowCommand,
-    ChitChatAnswerCommand,
-    SkipQuestionCommand,
-    HumanHandoffCommand,
-    KnowledgeAnswerCommand,
-    ClarifyCommand,
-)
+from typing import Any, Dict, Iterator, List, Optional, Union
+
+from rasa.dialogue_understanding.commands.prompt_command import PromptCommand
 from rasa.e2e_test.e2e_test_case import TestCase, TestStep
 from rasa.shared.core.constants import USER
 
@@ -19,7 +9,7 @@ from rasa.shared.core.constants import USER
 @dataclass
 class ConversationStep:
     original_test_step: TestStep
-    llm_commands: List[Command]
+    llm_commands: List[PromptCommand]
     llm_prompt: str
     failed_rephrasings: List[str] = field(default_factory=list)
     passed_rephrasings: List[str] = field(default_factory=list)
@@ -38,25 +28,7 @@ class ConversationStep:
         return data
 
     def _commands_to_str(self) -> List[str]:
-        output = []
-        for command in self.llm_commands:
-            if isinstance(command, StartFlowCommand):
-                output.append(f"StartFlow({command.flow})")
-            elif isinstance(command, SetSlotCommand):
-                output.append(f"SetSlot({command.name}, {command.value})")
-            elif isinstance(command, ClarifyCommand):
-                output.append(f"Clarify({command.options})")
-            elif isinstance(command, CancelFlowCommand):
-                output.append("CancelFlow()")
-            elif isinstance(command, ChitChatAnswerCommand):
-                output.append("ChitChat()")
-            elif isinstance(command, SkipQuestionCommand):
-                output.append("SkipQuestion()")
-            elif isinstance(command, KnowledgeAnswerCommand):
-                output.append("SearchAndReply()")
-            elif isinstance(command, HumanHandoffCommand):
-                output.append("HumanHandoff()")
-        return output
+        return [command.to_dsl() for command in self.llm_commands]
 
     def commands_as_string(self) -> str:
         return "\n".join(self._commands_to_str())

rasa/llm_fine_tuning/llm_data_preparation_module.py

@@ -1,11 +1,13 @@
 from dataclasses import dataclass
-from typing import List, Dict, Any, Optional
+from typing import Any, Dict, List, Optional
 
 import structlog
 from tqdm import tqdm
 
+from rasa.dialogue_understanding.commands.prompt_command import PromptCommand
 from rasa.llm_fine_tuning.conversations import Conversation, ConversationStep
 from rasa.llm_fine_tuning.storage import StorageContext
+from rasa.llm_fine_tuning.utils import commands_as_string
 
 LLM_DATA_PREPARATION_MODULE_STORAGE_LOCATION = "3_llm_finetune_data/llm_ft_data.jsonl"
 
@@ -15,7 +17,7 @@ structlogger = structlog.get_logger()
 @dataclass
 class LLMDataExample:
     prompt: str
-    output: str
+    output: List[PromptCommand]
     original_test_name: str
     original_user_utterance: str
     rephrased_user_utterance: str
@@ -23,7 +25,7 @@ class LLMDataExample:
     def as_dict(self) -> Dict[str, Any]:
         return {
             "prompt": self.prompt,
-            "output": self.output,
+            "output": commands_as_string(self.output),
             "original_test_name": self.original_test_name,
             "original_user_utterance": self.original_user_utterance,
             "rephrased_user_utterance": self.rephrased_user_utterance,
@@ -38,7 +40,7 @@ def _create_data_point(
 ) -> LLMDataExample:
     return LLMDataExample(
         prompt,
-        step.commands_as_string(),
+        step.llm_commands,
         conversation.get_full_name(),
         step.original_test_step.text,
         rephrased_user_message,

rasa/llm_fine_tuning/paraphrasing/conversation_rephraser.py

@@ -1,6 +1,6 @@
 import importlib.resources
 import re
-from typing import Dict, Any, List, Tuple, Optional
+from typing import Any, Dict, List, Optional, Tuple
 
 import structlog
 from jinja2 import Template
@@ -10,9 +10,9 @@ from rasa.llm_fine_tuning.paraphrasing.rephrased_user_message import (
     RephrasedUserMessage,
 )
 from rasa.shared.constants import (
-    MODEL_NAME_CONFIG_KEY,
-    MODEL_CONFIG_KEY,
     LLM_CONFIG_KEY,
+    MODEL_CONFIG_KEY,
+    MODEL_NAME_CONFIG_KEY,
     PROMPT_TEMPLATE_CONFIG_KEY,
     PROVIDER_CONFIG_KEY,
     TIMEOUT_CONFIG_KEY,
@@ -20,9 +20,9 @@ from rasa.shared.constants import (
 from rasa.shared.exceptions import ProviderClientAPIException
 from rasa.shared.providers.mappings import OPENAI_PROVIDER
 from rasa.shared.utils.llm import (
+    USER,
     get_prompt_template,
     llm_factory,
-    USER,
 )
 
 SEPARATOR = "\n\n"