rasa-pro 3.14.0.dev6__py3-none-any.whl → 3.14.0.dev8__py3-none-any.whl

rasa/graph_components/validators/default_recipe_validator.py

@@ -10,40 +10,61 @@ from rasa.core.policies.flow_policy import FlowPolicy
 from rasa.core.policies.memoization import AugmentedMemoizationPolicy, MemoizationPolicy
 from rasa.core.policies.policy import Policy, SupportedData
 from rasa.core.policies.rule_policy import RulePolicy
-
-# from rasa.core.policies.ted_policy import TEDPolicy
-# from rasa.core.policies.unexpected_intent_policy import UnexpecTEDIntentPolicy
 from rasa.engine.graph import ExecutionContext, GraphComponent, GraphSchema, SchemaNode
 from rasa.engine.storage.resource import Resource
 from rasa.engine.storage.storage import ModelStorage
-
-# from rasa.nlu.classifiers.diet_classifier import DIETClassifier
-# from rasa.nlu.extractors.crf_entity_extractor import (
-#     CRFEntityExtractor,
-#     CRFEntityExtractorOptions,
-# )
+from rasa.nlu.extractors.crf_entity_extractor import (
+    CRFEntityExtractor,
+    CRFEntityExtractorOptions,
+)
 from rasa.nlu.extractors.entity_synonyms import EntitySynonymMapper
 from rasa.nlu.extractors.mitie_entity_extractor import MitieEntityExtractor
 from rasa.nlu.extractors.regex_entity_extractor import RegexEntityExtractor
 from rasa.nlu.featurizers.featurizer import Featurizer
 from rasa.nlu.featurizers.sparse_featurizer.regex_featurizer import RegexFeaturizer
-
-# from rasa.nlu.selectors.response_selector import ResponseSelector
 from rasa.nlu.tokenizers.tokenizer import Tokenizer
 from rasa.shared.constants import (
+    DEFAULT_CONFIG_PATH,
     DOCS_URL_COMPONENTS,
+    DOCS_URL_DEFAULT_ACTIONS,
     DOCS_URL_NLU_BASED_POLICIES,
+    DOCS_URL_RULES,
+)
+from rasa.shared.core.constants import (
+    ACTION_BACK_NAME,
+    ACTION_RESTART_NAME,
+    USER_INTENT_BACK,
+    USER_INTENT_RESTART,
 )
-from rasa.shared.core.domain import Domain
+from rasa.shared.core.domain import Domain, InvalidDomain
 from rasa.shared.core.training_data.structures import RuleStep, StoryGraph
 from rasa.shared.exceptions import InvalidConfigException
 from rasa.shared.importers.importer import TrainingDataImporter
 from rasa.shared.nlu.training_data.training_data import TrainingData
+from rasa.shared.utils.common import conditional_import
+
+# Conditional imports for TensorFlow-dependent components
+TEDPolicy, TED_POLICY_AVAILABLE = conditional_import(
+    "rasa.core.policies.ted_policy", "TEDPolicy"
+)
+UnexpecTEDIntentPolicy, UNEXPECTED_INTENT_POLICY_AVAILABLE = conditional_import(
+    "rasa.core.policies.unexpected_intent_policy", "UnexpecTEDIntentPolicy"
+)
+DIETClassifier, DIET_CLASSIFIER_AVAILABLE = conditional_import(
+    "rasa.nlu.classifiers.diet_classifier", "DIETClassifier"
+)
+ResponseSelector, RESPONSE_SELECTOR_AVAILABLE = conditional_import(
+    "rasa.nlu.selectors.response_selector", "ResponseSelector"
+)
 
 # TODO: Can we replace this with the registered types from the regitry?
-TRAINABLE_EXTRACTORS = [MitieEntityExtractor]  # , CRFEntityExtractor, DIETClassifier]
+TRAINABLE_EXTRACTORS = [MitieEntityExtractor, CRFEntityExtractor]
+if DIET_CLASSIFIER_AVAILABLE:
+    TRAINABLE_EXTRACTORS.append(DIETClassifier)
 # TODO: replace these once the Recipe is merged (used in tests)
 POLICY_CLASSSES = {MemoizationPolicy, RulePolicy}
