Skip to content

Bug fix: when generation fails, save the sent message #4915

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.

Sign up for GitHub

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

Merged
oobabooga merged 3 commits into from
Dec 15, 2023
Merged

Bug fix: when generation fails, save the sent message #4915

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fbfdee
Bug fix: when generation fails, save the sent message
oobabooga Dec 14, 2023
d272ba2
Fix the prompt generation
oobabooga Dec 15, 2023
a0d3313
Minor change
oobabooga Dec 15, 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
33 changes: 17 additions & 16 deletions modules/chat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,40 +215,47 @@ def chatbot_wrapper(text, state, regenerate=False, _continue=False, loading_mess
yield output
return

just_started = True
visible_text = None
stopping_strings = get_stopping_strings(state)
is_stream = state['stream']

# Prepare the input
if not any((regenerate, _continue)):
if not (regenerate or _continue):
visible_text = html.escape(text)

# Apply extensions
text, visible_text = apply_extensions('chat_input', text, visible_text, state)
text = apply_extensions('input', text, state, is_chat=True)

output['internal'].append([text, ''])
output['visible'].append([visible_text, ''])

# *Is typing...*
if loading_message:
yield {'visible': output['visible'] + [[visible_text, shared.processing_message]], 'internal': output['internal']}
yield {
'visible': output['visible'][:-1] + [[output['visible'][-1][0], shared.processing_message]],
'internal': output['internal']
}
else:
text, visible_text = output['internal'][-1][0], output['visible'][-1][0]
if regenerate:
output['visible'].pop()
output['internal'].pop()

# *Is typing...*
if loading_message:
yield {'visible': output['visible'] + [[visible_text, shared.processing_message]], 'internal': output['internal']}
yield {
'visible': output['visible'][:-1] + [[visible_text, shared.processing_message]],
'internal': output['internal'][:-1] + [[text, '']]
}
elif _continue:
last_reply = [output['internal'][-1][1], output['visible'][-1][1]]
if loading_message:
yield {'visible': output['visible'][:-1] + [[visible_text, last_reply[1] + '...']], 'internal': output['internal']}
yield {
'visible': output['visible'][:-1] + [[visible_text, last_reply[1] + '...']],
'internal': output['internal']
}

# Generate the prompt
kwargs = {
'_continue': _continue,
'history': output,
'history': output if _continue else {k: v[:-1] for k, v in output.items()}
}
prompt = apply_extensions('custom_generate_chat_prompt', text, state, **kwargs)
if prompt is None:
Expand All @@ -270,12 +277,6 @@ def chatbot_wrapper(text, state, regenerate=False, _continue=False, loading_mess
yield output
return

if just_started:
just_started = False
if not _continue:
output['internal'].append(['', ''])
output['visible'].append(['', ''])

if _continue:
output['internal'][-1] = [text, last_reply[0] + reply]
output['visible'][-1] = [visible_text, last_reply[1] + visible_reply]
Expand Down