Merge "Updates SDK sample and updates lib changelog" into eap-device-actions

Author: proppy

google-assistant-library/CHANGELOG.rst

@@ -1,5 +1,9 @@
 Changelog
 =========
+0.1.0
+-----
+- Support for local device actions
+
 0.0.3
 ----- 
 - Support for x86_64 Linux

google-assistant-sdk/googlesamples/assistant/library/hotword.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-
 # Copyright (C) 2017 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,38 +12,77 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-
 from __future__ import print_function
-
 import argparse
 import os.path
 import json
-
+import google.auth.transport.requests
 import google.oauth2.credentials
-
 from google.assistant.library import Assistant
 from google.assistant.library.event import EventType
 from google.assistant.library.file_helpers import existing_file
+DEVICE_API_URL = 'https://embeddedassistant.googleapis.com/v1alpha2'
 
 
-def process_event(event):
-    """Pretty prints events.
+def process_device_actions(event, device_id):
+    if 'inputs' in event.args:
+        for i in event.args['inputs']:
+            if i['intent'] == 'action.devices.EXECUTE':
+                for c in i['payload']['commands']:
+                    for device in c['devices']:
+                        if device['id'] == device_id:
+                            if 'execution' in c:
+                                for e in c['execution']:
+                                    if e['params']:
+                                        yield e['command'], e['params']
+                                    else:
+                                        yield e['command'], None
 
+
+def process_event(event, device_id):
+    """Pretty prints events.
     Prints all events that occur with two spaces between each new
     conversation and a single space between turns of a conversation.
-
     Args:
         event(event.Event): The current event to process.
     """
     if event.type == EventType.ON_CONVERSATION_TURN_STARTED:
         print()
-
     print(event)
-
     if (event.type == EventType.ON_CONVERSATION_TURN_FINISHED and
             event.args and not event.args['with_follow_on_turn']):
         print()
+    if event.type == EventType.ON_DEVICE_ACTION:
+        for command, params in process_device_actions(event, device_id):
+            print('Do command', command, 'with params', str(params))
+
+
+def register_device(project_id, credentials, device_model_id, device_id):
+    """Register the device if needed.
+    Registers a new assistant device if an instance with the given id
+    does not already exists for this model.
+    Args:
+       project_id(str): The project ID used to register device instance.
+       credentials(google.oauth2.credentials.Credentials): The Google
+                OAuth2 credentials of the user to associate the device
+                instance with.
+       device_model_id: The registered device model ID.
+       device_id: The device ID of the new instance.
+    """
+    base_url = '/'.join([DEVICE_API_URL, 'projects', project_id, 'devices'])
+    device_url = '/'.join([base_url, device_id])
+    session = google.auth.transport.requests.AuthorizedSession(credentials)
+    r = session.get(device_url)
+    print(device_url, r.status_code)
+    if r.status_code == 404:
+        print('Registering....', end='', flush=True)
+        r = session.post(base_url, data=json.dumps({
+            'id': device_id,
+            'model_id': device_model_id,
+        }))
+        if r.status_code != 200:
+            raise Exception('failed to register device: ' + r.text)
+        print('\rDevice registered.')
 
 
 def main():
@@ -58,14 +96,26 @@ def main():
                             'credentials.json'
                         ),
                         help='Path to store and read OAuth2 credentials')
+    parser.add_argument('--device_model_id', type=str,
+                        metavar='DEVICE_MODEL_ID', required=True,
+                        help='The device model ID registered with Google.')
+    parser.add_argument('--project_id', type=str,
+                        metavar='PROJECT_ID', required=False,
+                        help='The project ID used to register device '
+                        + 'instances.')
     args = parser.parse_args()
     with open(args.credentials, 'r') as f:
         credentials = google.oauth2.credentials.Credentials(token=None,
                                                             **json.load(f))
-
-    with Assistant(credentials) as assistant:
-        for event in assistant.start():
-            process_event(event)
+    with Assistant(credentials, args.device_model_id) as assistant:
+        events = assistant.start()
+        print('device_model_id:', args.device_model_id + '\n' +
+              'device_id:', assistant.device_id + '\n')
+        if args.project_id:
+            register_device(args.project_id, credentials,
+                            args.device_model_id, assistant.device_id)
+        for event in events:
+            process_event(event, assistant.device_id)
 
 
 if __name__ == '__main__':