+if TED_POLICY_AVAILABLE:
+    POLICY_CLASSSES.add(TEDPolicy)
 
 
 def _types_to_str(types: Iterable[Type]) -> Text:
@@ -129,17 +150,16 @@ class DefaultV1RecipeValidator(GraphComponent):
         """
         if (
             training_data.response_examples
-            # and ResponseSelector not in self._component_types
+            and ResponseSelector not in self._component_types
         ):
-            pass
-            # rasa.shared.utils.io.raise_warning(
-            #     f"You have defined training data with examples for training a response "  # noqa: E501
-            #     f"selector, but your NLU configuration does not include a response "
-            #     f"selector component. "
-            #     f"To train a model on your response selector data, add a "
-            #     f"'{ResponseSelector.__name__}' to your configuration.",
-            #     docs=DOCS_URL_COMPONENTS,
-            # )
+            rasa.shared.utils.io.raise_warning(
+                f"You have defined training data with examples for training a response "
+                f"selector, but your NLU configuration does not include a response "
+                f"selector component. "
+                f"To train a model on your response selector data, add a "
+                f"'{ResponseSelector.__name__}' to your configuration.",
+                docs=DOCS_URL_COMPONENTS,
+            )
 
         if training_data.entity_examples and self._component_types.isdisjoint(
             TRAINABLE_EXTRACTORS
@@ -153,21 +173,21 @@ class DefaultV1RecipeValidator(GraphComponent):
                 docs=DOCS_URL_COMPONENTS,
             )
 
-        # if training_data.entity_examples and self._component_types.isdisjoint(
-        #     {DIETClassifier, CRFEntityExtractor}
-        # ):
-        #     if training_data.entity_roles_groups_used():
-        #         rasa.shared.utils.io.raise_warning(
-        #             f"You have defined training data with entities that "
-        #             f"have roles/groups, but your NLU configuration does not "
-        #             f"include a '{DIETClassifier.__name__}' "
-        #             f"or a '{CRFEntityExtractor.__name__}'. "
-        #             f"To train entities that have roles/groups, "
-        #             f"add either '{DIETClassifier.__name__}' "
-        #             f"or '{CRFEntityExtractor.__name__}' to your "
-        #             f"configuration.",
-        #             docs=DOCS_URL_COMPONENTS,
-        #         )
+        if training_data.entity_examples and self._component_types.isdisjoint(
+            {DIETClassifier, CRFEntityExtractor}
+        ):
+            if training_data.entity_roles_groups_used():
+                rasa.shared.utils.io.raise_warning(
+                    f"You have defined training data with entities that "
+                    f"have roles/groups, but your NLU configuration does not "
+                    f"include a '{DIETClassifier.__name__}' "
+                    f"or a '{CRFEntityExtractor.__name__}'. "
+                    f"To train entities that have roles/groups, "
+                    f"add either '{DIETClassifier.__name__}' "
+                    f"or '{CRFEntityExtractor.__name__}' to your "
+                    f"configuration.",
+                    docs=DOCS_URL_COMPONENTS,
+                )
 
         if training_data.regex_features and self._component_types.isdisjoint(
             [RegexFeaturizer, RegexEntityExtractor]
@@ -197,45 +217,45 @@ class DefaultV1RecipeValidator(GraphComponent):
                 docs=DOCS_URL_COMPONENTS,
             )
 
-        # if training_data.lookup_tables:
-        #     if self._component_types.isdisjoint([CRFEntityExtractor, DIETClassifier]):
-        #         rasa.shared.utils.io.raise_warning(
-        #             f"You have defined training data consisting of lookup tables, but "   # noqa: E501
-        #             f"your NLU configuration does not include any components "
-        #             f"that uses the features created from the lookup table. "
-        #             f"To make use of the features that are created with the "
-        #             f"help of the lookup tables, "
-        #             f"add a '{DIETClassifier.__name__}' or a "
-        #             f"'{CRFEntityExtractor.__name__}' "
-        #             f"with the 'pattern' feature "
-        #             f"to your configuration.",
-        #             docs=DOCS_URL_COMPONENTS,
-        #         )
-
-        #     elif CRFEntityExtractor in self._component_types:
-        #         crf_schema_nodes = [
-        #             schema_node
-        #             for schema_node in self._graph_schema.nodes.values()
-        #             if schema_node.uses == CRFEntityExtractor
-        #         ]
-        #         has_pattern_feature = any(
-        #             CRFEntityExtractorOptions.PATTERN in feature_list
-        #             for crf in crf_schema_nodes
-        #             for feature_list in crf.config.get("features", [])
-        #         )
-
-        #         if not has_pattern_feature:
-        #             rasa.shared.utils.io.raise_warning(
-        #                 f"You have defined training data consisting of "
-        #                 f"lookup tables, but your NLU configuration's "
-        #                 f"'{CRFEntityExtractor.__name__}' "
-        #                 f"does not include the "
-        #                 f"'pattern' feature. To featurize lookup tables, "
-        #                 f"add the 'pattern' feature to the "
-        #                 f"'{CRFEntityExtractor.__name__}' "
-        #                 "in your configuration.",
-        #                 docs=DOCS_URL_COMPONENTS,
-        #             )
+        if training_data.lookup_tables:
+            if self._component_types.isdisjoint([CRFEntityExtractor, DIETClassifier]):
+                rasa.shared.utils.io.raise_warning(
+                    f"You have defined training data consisting of lookup tables, but "
+                    f"your NLU configuration does not include any components "
+                    f"that uses the features created from the lookup table. "
+                    f"To make use of the features that are created with the "
+                    f"help of the lookup tables, "
+                    f"add a '{DIETClassifier.__name__}' or a "
+                    f"'{CRFEntityExtractor.__name__}' "
+                    f"with the 'pattern' feature "
+                    f"to your configuration.",
+                    docs=DOCS_URL_COMPONENTS,
+                )
+
+            elif CRFEntityExtractor in self._component_types:
+                crf_schema_nodes = [
+                    schema_node
+                    for schema_node in self._graph_schema.nodes.values()
+                    if schema_node.uses == CRFEntityExtractor
+                ]
+                has_pattern_feature = any(
+                    CRFEntityExtractorOptions.PATTERN in feature_list
+                    for crf in crf_schema_nodes
+                    for feature_list in crf.config.get("features", [])
+                )
+
+                if not has_pattern_feature:
+                    rasa.shared.utils.io.raise_warning(
+                        f"You have defined training data consisting of "
+                        f"lookup tables, but your NLU configuration's "
+                        f"'{CRFEntityExtractor.__name__}' "
+                        f"does not include the "
+                        f"'pattern' feature. To featurize lookup tables, "
+                        f"add the 'pattern' feature to the "
+                        f"'{CRFEntityExtractor.__name__}' "
+                        "in your configuration.",
+                        docs=DOCS_URL_COMPONENTS,
+                    )
 
         if (
             training_data.entity_synonyms
@@ -387,22 +407,21 @@ class DefaultV1RecipeValidator(GraphComponent):
 
     def _warn_if_no_policy_handles_default_intents(self) -> None:
         """Warns if there is no policy handling the default intents."""
-        # policies_handling_default_indents = (RulePolicy, FlowPolicy)
-        #
-        # contains_policy_handling_default_intents = any(
-        #     issubclass(node.uses, policies_handling_default_indents)
-        #     for node in self._policy_schema_nodes
-        # )
-        # if not contains_policy_handling_default_intents:
-        #     rasa.shared.utils.io.raise_warning(
-        #         f"'{RulePolicy.__name__}' is not included in the model's "
-        #         f"policy configuration. Default intents such as "
-        #         f"'{USER_INTENT_RESTART}' and '{USER_INTENT_BACK}' will "
-        #         f"not trigger actions '{ACTION_RESTART_NAME}' and "
-        #         f"'{ACTION_BACK_NAME}'.",
-        #         docs=DOCS_URL_DEFAULT_ACTIONS,
-        #     )
-        pass
+        policies_handling_default_indents = (RulePolicy, FlowPolicy)
+
+        contains_policy_handling_default_intents = any(
+            issubclass(node.uses, policies_handling_default_indents)
+            for node in self._policy_schema_nodes
+        )
+        if not contains_policy_handling_default_intents:
+            rasa.shared.utils.io.raise_warning(
+                f"'{RulePolicy.__name__}' is not included in the model's "
+                f"policy configuration. Default intents such as "
+                f"'{USER_INTENT_RESTART}' and '{USER_INTENT_BACK}' will "
+                f"not trigger actions '{ACTION_RESTART_NAME}' and "
+                f"'{ACTION_BACK_NAME}'.",
+                docs=DOCS_URL_DEFAULT_ACTIONS,
+            )
 
     def _raise_if_domain_contains_form_names_but_no_rule_policy_given(
         self, domain: Domain
@@ -412,20 +431,19 @@ class DefaultV1RecipeValidator(GraphComponent):
         Raises:
             `InvalidConfigException` if domain and rule policies do not match
         """
