Merge branch '1.10.x' into release-script-alpha

Author: m-vdb

rasa/cli/arguments/test.py

@@ -191,6 +191,6 @@ def add_no_plot_param(
         dest="disable_plotting",
         action="store_true",
         default=default,
-        help=f"Don't render evaluation plots",
+        help="Don't render evaluation plots",
         required=required,
     )

rasa/cli/export.py

@@ -220,7 +220,7 @@ def _get_continuation_command(exporter: "Exporter", timestamp: float) -> Text:
 
     """
     # build CLI command command based on supplied timestamp and options
-    command = f"rasa export"
+    command = "rasa export"
 
     if exporter.endpoints_path is not None:
         command += f" --endpoints {exporter.endpoints_path}"

rasa/cli/scaffold.py

@@ -63,7 +63,6 @@ def print_train_or_instructions(args: argparse.Namespace, path: Text) -> None:
         print_success(
             "No problem 👍🏼. You can also train a model later by going "
             "to the project directory and running 'rasa train'."
-            "".format(path)
         )
 
 
@@ -103,15 +102,13 @@ def print_run_or_instructions(args: argparse.Namespace, path: Text) -> None:
                 "If you want to speak to the assistant, "
                 "run 'rasa shell' at any time inside "
                 "the project directory."
-                "".format(path)
             )
         else:
             print_success(
                 "Ok 👍🏼. "
                 "If you want to speak to the assistant, "
                 "run 'rasa shell' at any time inside "
                 "the project directory."
-                "".format(path)
             )
 
 

rasa/core/exporter.py

@@ -140,9 +140,9 @@ def _get_conversation_ids_in_tracker(self) -> Set[Text]:
             return conversation_ids_in_tracker_store
 
         raise NoConversationsInTrackerStoreError(
-            f"Could not find any conversations in connected tracker store. "
-            f"Please validate your `endpoints.yml` and make sure the defined "
-            f"tracker store exists. Exiting."
+            "Could not find any conversations in connected tracker store. "
+            "Please validate your `endpoints.yml` and make sure the defined "
+            "tracker store exists. Exiting."
         )
 
     def _validate_all_requested_ids_exist(

rasa/core/policies/embedding_policy.py

@@ -162,8 +162,8 @@ def __init__(
         super().__init__(featurizer, priority, max_history, model, **kwargs)
 
         common_utils.raise_warning(
-            f"'EmbeddingPolicy' is deprecated and will be removed in version 2.0. "
-            f"Use 'TEDPolicy' instead.",
+            "'EmbeddingPolicy' is deprecated and will be removed in version 2.0. "
+            "Use 'TEDPolicy' instead.",
             category=FutureWarning,
             docs=DOCS_URL_MIGRATION_GUIDE,
         )

rasa/core/training/story_conflict.py

@@ -74,9 +74,7 @@ def __str__(self) -> Text:
         if last_event_type:
             conflict_message = f"Story structure conflict after {last_event_type} '{last_event_name}':\n"
         else:
-            conflict_message = (
-                f"Story structure conflict at the beginning of stories:\n"
-            )
+            conflict_message = "Story structure conflict at the beginning of stories:\n"
 
         # List which stories are in conflict with one another
         for action, stories in self._conflicting_actions.items():

rasa/nlu/classifiers/diet_classifier.py

@@ -869,7 +869,7 @@ def persist(self, file_name: Text, model_dir: Text) -> Dict[Text, Any]:
         )
 
         entity_tag_specs = (
-            [l._asdict() for l in self._entity_tag_specs]
+            [tag_spec._asdict() for tag_spec in self._entity_tag_specs]
             if self._entity_tag_specs
             else []
         )

rasa/nlu/featurizers/sparse_featurizer/regex_featurizer.py

@@ -141,8 +141,8 @@ def _generate_lookup_regex(
         if isinstance(lookup_elements, list):
             elements_to_regex = lookup_elements
             common_utils.raise_warning(
-                f"Directly including lookup tables as a list is deprecated since Rasa "
-                f"1.6.",
+                "Directly including lookup tables as a list is deprecated since Rasa "
+                "1.6.",
                 FutureWarning,
                 docs=DOCS_URL_TRAINING_DATA_NLU + "#lookup-tables",
             )

rasa/nlu/test.py

@@ -246,7 +246,7 @@ def remove_empty_response_examples(
 
 def clean_labels(labels: Iterable[Any]) -> List[Text]:
     """Get rid of `None` intents. sklearn metrics do not support them."""
-    return [l if l is not None else "" for l in labels]
+    return [label if label is not None else "" for label in labels]
 
 
 def drop_intents_below_freq(td: TrainingData, cutoff: int = 5) -> TrainingData:

rasa/nlu/training_data/formats/markdown.py

@@ -169,7 +169,9 @@ def _parse_item(self, line: Text) -> None:
     def _add_item_to_lookup(self, item: Text) -> None:
         """Takes a list of lookup table dictionaries.  Finds the one associated
         with the current lookup, then adds the item to the list."""
-        matches = [l for l in self.lookup_tables if l["name"] == self.current_title]
+        matches = [
+            table for table in self.lookup_tables if table["name"] == self.current_title
+        ]
         if not matches:
             self.lookup_tables.append({"name": self.current_title, "elements": [item]})
         else: