Merge 039a5bc into 3abf8a4

CHANGELOG.rst

@@ -25,6 +25,7 @@ Removed
 Fixed
 -----
 - validation no longer throws an error during interactive learning
+- updated the server endpoint ``/model/parse`` to handle also messages with the intent prefix
 
 [1.1.6] - 2019-07-12
 ^^^^^^^^^^^^^^^^^^^^

rasa/core/agent.py

@@ -400,6 +400,36 @@ def is_ready(self):
             and self.interpreter is not None
         )
 
+    async def parse_message_using_nlu_interpreter(
+        self, message_data: Text
+    ) -> Dict[Text, Any]:
+        """Handles message text and intent payload input messages.
+
+        The return value of this function is parsed_data.
+
+        Args:
+            message_data (Text): Contain the received message in text or\
+            intent payload format.
+
+        Returns:
+            The parsed message.
+
+            Example:
+
+                {\
+                    "text": '/greet{"name":"Rasa"}',\
+                    "intent": {"name": "greet", "confidence": 1.0},\
+                    "intent_ranking": [{"name": "greet", "confidence": 1.0}],\
+                    "entities": [{"entity": "name", "start": 6,\
+                                  "end": 21, "value": "Rasa"}],\
+                }
+
+        """
+
+        processor = self.create_processor()
+        message = UserMessage(message_data)
+        return await processor._parse_message(message)
+
     async def handle_message(
         self,
         message: UserMessage,

rasa/server.py

@@ -804,10 +804,18 @@ async def parse(request: Request):
 
         try:
             data = emulator.normalise_request_json(request.json)
-            parse_data = await app.agent.interpreter.parse(
-                data.get("text"), data.get("message_id")
-            )
-            response_data = emulator.normalise_response_json(parse_data)
+            try:
+                parsed_data = await app.agent.parse_message_using_nlu_interpreter(
+                    data.get("text")
+                )
+            except Exception as e:
+                logger.debug(traceback.format_exc())
+                raise ErrorResponse(
+                    400,
+                    "ParsingError",
+                    "An unexpected error occurred. Error: {}".format(e),
+                )
+            response_data = emulator.normalise_response_json(parsed_data)
 
             return response.json(response_data)
 

tests/core/test_agent.py

@@ -83,6 +83,38 @@ async def test_agent_train(tmpdir, default_domain):
     ]
 
 
+@pytest.mark.parametrize(
+    "text_message_data, expected",
+    [
+        (
+            '/greet{"name":"Rasa"}',
+            {
+                "text": '/greet{"name":"Rasa"}',
+                "intent": {"name": "greet", "confidence": 1.0},
+                "intent_ranking": [{"name": "greet", "confidence": 1.0}],
+                "entities": [
+                    {"entity": "name", "start": 6, "end": 21, "value": "Rasa"}
+                ],
+            },
+        ),
+        (
+            "text",
+            {
+                "text": "/text",
+                "intent": {"name": "text", "confidence": 1.0},
+                "intent_ranking": [{"name": "text", "confidence": 1.0}],
+                "entities": [],
+            },
+        ),
+    ],
+)
+async def test_agent_parse_message_using_nlu_interpreter(
+    default_agent, text_message_data, expected
+):
+    result = await default_agent.parse_message_using_nlu_interpreter(text_message_data)
+    assert result == expected
+
+
 async def test_agent_handle_text(default_agent):
     text = INTENT_MESSAGE_PREFIX + 'greet{"name":"Rasa"}'
     result = await default_agent.handle_text(text, sender_id="test_agent_handle_text")