rasa-pro 3.10.10__tar.gz → 3.10.11__tar.gz

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.10.10
+Version: 3.10.11
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Home-page: https://rasa.com
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
@@ -103,7 +103,7 @@ Requires-Dist: pyyaml (>=6.0)
 Requires-Dist: qdrant-client (>=1.9.0,<2.0.0)
 Requires-Dist: questionary (>=1.10.0,<2.1.0)
 Requires-Dist: randomname (>=0.2.1,<0.3.0)
-Requires-Dist: rasa-sdk (==3.10.0)
+Requires-Dist: rasa-sdk (>=3.10.0,<3.11.0)
 Requires-Dist: redis (>=4.6.0,<6.0)
 Requires-Dist: regex (>=2022.10.31,<2022.11)
 Requires-Dist: requests (>=2.31.0,<2.32.0)

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.10.10"
+version = "3.10.11"
 description = "State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development."
 authors = [ "Rasa Technologies GmbH <hi@rasa.com>",]
 maintainers = [ "Tom Bocklisch <tom@rasa.com>",]
@@ -273,7 +273,7 @@ timeout_func_only = true
 asyncio_mode = "auto"
 
 [tool.poetry.dependencies.rasa-sdk]
-version = "3.10.0"
+version = "~3.10.0"
 allow-prereleases = true
 
 [tool.poetry.dependencies.keras]

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/cli/arguments/train.py

@@ -3,12 +3,12 @@ from typing import Union
 
 from rasa.cli.arguments.default_arguments import (
     add_config_param,
-    add_stories_param,
-    add_nlu_data_param,
-    add_out_param,
     add_domain_param,
     add_endpoint_param,
+    add_nlu_data_param,
+    add_out_param,
     add_remote_storage_param,
+    add_stories_param,
 )
 from rasa.graph_components.providers.training_tracker_provider import (
     TrainingTrackerProvider,
@@ -40,6 +40,12 @@ def set_train_arguments(parser: argparse.ArgumentParser) -> None:
         parser, help_text="Configuration file for the connectors as a yml file."
     )
     add_remote_storage_param(parser)
+    parser.add_argument(
+        "--remote-bot-config-path",
+        help="Path to the bot configuration file in the remote storage.",
+        required=False,
+        type=str,
+    )
 
 
 def set_train_core_arguments(parser: argparse.ArgumentParser) -> None:

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/cli/train.py

@@ -1,18 +1,22 @@
 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.nlg.generator import NaturalLanguageGenerator
 from rasa.core.train import do_compare_training
