rasa-pro 3.10.6__tar.gz → 3.10.7.dev1__tar.gz

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rasa-pro
-Version: 3.10.6
+Version: 3.10.7.dev1
 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.5,<1.36.0)
+Requires-Dist: boto3 (>=1.35.15,<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"

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.10.6"
+version = "3.10.7.dev1"
 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.5"
+boto3 = "~1.35.15"
 google-cloud-storage = "^2.14.0"
 azure-storage-blob = ">=12.16.0, <12.17.0"
 requests = "~2.31.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" # pinned because 2.4.2 introduces milvus-lite dependency that fails on windows
+pymilvus = "<2.4.2"
 qdrant-client = "^1.9.0"
 psutil = "^5.9.5"
-tenacity = "~8.4.1" # pinned down because of langchain
+tenacity = "~8.4.1"
 types-protobuf = "4.25.0.20240417"
 litellm = "~1.45.0"
 openpyxl = "^3.1.5"
 diskcache = "~5.6.3"
 [[tool.poetry.dependencies.tensorflow-io-gcs-filesystem]]
-version = "==0.31" # newer versions doesn't provide wheels for Windows
+version = "==0.31"
 markers = "sys_platform == 'win32'"
 
 [[tool.poetry.dependencies.tensorflow-io-gcs-filesystem]]
@@ -245,20 +245,6 @@ 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",]
 
@@ -350,7 +336,7 @@ docker = "^6.0.1"
 pytest-cov = "^4.0.0"
 pytest-asyncio = "^0.20.0"
 pytest-xdist = "^3.2.1"
-pytest = "^7.1.3"
+pytest = "^7.4.4"
 freezegun = "^1.5.1"
 responses = ">=0.22,<0.25"
 aioresponses = "^0.7.2"
@@ -375,3 +361,4 @@ 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.6 → rasa_pro-3.10.7.dev1}/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.nlu.persistor import StorageType
+from rasa.core.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,6 +14,7 @@ from rasa.nlu.persistor import StorageType
 
 if TYPE_CHECKING:
     from rasa.model_training import TrainingResult
+    from rasa.shared.importers.importer import TrainingDataImporter
 
 
 def run(
@@ -78,6 +79,7 @@ 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.
 
@@ -99,7 +101,10 @@ 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.
+        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.
 
     Returns:
         An instance of `TrainingResult`.
@@ -121,6 +126,7 @@ 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.6 → rasa_pro-3.10.7.dev1}/rasa/cli/arguments/default_arguments.py

@@ -1,8 +1,9 @@
 import argparse
 import logging
-from typing import Optional, Text, Union
+from enum import Enum
+from typing import List, Optional, Text, Union
 
-from rasa.nlu.persistor import RemoteStorageType, StorageType, parse_remote_storage
+from rasa.core.persistor import RemoteStorageType, StorageType, parse_remote_storage
 from rasa.shared.constants import (
     DEFAULT_CONFIG_PATH,
     DEFAULT_DATA_PATH,
@@ -185,3 +186,23 @@ 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.6 → rasa_pro-3.10.7.dev1}/rasa/cli/arguments/run.py

@@ -5,6 +5,7 @@ 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
@@ -21,6 +22,7 @@ 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.6 → rasa_pro-3.10.7.dev1}/rasa/cli/inspect.py

@@ -3,11 +3,12 @@ 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
 
 
@@ -33,6 +34,8 @@ 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.6 → rasa_pro-3.10.7.dev1}/rasa/cli/run.py

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

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/cli/train.py

@@ -110,16 +110,20 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
         for f in args.data
     ]
 
+    training_data_importer = TrainingDataImporter.load_from_config(
+        domain_path=domain, training_data_paths=args.data, config_path=config
+    )
+
     if not args.skip_validation:
         structlogger.info(
             "cli.train.run_training",
             event_info="Started validating domain and training data...",
         )
-        importer = TrainingDataImporter.load_from_config(
-            domain_path=domain, training_data_paths=args.data, config_path=config
-        )
+
         rasa.cli.utils.validate_files(
-            args.fail_on_validation_warnings, args.validation_max_history, importer
+            args.fail_on_validation_warnings,
+            args.validation_max_history,
+            training_data_importer,
         )
 
     training_result = train_all(
@@ -138,6 +142,7 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
         model_to_finetune=_model_for_finetuning(args),
         finetuning_epoch_fraction=args.epoch_fraction,
         remote_storage=args.remote_storage,
+        file_importer=training_data_importer,
     )
     if training_result.code != 0 and can_exit:
         sys.exit(training_result.code)

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/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 = str(results_output_path) + f"/e2e_results_{result_type}.yml"
+        file_name = results_output_path / f"e2e_results_{result_type}.yml"
     else:
         parent = results_output_path.parent
         stem = results_output_path.stem
-        file_name = str(parent) + f"/{stem}_{result_type}.yml"
+        file_name = parent / f"{stem}_{result_type}.yml"
 
-    return file_name
+    return str(file_name)

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/core/agent.py

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

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/core/brokers/kafka.py

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

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/core/brokers/pika.py

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

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/core/channels/voice_aware/utils.py

