Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Restart dialogs #85

Merged
merged 23 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
317815c
action to save part 1 goal-setting dialog
nelealbers Apr 14, 2023
ece5b69
add part saving to rule goal-setting
nelealbers Apr 14, 2023
e7f9bb2
change start of dialog based on previously completed part + get which…
nelealbers May 1, 2023
230c2d7
store which_sport slot to db when saving part 2
nelealbers May 1, 2023
a800b4d
which_sport now part of users table in db
nelealbers May 2, 2023
126a35b
add more explanations
nelealbers May 2, 2023
48a93e6
add logic for typing 'verder'
nelealbers May 2, 2023
09286e7
Merge branch 'main' into restart_dialogs
nelealbers May 2, 2023
92544d4
retrained after merge
nelealbers May 2, 2023
ff91adf
add celery.send_task to idle command actions for verder
nelealbers May 2, 2023
c15fcad
clean up
nelealbers May 3, 2023
93183e7
also need to set completed=False when storing dialog parts in db
nelealbers May 3, 2023
65f81e2
use new db release in actions requirements
nelealbers May 4, 2023
9796c03
db version also for scheduler and onboarding
nelealbers May 4, 2023
e835ac8
prospector complaints
nelealbers May 8, 2023
b85e1ad
Merge branch 'main' into restart_dialogs
nelealbers May 15, 2023
faa1f4b
correct menu selection and dialog restart from fsm
wbaccinelli May 17, 2023
5ff42c7
prospector corrections
wbaccinelli May 17, 2023
7b3a032
new db version
wbaccinelli May 17, 2023
222f5f9
Update Rasa_Bot/actions/helper.py
nelealbers May 17, 2023
27116ee
remove consideration of last_part = 0
nelealbers May 17, 2023
e4f7d95
remove old models
nelealbers May 17, 2023
4228019
remove last_part 0 also from rules goal-setting and retrain
nelealbers May 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'main' into restart_dialogs
  • Loading branch information
nelealbers authored May 15, 2023
commit b85e1ad6fa452b4c487ac71121d813a363ca9b16
37 changes: 0 additions & 37 deletions Rasa_Bot/actions/actions_preparation_dialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
from rasa_sdk.events import SlotSet
from virtual_coach_db.helper.definitions import Components


### Slot-setting methods called for rasa to store current intervention component


Expand Down Expand Up @@ -44,39 +43,3 @@ def name(self):
async def run(self, dispatcher, tracker, domain):
return [SlotSet("current_intervention_component",
Components.TRACK_BEHAVIOR)]


class SetSlotColdTurkey(Action):
def name(self):
return "action_set_slot_cold_turkey"

async def run(self, dispatcher, tracker, domain):
return [SlotSet("current_intervention_component",
Components.COLD_TURKEY)]


class SetSlotPlanQuitStartDate(Action):
def name(self):
return "action_set_slot_plan_quit_start_date"

async def run(self, dispatcher, tracker, domain):
return [SlotSet("current_intervention_component",
Components.PLAN_QUIT_START_DATE)]


class SetSlotMentalContrasting(Action):
def name(self):
return "action_set_slot_mental_contrasting"

async def run(self, dispatcher, tracker, domain):
return [SlotSet("current_intervention_component",
Components.FUTURE_SELF)]


class SetSlotGoalSetting(Action):
def name(self):
return "action_set_slot_goal_setting"

async def run(self, dispatcher, tracker, domain):
return [SlotSet("current_intervention_component",
Components.GOAL_SETTING)]
56 changes: 56 additions & 0 deletions Rasa_Bot/actions/actions_relapse_dialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,62 @@ async def run(self, dispatcher, tracker, domain):
return [SlotSet('one_or_two_slot', None)]


class ActionSetSlotSmokeOrPa1(Action):
def name(self):
return "action_set_slot_smoke_or_pa_1"

async def run(self, dispatcher, tracker, domain):
return [SlotSet('smoke_or_pa', 1)]

class ActionSetSlotSmokeOrPa2(Action):
def name(self):
return "action_set_slot_smoke_or_pa_2"

async def run(self, dispatcher, tracker, domain):
return [SlotSet('smoke_or_pa', 2)]

class ActionSetSlotsCraveLapseRelapse1(Action):
def name(self):
return "action_set_slot_crave_lapse_relapse_1"

async def run(self, dispatcher, tracker, domain):
return [SlotSet('crave_lapse_relapse', 1)]


class ActionSetSlotCraveLapseRelapse2(Action):
def name(self):
return "action_set_slot_crave_lapse_relapse_2"

async def run(self, dispatcher, tracker, domain):
return [SlotSet('crave_lapse_relapse', 2)]

class ActionSetSlotCraveLapseRelapse3(Action):
def name(self):
return "action_set_slot_crave_lapse_relapse_3"

async def run(self, dispatcher, tracker, domain):
return [SlotSet('crave_lapse_relapse', 3)]

class ActionResetSlotCraveLapseRelapse(Action):
def name(self):
return "action_reset_slot_crave_lapse_relapse"

async def run(self, dispatcher, tracker, domain):
return {"crave_lapse_relapse": None}


class ActionSetSlotWeeklyOrRelapse(Action):
def name(self):
return "action_set_slot_weekly_or_relapse"

async def run(self, dispatcher, tracker, domain):
intervention_component = tracker.get_slot('current_intervention_component')

if intervention_component == Components.WEEKLY_REFLECTION:
return [SlotSet('weekly_or_relapse', 2)]

return [SlotSet('weekly_or_relapse', 1)]

class ActionSetSlotRelapseDialog(Action):
def name(self):
return "action_set_slot_relapse_dialog_hrs"
Expand Down
3 changes: 3 additions & 0 deletions Rasa_Bot/actions/actions_watching_a_video.py
Original file line number Diff line number Diff line change
Expand Up @@ -114,3 +114,6 @@ async def run(self, dispatcher, tracker, domain):
# resumes the relapse dialog opening the ehbo_me_self_lapse_form.
# The flow will then depend on the chosen option in the form
return [FollowupAction('ehbo_me_self_lapse_form')]
if current_dialog == Components.WEEKLY_REFLECTION:
# resumes weekly reflection from possible_smoking_situations_form.
return [FollowupAction('possible_smoking_situations_form')]
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.