Merge branch 'release/0.3.4'

Author: treethought

flask_assistant/response.py

@@ -4,7 +4,7 @@
 class _Response(object):
     """Base webhook response to be returned to Dialogflow"""
 
-    def __init__(self, speech):
+    def __init__(self, speech, display_text=None, is_ssml=False):
 
         self._speech = speech
         self._integrations = current_app.config.get("INTEGRATIONS", [])
@@ -26,22 +26,40 @@ def __init__(self, speech):
         }
 
         if "ACTIONS_ON_GOOGLE" in self._integrations:
-            self._integrate_with_actions(speech)
+            self._integrate_with_actions(speech, display_text, is_ssml)
 
-    def add_msg(self, speech):
+    def add_msg(self, speech, display_text=None, is_ssml=False):
         self._messages.append({"text": {"text": [speech]}})
         if "ACTIONS_ON_GOOGLE" in self._integrations:
-            self._integrate_with_actions(speech)
+            self._integrate_with_actions(speech, display_text, is_ssml)
 
         return self
 
-    def _integrate_with_actions(self, speech=None):
-        self._messages.append(
-            {
-                "platform": "ACTIONS_ON_GOOGLE",
-                "simpleResponses": {"simpleResponses": [{"textToSpeech": speech}]},
-            }
-        )
+    def _integrate_with_actions(self, speech=None, display_text=None, is_ssml=False):
+
+        if is_ssml:
+            ssml_speech = "<speak>" + speech + "</speak>"
+            self._messages.append(
+                {
+                    "platform": "ACTIONS_ON_GOOGLE",
+                    "simpleResponses": {
+                        "simpleResponses": [
+                            {"ssml": ssml_speech, "displayText": display_text}
+                        ]
+                    },
+                }
+            )
+        else:
+            self._messages.append(
+                {
+                    "platform": "ACTIONS_ON_GOOGLE",
+                    "simpleResponses": {
+                        "simpleResponses": [
+                            {"textToSpeech": speech, "displayText": display_text}
+                        ]
+                    },
+                }
+            )
 
     def _include_contexts(self):
         from flask_assistant import core
@@ -246,20 +264,20 @@ def _add_message(self):
 
 
 class tell(_Response):
-    def __init__(self, speech):
-        super(tell, self).__init__(speech)
+    def __init__(self, speech, display_text=None, is_ssml=False):
+        super(tell, self).__init__(speech, display_text, is_ssml)
         self._response["payload"]["google"]["expect_user_response"] = False
 
 
 class ask(_Response):
-    def __init__(self, speech):
+    def __init__(self, speech, display_text=None, is_ssml=False):
         """Returns a response to the user and keeps the current session alive.
         Expects a response from the user.
 
         Arguments:
             speech {str} --  Text to be pronounced to the user / shown on the screen
         """
-        super(ask, self).__init__(speech)
+        super(ask, self).__init__(speech, display_text, is_ssml)
         self._response["payload"]["google"]["expect_user_response"] = True
 
     def reprompt(self, prompt):

setup.py

@@ -11,7 +11,7 @@
 
 setup(
     name="Flask-Assistant",
-    version="0.3.3",
+    version="0.3.4",
     url="https://github.com/treethought/flask-assistant",
     license="Apache 2.0",
     author="Cam Sweeney",