rasa-pro 3.10.7.dev5__tar.gz → 3.10.8__tar.gz

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.10.7.dev5
+Version: 3.10.8
 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
@@ -32,7 +32,7 @@ Requires-Dist: aiohttp (>=3.9.4,<3.10)
 Requires-Dist: apscheduler (>=3.10,<3.11)
 Requires-Dist: attrs (>=23.1,<23.2)
 Requires-Dist: azure-storage-blob (>=12.16.0,<12.17.0)
-Requires-Dist: boto3 (>=1.35.15,<1.36.0)
+Requires-Dist: boto3 (>=1.35.5,<1.36.0)
 Requires-Dist: certifi (>=2024.07.04)
 Requires-Dist: cloudpickle (>=2.2.1,<3.1)
 Requires-Dist: colorama (>=0.4.6,<0.5.0) ; sys_platform == "win32"
@@ -53,8 +53,8 @@ Requires-Dist: gitpython (>=3.1.41,<3.2.0) ; extra == "full"
 Requires-Dist: google-auth (>=2.23.4,<3)
 Requires-Dist: google-cloud-storage (>=2.14.0,<3.0.0)
 Requires-Dist: hvac (>=1.2.1,<2.0.0)
-Requires-Dist: importlib-metadata (>=6.8.0,<7.0.0)
-Requires-Dist: importlib-resources (>=6.1.1,<7.0.0)
+Requires-Dist: importlib-metadata (>=8.5.0,<8.6.0)
+Requires-Dist: importlib-resources (==6.1.3)
 Requires-Dist: jieba (>=0.42.1,<0.43) ; extra == "jieba" or extra == "full"
 Requires-Dist: jinja2 (>=3.1.4,<4.0.0)
 Requires-Dist: joblib (>=1.2.0,<1.3.0)
@@ -64,13 +64,13 @@ Requires-Dist: jsonschema (>=4.22)
 Requires-Dist: keras (==2.14.0)
 Requires-Dist: langchain (>=0.2.0,<0.3.0)
 Requires-Dist: langchain-community (>=0.2.0,<0.3.0)
-Requires-Dist: litellm (>=1.45.0,<1.46.0)
+Requires-Dist: litellm (>=1.50.0,<1.51.0)
 Requires-Dist: matplotlib (>=3.7,<3.8)
 Requires-Dist: mattermostwrapper (>=2.2,<2.3)
 Requires-Dist: mlflow (>=2.15.1,<3.0.0) ; extra == "mlflow"
 Requires-Dist: networkx (>=3.1,<3.2)
 Requires-Dist: numpy (>=1.23.5,<1.25.0) ; python_version >= "3.9" and python_version < "3.11"
-Requires-Dist: openai (>=1.47.0,<1.48.0)
+Requires-Dist: openai (>=1.52.0,<1.53.0)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: opentelemetry-api (>=1.16.0,<1.17.0)
 Requires-Dist: opentelemetry-exporter-jaeger (>=1.16.0,<1.17.0)
@@ -390,6 +390,39 @@ 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.
 
@@ -472,9 +505,12 @@ Releasing a new version is quite simple, as the packages are build and distribut
 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 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
 

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/README.md

@@ -236,6 +236,39 @@ 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.
 
@@ -318,9 +351,12 @@ Releasing a new version is quite simple, as the packages are build and distribut
 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 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
 

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.10.7.dev5"
+version = "3.10.8"
 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>",]
@@ -88,7 +88,7 @@ exclude = [ "eggs", ".git", ".pytest_cache", "build", "dist",]
 
 [tool.poetry.dependencies]
 python = ">=3.9,<3.11"
-boto3 = "~1.35.15"
+boto3 = "~1.35.5"
 google-cloud-storage = "^2.14.0"
 azure-storage-blob = ">=12.16.0, <12.17.0"
 requests = "~2.31.0"
@@ -156,14 +156,14 @@ structlog-sentry = "^2.0.3"
 langchain = "~0.2.0"
 langchain-community = "~0.2.0"
 jinja2 = "^3.1.4"
-openai = "~1.47.0"
+openai = "~1.52.0"
 dnspython = "2.6.1"
 wheel = ">=0.40.0"
 certifi = ">=2024.07.04"
 cryptography = ">=42.0.5"
 jsonpatch = "^1.33"
-importlib-resources = "^6.1.1"
-importlib-metadata = "^6.8.0"
+importlib-resources = "6.1.3" # pinned to avoid breaking changes in versions >= 6.2.0 with Python 3.9
+importlib-metadata = "~8.5.0"
 opentelemetry-sdk = "~1.16.0"
 opentelemetry-exporter-jaeger = "~1.16.0"
 opentelemetry-exporter-otlp = "~1.16.0"