@@ -1,15 +1,16 @@
 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.6 → rasa_pro-3.10.7.dev1}/rasa/core/nlg/contextual_response_rephraser.py

@@ -1,11 +1,13 @@
 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,
@@ -23,6 +25,7 @@ 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,
 )
@@ -97,12 +100,18 @@ class ContextualResponseRephraser(TemplatedNaturalLanguageGenerator):
         self.trace_prompt_tokens = self.nlg_endpoint.kwargs.get(
             "trace_prompt_tokens", False
         )
-        try_instantiate_llm_client(
+        llm_client = try_instantiate_llm_client(
             self.nlg_endpoint.kwargs.get(LLM_CONFIG_KEY),
             DEFAULT_LLM_CONFIG,
             "contextual_response_rephraser.init",
-            "ContextualResponseRephraser",
+            ContextualResponseRephraser.__name__,
         )
+        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.

{rasa_pro-3.10.6/rasa/nlu → rasa_pro-3.10.7.dev1/rasa/core}/persistor.py

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

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/core/policies/enterprise_search_policy.py

@@ -1,5 +1,6 @@
 import importlib.resources
 import json
+import os
 import re
 from typing import TYPE_CHECKING, Any, Dict, List, Optional, Text
 
@@ -47,6 +48,7 @@ from rasa.graph_components.providers.forms_provider import Forms
 from rasa.graph_components.providers.responses_provider import Responses
 from rasa.shared.constants import (
     EMBEDDINGS_CONFIG_KEY,
+    LLM_API_HEALTH_CHECK_ENV_VAR,
     LLM_CONFIG_KEY,
     MODEL_CONFIG_KEY,
     MODEL_NAME_CONFIG_KEY,
@@ -72,6 +74,7 @@ from rasa.shared.utils.llm import (
     DEFAULT_OPENAI_EMBEDDING_MODEL_NAME,
     embedder_factory,
     get_prompt_template,
+    llm_api_health_check,
     llm_factory,
     sanitize_message_for_prompt,
     tracker_as_readable_transcript,
@@ -292,12 +295,18 @@ class EnterpriseSearchPolicy(Policy):
             )
 
         # validate llm configuration
-        try_instantiate_llm_client(
+        llm_client = try_instantiate_llm_client(
             self.config.get(LLM_CONFIG_KEY),
             DEFAULT_LLM_CONFIG,
             "enterprise_search_policy.train",
-            "EnterpriseSearchPolicy",
+            EnterpriseSearchPolicy.__name__,
         )
+        if os.getenv(LLM_API_HEALTH_CHECK_ENV_VAR, "true").lower() == "true":
+            llm_api_health_check(
+                llm_client,
+                "enterprise_search_policy.train",
+                EnterpriseSearchPolicy.__name__,
+            )
 
         if store_type == DEFAULT_VECTOR_STORE_TYPE:
             logger.info("enterprise_search_policy.train.faiss")

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/core/policies/intentless_policy.py

@@ -1,5 +1,6 @@
 import importlib.resources
 import math
+import os
 from dataclasses import dataclass, field
 from typing import Any, Dict, List, Optional, Set, TYPE_CHECKING, Text, Tuple
 
@@ -31,6 +32,7 @@ from rasa.graph_components.providers.responses_provider import Responses
 from rasa.shared.constants import (
     REQUIRED_SLOTS_KEY,
     EMBEDDINGS_CONFIG_KEY,
+    LLM_API_HEALTH_CHECK_ENV_VAR,
     LLM_CONFIG_KEY,
     MODEL_CONFIG_KEY,
     MODEL_NAME_CONFIG_KEY,
@@ -67,6 +69,7 @@ from rasa.shared.utils.llm import (
     combine_custom_and_default_config,
     embedder_factory,
     get_prompt_template,
+    llm_api_health_check,
     llm_factory,
     sanitize_message_for_prompt,
     tracker_as_readable_transcript,
@@ -487,12 +490,16 @@ class IntentlessPolicy(Policy):
             A policy must return its resource locator so that potential children nodes
             can load the policy from the resource.
         """
-        try_instantiate_llm_client(
+        llm_client = try_instantiate_llm_client(
             self.config.get(LLM_CONFIG_KEY),
             DEFAULT_LLM_CONFIG,
             "intentless_policy.train",
-            "IntentlessPolicy",
+            IntentlessPolicy.__name__,
         )
+        if os.getenv(LLM_API_HEALTH_CHECK_ENV_VAR, "true").lower() == "true":
+            llm_api_health_check(
+                llm_client, "intentless_policy.train", IntentlessPolicy.__name__
+            )
 
         responses = filter_responses(responses, forms, flows or FlowsList([]))
         telemetry.track_intentless_policy_train()

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/core/run.py

@@ -32,8 +32,8 @@ from rasa.core import agent, channels, constants
 from rasa.core.agent import Agent
 from rasa.core.channels import console
 from rasa.core.channels.channel import InputChannel
+from rasa.core.persistor import StorageType
 from rasa.core.utils import AvailableEndpoints
-from rasa.nlu.persistor import StorageType
 from rasa.plugin import plugin_manager
 from rasa.shared.exceptions import RasaException
 from rasa.shared.utils.yaml import read_config_file
@@ -311,6 +311,7 @@ async def load_agent_on_start(
         endpoints=endpoints,
         loop=loop,
     )
+
     logger.info("Rasa server is up and running.")
     return app.ctx.agent
 

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/core/secrets_manager/constants.py

@@ -23,6 +23,7 @@ VAULT_TRANSIT_MOUNT_POINT_ENV_NAME = "VAULT_TRANSIT_MOUNT_POINT"
 VAULT_NAMESPACE_ENV_NAME = "VAULT_NAMESPACE"
 VAULT_DEFAULT_RASA_SECRETS_PATH = "rasa-secrets"
 VAULT_SECRET_MANAGER_NAME = "vault"
+VAULT_MOUNT_POINT_ENV_NAME = "VAULT_MOUNT_POINT"
 
 
 VAULT_ENDPOINT_URL_LABEL = "url"
@@ -30,3 +31,6 @@ VAULT_ENDPOINT_TOKEN_LABEL = "token"
 VAULT_ENDPOINT_SECRETS_PATH_LABEL = "secrets_path"
 VAULT_ENDPOINT_TRANSIT_MOUNT_POINT_LABEL = "transit_mount_point"
 VAULT_ENDPOINT_NAMESPACE_LABEL = "namespace"
+VAULT_ENDPOINT_MOUNT_POINT_LABEL = "mount_point"
+
+VAULT_MOUNT_POINT_DEFAULT_VALUE = "secret"

{rasa_pro-3.10.6 → rasa_pro-3.10.7.dev1}/rasa/core/secrets_manager/factory.py

@@ -7,9 +7,11 @@ from rasa.utils.endpoints import EndpointConfig, read_endpoint_config
 from rasa.core.secrets_manager.constants import (
     SECRET_MANAGER_ENV_NAME,
     VAULT_DEFAULT_RASA_SECRETS_PATH,
+    VAULT_ENDPOINT_MOUNT_POINT_LABEL,
     VAULT_ENDPOINT_NAMESPACE_LABEL,
     VAULT_ENDPOINT_SECRETS_PATH_LABEL,
     VAULT_ENDPOINT_TRANSIT_MOUNT_POINT_LABEL,
+    VAULT_MOUNT_POINT_ENV_NAME,
     VAULT_NAMESPACE_ENV_NAME,
     VAULT_RASA_SECRETS_PATH_ENV_NAME,
     VAULT_SECRET_MANAGER_NAME,
@@ -48,6 +50,7 @@ def create(config: SecretManagerConfig) -> Optional[SecretsManager]:
             transit_mount_point=vault_config.transit_mount_point,
             secrets_path=vault_config.secrets_path,
             namespace=vault_config.namespace,
+            mount_point=vault_config.mount_point,
         )
 
     return secret_manager
@@ -79,6 +82,7 @@ def read_vault_endpoint_config(
         )
         secrets_path = endpoint_config.kwargs.get(VAULT_ENDPOINT_SECRETS_PATH_LABEL)
         namespace = endpoint_config.kwargs.get(VAULT_ENDPOINT_NAMESPACE_LABEL)
+        mount_point = endpoint_config.kwargs.get(VAULT_ENDPOINT_MOUNT_POINT_LABEL)
 
         return VaultSecretManagerNonStrictConfig(
             url=url,
@@ -86,6 +90,7 @@ def read_vault_endpoint_config(
             transit_mount_point=transit_mount_point,
             secrets_path=secrets_path or VAULT_DEFAULT_RASA_SECRETS_PATH,
             namespace=namespace,
+            mount_point=mount_point,
         )
 
     return None
@@ -102,6 +107,7 @@ def read_vault_env_vars() -> VaultSecretManagerNonStrictConfig:
     transit_mount_point = os.getenv(VAULT_TRANSIT_MOUNT_POINT_ENV_NAME)
     secrets_path = os.getenv(VAULT_RASA_SECRETS_PATH_ENV_NAME)
     namespace = os.getenv(VAULT_NAMESPACE_ENV_NAME)
+    mount_point = os.getenv(VAULT_MOUNT_POINT_ENV_NAME)
 
     return VaultSecretManagerNonStrictConfig(
         url=url,
@@ -109,6 +115,7 @@ def read_vault_env_vars() -> VaultSecretManagerNonStrictConfig:
         transit_mount_point=transit_mount_point,
         secrets_path=secrets_path,
         namespace=namespace,
+        mount_point=mount_point,
     )
 
 
@@ -149,6 +156,7 @@ def read_vault_config(
         f"{VAULT_RASA_SECRETS_PATH_ENV_NAME} = {env_config.secrets_path}, "
         f"{VAULT_TRANSIT_MOUNT_POINT_ENV_NAME} = {env_config.transit_mount_point}. "
         f"{VAULT_NAMESPACE_ENV_NAME} = {env_config.namespace}. "
+        f"{VAULT_MOUNT_POINT_ENV_NAME} = {env_config.mount_point}. "
     )