Merge branch 'release/0.3.7'

Author: treethought

.gitignore

@@ -23,6 +23,7 @@ var/
 *.egg-info/
 .installed.cfg
 *.egg
+MANIFEST
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -37,31 +38,72 @@ pip-delete-this-directory.txt
 # Unit test / coverage reports
 htmlcov/
 .tox/
+.nox/
 .coverage
+.coverage.*
 .cache
 nosetests.xml
 coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
 
 # Translations
 *.mo
 *.pot
 
 # Django stuff:
 *.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
 
 # Sphinx documentation
 docs/_build/
 
 # PyBuilder
 target/
 
+# IPython
+profile_default/
+ipython_config.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don’t work, or not
+#   install all needed dependencies.
+Pipfile.lock
+
+# pyenv
+.python-version
+
+
 # Pycharm
 .idea/
 
-# Virtualenv
-venv/
+# vscode
+.vscode
+
 
-###SublimeText###
+# SublimeText
 
 # cache files for sublime text
 *.tmlanguage.cache
@@ -76,4 +118,18 @@ venv/
 *.sublime-project
 
 # sftp configuration file
-sftp-config.json
+sftp-config.json
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/

flask_assistant/__init__.py

@@ -19,6 +19,7 @@
     intent,
     request,
     access_token,
+    user,
 )
 
 from flask_assistant.response import ask, tell, event, build_item, permission

flask_assistant/core.py

@@ -39,6 +39,7 @@ def find_assistant():  # Taken from Flask-ask courtesy of @voutilad
 context_manager = LocalProxy(lambda: find_assistant().context_manager)
 convert_errors = LocalProxy(lambda: find_assistant().convert_errors)
 session_id = LocalProxy(lambda: find_assistant().session_id)
+user = LocalProxy(lambda: find_assistant().user)
 
 # Converter shorthands for commonly used system entities
 _converter_shorthands = {
@@ -220,6 +221,14 @@ def session_id(self):
     def session_id(self, value):
         _app_ctx_stack.top._assist_session_id = value
 
+    @property
+    def user(self):
+        return getattr(_app_ctx_stack.top, "_assist_user", {})
+
+    @user.setter
+    def user(self, value):
+        _app_ctx_stack.top._assist_user = value
+
     def _register_context_to_func(self, intent_name, context=[]):
         required = self._required_contexts.get(intent_name)
         if required:
@@ -367,8 +376,16 @@ def _flask_assitant_view_func(self, nlp_result=None, *args, **kwargs):
         # TODO: acces context_manager from assist, instead of own object
         self.context_manager._assist = self
 
-        # Get access token from request
+        
         original_request = self.request.get("originalDetectIntentRequest")
+        
+        if original_request:
+            payload = original_request.get('payload')
+            if payload and payload.get('user'):
+                self.user = original_request["payload"]["user"]
+            
+
+        # Get access token from request
         if original_request and original_request.get("user"):
             self.access_token = original_request["user"].get("accessToken")
 

flask_assistant/integrations/google.py

@@ -1,3 +1,6 @@
+from flask_assistant import logger
+
+
 def parse_context_name(context_obj):
     """Parses context name from Dialogflow's contextsession prefixed context path"""
     return context_obj["name"].split("/contexts/")[1]
@@ -69,6 +72,7 @@ def get(self, context_name, default=None):
     def set(self, context_name, param, val):
         context = self.get(context_name)
         context.set(param, val)
+        self._cache[context.name] = context
         return context
 
     def get_param(self, context_name, param):
@@ -83,6 +87,15 @@ def update(self, contexts_json):
             context.parameters = obj.get("parameters", {})
             self._cache[context.name] = context
 
+    def clear_all(self):
+        logger.info("Clearing all contexts")
+        new_cache = {}
+        for name, context in self._cache.items():
+            context.lifespan = 0
+            new_cache[name] = context
+
+        self._cache = new_cache
+
     @property
     def status(self):
         return {"Active contexts": self.active, "Expired contexts": self.expired}

flask_assistant/manager.py

@@ -28,14 +28,21 @@ def __init__(self, speech, display_text=None, is_ssml=False):
         }
 
         if "ACTIONS_ON_GOOGLE" in self._integrations:
+            self._set_user_storage()
             self._integrate_with_actions(self._speech, self._display_text, is_ssml)
 
     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, display_text, is_ssml)
 
-        return self
+    def _set_user_storage(self):
+        from flask_assistant.core import user
+
+        # If empty or unspecified,
+        # the existing persisted token will be unchanged.
+        if user.get("userStorage"):
+            self._response["payload"]["google"]["userStorage"] = user["userStorage"]
 
     def _integrate_with_actions(self, speech=None, display_text=None, is_ssml=False):
         if display_text is None:
@@ -313,16 +320,26 @@ class permission(_Response):
     Arguments:
         permissions {list} -- list of permissions to request for eg. ['DEVICE_PRECISE_LOCATION']
         context {str} -- Text explaining the reason/value for the requested permission
+        update_intent {str} -- name of the intent that the user wants to get updates from
     """
 
-    def __init__(self, permissions, context=None):
+    def __init__(self, permissions, context=None, update_intent=None):
         super(permission, self).__init__(speech=None)
         self._messages[:] = []
+
+        if isinstance(permissions, str):
+            permissions = [permissions]
+
+        if "UPDATE" in permissions and update_intent is None:
+            raise ValueError("update_intent is required to ask for UPDATE permission")
+
         self._response["payload"]["google"]["systemIntent"] = {
             "intent": "actions.intent.PERMISSION",
             "data": {
                 "@type": "type.googleapis.com/google.actions.v2.PermissionValueSpec",
                 "optContext": context,
                 "permissions": permissions,
+                "updatePermissionValueSpec": {"intent": update_intent},
             },
         }
+