Google Assistant request sync service

homeassistant/components/google_assistant/__init__.py

@@ -16,10 +16,14 @@
 from typing import Dict, Any  # NOQA
 
 from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.loader import bind_hass
 
 from .const import (
     DOMAIN, CONF_PROJECT_ID, CONF_CLIENT_ID, CONF_ACCESS_TOKEN,
-    CONF_EXPOSE_BY_DEFAULT, CONF_EXPOSED_DOMAINS
+    CONF_EXPOSE_BY_DEFAULT, CONF_EXPOSED_DOMAINS, 
+    CONF_AGENT_USER_ID, CONF_HOMEGRAPH_API_KEY, 
+    SERVICE_REQUEST_SYNC, REQUEST_SYNC_BASE_URL
 )
 from .auth import GoogleAssistantAuthView
 from .http import GoogleAssistantView
@@ -36,10 +40,15 @@
             vol.Required(CONF_ACCESS_TOKEN): cv.string,
             vol.Optional(CONF_EXPOSE_BY_DEFAULT): cv.boolean,
             vol.Optional(CONF_EXPOSED_DOMAINS): cv.ensure_list,
+            vol.Required(CONF_AGENT_USER_ID): cv.string,
+            vol.Required(CONF_HOMEGRAPH_API_KEY): cv.string
         }
     },
     extra=vol.ALLOW_EXTRA)
 
+def request_sync(hass):
+    """Request sync."""
+    hass.services.call(DOMAIN, SERVICE_REQUEST_SYNC)
 
 @asyncio.coroutine
 def async_setup(hass: HomeAssistant, yaml_config: Dict[str, Any]):
@@ -49,4 +58,24 @@ def async_setup(hass: HomeAssistant, yaml_config: Dict[str, Any]):
     hass.http.register_view(GoogleAssistantAuthView(hass, config))
     hass.http.register_view(GoogleAssistantView(hass, config))
 
+    @asyncio.coroutine
+    def request_sync_service_handler(call):
+        """Handle request sync service calls."""
+        #Code to execute request sync goes here
+        websession = async_get_clientsession(hass) 
+        try:
+            agent_user_id = config.get(CONF_AGENT_USER_ID)
+            with async_timeout.timeout(5, loop=hass.loop):
+                req = yield from session.post(
+                                  REQUEST_SYNC_BASE_URL+CONF_HOMEGRAPH_API_KEY, 
+                                  json={'agent_user_id': agent_user_id})
+                _LOGGER.info("Submitted request_sync request to Google")
+        except (asyncio.TimeoutError, aiohttp.ClientError):
+                _LOGGER.error("Could not contact Google for request_sync")
+        return None
+
+    hass.services.async_register(
+               DOMAIN, SERVICE_REQUEST_SYNC, request_sync_service_handler,
+               descriptions.get(SERVICE_REQUEST_SYNC))
+
     return True

homeassistant/components/google_assistant/const.py

@@ -12,6 +12,8 @@
 CONF_ACCESS_TOKEN = 'access_token'
 CONF_CLIENT_ID = 'client_id'
 CONF_ALIASES = 'aliases'
+CONF_AGENT_USER_ID = 'agent_user_id'
+CONF_HOMEGRAPH_API_KEY = 'homegraph_api_key'
 
 DEFAULT_EXPOSE_BY_DEFAULT = True
 DEFAULT_EXPOSED_DOMAINS = [
@@ -35,3 +37,7 @@
 TYPE_LIGHT = PREFIX_TYPES + 'LIGHT'
 TYPE_SWITCH = PREFIX_TYPES + 'SWITCH'
 TYPE_SCENE = PREFIX_TYPES + 'SCENE'
+
+SERVICE_REQUEST_SYNC = 'request_sync'
+HOMEGRAPH_URL = 'https://homegraph.googleapis.com/'
+REQUEST_SYNC_BASE_URL = HOMEGRAPH_URL + 'v1/devices:requestSync?key='

homeassistant/components/google_assistant/http.py

@@ -26,7 +26,9 @@
     DEFAULT_EXPOSED_DOMAINS,
     CONF_EXPOSE_BY_DEFAULT,
     CONF_EXPOSED_DOMAINS,
-    ATTR_GOOGLE_ASSISTANT)
+    ATTR_GOOGLE_ASSISTANT,
+    CONF_AGENT_USER_ID
+    )
 from .smart_home import entity_to_device, query_device, determine_service
 
 _LOGGER = logging.getLogger(__name__)
@@ -48,6 +50,7 @@ def __init__(self, hass: HomeAssistant, cfg: Dict[str, Any]) -> None:
                                          DEFAULT_EXPOSE_BY_DEFAULT)
         self.exposed_domains = cfg.get(CONF_EXPOSED_DOMAINS,
                                        DEFAULT_EXPOSED_DOMAINS)
+        self.agent_user_id = cfg.get(CONF_AGENT_USER_ID)
 
     def is_entity_exposed(self, entity) -> bool:
         """Determine if an entity should be exposed to Google Assistant."""
@@ -85,7 +88,9 @@ def handle_sync(self, hass: HomeAssistant, request_id: str):
             devices.append(device)
 
         return self.json(
-            make_actions_response(request_id, {'devices': devices}))
+            make_actions_response(request_id, 
+            		{'agentUserId': self.agent_user_id, 
+            		'devices': devices}))
 
     @asyncio.coroutine
     def handle_query(self,