Merge branch 'master' into callback-input

RasaHQ · Aug 31, 2018 · f62c071 · f62c071
2 parents d0b796d + 9473e1a
commit f62c071
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/rasa_core/nlg/callback.py b/rasa_core/nlg/callback.py
@@ -25,18 +25,18 @@ def nlg_response_format_spec():
                 "type": "string"
             },
             "buttons": {
-                "type": "array",
+                "type": ["array", "null"],
                 "items": {"type": "object"}
             },
             "elements": {
-                "type": "array",
+                "type": ["array", "null"],
                 "items": {"type": "object"}
             },
             "attachment": {
-                "type": "object"
+                "type": ["object", "null"]
             },
             "image": {
-                "type": "string"
+                "type": ["string", "null"]
             }
         },
     }

diff --git a/tests/test_nlg.py b/tests/test_nlg.py
@@ -79,3 +79,8 @@ def test_nlg_schema_validation():
 def test_nlg_schema_validation_empty_buttons():
     content = {"text": "Hey there!", "buttons": []}
     assert CallbackNaturalLanguageGenerator.validate_response(content)
+
+
+def test_nlg_schema_validation_empty_image():
+    content = {"text": "Hey there!", "image": None}
+    assert CallbackNaturalLanguageGenerator.validate_response(content)