-        pass
-        # contains_rule_policy = any(
-        #     schema_node
-        #     for schema_node in self._graph_schema.nodes.values()
-        #     if issubclass(schema_node.uses, RulePolicy)
-        # )
-
-        # if domain.form_names and not contains_rule_policy:
-        #     raise InvalidDomain(
-        #         "You have defined a form action, but have not added the "
-        #         f"'{RulePolicy.__name__}' to your policy ensemble. "
-        #         f"Either remove all forms from your domain or add the "
-        #         f"'{RulePolicy.__name__}' to your policy configuration."
-        #     )
+        contains_rule_policy = any(
+            schema_node
+            for schema_node in self._graph_schema.nodes.values()
+            if issubclass(schema_node.uses, RulePolicy)
+        )
+
+        if domain.form_names and not contains_rule_policy:
+            raise InvalidDomain(
+                "You have defined a form action, but have not added the "
+                f"'{RulePolicy.__name__}' to your policy ensemble. "
+                f"Either remove all forms from your domain or add the "
+                f"'{RulePolicy.__name__}' to your policy configuration."
+            )
 
     def _raise_if_dm1_and_calm_policies_used_at_the_same_time(self) -> None:
         """Validates that there exists a rule policy if forms are defined.
@@ -443,13 +461,16 @@ class DefaultV1RecipeValidator(GraphComponent):
             return
 
         # if we are using a flow policy, there shouldn't be any dm1 policies
-        dm1_policies = (
-            # RulePolicy,
-            # TEDPolicy,
+        dm1_policies_list = [
+            RulePolicy,
             MemoizationPolicy,
             AugmentedMemoizationPolicy,
-            # UnexpecTEDIntentPolicy,
-        )
+        ]
+        if TED_POLICY_AVAILABLE:
+            dm1_policies_list.append(TEDPolicy)
+        if UNEXPECTED_INTENT_POLICY_AVAILABLE:
+            dm1_policies_list.append(UnexpecTEDIntentPolicy)
+        dm1_policies = tuple(dm1_policies_list)
 
         for schema_node in self._graph_schema.nodes.values():
             if issubclass(schema_node.uses, dm1_policies):
@@ -469,11 +490,10 @@ class DefaultV1RecipeValidator(GraphComponent):
             `InvalidDomain` if domain and rule policies do not match
         """
         for schema_node in self._graph_schema.nodes.values():
