rasa-pro 3.12.12__tar.gz → 3.12.13__tar.gz

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: rasa-pro
-Version: 3.12.12
+Version: 3.12.13
 Summary: State-of-the-art open-core Conversational AI framework for Enterprises that natively leverages generative AI for effortless assistant development.
 Keywords: nlp,machine-learning,machine-learning-library,bot,bots,botkit,rasa conversational-agents,conversational-ai,chatbot,chatbot-framework,bot-framework
 Author: Rasa Technologies GmbH

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "rasa-pro"
-version = "3.12.12"
+version = "3.12.13"
 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>",]
@@ -340,6 +340,7 @@ convention = "google"
 "tests/shared/core/test_domain.py" = [ "E501",]
 
 
+
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.3.5,<0.4.0"
 docker = "~7.1.0"

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/api.py

@@ -81,6 +81,7 @@ def train(
     remote_storage: Optional[StorageType] = None,
     file_importer: Optional["TrainingDataImporter"] = None,
     keep_local_model_copy: bool = False,
+    remote_root_only: bool = False,
 ) -> "TrainingResult":
     """Runs Rasa Core and NLU training in `async` loop.
 
@@ -108,6 +109,8 @@ def train(
             If it is not provided, a new instance will be created.
         keep_local_model_copy: If `True` the model will be stored locally even if
             remote storage is configured.
+        remote_root_only: If `True`, the model will be stored in the root of the
+            remote model storage.
 
     Returns:
         An instance of `TrainingResult`.
@@ -131,6 +134,7 @@ def train(
             remote_storage=remote_storage,
             file_importer=file_importer,
             keep_local_model_copy=keep_local_model_copy,
+            remote_root_only=remote_root_only,
         )
     )
 

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/cli/arguments/default_arguments.py

@@ -172,7 +172,7 @@ def add_remote_storage_param(
 ) -> None:
     parser.add_argument(
         "--remote-storage",
-        help="Remote storage which should be used to store/load the model."
+        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,
@@ -180,6 +180,18 @@ def add_remote_storage_param(
     )
 
 
+def add_remote_root_only_param(
+    parser: argparse.ArgumentParser, required: bool = False
+) -> None:
+    parser.add_argument(
+        "--remote-root-only",
+        action="store_true",
+        help="If set, models will be stored only at the root directory "
+        "of the remote storage.",
+        required=required,
+    )
+
+
 def parse_remote_storage_arg(value: str) -> StorageType:
     try:
         return parse_remote_storage(value)

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/cli/arguments/train.py

@@ -7,6 +7,7 @@ from rasa.cli.arguments.default_arguments import (
     add_endpoint_param,
     add_nlu_data_param,
     add_out_param,
+    add_remote_root_only_param,
     add_remote_storage_param,
     add_stories_param,
 )
@@ -41,6 +42,7 @@ def set_train_arguments(parser: argparse.ArgumentParser) -> None:
         parser, help_text="Configuration file for the connectors as a yml file."
     )
     add_remote_storage_param(parser)
+    add_remote_root_only_param(parser)
 
 
 def set_train_core_arguments(parser: argparse.ArgumentParser) -> None:

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/cli/train.py

@@ -155,6 +155,7 @@ def run_training(args: argparse.Namespace, can_exit: bool = False) -> Optional[T
         remote_storage=args.remote_storage,
         file_importer=training_data_importer,
         keep_local_model_copy=args.keep_local_model_copy,
+        remote_root_only=args.remote_root_only,
     )
     if training_result.code != 0 and can_exit:
         display_research_study_prompt()

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/constants.py

@@ -42,3 +42,5 @@ DEFAULT_BUCKET_NAME = "rasa-models"
 
 HTTP_STATUS_FORBIDDEN = 403
 HTTP_STATUS_NOT_FOUND = 404
+
+RASA_REMOTE_STORAGE_ENV_VAR_NAME = "RASA_REMOTE_STORAGE"

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/core/persistor.py

@@ -121,10 +121,12 @@ def get_persistor(storage: StorageType) -> Optional[Persistor]:
 class Persistor(abc.ABC):
     """Store models in cloud and fetch them when needed."""
 
-    def persist(self, trained_model: str) -> None:
+    def persist(self, trained_model: str, remote_root_only: bool = False) -> None:
         """Uploads a trained model persisted in the `target_dir` to cloud storage."""
         absolute_file_key = self._create_file_key(trained_model)
-        file_key = Path(absolute_file_key).name
+        file_key = (
+            Path(absolute_file_key).name if remote_root_only else absolute_file_key
+        )
         self._persist_tar(file_key, trained_model)
 
     def retrieve(self, model_name: Text, target_path: Text) -> Text:
@@ -143,30 +145,32 @@ class Persistor(abc.ABC):
             # ensure backward compatibility
             tar_name = self._tar_name(model_name)
         tar_name = self._create_file_key(tar_name)
-        target_filename = os.path.basename(tar_name)
-        self._retrieve_tar(target_filename)
-        self._copy(os.path.basename(tar_name), target_path)
+        self._retrieve_tar(tar_name, target_path)
 
         if os.path.isdir(target_path):
             return os.path.join(target_path, model_name)
 
         return target_path
 
-    def size_of_persisted_model(self, model_name: Text) -> int:
+    def size_of_persisted_model(
+        self, model_name: Text, target_path: Optional[str] = None
+    ) -> int:
         """Returns the size of the model that has been persisted to cloud storage.
 
         Args:
             model_name: The name of the model to retrieve.
