Greg Thompson commited on
Commit
f87e58b
·
1 Parent(s): a46f343

Changes the conditions for using a FSM

Browse files
mathtext_fastapi/v2_conversation_manager.py CHANGED
@@ -104,9 +104,8 @@ def manage_math_quiz_fsm(user_message, contact_uuid, type):
104
 
105
 
106
  def retrieve_microlesson_content(context_data, user_message, microlesson, contact_uuid):
107
- if context_data['local_state'] == 'addition-question-sequence' or \
108
- user_message == 'add' or \
109
- microlesson == 'addition':
110
  messages = manage_math_quiz_fsm(user_message, contact_uuid, 'addition')
111
 
112
  if user_message == 'exit':
@@ -120,9 +119,7 @@ def retrieve_microlesson_content(context_data, user_message, microlesson, contac
120
  'input_prompt': input_prompt,
121
  'state': state_label
122
  }
123
- elif context_data['local_state'] == 'subtraction-question-sequence' or \
124
- user_message == 'subtract' or \
125
- microlesson == 'subtraction':
126
  messages = manage_math_quiz_fsm(user_message, contact_uuid, 'subtraction')
127
 
128
  if user_message == 'exit':
@@ -214,6 +211,8 @@ def manage_conversation_response(data_json):
214
  next_state = curriculum_copy.state
215
  else:
216
  next_state = context_data['current_state']
 
 
217
 
218
  print("STEP 3")
219
  microlesson = lookup_local_state(next_state)
 
104
 
105
 
106
  def retrieve_microlesson_content(context_data, user_message, microlesson, contact_uuid):
107
+ # TODO: This is being filtered by both the local and global states, so not changing
108
+ if microlesson == 'addition':
 
109
  messages = manage_math_quiz_fsm(user_message, contact_uuid, 'addition')
110
 
111
  if user_message == 'exit':
 
119
  'input_prompt': input_prompt,
120
  'state': state_label
121
  }
122
+ elif microlesson == 'subtraction':
 
 
123
  messages = manage_math_quiz_fsm(user_message, contact_uuid, 'subtraction')
124
 
125
  if user_message == 'exit':
 
211
  next_state = curriculum_copy.state
212
  else:
213
  next_state = context_data['current_state']
214
+ print("next_state")
215
+ print(next_state)
216
 
217
  print("STEP 3")
218
  microlesson = lookup_local_state(next_state)