-            # if schema_node.uses == RulePolicy:
-            #     RulePolicy.raise_if_incompatible_with_domain(
-            #         config=schema_node.config, domain=domain
-            #     )
-            pass
+            if schema_node.uses == RulePolicy:
+                RulePolicy.raise_if_incompatible_with_domain(
+                    config=schema_node.config, domain=domain
+                )
 
     def _validate_policy_priorities(self) -> None:
         """Checks if every policy has a valid priority value.
@@ -529,22 +549,20 @@ class DefaultV1RecipeValidator(GraphComponent):
         )
 
         if consuming_rule_data and not contains_rule_tracker:
-            # rasa.shared.utils.io.raise_warning(
-            #     f"Found a rule-based policy in your configuration but "
-            #     f"no rule-based training data. Please add rule-based "
-            #     f"stories to your training data or "
-            #     f"remove the rule-based policy "
-            #     f"(`{RulePolicy.__name__}`) from your "
-            #     f"your configuration.",
-            #     docs=DOCS_URL_RULES,
-            # )
-            pass
+            rasa.shared.utils.io.raise_warning(
+                f"Found a rule-based policy in your configuration but "
+                f"no rule-based training data. Please add rule-based "
+                f"stories to your training data or "
+                f"remove the rule-based policy "
+                f"(`{RulePolicy.__name__}`) from your "
+                f"your configuration.",
+                docs=DOCS_URL_RULES,
+            )
         elif not consuming_rule_data and contains_rule_tracker:
-            # rasa.shared.utils.io.raise_warning(
-            #     f"Found rule-based training data but no policy supporting rule-based "
-            #     f"data. Please add `{RulePolicy.__name__}` "
-            #     f"or another rule-supporting "
-            #     f"policy to the `policies` section in `{DEFAULT_CONFIG_PATH}`.",
-            #     docs=DOCS_URL_RULES,
-            # )
-            pass
+            rasa.shared.utils.io.raise_warning(
+                f"Found rule-based training data but no policy supporting rule-based "
+                f"data. Please add `{RulePolicy.__name__}` "
+                f"or another rule-supporting "
+                f"policy to the `policies` section in `{DEFAULT_CONFIG_PATH}`.",
+                docs=DOCS_URL_RULES,
+            )

rasa/model_manager/model_api.py

@@ -39,11 +39,9 @@ from rasa.model_manager.trainer_service import (
     update_training_status,
 )
 from rasa.model_manager.utils import (
-    InvalidPathException,
     get_logs_content,
     logs_base_path,
     models_base_path,
-    subpath,
 )
 from rasa.model_manager.warm_rasa_process import (
     initialize_warm_rasa_process,
@@ -53,6 +51,7 @@ from rasa.server import ErrorResponse
 from rasa.shared.exceptions import InvalidConfigException
 from rasa.shared.utils.yaml import dump_obj_as_yaml_to_string
 from rasa.studio.upload import build_calm_import_parts
+from rasa.utils.io import InvalidPathException, subpath
 
 dotenv.load_dotenv()
 
@@ -571,10 +570,10 @@ def external_blueprint() -> Blueprint:
     """Create a blueprint for the model manager API."""
     from rasa.core.channels.socketio import SocketBlueprint
 
-    sio = AsyncServer(async_mode="sanic", cors_allowed_origins="*")
-    bp = SocketBlueprint(sio, "", "model_api_external")
+    sio_server = AsyncServer(async_mode="sanic", cors_allowed_origins="*")
+    bp = SocketBlueprint(sio_server, "", "model_api_external")
 
-    create_bridge_server(sio, running_bots)
+    create_bridge_server(sio_server, running_bots)
 
     @bp.get("/health")
     async def health(request: Request) -> response.HTTPResponse:

rasa/model_manager/runner_service.py

@@ -15,11 +15,11 @@ from rasa.model_manager import config
 from rasa.model_manager.utils import (
     logs_path,
     models_base_path,
-    subpath,
     write_encoded_data_to_file,
 )
 from rasa.model_manager.warm_rasa_process import start_rasa_process
 from rasa.studio.prompts import handle_prompts
+from rasa.utils.io import subpath
 
 structlogger = structlog.get_logger()
 

rasa/model_manager/socket_bridge.py

@@ -1,4 +1,3 @@
-import json
 from typing import Any, Dict, Optional
 
 import structlog
@@ -19,7 +18,7 @@ socket_proxy_clients = {}
 
 
 async def socketio_websocket_traffic_wrapper(
-    sio: AsyncServer,
+    sio_server: AsyncServer,
     running_bots: Dict[str, BotSession],
     sid: str,
     auth: Optional[Dict],
@@ -55,7 +54,9 @@ async def socketio_websocket_traffic_wrapper(
         structlogger.error("model_runner.bot_not_alive", deployment_id=deployment_id)
         raise ConnectionRefusedError("model_runner.bot_not_alive")
 
-    client = await create_bridge_client(sio, bot.internal_url, sid, deployment_id)
+    client = await create_bridge_client(
+        sio_server, bot.internal_url, sid, deployment_id
+    )
 
     if client.sid is not None:
         structlogger.debug(
@@ -70,20 +71,24 @@ async def socketio_websocket_traffic_wrapper(
         raise ConnectionRefusedError("model_runner.bot_connection_failed")
 
 
-def create_bridge_server(sio: AsyncServer, running_bots: Dict[str, BotSession]) -> None:
+def create_bridge_server(
+    sio_server: AsyncServer, running_bots: Dict[str, BotSession]
+) -> None:
     """Create handlers for the socket server side.
 
     Forwards messages coming from the user to the bot.
     """
 
-    @sio.on("connect")
+    @sio_server.on("connect")
     async def socketio_websocket_traffic(
         sid: str, environ: Dict, auth: Optional[Dict]
     ) -> bool:
         """Bridge websockets between user chat socket and bot server."""
-        return await socketio_websocket_traffic_wrapper(sio, running_bots, sid, auth)
+        return await socketio_websocket_traffic_wrapper(
+            sio_server, running_bots, sid, auth
+        )
 
-    @sio.on("disconnect")
+    @sio_server.on("disconnect")
     async def disconnect(sid: str) -> None:
         """Disconnect the bot connection."""
         structlogger.debug("model_runner.bot_disconnect", sid=sid)
@@ -91,7 +96,7 @@ def create_bridge_server(sio: AsyncServer, running_bots: Dict[str, BotSession])
             await socket_proxy_clients[sid].disconnect()
             del socket_proxy_clients[sid]
 
-    @sio.on("*")
+    @sio_server.on("*")
     async def handle_message(event: str, sid: str, data: Dict[str, Any]) -> None:
         """Bridge messages between user and bot.
 
