Merge pull request #4251 from RasaHQ/granular-fingerprint

Avoid retraining Core model if only templates section is changed

CHANGELOG.rst

@@ -17,6 +17,7 @@ Added
 
 Changed
 -------
+- Do not retrain the entire Core model if only the ``templates`` section of the domain is changed.
 
 Removed
 -------
@@ -228,7 +229,6 @@ Changed
 -------
 - Pin gast to == 0.2.2
 
-
 [1.3.0] - 2019-09-05
 ^^^^^^^^^^^^^^^^^^^^
 

rasa/cli/x.py

@@ -347,7 +347,7 @@ def run_in_production(args: argparse.Namespace):
 
 
 def _get_credentials_and_endpoints_paths(
-    args: argparse.Namespace
+    args: argparse.Namespace,
 ) -> Tuple[Optional[Text], Optional[Text]]:
     config_endpoint = args.config_endpoint
     if config_endpoint:

rasa/constants.py

@@ -9,6 +9,7 @@
 DEFAULT_DATA_PATH = "data"
 DEFAULT_RESULTS_PATH = "results"
 DEFAULT_NLU_RESULTS_PATH = "nlu_comparison_results"
+DEFAULT_CORE_SUBDIRECTORY_NAME = "core"
 DEFAULT_REQUEST_TIMEOUT = 60 * 5  # 5 minutes
 
 TEST_DATA_FILE = "test.md"

rasa/core/agent.py

@@ -12,7 +12,12 @@
 import rasa
 import rasa.utils.io
 import rasa.core.utils
-from rasa.constants import DEFAULT_DOMAIN_PATH, LEGACY_DOCS_BASE_URL, ENV_SANIC_BACKLOG
+from rasa.constants import (
+    DEFAULT_DOMAIN_PATH,
+    LEGACY_DOCS_BASE_URL,
+    ENV_SANIC_BACKLOG,
+    DEFAULT_CORE_SUBDIRECTORY_NAME,
+)
 from rasa.core import constants, jobs, training
 from rasa.core.channels.channel import InputChannel, OutputChannel, UserMessage
 from rasa.core.constants import DEFAULT_REQUEST_TIMEOUT
@@ -764,8 +769,8 @@ def persist(self, model_path: Text, dump_flattened_stories: bool = False) -> Non
         if not self.is_core_ready():
             raise AgentNotReady("Can't persist without a policy ensemble.")
 
-        if not model_path.endswith("core"):
-            model_path = os.path.join(model_path, "core")
+        if not model_path.endswith(DEFAULT_CORE_SUBDIRECTORY_NAME):
+            model_path = os.path.join(model_path, DEFAULT_CORE_SUBDIRECTORY_NAME)
 
         self._clear_model_directory(model_path)
 

rasa/core/brokers/utils.py

@@ -14,7 +14,7 @@
 
 
 def from_endpoint_config(
-    broker_config: Optional[EndpointConfig]
+    broker_config: Optional[EndpointConfig],
 ) -> Optional["EventChannel"]:
     """Instantiate an event channel based on its configuration."""
 
@@ -41,7 +41,7 @@ def from_endpoint_config(
 
 
 def load_event_channel_from_module_string(
-    broker_config: EndpointConfig
+    broker_config: EndpointConfig,
 ) -> Optional["EventChannel"]:
     """Instantiate an event channel based on its class name."""
 
@@ -57,7 +57,7 @@ def load_event_channel_from_module_string(
 
 
 def create_rabbitmq_ssl_options(
-    rabbitmq_host: Optional[Text] = None
+    rabbitmq_host: Optional[Text] = None,
 ) -> Optional["pika.SSLOptions"]:
     """Create RabbitMQ SSL options.
 

rasa/core/domain.py

@@ -3,6 +3,7 @@
 import logging
 import os
 import typing
+from pathlib import Path
 from typing import Any, Dict, List, Optional, Text, Tuple, Union, Set
 
 import rasa.core.constants
@@ -664,7 +665,7 @@ def as_dict(self) -> Dict[Text, Any]:
             "forms": self.form_names,
         }
 
-    def persist(self, filename: Text) -> None:
+    def persist(self, filename: Union[Text, Path]) -> None:
         """Write domain to a file."""
 
         domain_data = self.as_dict()

rasa/core/interpreter.py

@@ -135,7 +135,7 @@ def _starts_with_intent_prefix(self, text: Text) -> bool:
 
     @staticmethod
     def extract_intent_and_entities(
-        user_input: Text
+        user_input: Text,
     ) -> Tuple[Optional[Text], float, List[Dict[Text, Any]]]:
         """Parse the user input using regexes to extract intent & entities."""
 

rasa/core/policies/ensemble.py

@@ -303,9 +303,10 @@ def from_dict(cls, policy_configuration: Dict[Text, Any]) -> List[Policy]:
                 )
 
                 if featurizer_config.get("state_featurizer"):
-                    state_featurizer_func, state_featurizer_config = cls.get_state_featurizer_from_dict(
-                        featurizer_config
-                    )
+                    (
+                        state_featurizer_func,
+                        state_featurizer_config,
+                    ) = cls.get_state_featurizer_from_dict(featurizer_config)
 
                     # override featurizer's state_featurizer
                     # with real state_featurizer class

rasa/core/test.py

@@ -345,7 +345,11 @@ def _predict_tracker_actions(
 
     for event in events[1:]:
         if isinstance(event, ActionExecuted):
-            action_executed_result, policy, confidence = _collect_action_executed_predictions(
+            (
+                action_executed_result,
+                policy,
+                confidence,
+            ) = _collect_action_executed_predictions(
                 processor, partial_tracker, event, fail_on_prediction_errors
             )
             tracker_eval_store.merge_store(action_executed_result)

rasa/core/trackers.py

@@ -262,7 +262,7 @@ def init_copy(self) -> "DialogueStateTracker":
         )
 
     def generate_all_prior_trackers(
-        self
+        self,
     ) -> Generator["DialogueStateTracker", None, None]:
         """Returns a generator of the previous trackers of this tracker.
 

rasa/core/train.py

@@ -60,7 +60,6 @@ async def train(
             "debug_plots",
         },
     )
-
     training_data = await agent.load_data(
         training_resource, exclusion_percentage=exclusion_percentage, **data_load_args
     )

rasa/core/training/structures.py

@@ -653,7 +653,7 @@ def as_story_string(self) -> Text:
 
     @staticmethod
     def order_steps(
-        story_steps: List[StoryStep]
+        story_steps: List[StoryStep],
     ) -> Tuple[deque, List[Tuple[Text, Text]]]:
         """Topological sort of the steps returning the ids of the steps."""
 
@@ -668,7 +668,7 @@ def order_steps(
 
     @staticmethod
     def _group_by_start_checkpoint(
-        story_steps: List[StoryStep]
+        story_steps: List[StoryStep],
     ) -> Dict[Text, List[StoryStep]]:
         """Returns all the start checkpoint of the steps"""
 

rasa/core/training/visualization.py

@@ -30,7 +30,7 @@ def __init__(self, nlu_training_data):
 
     @staticmethod
     def _create_reverse_mapping(
-        data: "TrainingData"
+        data: "TrainingData",
     ) -> Dict[Dict[Text, Any], List["Message"]]:
         """Create a mapping from intent to messages