rasa-pro 3.10.7.dev5__py3-none-any.whl → 3.10.8__py3-none-any.whl

rasa/core/secrets_manager/vault.py

@@ -15,7 +15,6 @@ from rasa.utils.endpoints import EndpointConfig
 from rasa.core.secrets_manager.constants import (
     TRACKER_STORE_ENDPOINT_TYPE,
     TRANSIT_KEY_FOR_ENCRYPTION_LABEL,
-    VAULT_MOUNT_POINT_DEFAULT_VALUE,
     VAULT_SECRET_MANAGER_NAME,
 )
 from rasa.core.secrets_manager.endpoints import (
@@ -182,7 +181,6 @@ class VaultSecretsManager(SecretsManager):
         secrets_path: Text,
         transit_mount_point: Optional[Text] = None,
         namespace: Optional[Text] = None,
-        mount_point: Optional[Text] = None,
     ):
         """Initialise the VaultSecretsManager.
 
@@ -192,13 +190,11 @@ class VaultSecretsManager(SecretsManager):
             secrets_path: The path to the secrets in the vault server.
             transit_mount_point: The mount point of the transit engine.
             namespace: The namespace in which secrets reside in.
-            mount_point: The mount point of the kv engine.
         """
         self.host = host
         self.transit_mount_point = transit_mount_point
         self.token = token
         self.secrets_path = secrets_path
-        self.mount_point = mount_point or VAULT_MOUNT_POINT_DEFAULT_VALUE
         self.namespace = namespace
 
         # Create client
@@ -240,7 +236,7 @@ class VaultSecretsManager(SecretsManager):
         """
         logger.info(f"Loading secrets from vault server at {self.host}.")
         read_response = self.client.secrets.kv.read_secret_version(
-            mount_point=self.mount_point, path=self.secrets_path
+            mount_point="secret", path=self.secrets_path
         )
 
         secrets = read_response["data"]["data"]
@@ -459,7 +455,6 @@ class VaultSecretManagerConfig(SecretManagerConfig):
         secrets_path: Text,
         transit_mount_point: Text = "transit",
         namespace: Optional[Text] = None,
-        mount_point: Optional[Text] = None,
     ) -> None:
         """Initialise the VaultSecretManagerConfig.
 
@@ -476,7 +471,6 @@ class VaultSecretManagerConfig(SecretManagerConfig):
         self.secrets_path = secrets_path
         self.transit_mount_point = transit_mount_point
         self.namespace = namespace
-        self.mount_point = mount_point
 
 
 @dataclass
@@ -492,7 +486,6 @@ class VaultSecretManagerNonStrictConfig:
     secrets_path: Optional[Text]
     transit_mount_point: Optional[Text]
     namespace: Optional[Text] = None
-    mount_point: Optional[Text] = None
 
     def is_empty(self) -> bool:
         """Check if all the values are empty."""
@@ -502,7 +495,6 @@ class VaultSecretManagerNonStrictConfig:
             and (self.secrets_path is None or self.secrets_path == "")
             and (self.transit_mount_point is None or self.transit_mount_point == "")
             and (self.namespace is None or self.namespace == "")
-            and (self.mount_point is None or self.mount_point == "")
         )
 
     def is_valid(self) -> bool:
@@ -524,7 +516,6 @@ class VaultSecretManagerNonStrictConfig:
             and self.secrets_path != ""
             and self._is_optional_value_valid(self.transit_mount_point)
             and self._is_optional_value_valid(self.namespace)
-            and self._is_optional_value_valid(self.mount_point)
         )
 
     @staticmethod
@@ -556,7 +547,6 @@ class VaultSecretManagerNonStrictConfig:
             secrets_path=self.secrets_path or other.secrets_path,
             transit_mount_point=self.transit_mount_point or other.transit_mount_point,
             namespace=self.namespace or other.namespace,
-            mount_point=self.mount_point or other.mount_point,
         )
 
 

rasa/core/utils.py

@@ -1,4 +1,3 @@
-import structlog
 import logging
 import os
 from pathlib import Path
@@ -27,7 +26,7 @@ if TYPE_CHECKING:
     from rasa.core.nlg import NaturalLanguageGenerator
     from rasa.shared.core.domain import Domain
 