@@ -180,16 +180,16 @@ python-keycloak = "^3.12.0"
 tiktoken = "~0.7.0"
 faiss-cpu = "^1.7.4"
 pycountry = "^22.3.5"
-pymilvus = "<2.4.2"
+pymilvus = "<2.4.2" # pinned because 2.4.2 introduces milvus-lite dependency that fails on windows
 qdrant-client = "^1.9.0"
 psutil = "^5.9.5"
-tenacity = "~8.4.1"
+tenacity = "~8.4.1" # pinned down because of langchain
 types-protobuf = "4.25.0.20240417"
-litellm = "~1.45.0"
+litellm = "~1.50.0"
 openpyxl = "^3.1.5"
 diskcache = "~5.6.3"
 [[tool.poetry.dependencies.tensorflow-io-gcs-filesystem]]
-version = "==0.31"
+version = "==0.31" # newer versions doesn't provide wheels for Windows
 markers = "sys_platform == 'win32'"
 
 [[tool.poetry.dependencies.tensorflow-io-gcs-filesystem]]
@@ -245,6 +245,20 @@ mlflow = [ "mlflow",]
 rasa = "rasa.__main__:main"
 
 [tool.ruff.lint]
+# The following checks are disabled because they are not relevant for Rasa
+# - RUF001: Checks for ambiguous Unicode characters in strings. https://docs.astral.sh/ruff/rules/ambiguous-unicode-character-string/
+# - RUF002: Checks for ambiguous Unicode characters in docstrings. https://docs.astral.sh/ruff/rules/ambiguous-unicode-character-docstring/
+# - RUF003: Checks for ambiguous Unicode characters in comments. https://docs.astral.sh/ruff/rules/ambiguous-unicode-character-comment/
+# - RUF005: Use of + operator for string concatenation https://docs.astral.sh/ruff/rules/collection-literal-concatenation/
+# Following checks are currently disabled but will be enabled in the future
+# as part of the ticket https://rasahq.atlassian.net/browse/ATO-866
+# - D100: Missing docstring in public module
+# - D101: Missing docstring in public class
+# - D102: Missing docstring in public method
+# - D103: Missing docstring in public function
+# - D104: Missing docstring in public package
+# - D105: Missing docstring in magic method
+# - D107: Missing docstring in __init__
 ignore = [ "D100", "D101", "D102", "D103", "D104", "D105", "D107", "RUF001", "RUF002", "RUF003", "RUF005",]
 select = [ "D", "E", "F", "W", "RUF",]
 
@@ -336,7 +350,7 @@ docker = "^6.0.1"
 pytest-cov = "^4.0.0"
 pytest-asyncio = "^0.20.0"
 pytest-xdist = "^3.2.1"
-pytest = "^7.4.4"
+pytest = "^7.1.3"
 freezegun = "^1.5.1"
 responses = ">=0.22,<0.25"
 aioresponses = "^0.7.2"
@@ -361,4 +375,3 @@ datadog = "^0.49.1"
 types-redis = "^4.3.20"
 types-protobuf = "^4.24.0"
 types-toml = "^0.10.8.7"
-swagger-coverage = "^3.5.1"

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/api.py

@@ -2,7 +2,7 @@ import asyncio
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text, Union
 
 import rasa.shared.constants
-from rasa.core.persistor import StorageType
+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
@@ -14,7 +14,6 @@ from rasa.core.persistor import StorageType
 
 if TYPE_CHECKING:
     from rasa.model_training import TrainingResult