+from rasa.nlu.persistor import get_persistor
 from rasa.shared.constants import (
     CONFIG_MANDATORY_KEYS,
     CONFIG_MANDATORY_KEYS_CORE,
@@ -20,6 +24,7 @@ from rasa.shared.constants import (
     DEFAULT_DATA_PATH,
     DEFAULT_DOMAIN_PATHS,
 )
+from rasa.shared.exceptions import RasaException
 from rasa.shared.importers.importer import TrainingDataImporter
 
 structlogger = structlog.getLogger(__name__)
@@ -36,7 +41,7 @@ def add_subparser(
     """
     train_parser = subparsers.add_parser(
         "train",
-        help="Trains a Rasa model using your NLU data and stories.",
+        help="Trains a Rasa model using your CALM flows, NLU data and stories.",
         parents=parents,
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
@@ -83,6 +88,37 @@ 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.
 
@@ -94,7 +130,9 @@ 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.
     """
-    from rasa.api import train as train_all
+    # 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)
 
     domain = rasa.cli.utils.get_validated_path(
         args.domain, "domain", DEFAULT_DOMAIN_PATHS, none_is_valid=True

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/cli/utils.py

@@ -1,30 +1,32 @@
-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 Any, Dict, List, Optional, TYPE_CHECKING, Text, Union, overload
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text, Union, overload
+
 import randomname
+import structlog
 
 import rasa.shared.utils.cli
 import rasa.shared.utils.io
-from rasa.shared.importers.importer import TrainingDataImporter
+from rasa import telemetry
 from rasa.shared.constants import (
     ASSISTANT_ID_DEFAULT_VALUE,
     ASSISTANT_ID_KEY,
     DEFAULT_CONFIG_PATH,
 )
-from rasa import telemetry
+from rasa.shared.importers.importer import TrainingDataImporter
 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()

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/dialogue_understanding/generator/multi_step/multi_step_llm_command_generator.py

@@ -229,9 +229,9 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
         commands: List[Command] = []
 
         slot_set_re = re.compile(
-            r"""SetSlot\((\"?[a-zA-Z_][a-zA-Z0-9_-]*?\"?), ?(.*)\)"""
+            r"""SetSlot\(['"]?([a-zA-Z_][a-zA-Z0-9_-]*)['"]?, ?['"]?(.*)['"]?\)"""
         )
-        start_flow_re = re.compile(r"StartFlow\(([a-zA-Z0-9_-]+?)\)")
+        start_flow_re = re.compile(r"StartFlow\(['\"]?([a-zA-Z0-9_-]+)['\"]?\)")
         change_flow_re = re.compile(r"ChangeFlow\(\)")
         cancel_flow_re = re.compile(r"CancelFlow\(\)")
         chitchat_re = re.compile(r"ChitChat\(\)")
@@ -280,9 +280,19 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
                 commands.append(HumanHandoffCommand())
             elif match := clarify_re.search(action):
                 options = sorted([opt.strip() for opt in match.group(1).split(",")])
+                # Remove surrounding quotes if present
+                cleaned_options = []
+                for flow in options:
+                    if (flow.startswith('"') and flow.endswith('"')) or (
+                        flow.startswith("'") and flow.endswith("'")
+                    ):
+                        cleaned_options.append(flow[1:-1])
+                    else:
+                        cleaned_options.append(flow)
+                # check if flow is valid
                 valid_options = [
                     flow
-                    for flow in options
+                    for flow in cleaned_options
                     if flow in flows.user_flow_ids
                     and flow not in user_flows_on_the_stack(tracker.stack)
                 ]
@@ -293,6 +303,13 @@ class MultiStepLLMCommandGenerator(LLMBasedCommandGenerator):
             elif change_flow_re.search(action):
                 commands.append(ChangeFlowCommand())
 
+        if not commands:
+            structlogger.debug(
+                "multi_step_llm_command_generator.parse_commands",
+                message="No commands were parsed from the LLM actions.",
+                actions=actions,
+            )
+
         return commands
 
     ### Helper methods

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/dialogue_understanding/generator/single_step/single_step_llm_command_generator.py

@@ -185,6 +185,12 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
 
         if not commands:
             # no commands are parsed or there's an invalid command
+            structlogger.warning(
+                "single_step_llm_command_generator.predict_commands",
+                message="No commands were predicted as the LLM response could "
+                "not be parsed or the LLM responded with an invalid command."
+                "Returning a CannotHandleCommand instead.",
+            )
             commands = [CannotHandleCommand()]
 
         if tracker.has_coexistence_routing_slot:
@@ -285,14 +291,16 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
 
         commands: List[Command] = []
 
-        slot_set_re = re.compile(r"""SetSlot\(([a-zA-Z_][a-zA-Z0-9_-]*?), ?(.*)\)""")
-        start_flow_re = re.compile(r"StartFlow\(([a-zA-Z0-9_-]+?)\)")
+        slot_set_re = re.compile(
+            r"""SetSlot\(['"]?([a-zA-Z_][a-zA-Z0-9_-]*)['"]?, ?['"]?(.*)['"]?\)"""
+        )
+        start_flow_re = re.compile(r"StartFlow\(['\"]?([a-zA-Z0-9_-]+)['\"]?\)")
         cancel_flow_re = re.compile(r"CancelFlow\(\)")
         chitchat_re = re.compile(r"ChitChat\(\)")
         skip_question_re = re.compile(r"SkipQuestion\(\)")
         knowledge_re = re.compile(r"SearchAndReply\(\)")
         humand_handoff_re = re.compile(r"HumanHandoff\(\)")
-        clarify_re = re.compile(r"Clarify\(([a-zA-Z0-9_, ]+)\)")
+        clarify_re = re.compile(r"Clarify\(([\"\'a-zA-Z0-9_, ]+)\)")
 
         for action in actions.strip().splitlines():
             if match := slot_set_re.search(action):
@@ -321,14 +329,31 @@ class SingleStepLLMCommandGenerator(LLMBasedCommandGenerator):
                 commands.append(HumanHandoffCommand())
             elif match := clarify_re.search(action):
                 options = sorted([opt.strip() for opt in match.group(1).split(",")])
+                # Remove surrounding quotes if present
+                cleaned_options = []
+                for flow in options:
+                    if (flow.startswith('"') and flow.endswith('"')) or (
+                        flow.startswith("'") and flow.endswith("'")
+                    ):
+                        cleaned_options.append(flow[1:-1])
+                    else:
+                        cleaned_options.append(flow)
+                # check if flow is valid
                 valid_options = [
-                    flow for flow in options if flow in flows.user_flow_ids
+                    flow for flow in cleaned_options if flow in flows.user_flow_ids
                 ]
                 if len(set(valid_options)) == 1:
                     commands.extend(cls.start_flow_by_name(valid_options[0], flows))
                 elif len(valid_options) > 1:
                     commands.append(ClarifyCommand(valid_options))
 
+        if not commands:
+            structlogger.debug(
+                "single_step_llm_command_generator.parse_commands",
+                message="No commands were parsed from the LLM actions.",
+                actions=actions,
+            )
+
         return commands
 
     @classmethod

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/e2e_test/e2e_test_runner.py

@@ -190,11 +190,11 @@ class E2ETestRunner:
                     error=f"Message handling timed out for user message '{step.text}'.",
                     exc_info=True,
                 )
-            except Exception:
+            except Exception as exc:
                 structlogger.error(
                     "e2e_test_runner.run_prediction_loop",
                     error=f"An exception occurred while handling "
-                    f"user message '{step.text}'.",
+                    f"user message '{step.text}'. Error: {exc}",
                 )
             tracker = await self.agent.tracker_store.retrieve(sender_id)  # type: ignore[assignment]
             turns[position], event_cursor = self.get_actual_step_output(

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/engine/storage/local_model_storage.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import logging
 import shutil
 import sys
 import tempfile
@@ -8,19 +7,21 @@ import uuid
 from contextlib import contextmanager
 from datetime import datetime
 from pathlib import Path
-from tarsafe import TarSafe
 from typing import Generator, Optional, Text, Tuple, Union
 
-import rasa.utils.common
+import structlog
+from tarsafe import TarSafe
+
+import rasa.model
 import rasa.shared.utils.io
-from rasa.engine.storage.storage import ModelMetadata, ModelStorage
+import rasa.utils.common
 from rasa.engine.graph import GraphModelConfiguration
 from rasa.engine.storage.resource import Resource
+from rasa.engine.storage.storage import ModelMetadata, ModelStorage
 from rasa.exceptions import UnsupportedModelVersionError
 from rasa.shared.core.domain import Domain
-import rasa.model
 
-logger = logging.getLogger(__name__)
+structlogger = structlog.get_logger()
 
 # Paths within model archive
 MODEL_ARCHIVE_COMPONENTS_DIR = "components"
@@ -86,7 +87,14 @@ class LocalModelStorage(ModelStorage):
             cls._extract_archive_to_directory(
                 model_archive_path, temporary_directory_path
             )
-            logger.debug(f"Extracted model to '{temporary_directory_path}'.")
+            structlogger.debug(
+                "local_model_storage.from_model_archive",
+                event_info=(
+                    f"Extracted model '{model_archive_path}' to "
+                    f"'{temporary_directory_path}'."
+                ),
+            )
+
             cls._initialize_model_storage_from_model_archive(
                 temporary_directory_path, storage_path
             )
@@ -142,6 +150,10 @@ class LocalModelStorage(ModelStorage):
         temporary_directory: Path, storage_path: Path
     ) -> None:
         for path in (temporary_directory / MODEL_ARCHIVE_COMPONENTS_DIR).glob("*"):
+            structlogger.debug(
+                "local_model_storage._initialize_model_storage_from_model_archive",
+                event_info=f"Moving '{path}' to '{storage_path}'.",
+            )
             shutil.move(str(path), str(storage_path))
 
     @staticmethod
@@ -155,7 +167,10 @@ class LocalModelStorage(ModelStorage):
     @contextmanager
     def write_to(self, resource: Resource) -> Generator[Path, None, None]:
         """Persists data for a resource (see parent class for full docstring)."""
-        logger.debug(f"Resource '{resource.name}' was requested for writing.")
+        structlogger.debug(
+            "local_model_storage.write_to.resource_write_requested",
+            event_info=f"Resource '{resource.name}' was requested for writing.",
+        )
         directory = self._directory_for_resource(resource)
 
         if not directory.exists():
@@ -163,7 +178,10 @@ class LocalModelStorage(ModelStorage):
 
         yield directory
 
-        logger.debug(f"Resource '{resource.name}' was persisted.")
+        structlogger.debug(
+            "local_model_storage.write_to.resource_persisted",
+            event_info=f"Resource '{resource.name}' was persisted.",
+        )
 
     def _directory_for_resource(self, resource: Resource) -> Path:
         return self._storage_path / resource.name
@@ -171,7 +189,10 @@ class LocalModelStorage(ModelStorage):
     @contextmanager
     def read_from(self, resource: Resource) -> Generator[Path, None, None]:
         """Provides the data of a `Resource` (see parent class for full docstring)."""
-        logger.debug(f"Resource '{resource.name}' was requested for reading.")
+        structlogger.debug(
+            "local_model_storage.read_from",
+            event_info=f"Resource '{resource.name}' was requested for reading.",
+        )
         directory = self._directory_for_resource(resource)
 
         if not directory.exists():
@@ -193,7 +214,12 @@ class LocalModelStorage(ModelStorage):
         domain: Domain,
     ) -> ModelMetadata:
         """Creates model package (see parent class for full docstring)."""
-        logger.debug(f"Start to created model package for path '{model_archive_path}'.")
+        structlogger.debug(
+            "local_model_storage.create_model_package.started",
+            event_info=(
+                f"Start to created model " f"package for path '{model_archive_path}'.",
+            ),
+        )
 
         with windows_safe_temporary_directory() as temp_dir:
             temporary_directory = Path(temp_dir)
@@ -214,7 +240,10 @@ class LocalModelStorage(ModelStorage):
             with TarSafe.open(model_archive_path, "w:gz") as tar:
                 tar.add(temporary_directory, arcname="")
 
-        logger.debug(f"Model package created in path '{model_archive_path}'.")
+        structlogger.debug(
+            "local_model_storage.create_model_package.finished",
+            event_info=f"Model package created in path '{model_archive_path}'.",
+        )
 
         return model_metadata
 

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/model_training.py

@@ -22,7 +22,7 @@ from rasa.engine.storage.local_model_storage import LocalModelStorage
 from rasa.engine.storage.storage import ModelStorage
 from rasa.engine.training.components import FingerprintStatus
 from rasa.engine.training.graph_trainer import GraphTrainer
-from rasa.nlu.persistor import StorageType
+from rasa.nlu.persistor import RemoteStorageType, StorageType
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.events import SlotSet
 from rasa.shared.core.training_data.structures import StoryGraph
@@ -350,18 +350,25 @@ async def _train_graph(
             if remote_storage:
                 push_model_to_remote_storage(full_model_path, remote_storage)
                 full_model_path.unlink()
+                remote_storage_string = (
+                    remote_storage.value
+                    if isinstance(remote_storage, RemoteStorageType)
+                    else remote_storage
+                )
                 structlogger.info(
                     "model_training.train.finished_training",
                     event_info=(
                         f"Your Rasa model {model_name} is trained "
-                        f"and saved at remote storage provider '{remote_storage}'."
+                        f"and saved at remote storage provider "
+                        f"'{remote_storage_string}'."
                     ),
                 )
             else:
                 structlogger.info(
                     "model_training.train.finished_training",
                     event_info=(
-                        f"Your Rasa model is trained and saved at '{full_model_path}'."
+                        f"Your Rasa model is trained and saved at "
+                        f"'{full_model_path}'."
                     ),
                 )
 

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/nlu/persistor.py

@@ -82,16 +82,14 @@ def get_persistor(storage: StorageType) -> Optional[Persistor]:
     Currently, `aws`, `gcs`, `azure` and providing module paths are supported remote
     storages.
     """
-    storage = storage.value if isinstance(storage, RemoteStorageType) else storage
-
-    if storage == RemoteStorageType.AWS.value:
+    if storage == RemoteStorageType.AWS:
         return AWSPersistor(
             os.environ.get(BUCKET_NAME_ENV), os.environ.get(AWS_ENDPOINT_URL_ENV)
         )
-    if storage == RemoteStorageType.GCS.value:
+    if storage == RemoteStorageType.GCS:
         return GCSPersistor(os.environ.get(BUCKET_NAME_ENV))
 
-    if storage == RemoteStorageType.AZURE.value:
+    if storage == RemoteStorageType.AZURE:
         return AzurePersistor(
             os.environ.get(AZURE_CONTAINER_ENV),
             os.environ.get(AZURE_ACCOUNT_NAME_ENV),
@@ -125,24 +123,36 @@ class Persistor(abc.ABC):
         """Downloads a model that has been persisted to cloud storage.
 
         Downloaded model will be saved to the `target_path`.
-        If `target_path` is a directory, the model will be saved to that directory.
-        If `target_path` is a file, the model will be saved to that file.
+        If `target_path` is a directory, the model will be downloaded to that directory.
+        If `target_path` is a file, the model will be downloaded to that file.
 
         Args:
             model_name: The name of the model to retrieve.
-            target_path: The path to which the model should be saved.
+            target_path: The path to which the model should be downloaded.
         """
         tar_name = model_name
         if not model_name.endswith(MODEL_ARCHIVE_EXTENSION):
             # ensure backward compatibility
             tar_name = self._tar_name(model_name)
-        tar_name = self._create_file_key(tar_name)
-        self._retrieve_tar(tar_name)
-        self._copy(os.path.basename(tar_name), target_path)
+        remote_object_path = self._create_file_key(tar_name)
+        self._retrieve_tar(remote_object_path)
 
+        target_tar_file_name = os.path.basename(tar_name)
         if os.path.isdir(target_path):
-            return os.path.join(target_path, model_name)
+            target_path = os.path.join(target_path, target_tar_file_name)
+
+        if not os.path.exists(target_path):
+            structlogger.debug(
+                "persistor.retrieve.copy_model",
+                event_info=f"Copying model '{target_tar_file_name}' to "
+                f"'{target_path}'.",
+            )
+            self._copy(target_tar_file_name, target_path)
 
+        structlogger.debug(
+            "persistor.retrieve.model_retrieved",
+            event_info=f"Model retrieved and saved to '{target_path}'.",
+        )
         return target_path
 
     @abc.abstractmethod
@@ -262,6 +272,11 @@ class AWSPersistor(Persistor):
 
     def _persist_tar(self, file_key: Text, tar_path: Text) -> None:
         """Uploads a model persisted in the `target_dir` to s3."""
+        structlogger.debug(
+            "aws_persistor.persist_tar.uploading_model",
+            event_info=f"Uploading tar archive {file_key} to "
+            f"s3 bucket '{self.bucket_name}'.",
+        )
         with open(tar_path, "rb") as f:
             self.s3.Object(self.bucket_name, file_key).put(Body=f)
 
@@ -329,7 +344,7 @@ class GCSPersistor(Persistor):
     def _retrieve_tar(self, target_filename: Text) -> None:
         """Downloads a model that has previously been persisted to GCS."""
         blob = self.bucket.blob(target_filename)
-        blob.download_to_filename(target_filename)
+        blob.download_to_filename(os.path.basename(target_filename))
 
 
 class AzurePersistor(Persistor):
@@ -370,12 +385,19 @@ class AzurePersistor(Persistor):
     def _persist_tar(self, file_key: Text, tar_path: Text) -> None:
         """Uploads a model persisted in the `target_dir` to Azure."""
         with open(tar_path, "rb") as data:
-            self._container_client().upload_blob(name=file_key, data=data)
+            self._container_client().upload_blob(
+                name=file_key,
+                data=data,
+                # overwrite is set to True to keep in line with
+                # how GCS and AWS APIs work this enables easy
+                # updating of models in the cloud
+                overwrite=True,
+            )
 
     def _retrieve_tar(self, target_filename: Text) -> None:
         """Downloads a model that has previously been persisted to Azure."""
         blob_client = self._container_client().get_blob_client(target_filename)
 
-        with open(target_filename, "wb") as blob:
+        with open(os.path.basename(target_filename), "wb") as blob:
             download_stream = blob_client.download_blob()
             blob.write(download_stream.readall())

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/shared/constants.py

@@ -111,7 +111,10 @@ CONFIG_KEYS_NLU = ["language", "pipeline"] + CONFIG_MANDATORY_COMMON_KEYS
 CONFIG_KEYS = CONFIG_KEYS_CORE + CONFIG_KEYS_NLU
 CONFIG_MANDATORY_KEYS_CORE: List[Text] = [] + CONFIG_MANDATORY_COMMON_KEYS
 CONFIG_MANDATORY_KEYS_NLU = ["language"] + CONFIG_MANDATORY_COMMON_KEYS
-CONFIG_MANDATORY_KEYS = CONFIG_MANDATORY_KEYS_CORE + CONFIG_MANDATORY_KEYS_NLU
+# we need the list to contain unique values
+CONFIG_MANDATORY_KEYS = list(
+    set(CONFIG_MANDATORY_KEYS_CORE + CONFIG_MANDATORY_KEYS_NLU)
+)
 
 # Keys related to Forms (in the Domain)
 REQUIRED_SLOTS_KEY = "required_slots"

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/rasa/shared/importers/importer.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 import logging
 from abc import ABC, abstractmethod
 from functools import reduce
@@ -114,7 +116,7 @@ class TrainingDataImporter(ABC):
         domain_path: Optional[Text] = None,
         training_data_paths: Optional[List[Text]] = None,
         args: Optional[Dict[Text, Any]] = {},
-    ) -> "TrainingDataImporter":
+    ) -> TrainingDataImporter:
         """Loads a `TrainingDataImporter` instance from a configuration file."""
         config = read_config_file(config_path)
         return TrainingDataImporter.load_from_dict(
@@ -127,7 +129,7 @@ class TrainingDataImporter(ABC):
         domain_path: Optional[Text] = None,
         training_data_paths: Optional[List[Text]] = None,
         args: Optional[Dict[Text, Any]] = {},
-    ) -> "TrainingDataImporter":
+    ) -> TrainingDataImporter:
         """Loads core `TrainingDataImporter` instance.
 
         Instance loaded from configuration file will only read Core training data.
@@ -143,7 +145,7 @@ class TrainingDataImporter(ABC):
         domain_path: Optional[Text] = None,
         training_data_paths: Optional[List[Text]] = None,
         args: Optional[Dict[Text, Any]] = {},
-    ) -> "TrainingDataImporter":
+    ) -> TrainingDataImporter:
         """Loads nlu `TrainingDataImporter` instance.
 
         Instance loaded from configuration file will only read NLU training data.
@@ -166,7 +168,7 @@ class TrainingDataImporter(ABC):
         domain_path: Optional[Text] = None,
         training_data_paths: Optional[List[Text]] = None,
         args: Optional[Dict[Text, Any]] = None,
-    ) -> "TrainingDataImporter":
+    ) -> TrainingDataImporter:
         """Loads a `TrainingDataImporter` instance from a dictionary."""
         from rasa.shared.importers.rasa import RasaFileImporter
 
@@ -195,18 +197,15 @@ class TrainingDataImporter(ABC):
         domain_path: Optional[Text] = None,
         training_data_paths: Optional[List[Text]] = None,
         args: Optional[Dict[Text, Any]] = None,
-    ) -> Optional["TrainingDataImporter"]:
+    ) -> Optional[TrainingDataImporter]:
         from rasa.shared.importers.multi_project import MultiProjectImporter
         from rasa.shared.importers.rasa import RasaFileImporter
-        from rasa.shared.importers.remote_importer import RemoteTrainingDataImporter
 
         module_path = importer_config.pop("name", None)
         if module_path == RasaFileImporter.__name__:
             importer_class: Type[TrainingDataImporter] = RasaFileImporter
         elif module_path == MultiProjectImporter.__name__:
             importer_class = MultiProjectImporter
-        elif module_path == RemoteTrainingDataImporter.__name__:
-            importer_class = RemoteTrainingDataImporter
         else:
             try:
                 importer_class = rasa.shared.utils.common.class_from_module_path(

{rasa_pro-3.10.10 → rasa_pro-3.10.11}/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.10"
+__version__ = "3.10.11"