add fixes for buttons helper for #116

Author: treethought

flask_assistant/core.py

@@ -129,10 +129,9 @@ def init_app(self, app):
         app.add_url_rule(
             self._route, view_func=self._flask_assitant_view_func, methods=["POST"]
         )
-        if self.client_id is None:
+        if self.client_id is None and self.app is not None:
             self.client_id = self.app.config.get("AOG_CLIENT_ID")
 
-
     # Taken from Flask-ask courtesy of @voutilad
     def init_blueprint(self, blueprint, path="templates.yaml"):
         """Initialize a Flask Blueprint, similar to init_app, but without the access
@@ -158,11 +157,11 @@ def init_blueprint(self, blueprint, path="templates.yaml"):
         blueprint.add_url_rule(
             "", view_func=self._flask_assitant_view_func, methods=["POST"]
         )
+
         # blueprint.jinja_loader = ChoiceLoader([YamlLoader(blueprint, path)])
-        if self.client_id is None:
+        if self.client_id is None and self.app is not None:
             self.client_id = self.app.config.get("AOG_CLIENT_ID")
 
-
     @property
     def request(self):
         """Local Proxy refering to the request JSON recieved from Dialogflow"""

flask_assistant/response/actions.py

@@ -11,7 +11,10 @@ def build_card(
 
     card_payload = {"title": title, "subtitle": subtitle, "formattedText": text}
 
-    if link and link_title:
+    if buttons:
+        card_payload["buttons"] = buttons
+
+    elif link and link_title:
         btn_payload = [{"title": link_title, "openUriAction": {"uri": link}}]
         card_payload["buttons"] = btn_payload
 

flask_assistant/response/base.py

@@ -168,6 +168,7 @@ def card(
         subtitle=None,
         link=None,
         link_title=None,
+        buttons=None,
     ):
         df_card = dialogflow.build_card(
             text, title, img_url, img_alt, subtitle, link, link_title
@@ -192,7 +193,7 @@ def card(
 
         if "ACTIONS_ON_GOOGLE" in self._integrations:
             actions_card = actions.build_card(
-                text, title, img_url, img_alt, subtitle, link, link_title
+                text, title, img_url, img_alt, subtitle, link, link_title, buttons
             )
 
             self._messages.append(actions_card)
@@ -282,6 +283,10 @@ def add_media(self, url, name, description=None, icon_url=None, icon_alt=None):
         return self
 
 
+def build_button(title, link):
+    return {"title": title, "openUriAction": {"uri": link}}
+
+
 def build_item(
     title, key=None, synonyms=None, description=None, img_url=None, alt_text=None
 ):