revil-O/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

- Support for assistant response text as a ResponseEvent

Browse source 
- Don't trigger a ConversationEndEvent if the assistant needs to follow up on the previous interaction
This commit is contained in:
Fabio Manganiello 2018-06-20 19:20:23 +02:00
parent e70eb8bb42
commit f73adc83bc
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
platypush/backend/assistant/google/__init__.py
View file

@ -12,7 +12,7 @@ from google.assistant.library.file_helpers import existing_file
from platypush.backend import Backend from platypush.backend import Backend
from platypush.message.event.assistant import \ from platypush.message.event.assistant import \
ConversationStartEvent, ConversationEndEvent, ConversationTimeoutEvent, \ ConversationStartEvent, ConversationEndEvent, ConversationTimeoutEvent, \
NoResponseEvent, SpeechRecognizedEvent ResponseEvent, NoResponseEvent, SpeechRecognizedEvent
class AssistantGoogleBackend(Backend): class AssistantGoogleBackend(Backend):
@ -46,11 +46,14 @@ class AssistantGoogleBackend(Backend):
if event.type == EventType.ON_CONVERSATION_TURN_STARTED: if event.type == EventType.ON_CONVERSATION_TURN_STARTED:
self.bus.post(ConversationStartEvent()) self.bus.post(ConversationStartEvent())
elif event.type == EventType.ON_CONVERSATION_TURN_FINISHED: elif event.type == EventType.ON_CONVERSATION_TURN_FINISHED:
if not event.args.get('with_follow_on_turn'):
self.bus.post(ConversationEndEvent()) self.bus.post(ConversationEndEvent())
elif event.type == EventType.ON_CONVERSATION_TURN_TIMEOUT: elif event.type == EventType.ON_CONVERSATION_TURN_TIMEOUT:
self.bus.post(ConversationTimeoutEvent()) self.bus.post(ConversationTimeoutEvent())
elif event.type == EventType.ON_NO_RESPONSE: elif event.type == EventType.ON_NO_RESPONSE:
self.bus.post(NoResponseEvent()) self.bus.post(NoResponseEvent())
elif event.type == EventType.ON_RENDER_RESPONSE:
self.bus.post(ResponseEvent(response_text=event.args.get('text')))
elif event.type == EventType.ON_RECOGNIZING_SPEECH_FINISHED: elif event.type == EventType.ON_RECOGNIZING_SPEECH_FINISHED:
phrase = event.args['text'].lower().strip() phrase = event.args['text'].lower().strip()
self.logger.info('Speech recognized: {}'.format(phrase)) self.logger.info('Speech recognized: {}'.format(phrase))

5
platypush/message/event/assistant/__init__.py
View file

@ -37,6 +37,11 @@ class ConversationTimeoutEvent(ConversationEndEvent):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
class ResponseEvent(ConversationEndEvent):
def __init__(self, response_text, *args, **kwargs):
super().__init__(*args, response_text=response_text, **kwargs)
class NoResponseEvent(ConversationEndEvent): class NoResponseEvent(ConversationEndEvent):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)