Fix merge conflicts
This commit is contained in:
parent
4ce52466a2
commit
35a19cc5c0
@ -35,13 +35,9 @@ class DialogStateMonitor:
|
||||
total_cost=0,
|
||||
stages=[
|
||||
{'completed': False, 'name': 'collect_food', "confirmed": False},
|
||||
<<<<<<< Updated upstream
|
||||
# {'completed': False, 'name': 'more_food', "confirmed": False},
|
||||
{'completed': False, 'name': 'collect_drinks', "confirmed": False},
|
||||
=======
|
||||
{'completed': False, 'name': 'more_food', "confirmed": False},
|
||||
{'completed': False, 'name': 'collect_drinks', "confirmed": False},
|
||||
{'completed': False, 'name': 'more_drinks', "confirmed": False},
|
||||
>>>>>>> Stashed changes
|
||||
# {'completed': False, 'name': 'more_drinks', "confirmed": False},
|
||||
{'completed': False, 'name': 'collect_address', "confirmed": False},
|
||||
{'completed': False, 'name': 'collect_phone', "confirmed": False},
|
||||
],
|
||||
@ -62,33 +58,6 @@ class DialogStateMonitor:
|
||||
|
||||
def mark_current_stage_completed(self) -> None:
|
||||
for stage in self.state['stages']:
|
||||
<<<<<<< Updated upstream
|
||||
if stage['completed'] is False: # and stage['confirmed']:
|
||||
print("Stage completed: ", stage['name'])
|
||||
stage['completed'] = True
|
||||
return
|
||||
|
||||
def complete_stage_if_valid(self, stage_name):
|
||||
for stage in self.state['stages']:
|
||||
if stage['name'] != stage_name:
|
||||
continue
|
||||
|
||||
if stage['name'] == "collect_food":
|
||||
for order in self.state['belief_state']['order']:
|
||||
if order.get("pizza"):
|
||||
stage['completed'] = True
|
||||
return
|
||||
elif stage["name"] == "collect_drinks":
|
||||
for order in self.state['belief_state']['order']:
|
||||
if order.get("drink"):
|
||||
stage['completed'] = True
|
||||
return
|
||||
elif stage["name"] == "collect_address":
|
||||
if not len(self.state['belief_state']['address']):
|
||||
return
|
||||
stage['completed'] = True
|
||||
return
|
||||
=======
|
||||
if stage['completed'] is False:
|
||||
print("Stage completed: ", stage['name'])
|
||||
stage['completed'] = True
|
||||
@ -114,7 +83,6 @@ class DialogStateMonitor:
|
||||
return
|
||||
stage['completed'] = True
|
||||
return
|
||||
>>>>>>> Stashed changes
|
||||
elif stage["name"] == "collect_phone":
|
||||
if self.state['belief_state']["phone"].get("phone"):
|
||||
stage['completed'] = True
|
||||
|
Loading…
Reference in New Issue
Block a user