Revert "dump NLU data in original order"

This reverts commit 53c7b02.

Author: wochinge

CHANGELOG.rst

@@ -15,8 +15,6 @@ Added
 
 Changed
 -------
-- When NLU training data is dumped as Markdown file the intents are not longer ordered
-  alphabetically, but in the original order of given training data
 
 Removed
 -------

rasa/nlu/training_data/formats/markdown.py

@@ -211,31 +211,23 @@ def dumps(self, training_data: "TrainingData") -> Text:
     def _generate_training_examples_md(self, training_data: "TrainingData") -> Text:
         """Generates markdown training examples."""
 
-        from collections import defaultdict
-
-        training_examples = defaultdict(list)
-
-        # Sort by intent while keeping basic intent order
-        for example in [e.as_dict_nlu() for e in training_data.training_examples]:
-            intent = example[MESSAGE_INTENT_ATTRIBUTE]
-            training_examples[intent].append(example)
-
+        # Sort training data by intent
+        training_examples = sorted(
+            [e.as_dict_nlu() for e in training_data.training_examples],
+            key=lambda k: k[MESSAGE_INTENT_ATTRIBUTE],
+        )
         md = ""
+        for i, example in enumerate(training_examples):
+            intent = training_examples[i - 1][MESSAGE_INTENT_ATTRIBUTE]
+            if i == 0 or intent != example[MESSAGE_INTENT_ATTRIBUTE]:
+                md += self._generate_section_header_md(
+                    INTENT,
+                    example[MESSAGE_INTENT_ATTRIBUTE],
+                    example.get(MESSAGE_RESPONSE_KEY_ATTRIBUTE, None),
+                    i != 0,
+                )
 
-        for intent, examples in training_examples.items():
-            for i, example in enumerate(examples):
-                did_intent_change = i == 0
-                is_first_line = md == ""
-
-                if did_intent_change:
-                    md += self._generate_section_header_md(
-                        INTENT,
-                        intent,
-                        example.get(MESSAGE_RESPONSE_KEY_ATTRIBUTE, None),
-                        not is_first_line,
-                    )
-
-                md += self._generate_item_md(self._generate_message_md(example))
+            md += self._generate_item_md(self._generate_message_md(example))
 
         return md
 

tests/nlu/base/test_training_data.py

@@ -595,19 +595,3 @@ def test_section_value_with_delimiter():
         "data/test/markdown_single_sections/section_with_delimiter.md"
     )
     assert td_section_with_delimiter.entity_synonyms == {"10:00 am": "10:00"}
-
-
-def test_markdown_order():
-    r = MarkdownReader()
-
-    md = """## intent:z
-- i'm looking for a place to eat
-- i'm looking for a place in the [north](loc-direction) of town
-
-## intent:a
-- intent a
-- also very important
-"""
-
-    training_data = r.reads(md)
-    assert training_data.nlu_as_markdown() == md