Skip to content

Commit

Permalink
Add compact intents for new contact
Browse files Browse the repository at this point in the history 
Related to #30
  • Loading branch information
@davquar
davquar committed Aug 19, 2021
1 parent 057ae35 commit 82baa2b
Show file tree
Hide file tree
Showing 2 changed files with 61 additions and 45 deletions.
100 changes: 56 additions & 44 deletions crm-skill/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,37 +30,48 @@ def wrap_get_response(self, question: str, state: int, exact_match=False,
return utt, None, state + 1

@intent_file_handler("new-contact.intent")
def handle_new_contact(self) -> dict:
def handle_new_contact(self, message) -> dict:
done = False
state = 0

# get entities if the user used a compact phrase
utt_name = message.data.get("name")
utt_surname = message.data.get("surname")

while not done:
if state == 0:
surname, action, state = self.wrap_get_response("ask-surname", state, allowed_actions={
ACTION_STOP, ACTION_REPEAT
})
if action == ACTION_STOP:
self.speak_dialog("finishing")
return
if utt_surname is None:
utt_surname, action, state = self.wrap_get_response("ask-surname", state, allowed_actions={
ACTION_STOP, ACTION_REPEAT
})
if action == ACTION_STOP:
self.speak_dialog("finishing")
return

if surname is None:
return
if utt_surname is None:
return
else:
state += 1

if state == 1:
name, action, state = self.wrap_get_response("ask-name", state, allowed_actions={
ACTION_STOP, ACTION_REPEAT, ACTION_BACK
})
if action in (ACTION_REPEAT, ACTION_BACK):
continue
if action == ACTION_STOP:
self.speak_dialog("finishing")
return
if utt_name is None:
utt_name, action, state = self.wrap_get_response("ask-name", state, allowed_actions={
ACTION_STOP, ACTION_REPEAT, ACTION_BACK
})
if action in (ACTION_REPEAT, ACTION_BACK):
continue
if action == ACTION_STOP:
self.speak_dialog("finishing")
return

if name is None:
return
if utt_name is None:
return
else:
state += 1

nickname_mandatory = False
if len(get_contact(name, surname, "")) > 0:
self.speak_dialog("name-surname-duplicate", {"name": name, "surname": surname})
if len(get_contact(utt_name, utt_surname, "")) > 0:
self.speak_dialog("name-surname-duplicate", {"name": utt_name, "surname": utt_surname})
if self.ask_yesno("ask-sure-another-person") == "yes":
nickname_mandatory = True
continue
Expand All @@ -71,70 +82,71 @@ def handle_new_contact(self) -> dict:
allowed_actions = {ACTION_STOP, ACTION_REPEAT, ACTION_BACK}
if not nickname_mandatory:
allowed_actions.update({ACTION_SKIP})
nickname, action, state = self.wrap_get_response("ask-nickname", state, allowed_actions=allowed_actions, dialog_data={"name": name})
utt_nickname, action, state = self.wrap_get_response("ask-nickname", state, allowed_actions=allowed_actions, dialog_data={"name": utt_name})
if action is None:
if get_contact_by_nickname(nickname) is not None:
self.speak_dialog("error-duplicate-nickname")
state -= 1
continue
self.speak_dialog("generic-data-done-repeat", {"data": nickname})
self.speak_dialog("generic-data-done-repeat", {"data": utt_nickname})
elif action == ACTION_STOP:
self.speak_dialog("finishing")
return
else:
continue

if nickname is None:
if utt_nickname is None:
return

if get_contact_by_nickname(utt_nickname) is not None:
self.speak_dialog("error-duplicate-nickname")
state -= 1
continue

if state == 3:
add_contact(name, surname, nickname)
add_contact(utt_name, utt_surname, utt_nickname)
state += 1

if state == 4:
should_proceed = self.ask_yesno("contact-added-ask-details", {"name": name, "surname": surname})
contact = get_contact(name, surname, "")[0]
should_proceed = self.ask_yesno("contact-added-ask-details", {"name": utt_name, "surname": utt_surname})
contact = get_contact(utt_name, utt_surname, "")[0]
if should_proceed == "yes":
state += 1
continue
self.speak_dialog("finishing")
return contact

if state == 5:
gender, action, state = self.wrap_get_response("ask-gender", state, allowed_actions={
utt_gender, action, state = self.wrap_get_response("ask-gender", state, allowed_actions={
ACTION_STOP, ACTION_REPEAT, ACTION_SKIP
})
if action is None:
contact["gender"] = gender
self.speak_dialog("generic-data-done-repeat", {"data": gender})
contact["gender"] = utt_gender
self.speak_dialog("generic-data-done-repeat", {"data": utt_gender})
elif action == ACTION_STOP:
self.speak_dialog("finishing")
return contact
else:
continue

if gender is None:
if utt_gender is None:
return

if state == 6:
birth_date, action, state = self.wrap_get_response("ask-birth-date", state, allowed_actions={
utt_birth_date, action, state = self.wrap_get_response("ask-birth-date", state, allowed_actions={
ACTION_STOP, ACTION_REPEAT, ACTION_BACK, ACTION_SKIP
}, dialog_data={"name": name})
}, dialog_data={"name": utt_name})
if action is None:
contact["birth-date"] = parse.extract_datetime(birth_date)
contact["birth-date"] = parse.extract_datetime(utt_birth_date)
if contact["birth-date"] is None:
# no datetime found in the utterance --> repeat
self.speak_dialog("error-no-date")
state -= 1
continue
self.speak_dialog("generic-data-done-repeat", {"data": birth_date})
self.speak_dialog("generic-data-done-repeat", {"data": utt_birth_date})
elif action == ACTION_STOP:
self.speak_dialog("finishing")
return contact
else:
continue

if birth_date is None:
if utt_birth_date is None:
return

if state == 7:
Expand All @@ -150,7 +162,7 @@ def handle_new_reminder(self, message):
# get entities if the user used a compact phrase
utt_person = message.data.get("person")
utt_datetime = message.data.get("datetime")

while not done:
if state == 0:
if utt_person is not None and utt_datetime is not None:
Expand All @@ -175,7 +187,7 @@ def handle_new_reminder(self, message):
# the contact does not exist --> ask to create
should_proceed = self.ask_yesno("ask-create-contact")
if should_proceed == "yes":
list_contacts = [self.handle_new_contact()]
list_contacts = [self.handle_new_contact(None)]
if list_contacts[0] is None:
return
else:
Expand Down Expand Up @@ -281,7 +293,7 @@ def handle_new_activity(self, message):
if len(list_contacts) == 0:
should_proceed = self.ask_yesno("ask-create-contact")
if should_proceed == "yes":
list_contacts = [self.handle_new_contact()]
list_contacts = [self.handle_new_contact(None)]
if list_contacts[0] is None:
return
else:
Expand Down Expand Up @@ -403,7 +415,7 @@ def handle_last_activities(self, message):
# the contact does not exist --> ask to create
should_proceed = self.ask_yesno("ask-create-contact")
if should_proceed == "yes":
self.handle_new_contact()
self.handle_new_contact(None)
return
if len(list_contacts) > 1:
self.speak_dialog("similar-contacts", {"number": len(list_contacts), "name": utt_person})
Expand Down
6 changes: 5 additions & 1 deletion crm-skill/vocab/en-us/new-contact.intent
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
(add|create) a new (contact|person) (|to my contacts|to my contact list)
(add|create) (|a) (|new) (contact|person) (|to my contacts|to my contact list)
(add|create) someone (|to my contacts|to my contact list)
(add|create) someone (|to my contacts|to my contact list)
(add|create) name {name} surname {surname}
(add|create) contact name {name} surname {surname}
(add|create) surname {surname} name {name}
(add|create) contact surname {surname} name {name}

0 comments on commit 82baa2b

Please sign in to comment.