Merge branch 'eap-device-actions'

Change-Id: I98c9afd188248e4ee8fc30559261cf728b346be5
googlesamples · Dec 11, 2017 · a7019e3 · a7019e3
2 parents c923502 + 41a6cea
commit a7019e3
Show file tree

Hide file tree

Showing 26 changed files with 2,414 additions and 425 deletions.
diff --git a/google-assistant-grpc/CHANGELOG.rst b/google-assistant-grpc/CHANGELOG.rst
@@ -1,5 +1,8 @@
 Changelog
 =========
+0.1.0
+-----
+- Adds Device Actions to gRPC protobuf
 
 0.0.2
 -----

diff --git a/google-assistant-grpc/google/assistant/embedded/v1alpha1/embedded_assistant_pb2.py b/google-assistant-grpc/google/assistant/embedded/v1alpha1/embedded_assistant_pb2.py
diff --git a/google-assistant-grpc/google/assistant/embedded/v1alpha1/embedded_assistant_pb2_grpc.py b/google-assistant-grpc/google/assistant/embedded/v1alpha1/embedded_assistant_pb2_grpc.py
@@ -1,9 +1,7 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 import grpc
-from grpc.framework.common import cardinality
-from grpc.framework.interfaces.face import utilities as face_utilities
 
-import google.assistant.embedded.v1alpha1.embedded_assistant_pb2 as google_dot_assistant_dot_embedded_dot_v1alpha1_dot_embedded__assistant__pb2
+from google.assistant.embedded.v1alpha1 import embedded_assistant_pb2 as google_dot_assistant_dot_embedded_dot_v1alpha1_dot_embedded__assistant__pb2
 
 
 class EmbeddedAssistantStub(object):
@@ -45,11 +43,13 @@ def Converse(self, request_iterator, context):
     *   ConverseRequest.audio_in
     *   ConverseRequest.audio_in
     *   ConverseResponse.event_type.END_OF_UTTERANCE
+    *   ConverseResponse.result.spoken_request_text "add to my shopping list"
     *   ConverseResponse.result.microphone_mode.DIALOG_FOLLOW_ON
     *   ConverseResponse.audio_out
     *   ConverseResponse.audio_out
     *   ConverseResponse.audio_out
 
+
     The user then says *bagels* and the assistant responds
     *OK, I've added bagels to your shopping list*. This is sent as another gRPC
     connection call to the `Converse` method, again with streamed requests and

diff --git a/google-assistant-grpc/google/assistant/embedded/v1alpha2/__init__.py b/google-assistant-grpc/google/assistant/embedded/v1alpha2/__init__.py
@@ -0,0 +1,13 @@
+# Copyright (C) 2017 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.