-structlogger = structlog.get_logger()
+logger = logging.getLogger(__name__)
 
 
 def configure_file_logging(
@@ -125,17 +124,15 @@ def list_routes(app: Sanic) -> Dict[Text, Text]:
         for arg in route._params:
             options[arg] = f"[{arg}]"
 
-        name = route.name.replace("rasa_server.", "")
-        methods = ",".join(route.methods)
+        handlers = [(next(iter(route.methods)), route.name.replace("rasa_server.", ""))]
 
-        full_endpoint = "/" + "/".join(endpoint)
-        line = unquote(f"{full_endpoint:50s} {methods:30s} {name}")
-        output[name] = line
+        for method, name in handlers:
+            full_endpoint = "/" + "/".join(endpoint)
+            line = unquote(f"{full_endpoint:50s} {method:30s} {name}")
+            output[name] = line
 
     url_table = "\n".join(output[url] for url in sorted(output))
-    structlogger.debug(
-        "server.routes", event_info=f"Available web server routes: \n{url_table}"
-    )
+    logger.debug(f"Available web server routes: \n{url_table}")
 
     return output
 
@@ -266,22 +263,17 @@ def number_of_sanic_workers(lock_store: Union[EndpointConfig, LockStore, None])
     """
 
     def _log_and_get_default_number_of_workers() -> int:
-        structlogger.debug(
-            "server.worker.set_count",
-            number_of_workers=DEFAULT_SANIC_WORKERS,
-            event_info=f"Using the default number of Sanic workers "
-            f"({DEFAULT_SANIC_WORKERS}).",
+        logger.debug(
+            f"Using the default number of Sanic workers ({DEFAULT_SANIC_WORKERS})."
         )
         return DEFAULT_SANIC_WORKERS
 
     try:
         env_value = int(os.environ.get(ENV_SANIC_WORKERS, DEFAULT_SANIC_WORKERS))
     except ValueError:
-        structlogger.error(
-            "server.worker.set_count.error",
-            number_of_workers=os.environ[ENV_SANIC_WORKERS],
-            event_info=f"Cannot convert environment variable `{ENV_SANIC_WORKERS}` "
-            f"to int ('{os.environ[ENV_SANIC_WORKERS]}').",
+        logger.error(
+            f"Cannot convert environment variable `{ENV_SANIC_WORKERS}` "
+            f"to int ('{os.environ[ENV_SANIC_WORKERS]}')."
         )
         return _log_and_get_default_number_of_workers()
 
@@ -289,23 +281,20 @@ def number_of_sanic_workers(lock_store: Union[EndpointConfig, LockStore, None])
         return _log_and_get_default_number_of_workers()
 
     if env_value < 1:
-        structlogger.debug(
-            "server.worker.set_count.error_less_than_one",
-            number_of_workers=env_value,
-            event_info=f"Cannot set number of Sanic workers to the desired value "
-            f"({env_value}). The number of workers must be at least 1.",
+        logger.debug(
+            f"Cannot set number of Sanic workers to the desired value "
+            f"({env_value}). The number of workers must be at least 1."
         )
         return _log_and_get_default_number_of_workers()
 
     if _lock_store_is_multi_worker_compatible(lock_store):
-        structlogger.debug(f"Using {env_value} Sanic workers.")
+        logger.debug(f"Using {env_value} Sanic workers.")
         return env_value
 
-    structlogger.debug(
-        "server.worker.set_count.error_no_lock_store",
-        event_info=f"Unable to assign desired number of Sanic workers ({env_value}) as "
+    logger.debug(
+        f"Unable to assign desired number of Sanic workers ({env_value}) as "
         f"no `RedisLockStore` or custom `LockStore` endpoint "
-        f"configuration has been found.",
+        f"configuration has been found."
     )
     return _log_and_get_default_number_of_workers()
 

rasa/dialogue_understanding/coexistence/llm_based_router.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import importlib
-import os
 from typing import Any, Dict, List, Optional
 
 import structlog
@@ -22,7 +21,6 @@ from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
 from rasa.shared.constants import (
-    LLM_API_HEALTH_CHECK_ENV_VAR,
     ROUTE_TO_CALM_SLOT,
     PROMPT_CONFIG_KEY,
     PROVIDER_CONFIG_KEY,
@@ -38,7 +36,6 @@ from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.shared.utils.llm import (
     DEFAULT_OPENAI_CHAT_MODEL_NAME,
     get_prompt_template,
-    llm_api_health_check,
     llm_factory,
     try_instantiate_llm_client,
 )
@@ -133,16 +130,12 @@ class LLMBasedRouter(GraphComponent):
     def train(self, training_data: TrainingData) -> Resource:
         """Train the intent classifier on a data set."""
         # Validate llm configuration
-        llm_client = try_instantiate_llm_client(
+        try_instantiate_llm_client(
             self.config.get(LLM_CONFIG_KEY),
             DEFAULT_LLM_CONFIG,
             "llm_based_router.train",
-            LLMBasedRouter.__name__,
+            "LLMBasedRouter",
         )
-        if os.getenv(LLM_API_HEALTH_CHECK_ENV_VAR, "true").lower() == "true":
-            llm_api_health_check(
-                llm_client, "llm_based_router.train", LLMBasedRouter.__name__
-            )
 
         self.persist()
         return self._resource

rasa/dialogue_understanding/commands/__init__.py

@@ -9,6 +9,7 @@ from rasa.dialogue_understanding.commands.knowledge_answer_command import (
 from rasa.dialogue_understanding.commands.chit_chat_answer_command import (
     ChitChatAnswerCommand,
 )
+from rasa.dialogue_understanding.commands.restart_command import RestartCommand
 from rasa.dialogue_understanding.commands.skip_question_command import (
     SkipQuestionCommand,
 )
@@ -50,4 +51,5 @@ __all__ = [
     "NoopCommand",
     "ChangeFlowCommand",
     "SessionStartCommand",
+    "RestartCommand",
 ]

rasa/dialogue_understanding/commands/restart_command.py

@@ -0,0 +1,58 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Dict, List
+
+from rasa.dialogue_understanding.commands import Command
+from rasa.dialogue_understanding.patterns.restart import RestartPatternFlowStackFrame
+from rasa.shared.core.events import Event
+from rasa.shared.core.flows import FlowsList
+from rasa.shared.core.trackers import DialogueStateTracker
+
+
+@dataclass
+class RestartCommand(Command):
+    """A command to restart a session."""
+
+    @classmethod
+    def command(cls) -> str:
+        """Returns the command type."""
+        return "restart"
+
+    @classmethod
+    def from_dict(cls, data: Dict[str, Any]) -> RestartCommand:
+        """Converts the dictionary to a command.
+
+        Returns:
+            The converted dictionary.
+        """
+        return RestartCommand()
+
+    def run_command_on_tracker(
+        self,
+        tracker: DialogueStateTracker,
+        all_flows: FlowsList,
+        original_tracker: DialogueStateTracker,
+    ) -> List[Event]:
+        """Runs the command on the tracker.
+
+        Args:
+            tracker: The tracker to run the command on.
+            all_flows: All flows in the assistant.
+            original_tracker: The tracker before any command was executed.
+
+        Returns:
+            The events to apply to the tracker.
+        """
+        stack = tracker.stack
+        stack.push(RestartPatternFlowStackFrame())
+        return tracker.create_stack_updated_events(stack)
+
+    def __hash__(self) -> int:
+        return hash(self.command())
+
+    def __eq__(self, other: object) -> bool:
+        if not isinstance(other, RestartCommand):
+            return False
+
+        return True

rasa/dialogue_understanding/commands/set_slot_command.py

@@ -127,7 +127,11 @@ class SetSlotCommand(Command):
         if (
             self.name not in slots_of_active_flow
             and self.name != ROUTE_TO_CALM_SLOT
-            and self.extractor == SetSlotExtractor.LLM.value
+            and self.extractor
+            in {
+                SetSlotExtractor.LLM.value,
+                SetSlotExtractor.COMMAND_PAYLOAD_READER.value,
+            }
         ):
             # Get the other predicted flows from the most recent message on the tracker.
             predicted_flows = get_flows_predicted_to_start_from_tracker(tracker)

rasa/dialogue_understanding/commands/utils.py

@@ -9,6 +9,7 @@ from rasa.dialogue_understanding.commands import (
     KnowledgeAnswerCommand,
     SessionStartCommand,
     SkipQuestionCommand,
+    RestartCommand,
 )
 from rasa.dialogue_understanding.patterns.cancel import CancelPatternFlowStackFrame
 from rasa.dialogue_understanding.patterns.cannot_handle import (
@@ -18,6 +19,7 @@ from rasa.dialogue_understanding.patterns.chitchat import ChitchatPatternFlowSta
 from rasa.dialogue_understanding.patterns.human_handoff import (
     HumanHandoffPatternFlowStackFrame,
 )
+from rasa.dialogue_understanding.patterns.restart import RestartPatternFlowStackFrame
 from rasa.dialogue_understanding.patterns.search import SearchPatternFlowStackFrame
 from rasa.dialogue_understanding.patterns.session_start import (
     SessionStartPatternFlowStackFrame,
@@ -26,7 +28,6 @@ from rasa.dialogue_understanding.patterns.skip_question import (
     SkipQuestionPatternFlowStackFrame,
 )
 
-
 triggerable_pattern_to_command_class: Dict[str, Type[Command]] = {
     SessionStartPatternFlowStackFrame.flow_id: SessionStartCommand,
     CancelPatternFlowStackFrame.flow_id: CancelFlowCommand,
@@ -35,4 +36,5 @@ triggerable_pattern_to_command_class: Dict[str, Type[Command]] = {
     SearchPatternFlowStackFrame.flow_id: KnowledgeAnswerCommand,
     SkipQuestionPatternFlowStackFrame.flow_id: SkipQuestionCommand,
     CannotHandlePatternFlowStackFrame.flow_id: CannotHandleCommand,
+    RestartPatternFlowStackFrame.flow_id: RestartCommand,
 }

rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -2,7 +2,6 @@ from abc import ABC, abstractmethod
 from functools import lru_cache
 from typing import Dict, Any, List, Optional, Tuple, Union, Text
 
-import os
 import structlog
 from jinja2 import Template
 
@@ -23,7 +22,6 @@ from rasa.engine.graph import GraphComponent, ExecutionContext
 from rasa.engine.recipes.default_recipe import DefaultV1Recipe
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
-from rasa.shared.constants import LLM_API_HEALTH_CHECK_ENV_VAR
 from rasa.shared.core.domain import Domain
 from rasa.shared.core.flows import FlowStep, Flow, FlowsList
 from rasa.shared.core.flows.steps.collect import CollectInformationFlowStep
@@ -35,7 +33,6 @@ from rasa.shared.nlu.training_data.message import Message
 from rasa.shared.nlu.training_data.training_data import TrainingData
 from rasa.shared.utils.llm import (
     allowed_values_for_slot,
-    llm_api_health_check,
     llm_factory,
     try_instantiate_llm_client,
 )
@@ -172,18 +169,12 @@ class LLMBasedCommandGenerator(GraphComponent, CommandGenerator, ABC):
         store.
         """
         # Validate llm configuration
-        llm_client = try_instantiate_llm_client(
+        try_instantiate_llm_client(
             self.config.get(LLM_CONFIG_KEY),
             DEFAULT_LLM_CONFIG,
             "llm_based_command_generator.train",
-            LLMBasedCommandGenerator.__name__,
+            "LLMBasedCommandGenerator",
         )
-        if os.getenv(LLM_API_HEALTH_CHECK_ENV_VAR, "true").lower() == "true":
-            llm_api_health_check(
-                llm_client,
-                "llm_based_command_generator.train",
-                LLMBasedCommandGenerator.__name__,
-            )
 
         # flow retrieval is populated with only user-defined flows
         try:

rasa/dialogue_understanding/generator/llm_command_generator.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional, Text
+from typing import Dict, Any, Optional, Text
 
 import structlog
 from deprecated import deprecated  # type: ignore[import]

rasa/dialogue_understanding/patterns/default_flows_for_patterns.yml

@@ -55,7 +55,7 @@ responses:
         template: jinja
 
   utter_free_chitchat_response:
-    - text: placeholder_this_utterance_needs_the_rephraser
+    - text: "Sorry, I'm not able to answer that right now."
       metadata:
         rephrase: True
         rephrase_prompt: |
@@ -160,9 +160,9 @@ flows:
         action: action_run_slot_rejections
       - action: validate_{{context.collect}}
         next:
-        - if: "slots.{{context.collect}} is not null"
-          then: END
-        - else: ask_collect
+          - if: "slots.{{context.collect}} is not null"
+            then: END
+          - else: ask_collect
       - id: ask_collect
         action: "{{context.utter}}"
       - action: "{{context.collect_action}}"
@@ -205,17 +205,17 @@ flows:
     steps:
       - noop: true
         next:
-        - if: "'{{context.error_type}}' = 'rasa_internal_error_user_input_too_long'"
-          then:
-          - action: utter_user_input_too_long_error_rasa
-            next: END
-        - if: "'{{context.error_type}}' = 'rasa_internal_error_user_input_empty'"
-          then:
-            - action: utter_user_input_empty_error_rasa
-              next: END
-        - else:
-            - action: utter_internal_error_rasa
-              next: END
+          - if: "'{{context.error_type}}' = 'rasa_internal_error_user_input_too_long'"
+            then:
+              - action: utter_user_input_too_long_error_rasa
+                next: END
+          - if: "'{{context.error_type}}' = 'rasa_internal_error_user_input_empty'"
+            then:
+              - action: utter_user_input_empty_error_rasa
+                next: END
+          - else:
+              - action: utter_internal_error_rasa
+                next: END
 
 
   pattern_restart:

rasa/dialogue_understanding/patterns/restart.py

@@ -0,0 +1,37 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from typing import Any, Dict
+
+from rasa.dialogue_understanding.stack.frames import PatternFlowStackFrame
+from rasa.shared.constants import RASA_DEFAULT_FLOW_PATTERN_PREFIX
+
+FLOW_PATTERN_RESTART = RASA_DEFAULT_FLOW_PATTERN_PREFIX + "restart"
+
+
+@dataclass
+class RestartPatternFlowStackFrame(PatternFlowStackFrame):
+    """A flow stack frame that can get added at the beginning of the conversation."""
+
+    flow_id: str = FLOW_PATTERN_RESTART
+    """The ID of the flow."""
+
+    @classmethod
+    def type(cls) -> str:
+        """Returns the type of the frame."""
+        return FLOW_PATTERN_RESTART
+
+    @staticmethod
+    def from_dict(data: Dict[str, Any]) -> RestartPatternFlowStackFrame:
+        """Creates a `DialogueStackFrame` from a dictionary.
+
+        Args:
+            data: The dictionary to create the `DialogueStackFrame` from.
+
+        Returns:
+            The created `DialogueStackFrame`.
+        """
+        return RestartPatternFlowStackFrame(
+            frame_id=data["frame_id"],
+            step_id=data["step_id"],
+        )

rasa/e2e_test/e2e_test_runner.py

@@ -16,7 +16,6 @@ import rasa.shared.utils.io
 from rasa.core.channels import CollectingOutputChannel, UserMessage
 from rasa.core.constants import ACTIVE_FLOW_METADATA_KEY, STEP_ID_METADATA_KEY
 from rasa.core.exceptions import AgentNotReady
-from rasa.core.persistor import StorageType
 from rasa.core.utils import AvailableEndpoints
 from rasa.e2e_test.constants import TEST_CASE_NAME, TEST_FILE_NAME
 from rasa.e2e_test.e2e_config import create_llm_judge_config
@@ -35,6 +34,7 @@ from rasa.e2e_test.e2e_test_result import (
     TestResult,
 )
 from rasa.llm_fine_tuning.conversations import Conversation
+from rasa.nlu.persistor import StorageType
 from rasa.shared.constants import RASA_DEFAULT_FLOW_PATTERN_PREFIX
 from rasa.shared.core.events import (
     ActionExecuted,

rasa/engine/graph.py

@@ -634,3 +634,4 @@ class GraphModelConfiguration:
     language: Optional[Text]
     core_target: Optional[Text]
     nlu_target: Optional[Text]
+    spaces: Optional[Dict[Text, Text]] = None

rasa/engine/recipes/config_files/default_config.yml

@@ -35,6 +35,9 @@ pipeline:
 policies:
   - name: MemoizationPolicy
   - name: RulePolicy
+  - name: UnexpecTEDIntentPolicy
+    max_history: 5
+    epochs: 100
   - name: TEDPolicy
     max_history: 5
     epochs: 100

rasa/engine/recipes/default_recipe.py

@@ -233,6 +233,7 @@ class DefaultV1Recipe(Recipe):
             training_type=training_type,
             assistant_id=config.get(ASSISTANT_ID_KEY),
             language=config.get("language"),
+            spaces=config.get("spaces"),
             core_target=core_target,
             nlu_target=f"run_{RegexMessageHandler.__name__}",
         )

rasa/engine/recipes/graph_recipe.py

@@ -73,6 +73,7 @@ class GraphV1Recipe(Recipe):
             training_type=training_type,
             assistant_id=config.get(ASSISTANT_ID_KEY),
             language=config.get("language"),
+            spaces=config.get("spaces"),
             core_target=core_target,
             nlu_target=nlu_target,
         )

rasa/engine/storage/local_model_storage.py

@@ -238,6 +238,7 @@ class LocalModelStorage(ModelStorage):
             predict_schema=model_configuration.predict_schema,
             training_type=model_configuration.training_type,
             project_fingerprint=rasa.model.project_fingerprint(),
+            spaces=model_configuration.spaces,
             language=model_configuration.language,
             core_target=model_configuration.core_target,
             nlu_target=model_configuration.nlu_target,

rasa/engine/storage/storage.py

@@ -6,7 +6,7 @@ from contextlib import contextmanager
 from dataclasses import dataclass
 from datetime import datetime
 from pathlib import Path
-from typing import Tuple, Union, Text, Generator, Dict, Any, Optional
+from typing import List, Tuple, Union, Text, Generator, Dict, Any, Optional
 from packaging import version
 
 from rasa.constants import MINIMUM_COMPATIBLE_VERSION
@@ -140,6 +140,7 @@ class ModelMetadata:
     core_target: Optional[Text]
     nlu_target: Text
     language: Optional[Text]
+    spaces: Optional[List[Dict[Text, Any]]] = None
     training_type: TrainingType = TrainingType.BOTH
 
     def __post_init__(self) -> None:
@@ -169,6 +170,7 @@ class ModelMetadata:
             "core_target": self.core_target,
             "nlu_target": self.nlu_target,
             "language": self.language,
+            "spaces": self.spaces,
         }
 
     @classmethod
