rasa-pro 3.10.16__py3-none-any.whl → 3.11.0a1__py3-none-any.whl

rasa/cli/llm_fine_tuning.py

@@ -22,7 +22,6 @@ from rasa.cli.e2e_test import (
 )
 from rasa.core.exceptions import AgentNotReady
 from rasa.core.utils import AvailableEndpoints
-from rasa.dialogue_understanding.generator import SingleStepLLMCommandGenerator
 from rasa.e2e_test.e2e_test_runner import E2ETestRunner
 from rasa.llm_fine_tuning.annotation_module import annotate_e2e_tests
 from rasa.llm_fine_tuning.llm_data_preparation_module import convert_to_fine_tuning_data
@@ -45,9 +44,6 @@ from rasa.shared.constants import (
     DEFAULT_MODELS_PATH,
     LLM_CONFIG_KEY,
 )
-from rasa.shared.utils.llm import (
-    combine_custom_and_default_config,
-)
 from rasa.shared.utils.yaml import read_config_file
 from rasa.utils.beta import ensure_beta_feature_is_enabled
 
@@ -279,19 +275,20 @@ def _get_llm_command_generator_config(e2e_test_runner: E2ETestRunner) -> Dict[st
 
     train_schema = e2e_test_runner.agent.processor.model_metadata.train_schema  # type: ignore
 
-    for node_name, node in train_schema.nodes.items():
-        if node.matches_type(SingleStepLLMCommandGenerator, include_subtypes=True):
-            return combine_custom_and_default_config(
-                node.config.get(LLM_CONFIG_KEY, {}), DEFAULT_LLM_CONFIG
-            )
+    for node in train_schema.nodes:
+        if "SingleStepLLMCommandGenerator" in node:
+            return {
+                **DEFAULT_LLM_CONFIG,
+                **train_schema.nodes[node].config.get(LLM_CONFIG_KEY),
+            }
 
     rasa.shared.utils.cli.print_error(
-        "The provided model is not trained using 'SingleStepLLMCommandGenerator' or "
-        "its subclasses. Without it, no data for fine-tuning can be generated. To "
-        "resolve this, please include 'SingleStepLLMCommandGenerator' or its subclass "
-        "in your config and train your model."
+        "The provided model was not trained with the 'SingleStepLLMCommandGenerator'."
+        "Without the 'SingleStepLLMCommandGenerator' no data for fine-tuning can be "
+        "created. Please add the 'SingleStepLLMCommandGenerator' to your config and"
+        "train your model."
     )
-    sys.exit(1)
+    sys.exit(0)
 
 
 def log_start_of_module(module_name: str) -> None:
@@ -355,7 +352,7 @@ def get_valid_endpoints(endpoints_file: str) -> AvailableEndpoints:
     validated_endpoints_file = rasa.cli.utils.get_validated_path(
         endpoints_file, "endpoints", DEFAULT_ENDPOINTS_PATH, True
     )
-    endpoints = AvailableEndpoints.get_instance(validated_endpoints_file)
+    endpoints = AvailableEndpoints.read_endpoints(validated_endpoints_file)
 
     # Ignore all endpoints apart from action server, model, nlu and nlg
     # to ensure InMemoryTrackerStore is being used instead of production

rasa/cli/run.py

@@ -6,6 +6,7 @@ from typing import List, Text
 from rasa.api import run as rasa_run
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import run as arguments
+from rasa.cli.arguments.default_arguments import SkipYamlValidation
 from rasa.cli.utils import get_validated_path
 from rasa.exceptions import ModelNotFound
 from rasa.shared.constants import (
@@ -15,6 +16,7 @@ from rasa.shared.constants import (
     DEFAULT_MODELS_PATH,
     DOCS_BASE_URL,
 )
+from rasa.shared.core.domain import Domain
 from rasa.shared.utils.cli import print_error
 
 logger = logging.getLogger(__name__)
@@ -87,6 +89,11 @@ def run(args: argparse.Namespace) -> None:
         args.credentials, "credentials", DEFAULT_CREDENTIALS_PATH, True
     )
 
+    if SkipYamlValidation.DOMAIN.value in args.skip_yaml_validation:
+        Domain.validate_yaml = False
+    else:
+        Domain.validate_yaml = True
+
     if args.enable_api:
         if not args.remote_storage:
             args.model = _validate_model_path(args.model, "model", DEFAULT_MODELS_PATH)
@@ -106,7 +113,7 @@ def run(args: argparse.Namespace) -> None:
         return
 
     # start server if model server is configured
-    endpoints = AvailableEndpoints.get_instance(args.endpoints)
+    endpoints = AvailableEndpoints.read_endpoints(args.endpoints)
     model_server = endpoints.model if endpoints and endpoints.model else None
     if model_server is not None:
         rasa_run(**vars(args))

rasa/cli/studio/studio.py

@@ -1,5 +1,5 @@
 import argparse
-from typing import List, Optional, Tuple
+from typing import List, Optional
 from urllib.parse import ParseResult, urlparse
 
 import questionary
@@ -149,7 +149,7 @@ def _configure_studio_url() -> Optional[str]:
     return studio_url
 
 
-def _get_advanced_config(studio_url: str) -> Tuple:
+def _get_advanced_config(studio_url: str) -> tuple:
     """Get the advanced configuration values for Rasa Studio."""
     keycloak_url = questionary.text(
         "Please provide your Rasa Studio Keycloak URL",
@@ -167,7 +167,7 @@ def _get_advanced_config(studio_url: str) -> Tuple:
     return keycloak_url, realm_name, client_id
 
 
-def _get_default_config(studio_url: str) -> Tuple:
+def _get_default_config(studio_url: str) -> tuple:
     """Get the default configuration values for Rasa Studio."""
     keycloak_url = studio_url + "auth/"
     realm_name = DEFAULT_REALM_NAME
@@ -178,7 +178,6 @@ def _get_default_config(studio_url: str) -> Tuple:
         f"Keycloak URL: {keycloak_url}, "
         f"Realm Name: '{realm_name}', "
         f"Client ID: '{client_id}'. "
-        f"SSL verification is enabled."
         f"You can use '--advanced' to configure these settings."
     )
 
@@ -186,11 +185,7 @@ def _get_default_config(studio_url: str) -> Tuple:
 
 
 def _create_studio_config(
-    studio_url: str,
-    keycloak_url: str,
-    realm_name: str,
-    client_id: str,
-    disable_verify: bool = False,
+    studio_url: str, keycloak_url: str, realm_name: str, client_id: str
 ) -> StudioConfig:
     """Create a StudioConfig object with the provided parameters."""
     return StudioConfig(
@@ -198,7 +193,6 @@ def _create_studio_config(
         studio_url=studio_url + "api/graphql/",
         client_id=client_id,
         realm_name=realm_name,
-        disable_verify=disable_verify,
     )
 
 
@@ -233,23 +227,19 @@ def _configure_studio_config(args: argparse.Namespace) -> StudioConfig:
 
     # create a configuration and auth object to try to reach the studio
     studio_config = _create_studio_config(
-        studio_url,
-        keycloak_url,
-        realm_name,
-        client_id,
-        disable_verify=args.disable_verify,
+        studio_url, keycloak_url, realm_name, client_id
     )
 
-    if studio_config.disable_verify:
+    if args.disable_verify:
         rasa.shared.utils.cli.print_info(
             "Disabling SSL verification for the Rasa Studio authentication server."
         )
+        studio_auth = StudioAuth(studio_config, verify=False)
     else:
         rasa.shared.utils.cli.print_info(
             "Enabling SSL verification for the Rasa Studio authentication server."
         )
-
-    studio_auth = StudioAuth(studio_config)
+        studio_auth = StudioAuth(studio_config, verify=True)
 
     if _check_studio_auth(studio_auth):
         return studio_config

rasa/cli/train.py

@@ -1,33 +1,25 @@
 import argparse
 import asyncio
-import os
 import sys
 from pathlib import Path
 from typing import Dict, List, Optional, Text, Union
 
 import structlog
-from tarsafe import TarSafe
 
 import rasa.cli.arguments.train as train_arguments
 import rasa.cli.utils
 import rasa.core.utils
 import rasa.utils.common
-from rasa.api import train as train_all
 from rasa.cli import SubParsersAction
-from rasa.core import ContextualResponseRephraser
 from rasa.core.nlg.generator import NaturalLanguageGenerator
 from rasa.core.train import do_compare_training
-from rasa.engine.validation import validate_api_type_config_key_usage
-from rasa.nlu.persistor import get_persistor
 from rasa.shared.constants import (
     CONFIG_MANDATORY_KEYS,
     CONFIG_MANDATORY_KEYS_CORE,
     CONFIG_MANDATORY_KEYS_NLU,
     DEFAULT_DATA_PATH,
     DEFAULT_DOMAIN_PATHS,
-    LLM_CONFIG_KEY,
 )
-from rasa.shared.exceptions import RasaException
 from rasa.shared.importers.importer import TrainingDataImporter
 
 structlogger = structlog.getLogger(__name__)
@@ -44,7 +36,7 @@ def add_subparser(
     """
     train_parser = subparsers.add_parser(
         "train",
-        help="Trains a Rasa model using your CALM flows, NLU data and stories.",
+        help="Trains a Rasa model using your NLU data and stories.",
         parents=parents,
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
@@ -78,12 +70,6 @@ def add_subparser(
 def _check_nlg_endpoint_validity(endpoint: Union[Path, str]) -> None:
     try:
         endpoints = rasa.core.utils.read_endpoints_from_path(endpoint)
-        if endpoints.nlg is not None:
-            validate_api_type_config_key_usage(
-                endpoints.nlg.kwargs,
-                LLM_CONFIG_KEY,
-                ContextualResponseRephraser.__name__,
-            )
         NaturalLanguageGenerator.create(endpoints.nlg)
     except Exception as e:
         structlogger.error(
@@ -97,37 +83,6 @@ def _check_nlg_endpoint_validity(endpoint: Union[Path, str]) -> None:
         sys.exit(1)
 
 
-def retrieve_and_unpack_bot_config_from_remote_storage(
-    args: argparse.Namespace,
-) -> None:
-    """Retrieve and unpack bot config from remote storage.
-
-    Bot config is retrieved from remote storage and unpacked
-    to the current working directory.
-    """
-    persistor = get_persistor(args.remote_storage)
-    if persistor is None:
-        raise RasaException(
-            f"Could not find a persistor for "
-            f"the storage type '{args.remote_storage}'."
-        )
-
-    current_working_directory = os.getcwd()
-
-    persistor.retrieve(args.remote_bot_config_path, current_working_directory)
-
-    remote_bot_config_tar_file_name = os.path.basename(args.remote_bot_config_path)
-
-    with TarSafe.open(remote_bot_config_tar_file_name, "r:gz") as tar:
-        tar.extractall(path=current_working_directory)
-
-    structlogger.debug(
-        "rasa.train.retrieve_and_unpack_bot_config.remove_downloaded_archive",
-        training_data_path=args.remote_bot_config_path,
-    )
-    os.remove(Path(current_working_directory).joinpath(remote_bot_config_tar_file_name))
-
-
 def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[Text]:
     """Trains a model.
 
@@ -139,9 +94,7 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
     Returns:
         Path to a trained model or `None` if training was not successful.
     """
-    # retrieve and unpack bot_config from remote storage
-    if hasattr(args, "remote_bot_config_path") and args.remote_bot_config_path:
-        retrieve_and_unpack_bot_config_from_remote_storage(args)
+    from rasa.api import train as train_all
 
     domain = rasa.cli.utils.get_validated_path(
         args.domain, "domain", DEFAULT_DOMAIN_PATHS, none_is_valid=True
@@ -157,16 +110,20 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
         for f in args.data
     ]
 
+    training_data_importer = TrainingDataImporter.load_from_config(
+        domain_path=domain, training_data_paths=args.data, config_path=config
+    )
+
     if not args.skip_validation:
         structlogger.info(
             "cli.train.run_training",
             event_info="Started validating domain and training data...",
         )
-        importer = TrainingDataImporter.load_from_config(
-            domain_path=domain, training_data_paths=args.data, config_path=config
-        )
+
         rasa.cli.utils.validate_files(
-            args.fail_on_validation_warnings, args.validation_max_history, importer
+            args.fail_on_validation_warnings,
+            args.validation_max_history,
+            training_data_importer,
         )
 
     training_result = train_all(
@@ -185,6 +142,7 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
         model_to_finetune=_model_for_finetuning(args),
         finetuning_epoch_fraction=args.epoch_fraction,
         remote_storage=args.remote_storage,
+        file_importer=training_data_importer,
     )
     if training_result.code != 0 and can_exit:
         sys.exit(training_result.code)

rasa/cli/utils.py

@@ -1,32 +1,30 @@
+import json
 import argparse
+import structlog
 import importlib
-import json
 import os
 import sys
 import time
 from pathlib import Path
 from types import FrameType
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text, Union, overload
-
+from typing import Any, Dict, List, Optional, TYPE_CHECKING, Text, Union, overload
 import randomname
-import structlog
 
 import rasa.shared.utils.cli
 import rasa.shared.utils.io
-from rasa import telemetry
+from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.constants import (
     ASSISTANT_ID_DEFAULT_VALUE,
     ASSISTANT_ID_KEY,
     DEFAULT_CONFIG_PATH,
 )
-from rasa.shared.importers.importer import TrainingDataImporter
+from rasa import telemetry
 from rasa.shared.utils.yaml import read_config_file
 from rasa.utils.io import write_yaml
 
 if TYPE_CHECKING:
     from questionary import Question
     from typing_extensions import Literal
-
     from rasa.validator import Validator
 
 structlogger = structlog.get_logger()
@@ -472,10 +470,10 @@ def get_e2e_results_file_name(
 ) -> str:
     """Returns the name of the e2e results file."""
     if results_output_path.is_dir():
-        file_name = str(results_output_path) + f"/e2e_results_{result_type}.yml"
+        file_name = results_output_path / f"e2e_results_{result_type}.yml"
     else:
         parent = results_output_path.parent
         stem = results_output_path.stem
-        file_name = str(parent) + f"/{stem}_{result_type}.yml"
+        file_name = parent / f"{stem}_{result_type}.yml"
 
-    return file_name
+    return str(file_name)

rasa/cli/x.py

@@ -179,7 +179,7 @@ def run_in_enterprise_connection_mode(args: argparse.Namespace) -> None:
     print_success("Starting a Rasa server in Rasa Enterprise connection mode... 🚀")
 
     credentials_path, endpoints_path = _get_credentials_and_endpoints_paths(args)
-    endpoints = AvailableEndpoints.get_instance(endpoints_path)
+    endpoints = AvailableEndpoints.read_endpoints(endpoints_path)
 
     _rasa_service(args, endpoints, None, credentials_path)
 

rasa/constants.py

@@ -18,7 +18,7 @@ CONFIG_TELEMETRY_ID = "rasa_user_id"
 CONFIG_TELEMETRY_ENABLED = "enabled"
 CONFIG_TELEMETRY_DATE = "date"
 
-MINIMUM_COMPATIBLE_VERSION = "3.10.12"
+MINIMUM_COMPATIBLE_VERSION = "3.10.0rc1"
 
 GLOBAL_USER_CONFIG_PATH = os.path.expanduser("~/.config/rasa/global.yml")
 

rasa/core/actions/action.py

@@ -112,6 +112,7 @@ def default_actions(action_endpoint: Optional[EndpointConfig] = None) -> List["A
     from rasa.core.actions.action_trigger_chitchat import ActionTriggerChitchat
     from rasa.core.actions.action_trigger_search import ActionTriggerSearch
     from rasa.core.actions.two_stage_fallback import TwoStageFallbackAction
+    from rasa.core.actions.action_hangup import ActionHangup
     from rasa.dialogue_understanding.patterns.cancel import ActionCancelFlow
     from rasa.dialogue_understanding.patterns.clarify import ActionClarifyFlows
     from rasa.dialogue_understanding.patterns.correction import ActionCorrectFlowSlot
@@ -138,6 +139,7 @@ def default_actions(action_endpoint: Optional[EndpointConfig] = None) -> List["A
         ActionTriggerSearch(),
         ActionTriggerChitchat(),
         ActionResetRouting(),
+        ActionHangup(),
     ]
 
 

rasa/core/actions/action_hangup.py

@@ -0,0 +1,29 @@
+from typing import Optional, Dict, Any, List
+
+from rasa.core.actions.action import Action
+from rasa.core.channels import OutputChannel
+from rasa.core.nlg import NaturalLanguageGenerator
+from rasa.shared.core.constants import ACTION_HANGUP
+from rasa.shared.core.domain import Domain
+from rasa.shared.core.events import Event, SessionEnded
+from rasa.shared.core.trackers import DialogueStateTracker
+
+
+class ActionHangup(Action):
+    """Action which hangs up the call."""
+
+    def name(self) -> str:
+        """Return the name of the action."""
+        return ACTION_HANGUP
+
+    async def run(
+        self,
+        output_channel: OutputChannel,
+        nlg: NaturalLanguageGenerator,
+        tracker: DialogueStateTracker,
+        domain: Domain,
+        metadata: Optional[Dict[str, Any]] = None,
+    ) -> List[Event]:
+        """Ask the output channel to hang up the call."""
+        await output_channel.hangup(tracker.sender_id)
+        return [SessionEnded(metadata={"_reason": "hangup"})]

rasa/core/agent.py

@@ -19,6 +19,7 @@ from rasa.core.exceptions import AgentNotReady
 from rasa.core.http_interpreter import RasaNLUHttpInterpreter
 from rasa.core.lock_store import InMemoryLockStore, LockStore
 from rasa.core.nlg import NaturalLanguageGenerator, TemplatedNaturalLanguageGenerator
+from rasa.core.persistor import StorageType
 from rasa.core.policies.policy import PolicyPrediction
 from rasa.core.processor import MessageProcessor
 from rasa.core.tracker_store import (
@@ -28,7 +29,6 @@ from rasa.core.tracker_store import (
 )
 from rasa.core.utils import AvailableEndpoints
 from rasa.exceptions import ModelNotFound
-from rasa.nlu.persistor import StorageType
 from rasa.nlu.utils import is_url
 from rasa.shared.constants import DEFAULT_SENDER_ID
 from rasa.shared.core.domain import Domain
@@ -544,7 +544,7 @@ class Agent:
 
     def load_model_from_remote_storage(self, model_name: Text) -> None:
         """Loads an Agent from remote storage."""
-        from rasa.nlu.persistor import get_persistor
+        from rasa.core.persistor import get_persistor
 
         persistor = get_persistor(self.remote_storage)
 

rasa/core/brokers/kafka.py

@@ -2,6 +2,8 @@ import asyncio
 import os
 import json
 import logging
+from functools import cached_property
+
 import structlog
 import threading
 from asyncio import AbstractEventLoop
@@ -270,7 +272,7 @@ class KafkaEventBroker(EventBroker):
         if self.producer:
             self.producer.flush()
 
-    @rasa.shared.utils.common.lazy_property
+    @cached_property
     def rasa_environment(self) -> Optional[Text]:
         """Get value of the `RASA_ENVIRONMENT` environment variable."""
         return os.environ.get("RASA_ENVIRONMENT", "RASA_ENVIRONMENT_NOT_SET")

rasa/core/brokers/pika.py

@@ -1,6 +1,8 @@
 import asyncio
 import json
 import logging
+from functools import cached_property
+
 import structlog
 import os
 import ssl
@@ -333,7 +335,7 @@ class PikaEventBroker(EventBroker):
             delivery_mode=aio_pika.DeliveryMode.PERSISTENT,
         )
 
-    @rasa.shared.utils.common.lazy_property
+    @cached_property
     def rasa_environment(self) -> Optional[Text]:
         """Get value of the `RASA_ENVIRONMENT` environment variable."""
         return os.environ.get("RASA_ENVIRONMENT")

rasa/core/channels/__init__.py

@@ -21,13 +21,15 @@ from rasa.core.channels.rocketchat import RocketChatInput
 from rasa.core.channels.slack import SlackInput
 from rasa.core.channels.telegram import TelegramInput
 from rasa.core.channels.twilio import TwilioInput
-from rasa.core.channels.twilio_voice import TwilioVoiceInput
-from rasa.core.channels.voice_aware.jambonz import JambonzVoiceAwareInput
+from rasa.core.channels.voice_ready.twilio_voice import TwilioVoiceInput
+from rasa.core.channels.voice_ready.jambonz import JambonzVoiceReadyInput
+from rasa.core.channels.voice_ready.audiocodes import AudiocodesInput
 from rasa.core.channels.webexteams import WebexTeamsInput
 from rasa.core.channels.hangouts import HangoutsInput
-from rasa.core.channels.audiocodes import AudiocodesInput
-from rasa.core.channels.development_inspector import DevelopmentInspectInput
 from rasa.core.channels.vier_cvg import CVGInput
+from rasa.core.channels.voice_stream.twilio_media_streams import (
+    TwilioMediaStreamsInputChannel,
+)
 
 input_channel_classes: List[Type[InputChannel]] = [
     CmdlineInput,
@@ -46,9 +48,9 @@ input_channel_classes: List[Type[InputChannel]] = [
     WebexTeamsInput,
     HangoutsInput,
     AudiocodesInput,
-    DevelopmentInspectInput,
     CVGInput,
-    JambonzVoiceAwareInput,
+    JambonzVoiceReadyInput,
+    TwilioMediaStreamsInputChannel,
 ]
 
 # Mapping from an input channel name to its class to allow name based lookup.

rasa/core/channels/channel.py

@@ -25,6 +25,7 @@ from rasa.shared.core.trackers import (
     EventVerbosity,
 )
 
+
 try:
     from urlparse import urljoin
 except ImportError:
@@ -61,7 +62,7 @@ class UserMessage:
             input_channel: the name of the channel which received this message.
             message_id: ID of the message.
             metadata: additional metadata for this message.
-
+            **kwargs: additional arguments which will be included in the message.
         """
         self.text = text.strip() if text else text
 
@@ -235,7 +236,11 @@ class OutputChannel:
         """Attaches the current tracker state to the output channel."""
         self.tracker_state = tracker.current_state(EventVerbosity.AFTER_RESTART)
 
-    async def send_response(self, recipient_id: Text, message: Dict[Text, Any]) -> None:
+    async def send_response(
+        self,
+        recipient_id: Text,
+        message: Dict[Text, Any],
+    ) -> None:
         """Send a message to the client."""
         if message.get("quick_replies"):
             await self.send_quick_replies(
@@ -267,7 +272,10 @@ class OutputChannel:
             await self.send_elements(recipient_id, message.pop("elements"), **message)
 
     async def send_text_message(
-        self, recipient_id: Text, text: Text, **kwargs: Any
+        self,
+        recipient_id: Text,
+        text: Text,
+        **kwargs: Any,
     ) -> None:
         """Send a message through this channel."""
         raise NotImplementedError(
@@ -319,6 +327,7 @@ class OutputChannel:
         self, recipient_id: Text, elements: Iterable[Dict[Text, Any]], **kwargs: Any
     ) -> None:
         """Sends elements to the output.
+
         Default implementation will just post the elements as a string.
         """
         for element in elements:
@@ -333,10 +342,15 @@ class OutputChannel:
         self, recipient_id: Text, json_message: Dict[Text, Any], **kwargs: Any
     ) -> None:
         """Sends json dict to the output channel.
+
         Default implementation will just post the json contents as a string.
         """
         await self.send_text_message(recipient_id, json.dumps(json_message))
 
+    async def hangup(self, recipient_id: Text, **kwargs: Any) -> None:
+        """Indicate that the conversation should be ended."""
+        pass
+
 
 class CollectingOutputChannel(OutputChannel):
     """Output channel that collects send messages in a list.
@@ -385,7 +399,10 @@ class CollectingOutputChannel(OutputChannel):
         self.messages.append(message)
 
     async def send_text_message(
-        self, recipient_id: Text, text: Text, **kwargs: Any
+        self,
+        recipient_id: Text,
+        text: Text,
+        **kwargs: Any,
     ) -> None:
         for message_part in text.strip().split("\n\n"):
             await self._persist_message(self._message(recipient_id, text=message_part))