Unify the 3 interface modes (#3554)

README.md

@@ -189,8 +189,6 @@ Optionally, you can use the following command-line flags:
 | Flag                                       | Description |
 |--------------------------------------------|-------------|
 | `-h`, `--help`                             | Show this help message and exit. |
-| `--notebook`                               | Launch the web UI in notebook mode, where the output is written to the same text box as the input. |
-| `--chat`                                   | Launch the web UI in chat mode. |
 | `--multi-user`                             | Multi-user mode. Chat histories are not saved or automatically loaded. WARNING: this is highly experimental. |
 | `--character CHARACTER`                    | The name of the character to load in chat mode by default. |
 | `--model MODEL`                            | Name of the model to load by default. |

api-examples/api-example-chat-stream.py

@@ -36,8 +36,6 @@ async def run(user_input, history):
         # 'turn_template': 'turn_template', # Optional
         'regenerate': False,
         '_continue': False,
-        'stop_at_newline': False,
-        'chat_generation_attempts': 1,
         'chat_instruct_command': 'Continue the chat dialogue below. Write a single reply for the character "<|character|>".\n\n<|prompt|>',
 
         # Generation params. If 'preset' is set to different than 'None', the values

api-examples/api-example-chat.py

@@ -30,8 +30,6 @@ def run(user_input, history):
         # 'turn_template': 'turn_template', # Optional
         'regenerate': False,
         '_continue': False,
-        'stop_at_newline': False,
-        'chat_generation_attempts': 1,
         'chat_instruct_command': 'Continue the chat dialogue below. Write a single reply for the character "<|character|>".\n\n<|prompt|>',
 
         # Generation params. If 'preset' is set to different than 'None', the values

css/chat.css

@@ -1,146 +0,0 @@
-.h-\[40vh\], .wrap.svelte-byatnx.svelte-byatnx.svelte-byatnx {
-    height: 66.67vh
-}
-
-.gradio-container {
-    margin-left: auto !important;
-    margin-right: auto !important;
-}
-
-.w-screen {
-    width: unset
-}
-
-div.svelte-362y77>*, div.svelte-362y77>.form>* {
-    flex-wrap: nowrap
-}
-
-/* fixes the API documentation in chat mode */
-.api-docs.svelte-1iguv9h.svelte-1iguv9h.svelte-1iguv9h {
-    display: grid;
-}
-
-.pending.svelte-1ed2p3z {
-    opacity: 1;
-}
-
-#extensions {
-    padding: 0;
-}
-
-#gradio-chatbot {
-    height: 66.67vh;
-}
-
-.wrap.svelte-6roggh.svelte-6roggh {
-    max-height: 92.5%;
-}
-
-/* This is for the microphone button in the whisper extension */
-.sm.svelte-1ipelgc {
-    width: 100%;
-}
-
-#main button {
-    min-width: 0 !important;
-}
-
-#main > :first-child, #extensions {
-    max-width: 800px;
-    margin-left: auto;
-    margin-right: auto;
-}
-
-@media screen and (max-width: 688px) {
-    #main {
-        padding: 0px;
-    }
-
-    .chat {
-        height: calc(100vh - 274px) !important;
-    }
-}
-
-/*****************************************************/
-/*************** Chat box declarations ***************/
-/*****************************************************/
-
-.chat {
-    margin-left: auto;
-    margin-right: auto;
-    max-width: 800px;
-    height: calc(100vh - 286px);
-    overflow-y: auto;
-    padding-right: 20px;
-    display: flex;
-    flex-direction: column-reverse;
-    word-break: break-word;
-    overflow-wrap: anywhere;
-    padding-top: 1px;
-}
-
-.chat > .messages {
-    display: flex;
-    flex-direction: column;
-}
-
-.message-body li {
-    margin-top: 0.5em !important;
-    margin-bottom: 0.5em !important;
-}
-
-.message-body li > p {
-    display: inline !important;
-}
-
-.message-body ul, .message-body ol {
-    font-size: 15px !important;
-}
-
-.message-body ul {
-    list-style-type: disc !important;
-}
-
-.message-body pre {
-    margin-bottom: 1.25em !important;
-}
-
-.message-body code {
-    white-space: pre-wrap !important;
-    word-wrap: break-word !important;
-}
-
-.message-body :not(pre) > code {
-    white-space: normal !important;
-}
-
-@media print {
-    body {
-        visibility: hidden;
-    }
-
-    .chat {
-        visibility: visible;
-        position: absolute;
-        left: 0;
-        top: 0;
-        max-width: none;
-        max-height: none;
-        width: 100%;
-        height: fit-content;
-        display: flex;
-        flex-direction: column-reverse;
-    }
-    
-    .message {
-        break-inside: avoid;
-    }
-    
-    .gradio-container {
-        overflow: visible;
-    }
-    
-    .tab-nav {
-        display: none !important;
-    }
-}

css/main.css

@@ -45,13 +45,6 @@
     min-height: 0
 }
 
-#save_session {
-    margin-top: 32px;
-}
-
-#accordion {
-}
-
 .dark svg {
     fill: white;
 }
@@ -64,7 +57,7 @@ ol li p, ul li p {
     display: inline-block;
 }
 
-#main, #parameters, #chat-settings, #lora, #training-tab, #model-tab, #session-tab {
+#chat-tab, #default-tab, #notebook-tab, #parameters, #chat-settings, #lora, #training-tab, #model-tab, #session-tab {
     border: 0;
 }
 
@@ -78,7 +71,6 @@ ol li p, ul li p {
 }
 
 #extensions {
-    padding: 15px;
     margin-bottom: 35px;
 }
 
@@ -108,7 +100,7 @@ div.svelte-15lo0d8 > *, div.svelte-15lo0d8 > .form > * {
 }
 
 .textbox_default textarea {
-    height: calc(100vh - 380px);
+    height: calc(100vh - 310px);
 }
 
 .textbox_default_output textarea {
@@ -128,6 +120,12 @@ div.svelte-15lo0d8 > *, div.svelte-15lo0d8 > .form > * {
     color: #efefef !important;
 }
 
+@media screen and (max-width: 711px) {
+    .textbox_default textarea {
+        height: calc(100vh - 275px);
+    }
+}
+
 /* Hide the gradio footer*/
 footer {
     display: none !important;
@@ -193,3 +191,141 @@ button {
 .dark .pretty_scrollbar::-webkit-resizer {
   background: #374151;
 }
+
+/*****************************************************/
+/*************** Chat UI declarations ****************/
+/*****************************************************/
+
+.h-\[40vh\], .wrap.svelte-byatnx.svelte-byatnx.svelte-byatnx {
+    height: 66.67vh
+}
+
+.gradio-container {
+    margin-left: auto !important;
+    margin-right: auto !important;
+}
+
+.w-screen {
+    width: unset
+}
+
+div.svelte-362y77>*, div.svelte-362y77>.form>* {
+    flex-wrap: nowrap
+}
+
+.pending.svelte-1ed2p3z {
+    opacity: 1;
+}
+
+#gradio-chatbot {
+    height: 66.67vh;
+}
+
+.wrap.svelte-6roggh.svelte-6roggh {
+    max-height: 92.5%;
+}
+
+/* This is for the microphone button in the whisper extension */
+.sm.svelte-1ipelgc {
+    width: 100%;
+}
+
+#chat-tab button, #notebook-tab button, #default-tab button {
+    min-width: 0 !important;
+}
+
+#chat-tab > :first-child, #extensions {
+    max-width: 800px;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+@media screen and (max-width: 688px) {
+    #chat-tab {
+        padding: 0px;
+    }
+
+    .chat {
+        height: calc(100vh - 274px) !important;
+    }
+}
+
+.chat {
+    margin-left: auto;
+    margin-right: auto;
+    max-width: 800px;
+    height: calc(100vh - 286px);
+    overflow-y: auto;
+    padding-right: 20px;
+    display: flex;
+    flex-direction: column-reverse;
+    word-break: break-word;
+    overflow-wrap: anywhere;
+    padding-top: 1px;
+}
+
+.chat > .messages {
+    display: flex;
+    flex-direction: column;
+}
+
+.message-body li {
+    margin-top: 0.5em !important;
+    margin-bottom: 0.5em !important;
+}
+
+.message-body li > p {
+    display: inline !important;
+}
+
+.message-body ul, .message-body ol {
+    font-size: 15px !important;
+}
+
+.message-body ul {
+    list-style-type: disc !important;
+}
+
+.message-body pre {
+    margin-bottom: 1.25em !important;
+}
+
+.message-body code {
+    white-space: pre-wrap !important;
+    word-wrap: break-word !important;
+}
+
+.message-body :not(pre) > code {
+    white-space: normal !important;
+}
+
+@media print {
+    body {
+        visibility: hidden;
+    }
+
+    .chat {
+        visibility: visible;
+        position: absolute;
+        left: 0;
+        top: 0;
+        max-width: none;
+        max-height: none;
+        width: 100%;
+        height: fit-content;
+        display: flex;
+        flex-direction: column-reverse;
+    }
+    
+    .message {
+        break-inside: avoid;
+    }
+    
+    .gradio-container {
+        overflow: visible;
+    }
+    
+    .tab-nav {
+        display: none !important;
+    }
+}

docs/Extensions.md