@@ -196,4 +198,6 @@ class ModelMetadata:
             core_target=serialized["core_target"],
             nlu_target=serialized["nlu_target"],
             language=serialized["language"],
+            # optional, since introduced later
+            spaces=serialized.get("spaces"),
         )

rasa/model_training.py

@@ -15,7 +15,6 @@ import rasa.shared.utils.common
 import rasa.shared.utils.io
 import rasa.utils.common
 from rasa import telemetry
-from rasa.core.persistor import StorageType
 from rasa.engine.caching import LocalTrainingCache
 from rasa.engine.recipes.recipe import Recipe
 from rasa.engine.runner.dask import DaskGraphRunner
@@ -23,6 +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.shared.core.domain import Domain
 from rasa.shared.core.events import SlotSet
 from rasa.shared.core.training_data.structures import StoryGraph
@@ -156,7 +156,6 @@ async def train(
     model_to_finetune: Optional[Text] = None,
     finetuning_epoch_fraction: float = 1.0,
     remote_storage: Optional[StorageType] = None,
-    file_importer: Optional[TrainingDataImporter] = None,
 ) -> TrainingResult:
     """Trains a Rasa model (Core and NLU).
 
@@ -178,18 +177,14 @@ async def train(
             a directory in case the latest trained model should be used.
         finetuning_epoch_fraction: The fraction currently specified training epochs
             in the model configuration which should be used for finetuning.
-        remote_storage: Optional name of the remote storage to
-            use for storing the model.
-        file_importer: Instance of `TrainingDataImporter` to use for training.
-            If it is not provided, a new instance will be created.
+        remote_storage: The remote storage which should be used to store the model.
 
     Returns:
         An instance of `TrainingResult`.
     """