+            target_path: The path to which the model should be saved.
         """
         tar_name = model_name
         if not model_name.endswith(MODEL_ARCHIVE_EXTENSION):
             # ensure backward compatibility
             tar_name = self._tar_name(model_name)
         tar_name = self._create_file_key(tar_name)
-        target_filename = os.path.basename(tar_name)
-        return self._retrieve_tar_size(target_filename)
+        return self._retrieve_tar_size(tar_name, target_path)
 
-    def _retrieve_tar_size(self, filename: Text) -> int:
+    def _retrieve_tar_size(
+        self, filename: Text, target_path: Optional[str] = None
+    ) -> int:
         """Returns the size of the model that has been persisted to cloud storage."""
         structlogger.warning(
             "persistor.retrieve_tar_size.not_implemented",
@@ -179,11 +183,11 @@ class Persistor(abc.ABC):
                 "size directly from the cloud storage."
             ),
         )
-        self._retrieve_tar(filename)
+        self._retrieve_tar(filename, target_path)
         return os.path.getsize(os.path.basename(filename))
 
     @abc.abstractmethod
-    def _retrieve_tar(self, filename: Text) -> None:
+    def _retrieve_tar(self, filename: str, target_path: Optional[str] = None) -> None:
         """Downloads a model previously persisted to cloud storage."""
         raise NotImplementedError
 
@@ -302,7 +306,9 @@ class AWSPersistor(Persistor):
         with open(tar_path, "rb") as f:
             self.s3.Object(self.bucket_name, file_key).put(Body=f)
 
-    def _retrieve_tar_size(self, model_path: Text) -> int:
+    def _retrieve_tar_size(
+        self, model_path: Text, target_path: Optional[str] = None
+    ) -> int:
         """Returns the size of the model that has been persisted to s3."""
         try:
             obj = self.s3.Object(self.bucket_name, model_path)
@@ -310,7 +316,9 @@ class AWSPersistor(Persistor):
         except Exception:
             raise ModelNotFound()
 
-    def _retrieve_tar(self, target_filename: str) -> None:
+    def _retrieve_tar(
+        self, target_filename: str, target_path: Optional[str] = None
+    ) -> None:
         """Downloads a model that has previously been persisted to s3."""
         from botocore import exceptions
 
@@ -320,8 +328,14 @@ class AWSPersistor(Persistor):
             f"in the bucket."
         )
 
+        tar_name = (
+            os.path.join(target_path, os.path.basename(target_filename))
+            if target_path
+            else os.path.basename(target_filename)
+        )
+
         try:
-            with open(target_filename, "wb") as f:
+            with open(tar_name, "wb") as f:
                 self.bucket.download_fileobj(target_filename, f)
 
             structlogger.debug(
@@ -425,7 +439,9 @@ class GCSPersistor(Persistor):
         blob = self.bucket.blob(file_key)
         blob.upload_from_filename(tar_path)
 
-    def _retrieve_tar_size(self, target_filename: Text) -> int:
+    def _retrieve_tar_size(
+        self, target_filename: Text, target_path: Optional[str] = None
+    ) -> int:
         """Returns the size of the model that has been persisted to GCS."""
         try:
             blob = self.bucket.blob(target_filename)
@@ -433,13 +449,22 @@ class GCSPersistor(Persistor):
         except Exception:
             raise ModelNotFound()
 
-    def _retrieve_tar(self, target_filename: Text) -> None:
+    def _retrieve_tar(
+        self, target_filename: str, target_path: Optional[str] = None
+    ) -> None:
         """Downloads a model that has previously been persisted to GCS."""
         from google.api_core import exceptions
 
         blob = self.bucket.blob(target_filename)
+
+        destination = (
+            os.path.join(target_path, os.path.basename(target_filename))
+            if target_path
+            else target_filename
+        )
+
         try:
-            blob.download_to_filename(target_filename)
+            blob.download_to_filename(destination)
 
             structlogger.debug(
                 "gcs_persistor.retrieve_tar.object_found", object_key=target_filename
@@ -500,7 +525,9 @@ class AzurePersistor(Persistor):
         with open(tar_path, "rb") as data:
             self._container_client().upload_blob(name=file_key, data=data)
 
-    def _retrieve_tar_size(self, target_filename: Text) -> int:
+    def _retrieve_tar_size(
+        self, target_filename: Text, target_path: Optional[str] = None
+    ) -> int:
         """Returns the size of the model that has been persisted to Azure."""
         try:
             blob_client = self._container_client().get_blob_client(target_filename)
@@ -509,12 +536,20 @@ class AzurePersistor(Persistor):
         except Exception:
             raise ModelNotFound()
 
-    def _retrieve_tar(self, target_filename: Text) -> None:
+    def _retrieve_tar(
+        self, target_filename: Text, target_path: Optional[str] = None
+    ) -> None:
         """Downloads a model that has previously been persisted to Azure."""
         from azure.core.exceptions import AzureError
 
+        destination = (
+            os.path.join(target_path, os.path.basename(target_filename))
+            if target_path
+            else target_filename
+        )
+
         try:
-            with open(target_filename, "wb") as model_file:
+            with open(destination, "wb") as model_file:
                 blob_client = self._container_client().get_blob_client(target_filename)
                 download_stream = blob_client.download_blob()
                 model_file.write(download_stream.readall())

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/core/run.py

@@ -86,13 +86,15 @@ def _create_single_channel(channel: Text, credentials: Dict[Text, Any]) -> Any:
             )
 
 
-def _create_app_without_api(cors: Optional[Union[Text, List[Text]]] = None) -> Sanic:
+def _create_app_without_api(
+    cors: Optional[Union[Text, List[Text]]] = None, is_inspector_enabled: bool = False
+) -> Sanic:
     app = Sanic("rasa_core_no_api", configure_logging=False)
 
     # Reset Sanic warnings filter that allows the triggering of Sanic warnings
     warnings.filterwarnings("ignore", category=DeprecationWarning, module=r"sanic.*")
 
-    server.add_root_route(app)
+    server.add_root_route(app, is_inspector_enabled)
     server.configure_cors(app, cors)
     return app
 
@@ -127,6 +129,7 @@ def configure_app(
     server_listeners: Optional[List[Tuple[Callable, Text]]] = None,
     use_uvloop: Optional[bool] = True,
     keep_alive_timeout: int = constants.DEFAULT_KEEP_ALIVE_TIMEOUT,
+    is_inspector_enabled: bool = False,
 ) -> Sanic:
     """Run the agent."""
     rasa.core.utils.configure_file_logging(
@@ -144,6 +147,7 @@ def configure_app(
                 jwt_private_key=jwt_private_key,
                 jwt_method=jwt_method,
                 endpoints=endpoints,
+                is_inspector_enabled=is_inspector_enabled,
             )
         )
     else:
@@ -259,6 +263,7 @@ def serve_application(
         syslog_protocol=syslog_protocol,
         request_timeout=request_timeout,
         server_listeners=server_listeners,
+        is_inspector_enabled=inspect,
     )
 
     ssl_context = server.create_ssl_context(

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/dialogue_understanding/commands/clarify_command.py

@@ -117,9 +117,9 @@ class ClarifyCommand(Command):
     @staticmethod
     def regex_pattern() -> str:
         mapper = {
-            CommandSyntaxVersion.v1: r"Clarify\(([\"\'a-zA-Z0-9_, ]*)\)",
+            CommandSyntaxVersion.v1: r"Clarify\(([\"\'a-zA-Z0-9_, -]*)\)",
             CommandSyntaxVersion.v2: (
-                r"""^[\s\W\d]*disambiguate flows (["'a-zA-Z0-9_, ]*)['"`]*$"""
+                r"""^[\s\W\d]*disambiguate flows (["'a-zA-Z0-9_, -]*)['"`]*$"""
             ),
         }
         return mapper.get(

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/dialogue_understanding/generator/llm_based_command_generator.py

@@ -528,7 +528,7 @@ class LLMBasedCommandGenerator(
         either contain a StartFlowCommand or a SetSlot command
         for the current collect step.
         """
-        return self.config.get(KEY_MINIMIZE_NUM_CALLS, False) and (
+        return self.config.get(KEY_MINIMIZE_NUM_CALLS, True) and (
             self._prior_commands_contain_start_flow(prior_commands)
             or self._prior_commands_contain_set_slot_for_active_collect_step(
                 prior_commands, flows, tracker

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/model_manager/config.py

@@ -1,6 +1,8 @@
 import os
 import sys
 
+from rasa.constants import RASA_REMOTE_STORAGE_ENV_VAR_NAME
+
 DEFAULT_SERVER_BASE_WORKING_DIRECTORY = "working-data"
 
 SERVER_BASE_WORKING_DIRECTORY = os.environ.get(
@@ -12,7 +14,7 @@ SERVER_PORT = os.environ.get("RASA_MODEL_SERVER_PORT", 8000)
 SERVER_BASE_URL = os.environ.get("RASA_MODEL_SERVER_BASE_URL", None)
 
 # defaults to storing on the local hard drive
-SERVER_MODEL_REMOTE_STORAGE = os.environ.get("RASA_REMOTE_STORAGE", None)
+SERVER_MODEL_REMOTE_STORAGE = os.environ.get(RASA_REMOTE_STORAGE_ENV_VAR_NAME, None)
 
 # The path to the python executable that is running this script
 # we will use the same python to run training / bots

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/model_manager/model_api.py

@@ -532,8 +532,7 @@ def size_of_model(model_name: str) -> Optional[int]:
             model_name=model_file_name,
         )
         return fetch_size_of_remote_model(
-            model_file_name,
-            config.SERVER_MODEL_REMOTE_STORAGE,
+            model_file_name, config.SERVER_MODEL_REMOTE_STORAGE, model_path
         )
     raise ModelNotFound("Model not found.")
 

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/model_manager/runner_service.py

@@ -166,13 +166,13 @@ def fetch_remote_model_to_dir(
 ) -> str:
     """Fetch the model from remote storage.
 
-    Returns the path to the model diretory.
+    Returns the path to the model directory.
     """
     from rasa.core.persistor import get_persistor
 
     persistor = get_persistor(storage_type)
 
-    # we now there must be a persistor, because the config is set
+    # we know there must be a persistor, because the config is set
     # this is here to please the type checker for the call below
     assert persistor is not None
 
@@ -182,7 +182,9 @@ def fetch_remote_model_to_dir(
         raise ModelNotFound() from e
 
 
-def fetch_size_of_remote_model(model_name: str, storage_type: str) -> int:
+def fetch_size_of_remote_model(
+    model_name: str, storage_type: str, model_path: str
+) -> int:
     """Fetch the size of the model from remote storage."""
     from rasa.core.persistor import get_persistor
 
@@ -192,7 +194,9 @@ def fetch_size_of_remote_model(model_name: str, storage_type: str) -> int:
     # this is here to please the type checker for the call below
     assert persistor is not None
 
-    return persistor.size_of_persisted_model(model_name=model_name)
+    return persistor.size_of_persisted_model(
+        model_name=model_name, target_path=model_path
+    )
 
 
 def start_bot_process(

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/model_manager/trainer_service.py

@@ -278,6 +278,7 @@ def start_training_process(
                 "--keep-local-model-copy",
                 "--remote-storage",
                 config.SERVER_MODEL_REMOTE_STORAGE,
+                "--remote-root-only",
             ]
         )
 

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/model_training.py

@@ -160,6 +160,7 @@ async def train(
     remote_storage: Optional[StorageType] = None,
     file_importer: Optional[TrainingDataImporter] = None,
     keep_local_model_copy: bool = False,
+    remote_root_only: bool = False,
 ) -> TrainingResult:
     """Trains a Rasa model (Core and NLU).
 
@@ -187,6 +188,8 @@ async def train(
             If it is not provided, a new instance will be created.
         keep_local_model_copy: If `True` the model will be stored locally even if
             remote storage is configured.
+        remote_root_only: If `True`, the model will be stored in the root of the
+            remote model storage.
 
     Returns:
         An instance of `TrainingResult`.
@@ -269,6 +272,7 @@ async def train(
             dry_run=dry_run,
             remote_storage=remote_storage,
             keep_local_model_copy=keep_local_model_copy,
+            remote_root_only=remote_root_only,
             **(core_additional_arguments or {}),
             **(nlu_additional_arguments or {}),
         )
@@ -284,6 +288,7 @@ async def _train_graph(
     dry_run: bool = False,
     remote_storage: Optional[StorageType] = None,
     keep_local_model_copy: bool = False,
+    remote_root_only: bool = False,
     **kwargs: Any,
 ) -> TrainingResult:
     if model_to_finetune:
@@ -363,7 +368,9 @@ async def _train_graph(
             is_finetuning=is_finetuning,
         )
         if remote_storage:
-            push_model_to_remote_storage(full_model_path, remote_storage)
+            push_model_to_remote_storage(
+                full_model_path, remote_storage, remote_root_only
+            )
             if not keep_local_model_copy:
                 full_model_path.unlink()
             structlogger.info(
@@ -581,14 +588,16 @@ async def train_nlu(
     ).model
 
 
-def push_model_to_remote_storage(model_path: Path, remote_storage: StorageType) -> None:
+def push_model_to_remote_storage(
+    model_path: Path, remote_storage: StorageType, remote_root_only: bool = False
+) -> None:
     """Push model to remote storage."""
     from rasa.core.persistor import get_persistor
 
     persistor = get_persistor(remote_storage)
 
     if persistor is not None:
-        persistor.persist(str(model_path))
+        persistor.persist(str(model_path), remote_root_only)
 
     else:
         raise RasaException(

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/server.py

@@ -522,12 +522,15 @@ def configure_cors(
     )
 
 
-def add_root_route(app: Sanic) -> None:
+def add_root_route(app: Sanic, is_inspector_enabled: bool = False) -> None:
     """Add '/' route to return hello."""
 
     @app.get("/")
     async def hello(request: Request) -> HTTPResponse:
         """Check if the server is running and responds with the version."""
+        if not is_inspector_enabled:
+            return response.text("Hello from Rasa: " + rasa.__version__)
+
         html_content = f"""
         <html>
             <body>
@@ -688,6 +691,7 @@ def create_app(
     jwt_private_key: Optional[Text] = None,
     jwt_method: Text = "HS256",
     endpoints: Optional[AvailableEndpoints] = None,
+    is_inspector_enabled: bool = False,
 ) -> Sanic:
     """Class representing a Rasa HTTP server."""
     app = Sanic("rasa_server")
@@ -733,7 +737,7 @@ def create_app(
     ) -> HTTPResponse:
         return response.json(exception.error_info, status=exception.status)
 
-    add_root_route(app)
+    add_root_route(app, is_inspector_enabled)
 
     @app.get("/version")
     async def version(request: Request) -> HTTPResponse:

{rasa_pro-3.12.12 → rasa_pro-3.12.13}/rasa/version.py

@@ -1,3 +1,3 @@
 # this file will automatically be changed,
 # do not add anything but the version number here!
-__version__ = "3.12.12"
+__version__ = "3.12.13"