-    from rasa.shared.importers.importer import TrainingDataImporter
 
 
 def run(
@@ -79,7 +78,6 @@ 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":
     """Runs Rasa Core and NLU training in `async` loop.
 
@@ -101,10 +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: 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: Remote storage to use for model storage.
 
     Returns:
         An instance of `TrainingResult`.
@@ -126,7 +121,6 @@ def train(
             model_to_finetune=model_to_finetune,
             finetuning_epoch_fraction=finetuning_epoch_fraction,
             remote_storage=remote_storage,
-            file_importer=file_importer,
         )
     )
 

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/cli/arguments/default_arguments.py

@@ -1,9 +1,8 @@
 import argparse
 import logging
-from enum import Enum
-from typing import List, Optional, Text, Union
+from typing import Optional, Text, Union
 
-from rasa.core.persistor import RemoteStorageType, StorageType, parse_remote_storage
+from rasa.nlu.persistor import RemoteStorageType, StorageType, parse_remote_storage
 from rasa.shared.constants import (
     DEFAULT_CONFIG_PATH,
     DEFAULT_DATA_PATH,
@@ -186,23 +185,3 @@ def parse_remote_storage_arg(value: str) -> StorageType:
         return parse_remote_storage(value)
     except ValueError as e:
         raise argparse.ArgumentTypeError(str(e))
-
-
-class SkipYamlValidation(Enum):
-    DOMAIN = "domain"
-
-    @classmethod
-    def list(cls) -> List[str]:
-        return [e.value for e in SkipYamlValidation]
-
-
-def add_skip_validation_flag(
-    parser: Union[argparse.ArgumentParser, argparse._ActionsContainer],
-) -> None:
-    parser.add_argument(
-        "--skip-yaml-validation",
-        default=[],
-        choices=SkipYamlValidation.list(),
-        action="append",
-        help="Skip YAML validation for selected parts of the training data.",
-    )

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/cli/arguments/run.py

@@ -5,7 +5,6 @@ from typing import Union
 from rasa.cli.arguments.default_arguments import (
     add_endpoint_param,
     add_model_param,
-    add_skip_validation_flag,
     add_remote_storage_param,
 )
 from rasa.core import constants
@@ -22,7 +21,6 @@ def set_run_arguments(parser: argparse.ArgumentParser) -> None:
     """Arguments for running Rasa directly using `rasa run`."""
     add_model_param(parser)
     add_server_arguments(parser)
-    add_skip_validation_flag(parser)
 
 
 def set_run_action_arguments(parser: argparse.ArgumentParser) -> None:

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/cli/e2e_test.py

@@ -221,17 +221,15 @@ def execute_e2e_tests(args: argparse.Namespace) -> None:
     if args.e2e_results is not None:
         results_path = Path(args.e2e_results)
 
-        if passed:
-            passed_file = rasa.cli.utils.get_e2e_results_file_name(
-                results_path, STATUS_PASSED
-            )
-            write_test_results_to_file(passed, passed_file)
+        passed_file = rasa.cli.utils.get_e2e_results_file_name(
+            results_path, STATUS_PASSED
+        )
+        write_test_results_to_file(passed, passed_file)
 
-        if failed:
-            failed_file = rasa.cli.utils.get_e2e_results_file_name(
-                results_path, STATUS_FAILED
-            )
-            write_test_results_to_file(failed, failed_file)
+        failed_file = rasa.cli.utils.get_e2e_results_file_name(
+            results_path, STATUS_FAILED
+        )
+        write_test_results_to_file(failed, failed_file)
 
     aggregate_stats_calculator = AggregateTestStatsCalculator(
         passed_results=passed, failed_results=failed, test_cases=test_suite.test_cases

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/cli/inspect.py

@@ -3,12 +3,11 @@ import webbrowser
 from asyncio import AbstractEventLoop
 from typing import List, Text
 
-from sanic import Sanic
-
 from rasa.cli import SubParsersAction
 from rasa.cli.arguments import shell as arguments
-from rasa.cli.arguments.default_arguments import add_skip_validation_flag
 from rasa.core import constants
+from sanic import Sanic
+
 from rasa.utils.cli import remove_argument_from_parser
 
 
@@ -34,8 +33,6 @@ def add_subparser(
     inspect_parser.set_defaults(func=inspect)
 
     arguments.set_shell_arguments(inspect_parser)
-    add_skip_validation_flag(inspect_parser)
-
     # it'd be confusing to expose those arguments to the user,
     # so we remove them
     remove_argument_from_parser(inspect_parser, "--credentials")

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/cli/run.py

@@ -6,7 +6,6 @@ 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 (
@@ -16,7 +15,6 @@ 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__)
@@ -89,11 +87,6 @@ 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)

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/cli/studio/studio.py

@@ -5,6 +5,7 @@ from urllib.parse import ParseResult, urlparse
 import questionary
 from rasa.cli import SubParsersAction
 
+import rasa.shared.utils.cli
 import rasa.cli.studio.download
 import rasa.cli.studio.train
 import rasa.cli.studio.upload
@@ -50,6 +51,15 @@ def _add_config_subparser(
 
     studio_config_parser.set_defaults(func=create_and_store_studio_config)
 
+    studio_config_parser.add_argument(
+        "--disable-verify",
+        "-x",
+        action="store_true",
+        default=False,
+        help="Disable strict SSL verification for the "
+        "Rasa Studio authentication server.",
+    )
+
     # add advanced configuration flag to trigger
     # advanced configuration setup for authentication settings
     studio_config_parser.add_argument(
@@ -219,7 +229,17 @@ def _configure_studio_config(args: argparse.Namespace) -> StudioConfig:
     studio_config = _create_studio_config(
         studio_url, keycloak_url, realm_name, client_id
     )
-    studio_auth = StudioAuth(studio_config)
+
+    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, verify=True)
 
     if _check_studio_auth(studio_auth):
         return studio_config

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/cli/train.py

@@ -110,20 +110,16 @@ 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,
-            training_data_importer,
+            args.fail_on_validation_warnings, args.validation_max_history, importer
         )
 
     training_result = train_all(
@@ -142,7 +138,6 @@ 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_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/cli/utils.py

@@ -470,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 = results_output_path / f"e2e_results_{result_type}.yml"
+        file_name = str(results_output_path) + f"/e2e_results_{result_type}.yml"
     else:
         parent = results_output_path.parent
         stem = results_output_path.stem
-        file_name = parent / f"{stem}_{result_type}.yml"
+        file_name = str(parent) + f"/{stem}_{result_type}.yml"
 
-    return str(file_name)
+    return file_name

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/core/agent.py

@@ -19,7 +19,6 @@ 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 (
@@ -29,6 +28,7 @@ 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.core.persistor import get_persistor
+        from rasa.nlu.persistor import get_persistor
 
         persistor = get_persistor(self.remote_storage)
 

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/core/brokers/kafka.py

@@ -2,8 +2,6 @@ import asyncio
 import os
 import json
 import logging
-from functools import cached_property
-
 import structlog
 import threading
 from asyncio import AbstractEventLoop
@@ -272,7 +270,7 @@ class KafkaEventBroker(EventBroker):
         if self.producer:
             self.producer.flush()
 
-    @cached_property
+    @rasa.shared.utils.common.lazy_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_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/core/brokers/pika.py

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

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/core/channels/socketio.py

@@ -37,11 +37,7 @@ class SocketBlueprint(Blueprint):
         :param options: Options to be used while registering the
             blueprint into the app.
         """
-        if self.ctx.socketio_path:
-            path = self.ctx.socketio_path
-        else:
-            path = options.get("url_prefix", "/socket.io")
-        self.ctx.sio.attach(app, path)
+        self.ctx.sio.attach(app, self.ctx.socketio_path)
         super().register(app, options)
 
 

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/core/channels/voice_aware/utils.py

@@ -1,16 +1,15 @@
 import structlog
 
+from rasa.utils.licensing import (
+    PRODUCT_AREA,
+    VOICE_SCOPE,
+    validate_license_from_env,
+)
 
 structlogger = structlog.get_logger()
 
 
 def validate_voice_license_scope() -> None:
-    from rasa.utils.licensing import (
-        PRODUCT_AREA,
-        VOICE_SCOPE,
-        validate_license_from_env,
-    )
-
     """Validate that the correct license scope is present."""
     structlogger.info(
         f"Validating current Rasa Pro license scope which must include "

{rasa_pro-3.10.7.dev5 → rasa_pro-3.10.8}/rasa/core/nlg/contextual_response_rephraser.py

@@ -1,13 +1,11 @@
 from typing import Any, Dict, Optional, Text
 
-import os
 import structlog
 from jinja2 import Template
 
 from rasa import telemetry
 from rasa.core.nlg.response import TemplatedNaturalLanguageGenerator
 from rasa.shared.constants import (
-    LLM_API_HEALTH_CHECK_ENV_VAR,
     LLM_CONFIG_KEY,
     MODEL_CONFIG_KEY,
     MODEL_NAME_CONFIG_KEY,
@@ -25,7 +23,6 @@ from rasa.shared.utils.llm import (
     USER,
     combine_custom_and_default_config,
     get_prompt_template,
-    llm_api_health_check,
     llm_factory,
     try_instantiate_llm_client,
 )
@@ -100,18 +97,12 @@ class ContextualResponseRephraser(TemplatedNaturalLanguageGenerator):
         self.trace_prompt_tokens = self.nlg_endpoint.kwargs.get(
             "trace_prompt_tokens", False
         )
-        llm_client = try_instantiate_llm_client(
+        try_instantiate_llm_client(
             self.nlg_endpoint.kwargs.get(LLM_CONFIG_KEY),
             DEFAULT_LLM_CONFIG,
             "contextual_response_rephraser.init",
-            ContextualResponseRephraser.__name__,
+            "ContextualResponseRephraser",
         )
-        if os.getenv(LLM_API_HEALTH_CHECK_ENV_VAR, "true").lower() == "true":
-            llm_api_health_check(
-                llm_client,
-                "contextual_response_rephraser.init",
-                ContextualResponseRephraser.__name__,
-            )
 
     def _last_message_if_human(self, tracker: DialogueStateTracker) -> Optional[str]:
         """Returns the latest message from the tracker.