|
@@ -222,8 +222,12 @@ elif args.chat or args.cai_chat:
|
|
|
|
|
|
|
|
question = context+'\n\n'
|
|
question = context+'\n\n'
|
|
|
for i in range(len(history)):
|
|
for i in range(len(history)):
|
|
|
- question += f"{name1}: {history[i][0][3:-5].strip()}\n"
|
|
|
|
|
- question += f"{name2}: {history[i][1][3:-5].strip()}\n"
|
|
|
|
|
|
|
+ if args.cai_chat:
|
|
|
|
|
+ question += f"{name1}: {history[i][0].strip()}\n"
|
|
|
|
|
+ question += f"{name2}: {history[i][1].strip()}\n"
|
|
|
|
|
+ else:
|
|
|
|
|
+ question += f"{name1}: {history[i][0][3:-5].strip()}\n"
|
|
|
|
|
+ question += f"{name2}: {history[i][1][3:-5].strip()}\n"
|
|
|
question += f"{name1}: {text}\n"
|
|
question += f"{name1}: {text}\n"
|
|
|
question += f"{name2}:"
|
|
question += f"{name2}:"
|
|
|
|
|
|
|
@@ -294,8 +298,6 @@ elif args.chat or args.cai_chat:
|
|
|
with gr.Row():
|
|
with gr.Row():
|
|
|
check = gr.Checkbox(value=settings['stop_at_newline'], label='Stop generating at new line character?')
|
|
check = gr.Checkbox(value=settings['stop_at_newline'], label='Stop generating at new line character?')
|
|
|
|
|
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
if args.cai_chat:
|
|
if args.cai_chat:
|
|
|
btn.click(cai_chatbot_wrapper, [textbox, length_slider, preset_menu, model_menu, name1, name2, context, check], display1, show_progress=True, api_name="textgen")
|
|
btn.click(cai_chatbot_wrapper, [textbox, length_slider, preset_menu, model_menu, name1, name2, context, check], display1, show_progress=True, api_name="textgen")
|
|
|
textbox.submit(cai_chatbot_wrapper, [textbox, length_slider, preset_menu, model_menu, name1, name2, context, check], display1, show_progress=True)
|
|
textbox.submit(cai_chatbot_wrapper, [textbox, length_slider, preset_menu, model_menu, name1, name2, context, check], display1, show_progress=True)
|