-    if not file_importer:
-        file_importer = TrainingDataImporter.load_from_config(
-            config, domain, training_files, core_additional_arguments
-        )
+    file_importer = TrainingDataImporter.load_from_config(
+        config, domain, training_files, core_additional_arguments
+    )
 
     stories = file_importer.get_stories()
     flows = file_importer.get_flows()
@@ -560,7 +555,7 @@ async def train_nlu(
 
 def push_model_to_remote_storage(model_path: Path, remote_storage: StorageType) -> None:
     """push model to remote storage"""
-    from rasa.core.persistor import get_persistor
+    from rasa.nlu.persistor import get_persistor
 
     persistor = get_persistor(remote_storage)
 

rasa/{core → nlu}/persistor.py

@@ -165,7 +165,7 @@ class Persistor(abc.ABC):
             os.path.join(dirpath, base_name),
             "gztar",
             root_dir=model_directory,
-            base_dir="../nlu",
+            base_dir=".",
         )
         file_key = os.path.basename(tar_name)
         return file_key, tar_name

rasa/server.py

@@ -50,11 +50,11 @@ from rasa.core.channels.channel import (
     UserMessage,
 )
 from rasa.core.constants import DEFAULT_RESPONSE_TIMEOUT
-from rasa.core.persistor import parse_remote_storage
 from rasa.core.test import test
 from rasa.core.utils import AvailableEndpoints
 from rasa.nlu.emulators.emulator import Emulator
 from rasa.nlu.emulators.no_emulator import NoEmulator
+from rasa.nlu.persistor import parse_remote_storage
 from rasa.nlu.test import CVEvaluationResult
 from rasa.shared.constants import (
     DEFAULT_MODELS_PATH,