@@ -39,8 +39,8 @@ The extensions framework is based on special functions and variables that you ca
 | `def ui()` | Creates custom gradio elements when the UI is launched. | 
 | `def custom_css()` | Returns custom CSS as a string. It is applied whenever the web UI is loaded. |
 | `def custom_js()` | Same as above but for javascript. |
-| `def input_modifier(string, state)`  | Modifies the input string before it enters the model. In chat mode, it is applied to the user message. Otherwise, it is applied to the entire prompt. |
+| `def input_modifier(string, state, is_chat=False)`  | Modifies the input string before it enters the model. In chat mode, it is applied to the user message. Otherwise, it is applied to the entire prompt. |
-| `def output_modifier(string, state)`  | Modifies the output string before it is presented in the UI. In chat mode, it is applied to the bot's reply. Otherwise, it is applied to the entire output. |
+| `def output_modifier(string, state, is_chat=False)`  | Modifies the output string before it is presented in the UI. In chat mode, it is applied to the bot's reply. Otherwise, it is applied to the entire output. |
 | `def chat_input_modifier(text, visible_text, state)` | Modifies both the visible and internal inputs in chat mode. Can be used to hijack the chat input with custom content. |
 | `def bot_prefix_modifier(string, state)`  | Applied in chat mode to the prefix for the bot's reply. |
 | `def state_modifier(state)`  | Modifies the dictionary containing the UI input parameters before it is used by the text generation functions. |
@@ -163,7 +163,7 @@ def chat_input_modifier(text, visible_text, state):
     """
     return text, visible_text
 
-def input_modifier(string, state):
+def input_modifier(string, state, is_chat=False):
     """
     In default/notebook modes, modifies the whole prompt.
 
@@ -196,7 +196,7 @@ def logits_processor_modifier(processor_list, input_ids):
     processor_list.append(MyLogits())
     return processor_list
 
-def output_modifier(string, state):
+def output_modifier(string, state, is_chat=False):
     """
     Modifies the LLM output before it gets presented.
 

extensions/api/util.py

@@ -68,8 +68,6 @@ def build_parameters(body, chat=False):
         name1, name2, _, greeting, context, _ = load_character_memoized(character, str(body.get('your_name', shared.settings['name1'])), shared.settings['name2'], instruct=False)
         name1_instruct, name2_instruct, _, _, context_instruct, turn_template = load_character_memoized(instruction_template, '', '', instruct=True)
         generate_params.update({
-            'stop_at_newline': bool(body.get('stop_at_newline', shared.settings['stop_at_newline'])),
-            'chat_generation_attempts': int(body.get('chat_generation_attempts', shared.settings['chat_generation_attempts'])),
             'mode': str(body.get('mode', 'chat')),
             'name1': str(body.get('name1', name1)),
             'name2': str(body.get('name2', name2)),

extensions/elevenlabs_tts/script.py

@@ -4,9 +4,9 @@ from pathlib import Path
 import elevenlabs
 import gradio as gr
 
-from modules import chat, shared
+from modules import chat, shared, ui_chat
-from modules.utils import gradio
 from modules.logging_colors import logger
+from modules.utils import gradio
 
 params = {
     'activate': True,
@@ -167,7 +167,6 @@ def ui():
         convert_cancel = gr.Button('Cancel', visible=False)
         convert_confirm = gr.Button('Confirm (cannot be undone)', variant="stop", visible=False)
 
-    if shared.is_chat():
     # Convert history with confirmation
     convert_arr = [convert_confirm, convert, convert_cancel]
     convert.click(lambda: [gr.update(visible=True), gr.update(visible=False), gr.update(visible=True)], None, convert_arr)
@@ -175,7 +174,7 @@ def ui():
         lambda: [gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, convert_arr).then(
         remove_tts_from_history, gradio('history'), gradio('history')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None).then(
-            chat.redraw_html, shared.reload_inputs, gradio('display'))
+        chat.redraw_html, gradio(ui_chat.reload_arr), gradio('display'))
 
     convert_cancel.click(lambda: [gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, convert_arr)
 
@@ -184,7 +183,7 @@ def ui():
         lambda x: params.update({"show_text": x}), show_text, None).then(
         toggle_text_in_history, gradio('history'), gradio('history')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None).then(
-            chat.redraw_html, shared.reload_inputs, gradio('display'))
+        chat.redraw_html, gradio(ui_chat.reload_arr), gradio('display'))
 
     # Event functions to update the parameters in the backend
     activate.change(lambda x: params.update({'activate': x}), activate, None)

extensions/example/script.py

@@ -59,7 +59,7 @@ def chat_input_modifier(text, visible_text, state):
     """
     return text, visible_text
 
-def input_modifier(string, state):
+def input_modifier(string, state, is_chat=False):
     """
     In default/notebook modes, modifies the whole prompt.
 
@@ -92,7 +92,7 @@ def logits_processor_modifier(processor_list, input_ids):
     processor_list.append(MyLogits())
     return processor_list
 
-def output_modifier(string, state):
+def output_modifier(string, state, is_chat=False):
     """
     Modifies the LLM output before it gets presented.
 

extensions/gallery/script.js

@@ -0,0 +1,14 @@
+let gallery_element = document.getElementById('gallery-extension');
+
+main_parent.addEventListener('click', function(e) {
+    let chat_visible = (chat_tab.offsetHeight > 0 && chat_tab.offsetWidth > 0);
+    let notebook_visible = (notebook_tab.offsetHeight > 0 && notebook_tab.offsetWidth > 0);
+    let default_visible = (default_tab.offsetHeight > 0 && default_tab.offsetWidth > 0);
+
+    // Only show this extension in the Chat tab
+    if (chat_visible) {
+        gallery_element.style.display = 'flex';
+    } else {
+        gallery_element.style.display = 'none';
+    }
+});

extensions/gallery/script.py

@@ -82,8 +82,13 @@ def select_character(evt: gr.SelectData):
     return (evt.value[1])
 
 
+def custom_js():
+    path_to_js = Path(__file__).parent.resolve() / 'script.js'
+    return open(path_to_js, 'r').read()
+
+
 def ui():
-    with gr.Accordion("Character gallery", open=False):
+    with gr.Accordion("Character gallery", open=False, elem_id='gallery-extension'):
         update = gr.Button("Refresh")
         gr.HTML(value="<style>" + generate_css() + "</style>")
         gallery = gr.Dataset(components=[gr.HTML(visible=False)],

extensions/send_pictures/script.py

@@ -5,7 +5,7 @@ import gradio as gr
 import torch
 from transformers import BlipForConditionalGeneration, BlipProcessor
 
-from modules import chat, shared
+from modules import chat, shared, ui_chat
 from modules.ui import gather_interface_values
 from modules.utils import gradio
 
@@ -54,5 +54,5 @@ def ui():
             "value": generate_chat_picture(picture, name1, name2)
         }), [picture_select, shared.gradio['name1'], shared.gradio['name2']], None).then(
         gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        chat.generate_chat_reply_wrapper, shared.input_params, gradio('display', 'history'), show_progress=False).then(
+        chat.generate_chat_reply_wrapper, gradio(ui_chat.inputs), gradio('display', 'history'), show_progress=False).then(
         lambda: None, None, picture_select, show_progress=False)

extensions/silero_tts/script.py

@@ -6,7 +6,7 @@ import gradio as gr
 import torch
 
 from extensions.silero_tts import tts_preprocessor
-from modules import chat, shared
+from modules import chat, shared, ui_chat
 from modules.utils import gradio
 
 torch._C._jit_set_profiling_mode(False)
@@ -194,7 +194,6 @@ def ui():
             convert_cancel = gr.Button('Cancel', visible=False)
             convert_confirm = gr.Button('Confirm (cannot be undone)', variant="stop", visible=False)
 
-    if shared.is_chat():
     # Convert history with confirmation
     convert_arr = [convert_confirm, convert, convert_cancel]
     convert.click(lambda: [gr.update(visible=True), gr.update(visible=False), gr.update(visible=True)], None, convert_arr)
@@ -202,7 +201,7 @@ def ui():
         lambda: [gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, convert_arr).then(
         remove_tts_from_history, gradio('history'), gradio('history')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None).then(
-            chat.redraw_html, shared.reload_inputs, gradio('display'))
+        chat.redraw_html, gradio(ui_chat.reload_arr), gradio('display'))
 
     convert_cancel.click(lambda: [gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, convert_arr)
 
@@ -211,7 +210,7 @@ def ui():
         lambda x: params.update({"show_text": x}), show_text, None).then(
         toggle_text_in_history, gradio('history'), gradio('history')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None).then(
-            chat.redraw_html, shared.reload_inputs, gradio('display'))
+        chat.redraw_html, gradio(ui_chat.reload_arr), gradio('display'))
 
     # Event functions to update the parameters in the backend
     activate.change(lambda x: params.update({"activate": x}), activate, None)

extensions/superbooga/script.py

@@ -4,7 +4,7 @@ import textwrap
 import gradio as gr
 from bs4 import BeautifulSoup
 
-from modules import chat, shared
+from modules import chat
 from modules.logging_colors import logger
 
 from .chromadb import add_chunks_to_collector, make_collector
@@ -143,8 +143,8 @@ def remove_special_tokens(string):
     return re.sub(pattern, '', string)
 
 
-def input_modifier(string):
+def input_modifier(string, state, is_chat=False):
-    if shared.is_chat():
+    if is_chat:
         return string
 
     # Find the user input

js/main.js