@@ -108,7 +113,7 @@ def create_bridge_server(sio: AsyncServer, running_bots: Dict[str, BotSession])
 
 
 async def create_bridge_client(
-    sio: AsyncServer, url: str, sid: str, deployment_id: str
+    sio_server: AsyncServer, url: str, sid: str, deployment_id: str
 ) -> AsyncClient:
     """Create a new socket bridge client.
 
@@ -123,36 +128,36 @@ async def create_bridge_client(
         structlogger.debug(
             "model_runner.bot_session_confirmed", deployment_id=deployment_id
         )
-        await sio.emit("session_confirm", room=sid)
+        await sio_server.emit("session_confirm", room=sid)
 
     @client.event  # type: ignore[misc]
     async def bot_message(data: Dict[str, Any]) -> None:
         structlogger.debug("model_runner.bot_message", deployment_id=deployment_id)
-        await sio.emit("bot_message", data, room=sid)
+        await sio_server.emit("bot_message", data, room=sid)
 
     @client.event  # type: ignore[misc]
     async def error(data: Dict[str, Any]) -> None:
         structlogger.debug(
             "model_runner.bot_error", deployment_id=deployment_id, data=data
         )
-        await sio.emit("error", data, room=sid)
+        await sio_server.emit("error", data, room=sid)
 
     @client.event  # type: ignore[misc]
     async def tracker(data: Dict[str, Any]) -> None:
-        await sio.emit("tracker", json.loads(data), room=sid)
+        await sio_server.emit("tracker", data, room=sid)
 
     @client.event  # type: ignore[misc]
     async def disconnect() -> None:
         structlogger.debug(
             "model_runner.bot_connection_closed", deployment_id=deployment_id
         )
-        await sio.emit("disconnect", room=sid)
+        await sio_server.emit("disconnect", room=sid)
 
     @client.event  # type: ignore[misc]
     async def connect_error() -> None:
         structlogger.error(
             "model_runner.bot_connection_error", deployment_id=deployment_id
         )
-        await sio.emit("disconnect", room=sid)
+        await sio_server.emit("disconnect", room=sid)
 
     return client

rasa/model_manager/trainer_service.py

@@ -14,7 +14,6 @@ from rasa.model_manager.utils import (
     ensure_base_directory_exists,
     logs_path,
     models_base_path,
-    subpath,
     write_encoded_data_to_file,
 )
 from rasa.model_manager.warm_rasa_process import (
@@ -22,6 +21,7 @@ from rasa.model_manager.warm_rasa_process import (
 )
 from rasa.model_training import generate_random_model_name
 from rasa.studio.prompts import handle_prompts
+from rasa.utils.io import subpath
 
 structlogger = structlog.get_logger()
 
@@ -53,6 +53,15 @@ class TrainingSession(BaseModel):
         """Check if the training is running."""
         return self.status == TrainingSessionStatus.RUNNING
 
+    def has_just_finished(self) -> bool:
+        if not self.is_status_indicating_alive():
+            # skip if the training is not running
+            return False
+        if self.process.poll() is None:
+            # process is still running
+            return False
+        return True
+
     def model_path(self) -> str:
         """Return the path to the model."""
         return subpath(models_base_path(), f"{self.model_name}.tar.gz")
@@ -89,14 +98,8 @@ def terminate_training(training: TrainingSession) -> None:
 
 
 def update_training_status(training: TrainingSession) -> None:
-    if not training.is_status_indicating_alive():
-        # skip if the training is not running
-        return
-    if training.process.poll() is None:
-        # process is still running
-        return
-
-    complete_training(training)
+    if training.has_just_finished():
+        complete_training(training)
 
 
 def complete_training(training: TrainingSession) -> None:

rasa/model_manager/utils.py

@@ -5,15 +5,11 @@ from typing import Optional
 import structlog
 
 from rasa.model_manager import config
-from rasa.shared.exceptions import RasaException
+from rasa.utils.io import subpath
 
 structlogger = structlog.get_logger()
 
 
-class InvalidPathException(RasaException):
-    """Raised if a path is invalid - e.g. path traversal is detected."""
-
-
 def write_encoded_data_to_file(encoded_data: bytes, file: str) -> None:
     """Write base64 encoded data to a file."""
     # create the directory if it does not exist of the parent directory
@@ -53,30 +49,6 @@ def logs_path(action_id: str) -> str:
     return subpath(logs_base_path(), f"{action_id}.txt")
 
 
-def subpath(parent: str, child: str) -> str:
-    """Return the path to the child directory of the parent directory.
-
-    Ensures, that child doesn't navigate to parent directories. Prevents
-    path traversal. Raises an InvalidPathException if the path is invalid.
-
-    Based on Snyk's directory traversal mitigation:
-    https://learn.snyk.io/lesson/directory-traversal/
-    """
-    safe_path = os.path.abspath(os.path.join(parent, child))
-    parent = os.path.abspath(parent)
-
-    common_base = os.path.commonpath([parent, safe_path])
-    if common_base != parent:
-        raise InvalidPathException(f"Invalid path: {safe_path}")
-
-    if os.path.basename(safe_path) != child:
-        raise InvalidPathException(
-            f"Invalid path - path traversal detected: {safe_path}"
-        )
-
-    return safe_path
-
-
 def get_logs_content(action_id: str) -> Optional[str]:
     """Return the content of the log file for a given action id."""
     try:

rasa/model_manager/warm_rasa_process.py

@@ -157,8 +157,8 @@ def warmup() -> None:
         import pandas  # noqa: F401
         import presidio_analyzer  # noqa: F401
         import spacy  # noqa: F401
+        import tensorflow  # noqa: F401
 
-        # import tensorflow
         import rasa.validator  # noqa: F401
     except ImportError:
         pass