rasa-pro 3.9.18__py3-none-any.whl → 3.10.16__py3-none-any.whl

README.md

@@ -38,378 +38,4 @@ Check out our
 - [Rasa Pro / CALM tutorial](https://rasa.com/docs/rasa-pro/tutorial), and
 - [Rasa pro changelog](https://rasa.com/docs/rasa/rasa-pro-changelog/)
 
-<<<<<<< HEAD
-### Managing environments
-
-The official [Poetry guide](https://python-poetry.org/docs/managing-environments/) suggests to use
-[pyenv](https://github.com/pyenv/pyenv) or any other similar tool to easily switch between Python versions.
-This is how it can be done:
-
-```bash
-pyenv install 3.10.10
-pyenv local 3.10.10  # Activate Python 3.10.10 for the current project
-```
-*Note*: If you have trouble installing a specific version of python on your system
-it might be worth trying other supported versions.
-
-By default, Poetry will try to use the currently activated Python version to create the virtual environment
-for the current project automatically. You can also create and activate a virtual environment manually — in this
-case, Poetry should pick it up and use it to install the dependencies. For example:
-
-```bash
-python -m venv .venv
-source .venv/bin/activate
-```
-
-You can make sure that the environment is picked up by executing
-
-```bash
-poetry env info
-```
-
-### Building from source
-
-To install dependencies and `rasa` itself in editable mode execute
-
-```bash
-make install
-```
-
-*Note for macOS users*: under macOS Big Sur we've seen some compiler issues for
-dependencies. Using `export SYSTEM_VERSION_COMPAT=1` before the installation helped.
-
-
-#### Installing optional dependencies
-
-In order to install rasa's optional dependencies, you need to run:
-
-```bash
-make install-full
-```
-
-*Note for macOS users*: The command `make install-full` could result in a failure while installing `tokenizers`
-(issue described in depth [here](https://github.com/huggingface/tokenizers/issues/1050)).
-
-In order to resolve it, you must follow these steps to install a Rust compiler:
-```bash
-brew install rustup
-rustup-init
-```
-
-After initialising the Rust compiler, you should restart the console and check its installation:
-```bash
-rustc --version
-```
-
-In case the PATH variable had not been automatically setup, run:
-```bash
-export PATH="$HOME/.cargo/bin:$PATH"
-```
-
-#### Installing from published Python package
-
-We have a private package registry running at **europe-west3-docker.pkg.dev/rasa-releases/** which hosts python packages as well
-as docker containers. To use it, you need to be authenticated.
-Follow the steps in the [google documentation](https://cloud.google.com/artifact-registry/docs/python/authentication#keyring)
-to make sure `pip` has the necessary credentials to authenticate with the registry.
-Afterwards, you should be able to run `pip install rasa`.
-
-To be able to pull the docker image via `docker pull europe-west3-docker.pkg.dev/rasa-releases/rasa/rasa`,
-you’ll need to authenticate using the `gcloud auth` command: `gcloud auth configure-docker europe-west3-docker.pkg.dev`.
-
-More information is available in our [public documentation](https://rasa.com/docs/rasa-pro/installation/python/installation).
-
-### Running the Tests
-
-In order to run the tests, make sure that you have set locally the environment variable `RASA_PRO_LICENSE` to a valid license available in 1Password.
-You should ensure to install the development requirements:
-
-```bash
-make prepare-tests-ubuntu # Only on Ubuntu and Debian based systems
-make prepare-tests-macos  # Only on macOS
-```
-
-Then, run the tests:
-
-```bash
-make test
-```
-
-They can also be run at multiple jobs to save some time:
-
-```bash
-JOBS=[n] make test
-```
-
-Where `[n]` is the number of jobs desired. If omitted, `[n]` will be automatically chosen by pytest.
-
-
-### Running the Integration Tests
-
-In order to run the integration tests, make sure that you have the development requirements installed:
-
-```bash
-make prepare-tests-ubuntu # Only on Ubuntu and Debian based systems
-make prepare-tests-macos  # Only on macOS
-```
-
-Then, you'll need to start services with the following command which uses
-[Docker Compose](https://docs.docker.com/compose/install/):
-
-```bash
-make run-integration-containers
-```
-
-Finally, you can run the integration tests like this:
-
-```bash
-make test-integration
-```
-
-In order to run locally the integration tests for the tracing capability, you must first build the rasa image locally.
-You can do so using the `docker buildx bake` command.
-Note that the rasa image build requires a few base images, which must be built prior to building the rasa image.
-The Dockerfiles for these base images are located in the `docker` subdirectory.
-
-You must also set the following environment variables to build the rasa image locally:
-- `TARGET_IMAGE_REGISTRY`, e.g. you can either use `rasa` or the private registry `europe-west3-docker.pkg.dev/rasa-releases/rasa-docker`.
-- `IMAGE_TAG`, e.g. `localdev`, `latest` or PR ID.
-- `BASE_IMAGE_HASH`, e.g. `localdev`
-- `BASE_MITIE_IMAGE_HASH`, e.g. `localdev`
-- `BASE_BUILDER_IMAGE_HASH`, e.g. `localdev`
-
-
-### Resolving merge conflicts
-
-Poetry doesn't include any solution that can help to resolve merge conflicts in
-the lock file `poetry.lock` by default.
-However, there is a great tool called [poetry-merge-lock](https://poetry-merge-lock.readthedocs.io/en/latest/).
-Here is how you can install it:
-
-```bash
-pip install poetry-merge-lock
-```
-
-Just execute this command to resolve merge conflicts in `poetry.lock` automatically:
-
-```bash
-poetry-merge-lock
-```
-
-### Build a Docker image locally
-
-In order to build a Docker image on your local machine execute the following command:
-
-```bash
-make build-docker
-```
-
-The Docker image is available on your local machine as `rasa-private-dev`.
-
-### Code Style
-
-To ensure a standardized code style we use the [ruff](https://docs.astral.sh/ruff/formatter/) formatter.
-To ensure our type annotations are correct we use the type checker [mypy](https://mypy.readthedocs.io/en/stable/).
-If your code is not formatted properly or doesn't type check, GitHub will fail to build.
-
-#### Formatting
-
-If you want to automatically format your code on every commit, you can use [pre-commit](https://pre-commit.com/).
-Just install it via `pip install pre-commit` and execute `pre-commit install` in the root folder.
-This will add a hook to the repository, which reformats files on every commit.
-
-If you want to set it up manually, install `ruff` via `poetry install`.
-To reformat files execute
-```
-make formatter
-```
-
-#### Type Checking
-
-If you want to check types on the codebase, install `mypy` using `poetry install`.
-To check the types execute
-```
-make types
-```
-
-### Backporting
-
-In order to port changes to `main` and across release branches, we use the `backport` workflow located at
-the `.github/workflows/backport.yml` path.
-This workflow is triggered by the `backport-to-<release-branch>` label applied to a PR, for example `backport-to-3.8.x`.
-Current available target branches are `main` and maintained release branches.
-
-When a PR gets labelled `backport-to-<release-branch>`, a PR is opened by the `backport-github-action` as soon as the
-source PR gets closed (by merging). If you want to close the PR without merging changes, make sure to remove the `backport-to-<release-branch>` label.
-
-The PR author which the action assigns to the backporting PR has to resolve any conflicts before approving and merging.
-Release PRs should also be labelled with `backport-to-main` to backport the `CHANGELOG.md` updates to `main`.
-Backporting version updates should be accepted to the `main` branch from the latest release branch only.
-
-Here are some guidelines to follow when backporting changes and resolving conflicts:
-
-a) for conflicts in `version.py`: accept only the version from the latest release branch. Do not merge version changes
-from earlier release branches into `main` because this could cause issues when trying to make the next minor release.
-
-b) for conflicts in `pyproject.toml`: if related to the `rasa-pro` version, accept only the latest release branch; 
-if related to other dependencies, accept `main` or whichever is the higher upgrade (main usually has the updated 
-dependencies because we only do housekeeping on `main`, apart from vulnerability updates). Be mindful of dependencies that
-are removed from `main` but still exist in former release branches (for example `langchain`).
-
-c) for conflicts in `poetry.lock`: accept changes which were already present on the target branch, then run
-`poetry lock --no-update` so that the lock file contains your changes from `pyproject.toml` too.
-
-d) for conflicts in `CHANGELOG.md`: Manually place the changelog in their allocated section (e.g. 3.8.10 will go under the 
-3.8 section with the other releases, rather than go at the top of the file)
-
-If the backporting workflow fails, you are encouraged to cherry-pick the commits manually and create a PR to
-the target branch. Alternatively, you can install the backporting CLI tool as described [here](https://github.com/sorenlouv/backport?tab=readme-ov-file#install).
-
-## Releases
-Rasa has implemented robust policies governing version naming, as well as release pace for major, minor, and patch releases.
-
-The values for a given version number (MAJOR.MINOR.PATCH) are incremented as follows:
-- MAJOR version for incompatible API changes or other breaking changes.
-- MINOR version for functionality added in a backward compatible manner.
-- PATCH version for backward compatible bug fixes.
-
-The following table describes the version types and their expected *release cadence*:
-
-| Version Type |                                                                  Description                                                                  |  Target Cadence |
-|--------------|-----------------------------------------------------------------------------------------------------------------------------------------------|-----------------|
-| Major        | For significant changes, or when any backward-incompatible changes are introduced to the API or data model.                                   | Every 1 - 2 yrs |
-| Minor        | For when new backward-compatible functionality is introduced, a minor feature is introduced, or when a set of smaller features is rolled out. | +/- Quarterly   |
-| Patch        | For backward-compatible bug fixes that fix incorrect behavior.                                                                                | As needed       |
-
-While this table represents our target release frequency, we reserve the right to modify it based on changing market conditions and technical requirements.
-
-### Maintenance Policy
-Our End of Life policy defines how long a given release is considered supported, as well as how long a release is
-considered to be still in active development or maintenance.
-
-The maintenance duration and end of life for every release are shown on our website as part of the [Product Release and Maintenance Policy](https://rasa.com/rasa-product-release-and-maintenance-policy/).
-
-### Cutting a Major / Minor release
-#### A week before release day
-
-**Post a message on the engineering Slack channel**, letting the team know you'll be the one cutting the upcoming
-release, as well as:
-    1. Reminding everyone to go over their issues and PRs and prioritise reviews and merges
-    2. Reminding everyone of the scheduled date for the release
-
-#### A day before release day
-
-1. **Evaluate the status of any PR merging that's happening. Follow up with people on their
-bugs and fixes.** If the release introduces new bugs or regressions that can't be fixed in time, we should discuss on
-Slack about this and take a decision on how to move forward. If the issue is not ready to be merged in time, we remove the issue / PR from the release and notify the PR owner and the product manager on Slack about it. The PR / issue owners are responsible for
-communicating any issues which might be release relevant. Postponing the release should be considered as an edge case scenario.
-
-#### Release day! 🚀
-
-1. **At the start of the day, post a small message on slack announcing release day!** Communicate you'll be handling
-the release, and the time you're aiming to start releasing (again, no later than 4pm, as issues may arise and
-cause delays). This message should be posted early in the morning and before moving forward with any of the steps of the release,
-   in order to give enough time to people to check their PRs and issues. That way they can plan any remaining work. A template of the slack message can be found [here](https://rasa-hq.slack.com/archives/C36SS4N8M/p1613032208137500?thread_ts=1612876410.068400&cid=C36SS4N8M).
-   The release time should be communicated transparently so that others can plan potentially necessary steps accordingly. If there are bigger changes this should be communicated.
-2. Once everything in the release is taken care of, post a small message on Slack communicating you are about to
-start the release process (in case anything is missing).
-3. **You may now do the release by following the instructions outlined in the
-[Rasa Pro README](#steps-to-release-a-new-version) !**
-
-### Steps to release a new version
-Releasing a new version is quite simple, as the packages are build and distributed by GitHub Actions.
-
-*Release steps*:
-1. Make sure all dependencies are up to date (**especially Rasa SDK**)
-    - For Rasa SDK, except in the case of a patch release, that means first creating a [new Rasa SDK release](https://github.com/RasaHQ/rasa-sdk#steps-to-release-a-new-version) (make sure the version numbers between the new Rasa and Rasa SDK releases match)
-    - Once the tag with the new Rasa SDK release is pushed and the package appears on [pypi](https://pypi.org/project/rasa-sdk/), the dependency in the rasa repository can be resolved (see below).
-2. If this is a minor / major release: Make sure all fixes from currently supported minor versions have been merged from their respective release branches (e.g. 3.8.x) back into main.
-3. In case of a minor release, create a new branch that corresponds to the new release, e.g.
-   ```bash
-    git checkout -b 3.8.x
-    git push origin 3.8.x
-    ```
-4. Switch to the branch you want to cut the release from (`main` in case of a major, the `<major>.<minor>.x` branch for minors and patches)
-    - Update the `rasa-sdk` entry in `pyproject.toml` with the new release version and run `poetry update`. This creates a new `poetry.lock` file with all dependencies resolved.
-    - Commit the changes with `git commit -am "bump rasa-sdk dependency"` but do not push them. They will be automatically picked up by the following step.
-5. Run `make release`
-6. Create a PR against the release branch (e.g. `3.8.x`)
-7. Once your PR is merged, [this](https://github.com/RasaHQ/rasa-private/actions/workflows/tag-release.yml) workflow runs and an automatic tag is created and pushed to remote.
-   (If this fails for some reason, then run the following manually on the release branch) :
-    ```bash
-    git checkout 3.8.x
-    git pull origin 3.8.x
-    git tag 3.8.0 -m "next release"
-    git push origin 3.8.0 --tags
-    ```
-    GitHub will build this tag and publish the build artifacts.
-8. After all the steps are completed and if everything goes well then we should see a message automatically posted in the company's Slack (`release` channel) like this [one](https://rasa-hq.slack.com/archives/C7B08Q5FX/p1614354499046600)
-9. If however an error occurs in the build, then we should see a failure message automatically posted in the company's Slack (`dev-tribe` channel) like this [one](https://rasa-hq.slack.com/archives/C01M5TAHDHA/p1701444735622919)
-   (In this case do the following checks):
-    - Check the workflows in [Github Actions](https://github.com/RasaHQ/rasa-private/actions) and make sure that the merged PR of the current release is completed successfully. To easily find your PR you can use the filters `event: push` and `branch: <version number>` (example on release 2.4 you can see [here](https://github.com/RasaHQ/rasa/actions/runs/643344876))
-    - If the workflow is not completed, then try to re-run the workflow in case that solves the problem
-    - If the problem persists, check also the log files and try to find the root cause of the issue
-    - If you still cannot resolve the error, contact the infrastructure team by providing any helpful information from your investigation
-10. If the release is successful, add the newly created release branch to the backporting configuration in the `.backportrc.json` file to
-the `targetBranchesChoices` list. This is necessary for the backporting workflow to work correctly with new release branches.
-
-
-### Cutting a Patch release
-
-Patch releases are simpler to cut, since they are meant to contain only bugfixes.
-
-**The only things you need to do to cut a patch release are:**
-
-1. Notify the engineering team on Slack that you are planning to cut a patch, in case someone has an important fix
-to add.
-2. Make sure the bugfix(es) are in the release branch you will use (p.e if you are cutting a `3.8.2` patch, you will
-need your fixes to be on the `3.8.x` release branch). All patch releases must come from a `.x` branch!
-3. Once you're ready to release the Rasa Pro patch, checkout the branch, run `make release` and follow the
-steps + get the PR merged.
-4. Once the PR is in, wait for the [tag release workflow](https://github.com/RasaHQ/rasa-private/actions/workflows/tag-release.yml) to create the tag.
-   (If this fails for some reason, then run the following manually on the release branch) :
-    ```bash
-    git checkout 3.8.x
-    git pull origin 3.8.x
-    git tag 3.8.0 -m "next release"
-    git push origin 3.8.0 --tags
-    ```
-5. After this you should see the CI workflow "Continuous Integration" in the Actions tab with the relevant tag name. Keep an eye on it to make sure it is successful as sometimes retries might be required. 
-6. After all the steps are completed and if everything goes well then we should see a message automatically posted in the company's Slack (`release` channel) like this [one](https://rasa-hq.slack.com/archives/C7B08Q5FX/p1614354499046600)
-7. If however an error occurs in the build, then we should see a failure message automatically posted in the company's Slack (`dev-tribe` channel) like this [one](https://rasa-hq.slack.com/archives/C01M5TAHDHA/p1701444735622919)
-
-Make sure to merge the branch `3.7.x` after your PR with `main`. This needs to be done manually until Roberto is added (see [ATO-2091](https://rasahq.atlassian.net/browse/ATO-2091))
-
-### Cutting a Pre release version
-
-A Pre release version is an alpha, beta, dev or rc version. For more details on which version you require refer to the [Rasa Software Release Lifecycle](https://www.notion.so/rasa/Rasa-Software-Release-Lifecycle-eb704d75f87646a9a9aca1f3fbe71fb3#6e26ac9a15b64f91bb94d6bfea9306a0)
-
-1. Make sure you are using the right branch for the release, for instance pre releases are always made from either the main or a feature branch (especially for a dev release)
-2. Once you're ready to release, checkout the branch, run `make release` and follow the
-steps.
-3. Only in case of a pre release, the release branch created will be prefixed with 'prepare-release-pre-'
-4. Note that when releasing from a feature branch the 'prepare-release-pre' branch will not be created automatically and has to be done manually. This is done to ensure all major/minor/patch releases only happens from the correct branches.
-   (In this case the version updates will be added to the same branch as a commit, and you will have to manually create a `prepare-release-pre-' branch and push to remote)
-5. Only in case of a pre release, we currently skip all test runs and docker image builds on a 'prepare-release-pre-' PR. This was done to speed up the pre release process.
-6. Once your PR gets merged, the [tag release workflow](https://github.com/RasaHQ/rasa-private/actions/workflows/tag-release.yml) will create the tag.
-7. After this you should see the CI workflow "Continuous Integration" in the Actions tab with the relevant tag name. Keep an eye on it to make sure it is successful as sometimes retries might be required. 
-8. After all the steps are completed and if everything goes well then we should see a message automatically posted in the company's Slack (`release` channel) like this [one](https://rasa-hq.slack.com/archives/C7B08Q5FX/p1614354499046600)
-9. If however an error occurs in the build, then we should see a failure message automatically posted in the company's Slack (`dev-tribe` channel) like this [one](https://rasa-hq.slack.com/archives/C01M5TAHDHA/p1701444735622919)
-
-
-### Actively maintained versions
-
-Please refer to the [Rasa Product Release and Maintenance Policy](https://rasa.com/rasa-product-release-and-maintenance-policy/) page.
-
-## Troubleshooting
-
-- When running docker commands, if you encounter this error: `OSError No space left on device`, consider running:
-
-  ```shell
-  docker system prune --all
-  ```
-
-  For more information on this command, please see the [Official Docker Documentation](https://docs.docker.com/engine/reference/commandline/system_prune/).
-=======
 for more. Also feel free to reach out to us on the [Rasa forum](https://forum.rasa.com/).
->>>>>>> 2c5cd7bc639 (update readme.md from main branch on 3.10.x (#1597))

rasa/__init__.py

@@ -1,7 +1,6 @@
 import logging
 
-from rasa import version, plugin  # noqa: F401
-from rasa.api import run, train, test  # noqa: F401
+from rasa import version
 
 # define the version before the other imports since these need it
 __version__ = version.__version__

rasa/__main__.py

@@ -25,6 +25,7 @@ from rasa.cli import (
     visualize,
     x,
     evaluate,
+    llm_fine_tuning,
 )
 from rasa.cli.arguments.default_arguments import add_logging_options
 from rasa.cli.utils import (
@@ -76,6 +77,7 @@ def create_argument_parser() -> argparse.ArgumentParser:
     export.add_subparser(subparsers, parents=parent_parsers)
     x.add_subparser(subparsers, parents=parent_parsers)
     evaluate.add_subparser(subparsers, parents=parent_parsers)
+    llm_fine_tuning.add_subparser(subparsers, parent_parsers)
     plugin_manager().hook.refine_cli(
         subparsers=subparsers, parent_parsers=parent_parsers
     )
@@ -85,12 +87,15 @@ def create_argument_parser() -> argparse.ArgumentParser:
 
 def print_version() -> None:
     """Prints version information of rasa tooling and python."""
+    from rasa.utils.licensing import get_license_expiration_date
+
     print(f"Rasa Version      :         {version.__version__}")
     print(f"Minimum Compatible Version: {MINIMUM_COMPATIBLE_VERSION}")
     print(f"Rasa SDK Version  :         {rasa_sdk_version}")
     print(f"Python Version    :         {platform.python_version()}")
     print(f"Operating System  :         {platform.platform()}")
     print(f"Python Path       :         {sys.executable}")
+    print(f"License Expires   :         {get_license_expiration_date()}")
 
 
 def main() -> None:

rasa/anonymization/anonymization_rule_executor.py

@@ -123,7 +123,7 @@ class AnonymizationRuleExecutor:
             else None
         )
 
-        self.anonymizer_engine = AnonymizerEngine()
+        self.anonymizer_engine = AnonymizerEngine()  # type: ignore
 
     @staticmethod
     def _validate_anonymization_rule_list(
@@ -146,7 +146,7 @@ class AnonymizationRuleExecutor:
 
         return True
 
-    def run(self, text: Text) -> Text:
+    def run(self, text: Text) -> Optional[Text]:
         """Anonymizes the given text using the given anonymization rule list."""
         if (
             self.analyzer is None

rasa/api.py

@@ -1,6 +1,8 @@
-from typing import Any, Text, Dict, Union, List, Optional, TYPE_CHECKING
 import asyncio
+from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text, Union
+
 import rasa.shared.constants
+from rasa.nlu.persistor import StorageType
 
 # WARNING: Be careful about adding any top level imports at this place!
 #   These functions are imported in `rasa.__init__` and any top level import
@@ -15,11 +17,11 @@ if TYPE_CHECKING:
 
 
 def run(
-    model: "Text",
-    endpoints: "Text",
-    connector: "Optional[Text]" = None,
-    credentials: "Optional[Text]" = None,
-    **kwargs: "Dict[Text, Any]",
+    model: Text,
+    endpoints: Text,
+    connector: Optional[Text] = None,
+    credentials: Optional[Text] = None,
+    **kwargs: Dict[Text, Any],
 ) -> None:
     """Runs a Rasa model.
 
@@ -34,12 +36,12 @@ def run(
 
     """
     import rasa.core.run
-    from rasa.core.utils import AvailableEndpoints
-    from rasa.shared.utils.cli import print_warning
     import rasa.shared.utils.common
+    from rasa.core.utils import AvailableEndpoints
     from rasa.shared.constants import DOCS_BASE_URL
+    from rasa.shared.utils.cli import print_warning
 
-    _endpoints = AvailableEndpoints.read_endpoints(endpoints)
+    _endpoints = AvailableEndpoints.get_instance(endpoints)
 
     if not connector and not credentials:
         connector = "rest"
@@ -63,18 +65,19 @@ def run(
 
 
 def train(
-    domain: "Text",
-    config: "Text",
+    domain: Text,
+    config: Text,
     training_files: "Union[Text, List[Text]]",
-    output: "Text" = rasa.shared.constants.DEFAULT_MODELS_PATH,
+    output: Text = rasa.shared.constants.DEFAULT_MODELS_PATH,
     dry_run: bool = False,
     force_training: bool = False,
-    fixed_model_name: "Optional[Text]" = None,
+    fixed_model_name: Optional[Text] = None,
     persist_nlu_training_data: bool = False,
-    core_additional_arguments: "Optional[Dict]" = None,
-    nlu_additional_arguments: "Optional[Dict]" = None,
-    model_to_finetune: "Optional[Text]" = None,
+    core_additional_arguments: Optional[Dict] = None,
+    nlu_additional_arguments: Optional[Dict] = None,
+    model_to_finetune: Optional[Text] = None,
     finetuning_epoch_fraction: float = 1.0,
+    remote_storage: Optional[StorageType] = None,
 ) -> "TrainingResult":
     """Runs Rasa Core and NLU training in `async` loop.
 
@@ -96,6 +99,7 @@ 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: Remote storage to use for model storage.
 
     Returns:
         An instance of `TrainingResult`.
@@ -116,16 +120,17 @@ def train(
             nlu_additional_arguments=nlu_additional_arguments,
             model_to_finetune=model_to_finetune,
             finetuning_epoch_fraction=finetuning_epoch_fraction,
+            remote_storage=remote_storage,
         )
     )
 
 
 def test(
-    model: "Text",
-    stories: "Text",
-    nlu_data: "Text",
-    output: "Text" = rasa.shared.constants.DEFAULT_RESULTS_PATH,
-    additional_arguments: "Optional[Dict]" = None,
+    model: Text,
+    stories: Text,
+    nlu_data: Text,
+    output: Text = rasa.shared.constants.DEFAULT_RESULTS_PATH,
+    additional_arguments: Optional[Dict] = None,
 ) -> None:
     """Test a Rasa model against a set of test data.
 
@@ -136,8 +141,7 @@ def test(
         output: path to folder where all output will be stored
         additional_arguments: additional arguments for the test call
     """
-    from rasa.model_testing import test_core
-    from rasa.model_testing import test_nlu
+    from rasa.model_testing import test_core, test_nlu
 
     if additional_arguments is None:
         additional_arguments = {}

rasa/cli/arguments/data.py

@@ -10,8 +10,8 @@ from rasa.cli.arguments.default_arguments import (
 from rasa.shared.constants import DEFAULT_CONVERTED_DATA_PATH
 
 
-def set_convert_arguments(parser: argparse.ArgumentParser, data_type: Text) -> None:
-    """Sets convert command arguments."""
+def set_convert_nlu_arguments(parser: argparse.ArgumentParser, data_type: Text) -> None:
+    """Sets convert nlu command arguments."""
     parser.add_argument(
         "-f",
         "--format",
@@ -32,6 +32,31 @@ def set_convert_arguments(parser: argparse.ArgumentParser, data_type: Text) -> N
     parser.add_argument("-l", "--language", default="en", help="Language of data.")
 
 
+def set_convert_e2e_arguments(parser: argparse.ArgumentParser) -> None:
+    """Sets convert e2e command arguments.
+
+    Args:
+        parser: Parser we are going to attach arguments to.
+    """
+    parser.add_argument(
+        "path",
+        type=str,
+        help="Path to the input CSV or XLS/XLSX file.",
+    )
+    parser.add_argument(
+        "-o",
+        "--output",
+        type=str,
+        default="e2e_tests",
+        help="Output directory to store the tests.",
+    )
+    parser.add_argument(
+        "--sheet-name",
+        type=str,
+        help="Worksheet name containing relevant data. Mandatory for Excel file input.",
+    )
+
+
 def set_split_arguments(parser: argparse.ArgumentParser) -> None:
     add_nlu_data_param(parser, help_text="File or folder containing your NLU data.")
 

rasa/cli/arguments/default_arguments.py

@@ -1,13 +1,14 @@
 import argparse
 import logging
-from typing import Text, Union, Optional
+from typing import Optional, Text, Union
 
+from rasa.nlu.persistor import RemoteStorageType, StorageType, parse_remote_storage
 from rasa.shared.constants import (
     DEFAULT_CONFIG_PATH,
-    DEFAULT_DOMAIN_PATH,
-    DEFAULT_MODELS_PATH,
     DEFAULT_DATA_PATH,
+    DEFAULT_DOMAIN_PATH,
     DEFAULT_ENDPOINTS_PATH,
+    DEFAULT_MODELS_PATH,
 )
 
 
@@ -163,3 +164,24 @@ def add_logging_options(parser: argparse.ArgumentParser) -> None:
         help="If set, the name of the logging configuration file will be set "
         "to the given name.",
     )
+
+
+def add_remote_storage_param(
+    parser: Union[argparse.ArgumentParser, argparse._ActionsContainer],
+    required: bool = False,
+) -> None:
+    parser.add_argument(
+        "--remote-storage",
+        help="Remote storage which should be used to store/load the model."
+        f"Supported storages are: {RemoteStorageType.list()}. "
+        "You can also provide your own implementation of the `Persistor` interface.",
+        required=required,
+        type=parse_remote_storage_arg,
+    )
+
+
+def parse_remote_storage_arg(value: str) -> StorageType:
+    try:
+        return parse_remote_storage(value)
+    except ValueError as e:
+        raise argparse.ArgumentTypeError(str(e))

rasa/cli/arguments/run.py

@@ -1,16 +1,19 @@
-import os
-
 import argparse
+import os
 from typing import Union
 
-from rasa.cli.arguments.default_arguments import add_model_param, add_endpoint_param
+from rasa.cli.arguments.default_arguments import (
+    add_endpoint_param,
+    add_model_param,
+    add_remote_storage_param,
+)
 from rasa.core import constants
 from rasa.env import (
+    AUTH_TOKEN_ENV,
     DEFAULT_JWT_METHOD,
     JWT_METHOD_ENV,
-    JWT_SECRET_ENV,
     JWT_PRIVATE_KEY_ENV,
-    AUTH_TOKEN_ENV,
+    JWT_SECRET_ENV,
 )
 
 
@@ -136,10 +139,7 @@ def add_server_settings_arguments(parser: argparse.ArgumentParser) -> None:
         type=int,
         help="Maximum time a request can take to process (sec).",
     )
-    server_arguments.add_argument(
-        "--remote-storage",
-        help="Set the remote location where your Rasa model is stored, e.g. on AWS.",
-    )
+    add_remote_storage_param(server_arguments)
     server_arguments.add_argument(
         "--ssl-certificate",
         help="Set the SSL Certificate to create a TLS secured server.",