@@ -1,17 +1,30 @@
-document.getElementById("main").parentNode.childNodes[0].classList.add("header_bar");
+let chat_tab = document.getElementById('chat-tab');
-document.getElementById("main").parentNode.style = "padding: 0; margin: 0";
+let notebook_tab = document.getElementById('notebook-tab');
-document.getElementById("main").parentNode.parentNode.parentNode.style = "padding: 0";
+let default_tab = document.getElementById('default-tab');
 
-// Get references to the elements
+let main_parent = chat_tab.parentNode;
-let main = document.getElementById('main');
-let main_parent = main.parentNode;
 let extensions = document.getElementById('extensions');
 
-// Add an event listener to the main element
+main_parent.childNodes[0].classList.add("header_bar");
+main_parent.style = "padding: 0; margin: 0";
+main_parent.parentNode.parentNode.style = "padding: 0";
+
+// Add an event listener to the generation tabs
 main_parent.addEventListener('click', function(e) {
-    // Check if the main element is visible
+    let chat_visible = (chat_tab.offsetHeight > 0 && chat_tab.offsetWidth > 0);
-    if (main.offsetHeight > 0 && main.offsetWidth > 0) {
+    let notebook_visible = (notebook_tab.offsetHeight > 0 && notebook_tab.offsetWidth > 0);
+    let default_visible = (default_tab.offsetHeight > 0 && default_tab.offsetWidth > 0);
+
+    // Check if one of the generation tabs is visible
+    if (chat_visible || notebook_visible || default_visible) {
         extensions.style.display = 'flex';
+        if (chat_visible) {
+            extensions.style.maxWidth = "800px";
+            extensions.style.padding = "0px";
+        } else {
+            extensions.style.maxWidth = "none";
+            extensions.style.padding = "15px";
+        }
     } else {
         extensions.style.display = 'none';
     }

js/save_files.js

@@ -32,9 +32,9 @@ function saveHistory(history, character, mode) {
     saveFile(history, path);
 }
 
-function saveSession(session, mode) {
+function saveSession(session) {
     let path = null;
 
-    path = `session_${mode}_${getCurrentTimestamp()}.json`;
+    path = `session_${getCurrentTimestamp()}.json`;
     saveFile(session, path);
 }

modules/chat.py

@@ -175,9 +175,6 @@ def get_stopping_strings(state):
             f"\n{state['name2']}:"
         ]
 
-    if state['stop_at_newline']:
-        stopping_strings.append("\n")
-
     return stopping_strings
 
 
@@ -201,7 +198,7 @@ def chatbot_wrapper(text, state, regenerate=False, _continue=False, loading_mess
     if not any((regenerate, _continue)):
         visible_text = text
         text, visible_text = apply_extensions('chat_input', text, visible_text, state)
-        text = apply_extensions('input', text, state)
+        text = apply_extensions('input', text, state, is_chat=True)
 
         # *Is typing...*
         if loading_message:
@@ -230,11 +227,8 @@ def chatbot_wrapper(text, state, regenerate=False, _continue=False, loading_mess
         prompt = generate_chat_prompt(text, state, **kwargs)
 
     # Generate
-    cumulative_reply = ''
-    for i in range(state['chat_generation_attempts']):
     reply = None
-        for j, reply in enumerate(generate_reply(prompt + cumulative_reply, state, stopping_strings=stopping_strings, is_chat=True)):
+    for j, reply in enumerate(generate_reply(prompt, state, stopping_strings=stopping_strings, is_chat=True)):
-            reply = cumulative_reply + reply
 
         # Extract the reply
         visible_reply = re.sub("(<USER>|<user>|{{user}})", state['name1'], reply)
@@ -242,7 +236,7 @@ def chatbot_wrapper(text, state, regenerate=False, _continue=False, loading_mess
         # We need this global variable to handle the Stop event,
         # otherwise gradio gets confused
         if shared.stop_everything:
-                output['visible'][-1][1] = apply_extensions('output', output['visible'][-1][1], state)
+            output['visible'][-1][1] = apply_extensions('output', output['visible'][-1][1], state, is_chat=True)
             yield output
             return
 
@@ -263,12 +257,7 @@ def chatbot_wrapper(text, state, regenerate=False, _continue=False, loading_mess
             if is_stream:
                 yield output
 
-        if reply in [None, cumulative_reply]:
+    output['visible'][-1][1] = apply_extensions('output', output['visible'][-1][1], state, is_chat=True)
-            break
-        else:
-            cumulative_reply = reply
-
-    output['visible'][-1][1] = apply_extensions('output', output['visible'][-1][1], state)
     yield output
 
 
@@ -278,28 +267,16 @@ def impersonate_wrapper(text, start_with, state):
         yield ''
         return
 
-    # Defining some variables
-    cumulative_reply = ''
     prompt = generate_chat_prompt('', state, impersonate=True)
     stopping_strings = get_stopping_strings(state)
 
     yield text + '...'
-    cumulative_reply = text
-    for i in range(state['chat_generation_attempts']):
     reply = None
-        for reply in generate_reply(prompt + cumulative_reply, state, stopping_strings=stopping_strings, is_chat=True):
+    for reply in generate_reply(prompt, state, stopping_strings=stopping_strings, is_chat=True):
-            reply = cumulative_reply + reply
         yield reply.lstrip(' ')
         if shared.stop_everything:
             return
 
-        if reply in [None, cumulative_reply]:
-            break
-        else:
-            cumulative_reply = reply
-
-    yield cumulative_reply.lstrip(' ')
-
 
 def generate_chat_reply(text, state, regenerate=False, _continue=False, loading_message=True):
     history = state['history']
@@ -352,7 +329,7 @@ def replace_last_reply(text, state):
         return history
     elif len(history['visible']) > 0:
         history['visible'][-1][1] = text
-        history['internal'][-1][1] = apply_extensions('input', text, state)
+        history['internal'][-1][1] = apply_extensions('input', text, state, is_chat=True)
 
     return history
 
@@ -360,7 +337,7 @@ def replace_last_reply(text, state):
 def send_dummy_message(text, state):
     history = state['history']
     history['visible'].append([text, ''])
-    history['internal'].append([apply_extensions('input', text, state), ''])
+    history['internal'].append([apply_extensions('input', text, state, is_chat=True), ''])
     return history
 
 
@@ -371,7 +348,7 @@ def send_dummy_reply(text, state):
         history['internal'].append(['', ''])
 
     history['visible'][-1][1] = text
-    history['internal'][-1][1] = apply_extensions('input', text, state)
+    history['internal'][-1][1] = apply_extensions('input', text, state, is_chat=True)
     return history
 
 
@@ -385,7 +362,7 @@ def clear_chat_log(state):
     if mode != 'instruct':
         if greeting != '':
             history['internal'] += [['<|BEGIN-VISIBLE-CHAT|>', greeting]]
-            history['visible'] += [['', apply_extensions('output', greeting, state)]]
+            history['visible'] += [['', apply_extensions('output', greeting, state, is_chat=True)]]
 
     return history
 
@@ -452,7 +429,7 @@ def load_persistent_history(state):
         history = {'internal': [], 'visible': []}
         if greeting != "":
             history['internal'] += [['<|BEGIN-VISIBLE-CHAT|>', greeting]]
-            history['visible'] += [['', apply_extensions('output', greeting, state)]]
+            history['visible'] += [['', apply_extensions('output', greeting, state, is_chat=True)]]
 
     return history
 

modules/extensions.py

@@ -53,14 +53,32 @@ def iterator():
 
 
 # Extension functions that map string -> string
-def _apply_string_extensions(function_name, text, state):
+def _apply_string_extensions(function_name, text, state, is_chat=False):
     for extension, _ in iterator():
         if hasattr(extension, function_name):
             func = getattr(extension, function_name)
-            if len(signature(func).parameters) == 2:
+
-                text = func(text, state)
+            # Handle old extensions without the 'state' arg or
+            # the 'is_chat' kwarg
+            count = 0
+            has_chat = False
+            for k in signature(func).parameters:
+                if k == 'is_chat':
+                    has_chat = True
                 else:
-                text = func(text)
+                    count += 1
+
+            if count == 2:
+                args = [text, state]
+            else:
+                args = [text]
+
+            if has_chat:
+                kwargs = {'is_chat': is_chat}
+            else:
+                kwargs = {}
+
+            text = func(*args, **kwargs)
 
     return text
 
@@ -169,9 +187,7 @@ def create_extensions_block():
     if len(to_display) > 0:
         with gr.Column(elem_id="extensions"):
             for row in to_display:
-                extension, name = row
+                extension, _ = row
-                display_name = getattr(extension, 'params', {}).get('display_name', name)
-                gr.Markdown(f"\n### {display_name}")
                 extension.ui()
 
 

modules/shared.py

@@ -19,8 +19,6 @@ lora_names = []
 stop_everything = False
 generation_lock = None
 processing_message = '*Is typing...*'
-input_params = []
-reload_inputs = []
 
 # UI variables
 gradio = {}
@@ -45,7 +43,6 @@ settings = {
     'greeting': '',
     'turn_template': '',
     'custom_stopping_strings': '',
-    'stop_at_newline': False,
     'add_bos_token': True,
     'ban_eos_token': False,
     'skip_special_tokens': True,
@@ -57,11 +54,7 @@ settings = {
     'chat_style': 'TheEncrypted777',
     'instruction_template': 'None',
     'chat-instruct_command': 'Continue the chat dialogue below. Write a single reply for the character "<|character|>".\n\n<|prompt|>',
-    'chat_generation_attempts': 1,
+    'default_extensions': ['gallery'],
-    'chat_generation_attempts_min': 1,
-    'chat_generation_attempts_max': 10,
-    'default_extensions': [],
-    'chat_default_extensions': ['gallery'],
     'preset': 'simple-1',
     'prompt': 'QA',
 }
@@ -81,8 +74,8 @@ def str2bool(v):
 parser = argparse.ArgumentParser(formatter_class=lambda prog: argparse.HelpFormatter(prog, max_help_position=54))
 
 # Basic settings
-parser.add_argument('--notebook', action='store_true', help='Launch the web UI in notebook mode, where the output is written to the same text box as the input.')
+parser.add_argument('--notebook', action='store_true', help='DEPRECATED')
-parser.add_argument('--chat', action='store_true', help='Launch the web UI in chat mode with a style similar to the Character.AI website.')
+parser.add_argument('--chat', action='store_true', help='DEPRECATED')
 parser.add_argument('--multi-user', action='store_true', help='Multi-user mode. Chat histories are not saved or automatically loaded. WARNING: this is highly experimental.')
 parser.add_argument('--character', type=str, help='The name of the character to load in chat mode by default.')
 parser.add_argument('--model', type=str, help='Name of the model to load by default.')
@@ -187,6 +180,11 @@ parser.add_argument('--multimodal-pipeline', type=str, default=None, help='The m
 args = parser.parse_args()
 args_defaults = parser.parse_args([])
 
+# Deprecation warnings
+for k in ['chat', 'notebook']:
+    if getattr(args, k):
+        logger.warning(f'--{k} has been deprecated and will be removed soon. Please remove that flag.')
+
 # Security warnings
 if args.trust_remote_code:
     logger.warning("trust_remote_code is enabled. This is dangerous.")
@@ -227,16 +225,7 @@ def add_extension(name):
 
 
 def is_chat():
-    return args.chat
+    return True
-
-
-def get_mode():
-    if args.chat:
-        return 'chat'
-    elif args.notebook:
-        return 'notebook'
-    else:
-        return 'default'
 
 
 args.loader = fix_loader_name(args.loader)

modules/ui.py

@@ -8,10 +8,8 @@ from modules import shared
 
 with open(Path(__file__).resolve().parent / '../css/main.css', 'r') as f:
     css = f.read()
-with open(Path(__file__).resolve().parent / '../css/chat.css', 'r') as f:
-    chat_css = f.read()
 with open(Path(__file__).resolve().parent / '../js/main.js', 'r') as f:
-    main_js = f.read()
+    js = f.read()
 with open(Path(__file__).resolve().parent / '../js/save_files.js', 'r') as f:
     save_files_js = f.read()
 
@@ -116,16 +114,15 @@ def list_interface_input_elements():
         'top_a',
     ]
 
-    if shared.args.chat:
+    # Chat elements
     elements += [
+        'textbox',
         'character_menu',
         'history',
         'name1',
         'name2',
         'greeting',
         'context',
-            'chat_generation_attempts',
-            'stop_at_newline',
         'mode',
         'instruction_template',
         'name1_instruct',
@@ -135,12 +132,17 @@ def list_interface_input_elements():
         'chat_style',
         'chat-instruct_command',
     ]
-    else:
-        elements.append('textbox')
-        if not shared.args.notebook:
-            elements.append('output_textbox')
 
+    # Notebook/default elements
+    elements += [
+        'textbox-notebook',
+        'textbox-default',
+        'output_textbox'
+    ]
+
+    # Model elements
     elements += list_model_elements()
+
     return elements
 
 

modules/ui_chat.py

@@ -10,14 +10,17 @@ from modules.html_generator import chat_html_wrapper
 from modules.text_generation import stop_everything_event
 from modules.utils import gradio
 
+inputs = ('Chat input', 'start_with', 'interface_state')
+reload_arr = ('history', 'name1', 'name2', 'mode', 'chat_style')
+clear_arr = ('Clear history-confirm', 'Clear history', 'Clear history-cancel')
+
 
 def create_ui():
-    shared.gradio['interface_state'] = gr.State({k: None for k in shared.input_elements})
     shared.gradio['Chat input'] = gr.State()
     shared.gradio['dummy'] = gr.State()
     shared.gradio['history'] = gr.State({'internal': [], 'visible': []})
 
-    with gr.Tab('Text generation', elem_id='main'):
+    with gr.Tab('Chat', elem_id='chat-tab'):
         shared.gradio['display'] = gr.HTML(value=chat_html_wrapper({'internal': [], 'visible': []}, shared.settings['name1'], shared.settings['name2'], 'chat', 'cai-chat'))
         shared.gradio['textbox'] = gr.Textbox(label='Input')
         with gr.Row():
@@ -45,10 +48,11 @@ def create_ui():
             shared.gradio['start_with'] = gr.Textbox(label='Start reply with', placeholder='Sure thing!', value=shared.settings['start_with'])
 
         with gr.Row():
-            shared.gradio['mode'] = gr.Radio(choices=['chat', 'chat-instruct', 'instruct'], value=shared.settings['mode'] if shared.settings['mode'] in ['chat', 'instruct', 'chat-instruct'] else 'chat', label='Mode', info='Defines how the chat prompt is generated. In instruct and chat-instruct modes, the instruction template selected under "Chat settings" must match the current model.')
+            shared.gradio['mode'] = gr.Radio(choices=['chat', 'chat-instruct', 'instruct'], value=shared.settings['mode'] if shared.settings['mode'] in ['chat', 'instruct', 'chat-instruct'] else 'chat', label='Mode', info='Defines how the chat prompt is generated. In instruct and chat-instruct modes, the instruction template selected under Parameters > Instruction template must match the current model.')
             shared.gradio['chat_style'] = gr.Dropdown(choices=utils.get_available_chat_styles(), label='Chat style', value=shared.settings['chat_style'], visible=shared.settings['mode'] != 'instruct')
 
-    with gr.Tab('Chat settings', elem_id='chat-settings'):
+
+def create_chat_settings_ui():
     with gr.Tab('Character'):
         with gr.Row():
             with gr.Column(scale=8):
@@ -112,15 +116,12 @@ def create_ui():
 
 def create_event_handlers():
     gen_events = []
-
+    shared.input_params = gradio(inputs)  # Obsolete, kept for compatibility with old extensions
-    shared.input_params = gradio('Chat input', 'start_with', 'interface_state')
-    clear_arr = gradio('Clear history-confirm', 'Clear history', 'Clear history-cancel')
-    shared.reload_inputs = gradio('history', 'name1', 'name2', 'mode', 'chat_style')
 
     gen_events.append(shared.gradio['Generate'].click(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda x: (x, ''), gradio('textbox'), gradio('Chat input', 'textbox'), show_progress=False).then(
-        chat.generate_chat_reply_wrapper, shared.input_params, gradio('display', 'history'), show_progress=False).then(
+        chat.generate_chat_reply_wrapper, gradio(inputs), gradio('display', 'history'), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
@@ -129,7 +130,7 @@ def create_event_handlers():
     gen_events.append(shared.gradio['textbox'].submit(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda x: (x, ''), gradio('textbox'), gradio('Chat input', 'textbox'), show_progress=False).then(
-        chat.generate_chat_reply_wrapper, shared.input_params, gradio('display', 'history'), show_progress=False).then(
+        chat.generate_chat_reply_wrapper, gradio(inputs), gradio('display', 'history'), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
@@ -137,7 +138,7 @@ def create_event_handlers():
 
     gen_events.append(shared.gradio['Regenerate'].click(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        partial(chat.generate_chat_reply_wrapper, regenerate=True), shared.input_params, gradio('display', 'history'), show_progress=False).then(
+        partial(chat.generate_chat_reply_wrapper, regenerate=True), gradio(inputs), gradio('display', 'history'), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
@@ -145,7 +146,7 @@ def create_event_handlers():
 
     gen_events.append(shared.gradio['Continue'].click(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        partial(chat.generate_chat_reply_wrapper, _continue=True), shared.input_params, gradio('display', 'history'), show_progress=False).then(
+        partial(chat.generate_chat_reply_wrapper, _continue=True), gradio(inputs), gradio('display', 'history'), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
@@ -154,7 +155,7 @@ def create_event_handlers():
     gen_events.append(shared.gradio['Impersonate'].click(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda x: x, gradio('textbox'), gradio('Chat input'), show_progress=False).then(
-        chat.impersonate_wrapper, shared.input_params, gradio('textbox'), show_progress=False).then(
+        chat.impersonate_wrapper, gradio(inputs), gradio('textbox'), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
     )
@@ -163,59 +164,59 @@ def create_event_handlers():
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         chat.replace_last_reply, gradio('textbox', 'interface_state'), gradio('history')).then(
         lambda: '', None, gradio('textbox'), show_progress=False).then(
-        chat.redraw_html, shared.reload_inputs, gradio('display')).then(
+        chat.redraw_html, gradio(reload_arr), gradio('display')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None)
 
     shared.gradio['Send dummy message'].click(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         chat.send_dummy_message, gradio('textbox', 'interface_state'), gradio('history')).then(
         lambda: '', None, gradio('textbox'), show_progress=False).then(
-        chat.redraw_html, shared.reload_inputs, gradio('display')).then(
+        chat.redraw_html, gradio(reload_arr), gradio('display')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None)
 
     shared.gradio['Send dummy reply'].click(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         chat.send_dummy_reply, gradio('textbox', 'interface_state'), gradio('history')).then(
         lambda: '', None, gradio('textbox'), show_progress=False).then(
-        chat.redraw_html, shared.reload_inputs, gradio('display')).then(
+        chat.redraw_html, gradio(reload_arr), gradio('display')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None)
 
-    shared.gradio['Clear history'].click(lambda: [gr.update(visible=True), gr.update(visible=False), gr.update(visible=True)], None, clear_arr)
+    shared.gradio['Clear history'].click(lambda: [gr.update(visible=True), gr.update(visible=False), gr.update(visible=True)], None, gradio(clear_arr))
-    shared.gradio['Clear history-cancel'].click(lambda: [gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, clear_arr)
+    shared.gradio['Clear history-cancel'].click(lambda: [gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, gradio(clear_arr))
     shared.gradio['Clear history-confirm'].click(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        lambda: [gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, clear_arr).then(
+        lambda: [gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)], None, gradio(clear_arr)).then(
         chat.clear_chat_log, gradio('interface_state'), gradio('history')).then(
-        chat.redraw_html, shared.reload_inputs, gradio('display')).then(
+        chat.redraw_html, gradio(reload_arr), gradio('display')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None)
 
     shared.gradio['Remove last'].click(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         chat.remove_last_message, gradio('history'), gradio('textbox', 'history'), show_progress=False).then(
-        chat.redraw_html, shared.reload_inputs, gradio('display')).then(
+        chat.redraw_html, gradio(reload_arr), gradio('display')).then(
         chat.save_persistent_history, gradio('history', 'character_menu', 'mode'), None)
 
     shared.gradio['character_menu'].change(
         partial(chat.load_character, instruct=False), gradio('character_menu', 'name1', 'name2'), gradio('name1', 'name2', 'character_picture', 'greeting', 'context', 'dummy')).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         chat.load_persistent_history, gradio('interface_state'), gradio('history')).then(
-        chat.redraw_html, shared.reload_inputs, gradio('display'))
+        chat.redraw_html, gradio(reload_arr), gradio('display'))
 
     shared.gradio['Stop'].click(
         stop_everything_event, None, None, queue=False, cancels=gen_events if shared.args.no_stream else None).then(
-        chat.redraw_html, shared.reload_inputs, gradio('display'))
+        chat.redraw_html, gradio(reload_arr), gradio('display'))
 
     shared.gradio['mode'].change(
         lambda x: gr.update(visible=x != 'instruct'), gradio('mode'), gradio('chat_style'), show_progress=False).then(
-        chat.redraw_html, shared.reload_inputs, gradio('display'))
+        chat.redraw_html, gradio(reload_arr), gradio('display'))
 
-    shared.gradio['chat_style'].change(chat.redraw_html, shared.reload_inputs, gradio('display'))
+    shared.gradio['chat_style'].change(chat.redraw_html, gradio(reload_arr), gradio('display'))
     shared.gradio['instruction_template'].change(
         partial(chat.load_character, instruct=True), gradio('instruction_template', 'name1_instruct', 'name2_instruct'), gradio('name1_instruct', 'name2_instruct', 'dummy', 'dummy', 'context_instruct', 'turn_template'))
 
     shared.gradio['load_chat_history'].upload(
         chat.load_history, gradio('load_chat_history', 'history'), gradio('history')).then(
-        chat.redraw_html, shared.reload_inputs, gradio('display')).then(
+        chat.redraw_html, gradio(reload_arr), gradio('display')).then(
         None, None, None, _js='() => {alert("The history has been loaded.")}')
 
     shared.gradio['Copy last reply'].click(chat.send_last_reply_to_input, gradio('history'), gradio('textbox'), show_progress=False)
@@ -256,4 +257,4 @@ def create_event_handlers():
     shared.gradio['upload_img_tavern'].clear(lambda: (None, None, None, gr.update(interactive=False)), None, gradio('tavern_name', 'tavern_desc', 'tavern_json', 'Submit tavern character'), show_progress=False)
     shared.gradio['your_picture'].change(
         chat.upload_your_profile_picture, gradio('your_picture'), None).then(
-        partial(chat.redraw_html, reset_cache=True), shared.reload_inputs, gradio('display'))
+        partial(chat.redraw_html, reset_cache=True), gradio(reload_arr), gradio('display'))

modules/ui_default.py

@@ -8,87 +8,85 @@ from modules.text_generation import (
 )
 from modules.utils import gradio
 
+inputs = ('textbox-default', 'interface_state')
+outputs = ('output_textbox', 'html-default')
+
 
 def create_ui():
     default_text = load_prompt(shared.settings['prompt'])
 
-    shared.gradio['interface_state'] = gr.State({k: None for k in shared.input_elements})
+    with gr.Tab('Default', elem_id='default-tab'):
-    shared.gradio['last_input'] = gr.State('')
+        shared.gradio['last_input-default'] = gr.State('')
-
-    with gr.Tab('Text generation', elem_id='main'):
         with gr.Row():
             with gr.Column():
-                shared.gradio['textbox'] = gr.Textbox(value=default_text, elem_classes=['textbox_default', 'add_scrollbar'], lines=27, label='Input')
+                shared.gradio['textbox-default'] = gr.Textbox(value=default_text, elem_classes=['textbox_default', 'add_scrollbar'], lines=27, label='Input')
-                shared.gradio['max_new_tokens'] = gr.Slider(minimum=shared.settings['max_new_tokens_min'], maximum=shared.settings['max_new_tokens_max'], step=1, label='max_new_tokens', value=shared.settings['max_new_tokens'])
                 with gr.Row():
-                    shared.gradio['Generate'] = gr.Button('Generate', variant='primary')
+                    shared.gradio['Generate-default'] = gr.Button('Generate', variant='primary')
-                    shared.gradio['Stop'] = gr.Button('Stop', elem_id='stop')
+                    shared.gradio['Stop-default'] = gr.Button('Stop', elem_id='stop')
-                    shared.gradio['Continue'] = gr.Button('Continue')
+                    shared.gradio['Continue-default'] = gr.Button('Continue')
-                    shared.gradio['count_tokens'] = gr.Button('Count tokens')
+                    shared.gradio['count_tokens-default'] = gr.Button('Count tokens')
 
                 with gr.Row():
-                    shared.gradio['prompt_menu'] = gr.Dropdown(choices=utils.get_available_prompts(), value='None', label='Prompt', elem_classes='slim-dropdown')
+                    shared.gradio['prompt_menu-default'] = gr.Dropdown(choices=utils.get_available_prompts(), value='None', label='Prompt', elem_classes='slim-dropdown')
-                    ui.create_refresh_button(shared.gradio['prompt_menu'], lambda: None, lambda: {'choices': utils.get_available_prompts()}, 'refresh-button')
+                    ui.create_refresh_button(shared.gradio['prompt_menu-default'], lambda: None, lambda: {'choices': utils.get_available_prompts()}, 'refresh-button')
-                    shared.gradio['save_prompt'] = gr.Button('💾', elem_classes='refresh-button')
+                    shared.gradio['save_prompt-default'] = gr.Button('💾', elem_classes='refresh-button')
-                    shared.gradio['delete_prompt'] = gr.Button('🗑️', elem_classes='refresh-button')
+                    shared.gradio['delete_prompt-default'] = gr.Button('🗑️', elem_classes='refresh-button')
 
-                shared.gradio['status'] = gr.Markdown('')
+                shared.gradio['status-default'] = gr.Markdown('')
 
             with gr.Column():
                 with gr.Tab('Raw'):
                     shared.gradio['output_textbox'] = gr.Textbox(lines=27, label='Output', elem_classes=['textbox_default_output', 'add_scrollbar'])
 
                 with gr.Tab('Markdown'):
-                    shared.gradio['markdown_render'] = gr.Button('Render')
+                    shared.gradio['markdown_render-default'] = gr.Button('Render')
-                    shared.gradio['markdown'] = gr.Markdown()
+                    shared.gradio['markdown-default'] = gr.Markdown()
 
                 with gr.Tab('HTML'):
-                    shared.gradio['html'] = gr.HTML()
+                    shared.gradio['html-default'] = gr.HTML()
 
 
 def create_event_handlers():
     gen_events = []
-    shared.input_params = gradio('textbox', 'interface_state')
-    output_params = gradio('output_textbox', 'html')
 
-    gen_events.append(shared.gradio['Generate'].click(
+    gen_events.append(shared.gradio['Generate-default'].click(
-        lambda x: x, gradio('textbox'), gradio('last_input')).then(
+        lambda x: x, gradio('textbox-default'), gradio('last_input-default')).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        generate_reply_wrapper, shared.input_params, output_params, show_progress=False).then(
+        generate_reply_wrapper, gradio(inputs), gradio(outputs), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
         # lambda: None, None, None, _js="() => {element = document.getElementsByTagName('textarea')[0]; element.scrollTop = element.scrollHeight}")
     )
 
-    gen_events.append(shared.gradio['textbox'].submit(
+    gen_events.append(shared.gradio['textbox-default'].submit(
-        lambda x: x, gradio('textbox'), gradio('last_input')).then(
+        lambda x: x, gradio('textbox-default'), gradio('last_input-default')).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        generate_reply_wrapper, shared.input_params, output_params, show_progress=False).then(
+        generate_reply_wrapper, gradio(inputs), gradio(outputs), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
         # lambda: None, None, None, _js="() => {element = document.getElementsByTagName('textarea')[0]; element.scrollTop = element.scrollHeight}")
     )
 
-    shared.gradio['markdown_render'].click(lambda x: x, gradio('output_textbox'), gradio('markdown'), queue=False)
+    shared.gradio['markdown_render-default'].click(lambda x: x, gradio('output_textbox'), gradio('markdown-default'), queue=False)
-    gen_events.append(shared.gradio['Continue'].click(
+    gen_events.append(shared.gradio['Continue-default'].click(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        generate_reply_wrapper, [shared.gradio['output_textbox']] + shared.input_params[1:], output_params, show_progress=False).then(
+        generate_reply_wrapper, [shared.gradio['output_textbox']] + gradio(inputs)[1:], gradio(outputs), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
         # lambda: None, None, None, _js="() => {element = document.getElementsByTagName('textarea')[1]; element.scrollTop = element.scrollHeight}")
     )
 
-    shared.gradio['Stop'].click(stop_everything_event, None, None, queue=False, cancels=gen_events if shared.args.no_stream else None)
+    shared.gradio['Stop-default'].click(stop_everything_event, None, None, queue=False, cancels=gen_events if shared.args.no_stream else None)
-    shared.gradio['prompt_menu'].change(load_prompt, gradio('prompt_menu'), gradio('textbox'), show_progress=False)
+    shared.gradio['prompt_menu-default'].change(load_prompt, gradio('prompt_menu-default'), gradio('textbox-default'), show_progress=False)
-    shared.gradio['save_prompt'].click(
+    shared.gradio['save_prompt-default'].click(
-        lambda x: x, gradio('textbox'), gradio('save_contents')).then(
+        lambda x: x, gradio('textbox-default'), gradio('save_contents')).then(
         lambda: 'prompts/', None, gradio('save_root')).then(
         lambda: utils.current_time() + '.txt', None, gradio('save_filename')).then(
         lambda: gr.update(visible=True), None, gradio('file_saver'))
 
-    shared.gradio['delete_prompt'].click(
+    shared.gradio['delete_prompt-default'].click(
         lambda: 'prompts/', None, gradio('delete_root')).then(
-        lambda x: x + '.txt', gradio('prompt_menu'), gradio('delete_filename')).then(
+        lambda x: x + '.txt', gradio('prompt_menu-default'), gradio('delete_filename')).then(
         lambda: gr.update(visible=True), None, gradio('file_deleter'))
 
-    shared.gradio['count_tokens'].click(count_tokens, gradio('textbox'), gradio('status'), show_progress=False)
+    shared.gradio['count_tokens-default'].click(count_tokens, gradio('textbox-default'), gradio('status-default'), show_progress=False)

modules/ui_file_saving.py

@@ -2,7 +2,7 @@ import json
 
 import gradio as gr
 
-from modules import chat, presets, shared, ui, utils
+from modules import chat, presets, shared, ui, ui_chat, utils
 from modules.utils import gradio
 
 
@@ -26,7 +26,6 @@ def create_ui():
             shared.gradio['delete_cancel'] = gr.Button('Cancel', elem_classes="small-button")
 
     # Character saver/deleter
-    if shared.is_chat():
     with gr.Box(visible=False, elem_classes='file-saver') as shared.gradio['character_saver']:
         shared.gradio['save_character_filename'] = gr.Textbox(lines=1, label='File name', info='The character will be saved to your characters/ folder with this base filename.')
         with gr.Row():
@@ -51,7 +50,7 @@ def create_event_handlers():
 
     shared.gradio['delete_cancel'].click(lambda: gr.update(visible=False), None, gradio('file_deleter'))
     shared.gradio['save_cancel'].click(lambda: gr.update(visible=False), None, gradio('file_saver'))
-    if shared.is_chat():
+
     shared.gradio['save_character_confirm'].click(
         chat.save_character, gradio('name2', 'greeting', 'context', 'character_picture', 'save_character_filename'), None).then(
         lambda: gr.update(visible=False), None, gradio('character_saver'))
@@ -80,20 +79,13 @@ def create_event_handlers():
         shared.gradio['save_session'].click(
             ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
             lambda x: json.dumps(x, indent=4), gradio('interface_state'), gradio('temporary_text')).then(
-            None, gradio('temporary_text'), None, _js=f"(contents) => {{{ui.save_files_js}; saveSession(contents, \"{shared.get_mode()}\")}}")
+            None, gradio('temporary_text'), None, _js=f"(contents) => {{{ui.save_files_js}; saveSession(contents)}}")
 
-        if shared.is_chat():
-            shared.gradio['load_session'].upload(
-                ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-                load_session, gradio('load_session', 'interface_state'), gradio('interface_state')).then(
-                ui.apply_interface_values, gradio('interface_state'), gradio(ui.list_interface_input_elements()), show_progress=False).then(
-                chat.redraw_html, shared.reload_inputs, gradio('display')).then(
-                None, None, None, _js='() => {alert("The session has been loaded.")}')
-        else:
         shared.gradio['load_session'].upload(
             ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
             load_session, gradio('load_session', 'interface_state'), gradio('interface_state')).then(
             ui.apply_interface_values, gradio('interface_state'), gradio(ui.list_interface_input_elements()), show_progress=False).then(
+            chat.redraw_html, gradio(ui_chat.reload_arr), gradio('display')).then(
             None, None, None, _js='() => {alert("The session has been loaded.")}')
 
 
@@ -101,7 +93,7 @@ def load_session(file, state):
     decoded_file = file if type(file) == str else file.decode('utf-8')
     data = json.loads(decoded_file)
 
-    if shared.is_chat() and 'character_menu' in data and state.get('character_menu') != data.get('character_menu'):
+    if 'character_menu' in data and state.get('character_menu') != data.get('character_menu'):
         shared.session_is_loading = True
 
     state.update(data)

modules/ui_notebook.py

@@ -8,90 +8,85 @@ from modules.text_generation import (
 )
 from modules.utils import gradio
 
+inputs = ('textbox-notebook', 'interface_state')
+outputs = ('textbox-notebook', 'html-notebook')
+
 
 def create_ui():
     default_text = load_prompt(shared.settings['prompt'])
-    shared.gradio['interface_state'] = gr.State({k: None for k in shared.input_elements})
-    shared.gradio['last_input'] = gr.State('')
 
-    with gr.Tab('Text generation', elem_id='main'):
+    with gr.Tab('Notebook', elem_id='notebook-tab'):
+        shared.gradio['last_input-notebook'] = gr.State('')
         with gr.Row():
             with gr.Column(scale=4):
                 with gr.Tab('Raw'):
-                    shared.gradio['textbox'] = gr.Textbox(value=default_text, elem_classes=['textbox', 'add_scrollbar'], lines=27)
+                    shared.gradio['textbox-notebook'] = gr.Textbox(value=default_text, elem_classes=['textbox', 'add_scrollbar'], lines=27)
 
                 with gr.Tab('Markdown'):
-                    shared.gradio['markdown_render'] = gr.Button('Render')
+                    shared.gradio['markdown_render-notebook'] = gr.Button('Render')
-                    shared.gradio['markdown'] = gr.Markdown()
+                    shared.gradio['markdown-notebook'] = gr.Markdown()
 
                 with gr.Tab('HTML'):
-                    shared.gradio['html'] = gr.HTML()
+                    shared.gradio['html-notebook'] = gr.HTML()
 
                 with gr.Row():
-                    shared.gradio['Generate'] = gr.Button('Generate', variant='primary', elem_classes='small-button')
+                    shared.gradio['Generate-notebook'] = gr.Button('Generate', variant='primary', elem_classes='small-button')
-                    shared.gradio['Stop'] = gr.Button('Stop', elem_classes='small-button', elem_id='stop')
+                    shared.gradio['Stop-notebook'] = gr.Button('Stop', elem_classes='small-button', elem_id='stop')
                     shared.gradio['Undo'] = gr.Button('Undo', elem_classes='small-button')
-                    shared.gradio['Regenerate'] = gr.Button('Regenerate', elem_classes='small-button')
+                    shared.gradio['Regenerate-notebook'] = gr.Button('Regenerate', elem_classes='small-button')
 
             with gr.Column(scale=1):
                 gr.HTML('<div style="padding-bottom: 13px"></div>')
-                shared.gradio['max_new_tokens'] = gr.Slider(minimum=shared.settings['max_new_tokens_min'], maximum=shared.settings['max_new_tokens_max'], step=1, label='max_new_tokens', value=shared.settings['max_new_tokens'])
                 with gr.Row():
-                    shared.gradio['prompt_menu'] = gr.Dropdown(choices=utils.get_available_prompts(), value='None', label='Prompt', elem_classes='slim-dropdown')
+                    shared.gradio['prompt_menu-notebook'] = gr.Dropdown(choices=utils.get_available_prompts(), value='None', label='Prompt', elem_classes='slim-dropdown')
-                    ui.create_refresh_button(shared.gradio['prompt_menu'], lambda: None, lambda: {'choices': utils.get_available_prompts()}, ['refresh-button', 'refresh-button-small'])
+                    ui.create_refresh_button(shared.gradio['prompt_menu-notebook'], lambda: None, lambda: {'choices': utils.get_available_prompts()}, ['refresh-button', 'refresh-button-small'])
-                    shared.gradio['save_prompt'] = gr.Button('💾', elem_classes=['refresh-button', 'refresh-button-small'])
+                    shared.gradio['save_prompt-notebook'] = gr.Button('💾', elem_classes=['refresh-button', 'refresh-button-small'])
-                    shared.gradio['delete_prompt'] = gr.Button('🗑️', elem_classes=['refresh-button', 'refresh-button-small'])
+                    shared.gradio['delete_prompt-notebook'] = gr.Button('🗑️', elem_classes=['refresh-button', 'refresh-button-small'])
 
-                shared.gradio['count_tokens'] = gr.Button('Count tokens')
+                shared.gradio['count_tokens-notebook'] = gr.Button('Count tokens')
-                shared.gradio['status'] = gr.Markdown('')
+                shared.gradio['status-notebook'] = gr.Markdown('')
 
 
 def create_event_handlers():
     gen_events = []
 
-    shared.input_params = gradio('textbox', 'interface_state')
+    gen_events.append(shared.gradio['Generate-notebook'].click(
-    output_params = gradio('textbox', 'html')
+        lambda x: x, gradio('textbox-notebook'), gradio('last_input-notebook')).then(
-
-    gen_events.append(shared.gradio['Generate'].click(
-        lambda x: x, gradio('textbox'), gradio('last_input')).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        generate_reply_wrapper, shared.input_params, output_params, show_progress=False).then(
+        generate_reply_wrapper, gradio(inputs), gradio(outputs), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
-        # lambda: None, None, None, _js="() => {element = document.getElementsByTagName('textarea')[0]; element.scrollTop = element.scrollHeight}")
     )
 
-    gen_events.append(shared.gradio['textbox'].submit(
+    gen_events.append(shared.gradio['textbox-notebook'].submit(
-        lambda x: x, gradio('textbox'), gradio('last_input')).then(
+        lambda x: x, gradio('textbox-notebook'), gradio('last_input-notebook')).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        generate_reply_wrapper, shared.input_params, output_params, show_progress=False).then(
+        generate_reply_wrapper, gradio(inputs), gradio(outputs), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
-        # lambda: None, None, None, _js="() => {element = document.getElementsByTagName('textarea')[0]; element.scrollTop = element.scrollHeight}")
     )
 
-    shared.gradio['Undo'].click(lambda x: x, gradio('last_input'), gradio('textbox'), show_progress=False)
+    shared.gradio['Undo'].click(lambda x: x, gradio('last_input-notebook'), gradio('textbox-notebook'), show_progress=False)
-    shared.gradio['markdown_render'].click(lambda x: x, gradio('textbox'), gradio('markdown'), queue=False)
+    shared.gradio['markdown_render-notebook'].click(lambda x: x, gradio('textbox-notebook'), gradio('markdown-notebook'), queue=False)
-    gen_events.append(shared.gradio['Regenerate'].click(
+    gen_events.append(shared.gradio['Regenerate-notebook'].click(
-        lambda x: x, gradio('last_input'), gradio('textbox'), show_progress=False).then(
+        lambda x: x, gradio('last_input-notebook'), gradio('textbox-notebook'), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
-        generate_reply_wrapper, shared.input_params, output_params, show_progress=False).then(
+        generate_reply_wrapper, gradio(inputs), gradio(outputs), show_progress=False).then(
         ui.gather_interface_values, gradio(shared.input_elements), gradio('interface_state')).then(
         lambda: None, None, None, _js=f'() => {{{ui.audio_notification_js}}}')
-        # lambda: None, None, None, _js="() => {element = document.getElementsByTagName('textarea')[0]; element.scrollTop = element.scrollHeight}")
     )
 
-    shared.gradio['Stop'].click(stop_everything_event, None, None, queue=False, cancels=gen_events if shared.args.no_stream else None)
+    shared.gradio['Stop-notebook'].click(stop_everything_event, None, None, queue=False, cancels=gen_events if shared.args.no_stream else None)
-    shared.gradio['prompt_menu'].change(load_prompt, gradio('prompt_menu'), gradio('textbox'), show_progress=False)
+    shared.gradio['prompt_menu-notebook'].change(load_prompt, gradio('prompt_menu-notebook'), gradio('textbox-notebook'), show_progress=False)
-    shared.gradio['save_prompt'].click(
+    shared.gradio['save_prompt-notebook'].click(
-        lambda x: x, gradio('textbox'), gradio('save_contents')).then(
+        lambda x: x, gradio('textbox-notebook'), gradio('save_contents')).then(
         lambda: 'prompts/', None, gradio('save_root')).then(
         lambda: utils.current_time() + '.txt', None, gradio('save_filename')).then(
         lambda: gr.update(visible=True), None, gradio('file_saver'))
 
-    shared.gradio['delete_prompt'].click(
+    shared.gradio['delete_prompt-notebook'].click(
         lambda: 'prompts/', None, gradio('delete_root')).then(
-        lambda x: x + '.txt', gradio('prompt_menu'), gradio('delete_filename')).then(
+        lambda x: x + '.txt', gradio('prompt_menu-notebook'), gradio('delete_filename')).then(
         lambda: gr.update(visible=True), None, gradio('file_deleter'))
 
-    shared.gradio['count_tokens'].click(count_tokens, gradio('textbox'), gradio('status'), show_progress=False)
+    shared.gradio['count_tokens-notebook'].click(count_tokens, gradio('textbox-notebook'), gradio('status-notebook'), show_progress=False)

modules/ui_parameters.py

@@ -1,16 +1,17 @@
 import gradio as gr
 
-from modules import loaders, presets, shared, ui, utils
+from modules import loaders, presets, shared, ui, ui_chat, utils
 from modules.utils import gradio
 
 
 def create_ui(default_preset):
     generate_params = presets.load_preset(default_preset)
     with gr.Tab("Parameters", elem_id="parameters"):
+        with gr.Tab("Generation"):
             with gr.Row():
                 with gr.Column():
                     with gr.Row():
-                    shared.gradio['preset_menu'] = gr.Dropdown(choices=utils.get_available_presets(), value=default_preset, label='Generation parameters preset', elem_classes='slim-dropdown')
+                        shared.gradio['preset_menu'] = gr.Dropdown(choices=utils.get_available_presets(), value=default_preset, label='Preset', elem_classes='slim-dropdown')
                         ui.create_refresh_button(shared.gradio['preset_menu'], lambda: None, lambda: {'choices': utils.get_available_presets()}, 'refresh-button')
                         shared.gradio['save_preset'] = gr.Button('💾', elem_classes='refresh-button')
                         shared.gradio['delete_preset'] = gr.Button('🗑️', elem_classes='refresh-button')
@@ -23,6 +24,7 @@ def create_ui(default_preset):
                     with gr.Box():
                         with gr.Row():
                             with gr.Column():
+                                shared.gradio['max_new_tokens'] = gr.Slider(minimum=shared.settings['max_new_tokens_min'], maximum=shared.settings['max_new_tokens_max'], step=1, label='max_new_tokens', value=shared.settings['max_new_tokens'])
                                 shared.gradio['temperature'] = gr.Slider(0.01, 1.99, value=generate_params['temperature'], step=0.01, label='temperature')
                                 shared.gradio['top_p'] = gr.Slider(0.0, 1.0, value=generate_params['top_p'], step=0.01, label='top_p')
                                 shared.gradio['top_k'] = gr.Slider(0, 200, value=generate_params['top_k'], step=1, label='top_k')
@@ -92,7 +94,6 @@ def create_ui(default_preset):
                         """, elem_classes="markdown")
 
                 with gr.Column():
-                create_chat_settings_menus()
                     with gr.Box():
                         with gr.Row():
                             with gr.Column():
@@ -122,22 +123,9 @@ def create_ui(default_preset):
                                 shared.gradio['skip_special_tokens'] = gr.Checkbox(value=shared.settings['skip_special_tokens'], label='Skip special tokens', info='Some specific models need this unset.')
                                 shared.gradio['stream'] = gr.Checkbox(value=not shared.args.no_stream, label='Activate text streaming')
 
+        ui_chat.create_chat_settings_ui()
+
 
 def create_event_handlers():
     shared.gradio['filter_by_loader'].change(loaders.blacklist_samplers, gradio('filter_by_loader'), gradio(loaders.list_all_samplers()), show_progress=False)
     shared.gradio['preset_menu'].change(presets.load_preset_for_ui, gradio('preset_menu', 'interface_state'), gradio('interface_state') + gradio(presets.presets_params()))
-
-
-def create_chat_settings_menus():
-    if not shared.is_chat():
-        return
-
-    with gr.Box():
-        gr.Markdown("Chat parameters")
-        with gr.Row():
-            with gr.Column():
-                shared.gradio['max_new_tokens'] = gr.Slider(minimum=shared.settings['max_new_tokens_min'], maximum=shared.settings['max_new_tokens_max'], step=1, label='max_new_tokens', value=shared.settings['max_new_tokens'])
-                shared.gradio['chat_generation_attempts'] = gr.Slider(minimum=shared.settings['chat_generation_attempts_min'], maximum=shared.settings['chat_generation_attempts_max'], value=shared.settings['chat_generation_attempts'], step=1, label='Generation attempts (for longer replies)', info='New generations will be called until either this number is reached or no new content is generated between two iterations.')
-
-            with gr.Column():
-                shared.gradio['stop_at_newline'] = gr.Checkbox(value=shared.settings['stop_at_newline'], label='Stop generating at new line character')

modules/ui_session.py

@@ -7,35 +7,21 @@ from modules.utils import gradio
 
 def create_ui():
     with gr.Tab("Session", elem_id="session-tab"):
-        modes = ["default", "notebook", "chat"]
-        current_mode = "default"
-        for mode in modes[1:]:
-            if getattr(shared.args, mode):
-                current_mode = mode
-                break
-
-        cmd_list = vars(shared.args)
-        bool_list = sorted([k for k in cmd_list if type(cmd_list[k]) is bool and k not in modes + ui.list_model_elements()])
-        bool_active = [k for k in bool_list if vars(shared.args)[k]]
-
         with gr.Row():
-
             with gr.Column():
-                with gr.Row():
+                shared.gradio['reset_interface'] = gr.Button("Apply and restart")
-                    shared.gradio['interface_modes_menu'] = gr.Dropdown(choices=modes, value=current_mode, label="Mode", elem_classes='slim-dropdown')
+                shared.gradio['toggle_dark_mode'] = gr.Button('Toggle 💡')
-                    shared.gradio['reset_interface'] = gr.Button("Apply and restart", elem_classes="small-button", variant="primary")
-                    shared.gradio['toggle_dark_mode'] = gr.Button('Toggle 💡', elem_classes="small-button")
 
                 with gr.Row():
                     with gr.Column():
                         shared.gradio['extensions_menu'] = gr.CheckboxGroup(choices=utils.get_available_extensions(), value=shared.args.extensions, label="Available extensions", info='Note that some of these extensions may require manually installing Python requirements through the command: pip install -r extensions/extension_name/requirements.txt', elem_classes='checkboxgroup-table')
 
                     with gr.Column():
-                        shared.gradio['bool_menu'] = gr.CheckboxGroup(choices=bool_list, value=bool_active, label="Boolean command-line flags", elem_classes='checkboxgroup-table')
+                        shared.gradio['bool_menu'] = gr.CheckboxGroup(choices=get_boolean_arguments(), value=get_boolean_arguments(active=True), label="Boolean command-line flags", elem_classes='checkboxgroup-table')
 
             with gr.Column():
                 if not shared.args.multi_user:
-                    shared.gradio['save_session'] = gr.Button('Save session', elem_id="save_session")
+                    shared.gradio['save_session'] = gr.Button('Save session')
                     shared.gradio['load_session'] = gr.File(type='binary', file_types=['.json'], label="Upload Session JSON")
 
                 extension_name = gr.Textbox(lines=1, label='Install or update an extension', info='Enter the GitHub URL below and press Enter. For a list of extensions, see: https://github.com/oobabooga/text-generation-webui-extensions ⚠️  WARNING ⚠️ : extensions can execute arbitrary code. Make sure to inspect their source code before activating them.')
@@ -47,25 +33,33 @@ def create_ui():
 
         # Reset interface event
         shared.gradio['reset_interface'].click(
-            set_interface_arguments, gradio('interface_modes_menu', 'extensions_menu', 'bool_menu'), None).then(
+            set_interface_arguments, gradio('extensions_menu', 'bool_menu'), None).then(
             lambda: None, None, None, _js='() => {document.body.innerHTML=\'<h1 style="font-family:monospace;padding-top:20%;margin:0;height:100vh;color:lightgray;text-align:center;background:var(--body-background-fill)">Reloading...</h1>\'; setTimeout(function(){location.reload()},2500); return []}')
 
         shared.gradio['toggle_dark_mode'].click(lambda: None, None, None, _js='() => {document.getElementsByTagName("body")[0].classList.toggle("dark")}')
 
 
-def set_interface_arguments(interface_mode, extensions, bool_active):
+def set_interface_arguments(extensions, bool_active):
-    modes = ["default", "notebook", "chat", "cai_chat"]
-    cmd_list = vars(shared.args)
-    bool_list = [k for k in cmd_list if type(cmd_list[k]) is bool and k not in modes]
-
     shared.args.extensions = extensions
-    for k in modes[1:]:
+
-        setattr(shared.args, k, False)
+    bool_list = get_boolean_arguments()
-    if interface_mode != "default":
+
-        setattr(shared.args, interface_mode, True)
     for k in bool_list:
         setattr(shared.args, k, False)
     for k in bool_active:
         setattr(shared.args, k, True)
 
     shared.need_restart = True
+
+
+def get_boolean_arguments(active=False):
+    exclude = ["default", "notebook", "chat"]
+
+    cmd_list = vars(shared.args)
+    bool_list = sorted([k for k in cmd_list if type(cmd_list[k]) is bool and k not in exclude + ui.list_model_elements()])
+    bool_active = [k for k in bool_list if vars(shared.args)[k]]
+
+    if active:
+        return bool_active
+    else:
+        return bool_list

modules/utils.py

@@ -9,7 +9,7 @@ from modules.logging_colors import logger
 
 # Helper function to get multiple values from shared.gradio
 def gradio(*keys):
-    if len(keys) == 1 and type(keys[0]) is list:
+    if len(keys) == 1 and type(keys[0]) in [list, tuple]:
         keys = keys[0]
 
     return [shared.gradio[k] for k in keys]

server.py

@@ -69,9 +69,6 @@ def create_interface():
     # Force some events to be triggered on page load
     shared.persistent_interface_state.update({
         'loader': shared.args.loader or 'Transformers',
-    })
-    if shared.is_chat():
-        shared.persistent_interface_state.update({
         'mode': shared.settings['mode'],
         'character_menu': shared.args.character or shared.settings['character'],
         'instruction_template': shared.settings['instruction_template']
@@ -81,16 +78,19 @@ def create_interface():
         Path("cache/pfp_character.png").unlink()
 
     # css/js strings
-    css = ui.css if not shared.is_chat() else ui.css + ui.chat_css
+    css = ui.css
-    js = ui.main_js
+    js = ui.js
     css += apply_extensions('css')
     js += apply_extensions('js')
 
-    # The input elements for the generation functions
+    # Interface state elements
     shared.input_elements = ui.list_interface_input_elements()
 
     with gr.Blocks(css=css, analytics_enabled=False, title=title, theme=ui.theme) as shared.gradio['interface']:
 
+        # Interface state
+        shared.gradio['interface_state'] = gr.State({k: None for k in shared.input_elements})
+
         # Audio notification
         if Path("notification.mp3").exists():
             shared.gradio['audio_notification'] = gr.Audio(interactive=False, value="notification.mp3", elem_id="audio_notification", visible=False)
@@ -102,12 +102,9 @@ def create_interface():
         shared.gradio['temporary_text'] = gr.Textbox(visible=False)
 
         # Text Generation tab
-        if shared.is_chat():
         ui_chat.create_ui()
-        elif shared.args.notebook:
-            ui_notebook.create_ui()
-        else:
         ui_default.create_ui()
+        ui_notebook.create_ui()
 
         ui_parameters.create_ui(shared.settings['preset'])  # Parameters tab
         ui_model_menu.create_ui()  # Model tab
@@ -115,12 +112,9 @@ def create_interface():
         ui_session.create_ui()  # Session tab
 
         # Generation events
-        if shared.is_chat():
         ui_chat.create_event_handlers()
-        elif shared.args.notebook:
-            ui_notebook.create_event_handlers()
-        else:
         ui_default.create_event_handlers()
+        ui_notebook.create_event_handlers()
 
         # Other events
         ui_file_saving.create_event_handlers()
@@ -133,8 +127,7 @@ def create_interface():
 
         shared.gradio['interface'].load(lambda: None, None, None, _js=f"() => {{{js}}}")
         shared.gradio['interface'].load(partial(ui.apply_interface_values, {}, use_persistent=True), None, gradio(ui.list_interface_input_elements()), show_progress=False)
-        if shared.is_chat():
+        shared.gradio['interface'].load(chat.redraw_html, gradio(ui_chat.reload_arr), gradio('display'))
-            shared.gradio['interface'].load(chat.redraw_html, shared.reload_inputs, gradio('display'))
 
         extensions_module.create_extensions_tabs()  # Extensions tabs
         extensions_module.create_extensions_block()  # Extensions block
@@ -190,12 +183,6 @@ if __name__ == "__main__":
 
     # Activate the extensions listed on settings.yaml
     extensions_module.available_extensions = utils.get_available_extensions()
-    if shared.is_chat():
-        for extension in shared.settings['chat_default_extensions']:
-            shared.args.extensions = shared.args.extensions or []
-            if extension not in shared.args.extensions:
-                shared.args.extensions.append(extension)
-    else:
     for extension in shared.settings['default_extensions']:
         shared.args.extensions = shared.args.extensions or []
         if extension not in shared.args.extensions:

settings-template.yaml

@@ -13,7 +13,6 @@ context: This is a conversation with your Assistant. It is a computer program de
 greeting: ''
 turn_template: ''
 custom_stopping_strings: ''
-stop_at_newline: false
 add_bos_token: true
 ban_eos_token: false
 skip_special_tokens: true
@@ -28,11 +27,7 @@ chat-instruct_command: |-
   Continue the chat dialogue below. Write a single reply for the character "<|character|>".
 
   <|prompt|>
-chat_generation_attempts: 1
+default_extensions:
-chat_generation_attempts_min: 1
-chat_generation_attempts_max: 10
-default_extensions: []
-chat_default_extensions:
 - gallery
 preset: simple-1
 prompt: QA