From d4a9b5ea9708deef1357cf11f91d384b438089aa Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Thu, 30 Mar 2023 17:34:44 -0300 Subject: [PATCH 01/12] Remove redundant preset (see the plot in #587) --- README.md | 2 +- modules/shared.py | 2 +- presets/Pygmalion.txt | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 presets/Pygmalion.txt diff --git a/README.md b/README.md index 97f26ccb..169c894b 100644 --- a/README.md +++ b/README.md @@ -240,4 +240,4 @@ Before reporting a bug, make sure that you have: - Gradio dropdown menu refresh button, code for reloading the interface: https://github.com/AUTOMATIC1111/stable-diffusion-webui - Verbose preset: Anonymous 4chan user. - NovelAI and KoboldAI presets: https://github.com/KoboldAI/KoboldAI-Client/wiki/Settings-Presets -- Pygmalion preset, code for early stopping in chat mode, code for some of the sliders, --chat mode colors: https://github.com/PygmalionAI/gradio-ui/ +- Code for early stopping in chat mode, code for some of the sliders: https://github.com/PygmalionAI/gradio-ui/ diff --git a/modules/shared.py b/modules/shared.py index 348defa3..51fdf36c 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -41,7 +41,7 @@ settings = { 'chat_default_extensions': ["gallery"], 'presets': { 'default': 'NovelAI-Sphinx Moth', - '.*pygmalion': 'Pygmalion', + '.*pygmalion': 'NovelAI-Storywriter', '.*RWKV': 'Naive', }, 'prompts': { diff --git a/presets/Pygmalion.txt b/presets/Pygmalion.txt deleted file mode 100644 index f8b2ca55..00000000 --- a/presets/Pygmalion.txt +++ /dev/null @@ -1,6 +0,0 @@ -do_sample=True -top_p=0.9 -top_k=0 -temperature=0.5 -repetition_penalty=1.1 -typical_p=1.0 From bb69e054a7241798a8bc0c784747653aa753daab Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Thu, 30 Mar 2023 21:08:50 -0300 Subject: [PATCH 02/12] Add dummy file --- loras/place-your-loras-here.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 loras/place-your-loras-here.txt diff --git a/loras/place-your-loras-here.txt b/loras/place-your-loras-here.txt new file mode 100644 index 00000000..e69de29b From f9940b79dc9f67477cec3819dbfb250f5e92a658 Mon Sep 17 00:00:00 2001 From: ye7iaserag Date: Fri, 31 Mar 2023 04:56:49 +0200 Subject: [PATCH 03/12] Implement character gallery using Dataset --- extensions/gallery/script.py | 38 +++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/extensions/gallery/script.py b/extensions/gallery/script.py index fbf23bc9..e96fe40a 100644 --- a/extensions/gallery/script.py +++ b/extensions/gallery/script.py @@ -1,20 +1,23 @@ from pathlib import Path - import gradio as gr - from modules.html_generator import get_image_cache +from modules.chat import load_character +from modules.shared import gradio, settings - -def generate_html(): +def generate_css(): css = """ - .character-gallery { + .character-gallery > .gallery { margin: 1rem 0; - display: grid; + display: grid !important; grid-template-columns: repeat(auto-fit, minmax(150px, 1fr)); grid-column-gap: 0.4rem; grid-row-gap: 1.2rem; } + .character-gallery > .label { + display: none !important; + } + .character-container { cursor: pointer; text-align: center; @@ -45,14 +48,16 @@ def generate_html(): overflow-wrap: anywhere; } """ + return css - container_html = f'
' +def generate_html(): + cards = [] # Iterate through files in image folder for file in sorted(Path("characters").glob("*")): if file.name.endswith(".json"): character = file.name.replace(".json", "") - container_html += f'
' + container_html = f'
' image_html = "
" for i in [ @@ -71,12 +76,23 @@ def generate_html(): container_html += f'{image_html} {character}' container_html += "
" + cards.append([container_html, character]) + + return cards + + +def select_character(evt: gr.SelectData): + return (evt.value[1]) - container_html += "
" - return container_html def ui(): with gr.Accordion("Character gallery", open=False): update = gr.Button("Refresh") - gallery = gr.HTML(value=generate_html()) + gr.HTML(value="") + gallery = gr.Dataset(components=[gr.HTML(visible=False)], + label="", + samples=generate_html(), + elem_classes=["character-gallery"] + ) update.click(generate_html, [], gallery) + gallery.select(select_character, None, gradio['character_menu']) \ No newline at end of file From f27a66b01433d94bd973c7ce89f0e963db674b6c Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 31 Mar 2023 00:42:26 -0300 Subject: [PATCH 04/12] Bump gradio version (make sure to update) This fixes the textbox shrinking vertically once it reaches a certain number of lines. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 79da715d..8d22d41f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ accelerate==0.18.0 bitsandbytes==0.37.2 flexgen==0.1.7 -gradio==3.23.0 +gradio==3.24.0 markdown numpy peft==0.2.0 From fd72afd8e701cec8888d7fb1438174a5b02b0cc4 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 31 Mar 2023 00:43:00 -0300 Subject: [PATCH 05/12] Increase the textbox sizes --- server.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server.py b/server.py index 27223f84..8cbe1f7c 100644 --- a/server.py +++ b/server.py @@ -408,7 +408,7 @@ def create_interface(): with gr.Row(): with gr.Column(scale=4): with gr.Tab('Raw'): - shared.gradio['textbox'] = gr.Textbox(value=default_text, elem_id="textbox", lines=25) + shared.gradio['textbox'] = gr.Textbox(value=default_text, elem_id="textbox", lines=27) with gr.Tab('Markdown'): shared.gradio['markdown'] = gr.Markdown() with gr.Tab('HTML'): @@ -442,7 +442,7 @@ def create_interface(): with gr.Tab("Text generation", elem_id="main"): with gr.Row(): with gr.Column(): - shared.gradio['textbox'] = gr.Textbox(value=default_text, lines=15, label='Input') + shared.gradio['textbox'] = gr.Textbox(value=default_text, lines=21, 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']) shared.gradio['Generate'] = gr.Button('Generate') with gr.Row(): @@ -455,7 +455,7 @@ def create_interface(): with gr.Column(): with gr.Tab('Raw'): - shared.gradio['output_textbox'] = gr.Textbox(lines=25, label='Output') + shared.gradio['output_textbox'] = gr.Textbox(lines=27, label='Output') with gr.Tab('Markdown'): shared.gradio['markdown'] = gr.Markdown() with gr.Tab('HTML'): From 3737eafeaa1a5df97456f04b665e45e1586677a4 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 31 Mar 2023 00:48:50 -0300 Subject: [PATCH 06/12] Remove a border and allow more characters per pagination page --- css/chat.css | 4 ++++ extensions/gallery/script.py | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/css/chat.css b/css/chat.css index c8a9d70a..2015a80a 100644 --- a/css/chat.css +++ b/css/chat.css @@ -36,3 +36,7 @@ div.svelte-362y77>*, div.svelte-362y77>.form>* { .wrap.svelte-6roggh.svelte-6roggh { max-height: 92.5%; } + +.gallery-item.svelte-13hsdno.svelte-13hsdno.svelte-13hsdno { + border: 0 !important; +} diff --git a/extensions/gallery/script.py b/extensions/gallery/script.py index e96fe40a..1954e3d0 100644 --- a/extensions/gallery/script.py +++ b/extensions/gallery/script.py @@ -92,7 +92,8 @@ def ui(): gallery = gr.Dataset(components=[gr.HTML(visible=False)], label="", samples=generate_html(), - elem_classes=["character-gallery"] + elem_classes=["character-gallery"], + samples_per_page=50 ) update.click(generate_html, [], gallery) gallery.select(select_character, None, gradio['character_menu']) \ No newline at end of file From ec093a5af76e5a76327ae983b23805f09e8aaac8 Mon Sep 17 00:00:00 2001 From: ye7iaserag Date: Fri, 31 Mar 2023 06:54:24 +0200 Subject: [PATCH 07/12] Fix div alignment for long strings --- extensions/gallery/script.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/gallery/script.py b/extensions/gallery/script.py index 1954e3d0..15d740ca 100644 --- a/extensions/gallery/script.py +++ b/extensions/gallery/script.py @@ -18,6 +18,10 @@ def generate_css(): display: none !important; } + .character-gallery button.gallery-item { + display: contents; + } + .character-container { cursor: pointer; text-align: center; From d28a5c9569eeab5ac3c3e9f17802fa20241b9664 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 31 Mar 2023 02:01:13 -0300 Subject: [PATCH 08/12] Remove unnecessary css --- css/chat.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/css/chat.css b/css/chat.css index 2015a80a..c8a9d70a 100644 --- a/css/chat.css +++ b/css/chat.css @@ -36,7 +36,3 @@ div.svelte-362y77>*, div.svelte-362y77>.form>* { .wrap.svelte-6roggh.svelte-6roggh { max-height: 92.5%; } - -.gallery-item.svelte-13hsdno.svelte-13hsdno.svelte-13hsdno { - border: 0 !important; -} From 3b90d604d75255708bfba7d7b92f492d51dc4ccf Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 31 Mar 2023 02:01:48 -0300 Subject: [PATCH 09/12] Sort the imports --- extensions/gallery/script.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/extensions/gallery/script.py b/extensions/gallery/script.py index 15d740ca..c17d69ee 100644 --- a/extensions/gallery/script.py +++ b/extensions/gallery/script.py @@ -1,9 +1,12 @@ from pathlib import Path + import gradio as gr -from modules.html_generator import get_image_cache + from modules.chat import load_character +from modules.html_generator import get_image_cache from modules.shared import gradio, settings + def generate_css(): css = """ .character-gallery > .gallery { From b246d17513465e3bc3718c7f7fd7269b575c608d Mon Sep 17 00:00:00 2001 From: Maya <48323879+mayaeary@users.noreply.github.com> Date: Fri, 31 Mar 2023 14:20:31 +0300 Subject: [PATCH 10/12] Fix `type object is not subscriptable` Fix `type object is not subscriptable` on python 3.8 --- modules/callbacks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/callbacks.py b/modules/callbacks.py index aa92f9cb..945b8c37 100644 --- a/modules/callbacks.py +++ b/modules/callbacks.py @@ -12,7 +12,7 @@ import modules.shared as shared # Copied from https://github.com/PygmalionAI/gradio-ui/ class _SentinelTokenStoppingCriteria(transformers.StoppingCriteria): - def __init__(self, sentinel_token_ids: list[torch.LongTensor], starting_idx: int): + def __init__(self, sentinel_token_ids: list, starting_idx: int): transformers.StoppingCriteria.__init__(self) self.sentinel_token_ids = sentinel_token_ids self.starting_idx = starting_idx From 5a6f939f0566dd33c51cfa209938cda98ff47a78 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 31 Mar 2023 10:43:05 -0300 Subject: [PATCH 11/12] Change the preset here too --- settings-template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings-template.json b/settings-template.json index da767cda..047373f2 100644 --- a/settings-template.json +++ b/settings-template.json @@ -18,7 +18,7 @@ ], "presets": { "default": "NovelAI-Sphinx Moth", - ".*pygmalion": "Pygmalion", + ".*pygmalion": "NovelAI-Storywriter", ".*RWKV": "Naive" }, "prompts": { From 1d1d9e40cdfe787e7ac6a1cb499f4cd64af2e680 Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Fri, 31 Mar 2023 12:22:07 -0300 Subject: [PATCH 12/12] Add seed to settings --- modules/shared.py | 1 + server.py | 2 +- settings-template.json | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/shared.py b/modules/shared.py index 51fdf36c..6f3396a7 100644 --- a/modules/shared.py +++ b/modules/shared.py @@ -27,6 +27,7 @@ settings = { 'max_new_tokens': 200, 'max_new_tokens_min': 1, 'max_new_tokens_max': 2000, + 'seed': -1, 'name1': 'You', 'name2': 'Assistant', 'context': 'This is a conversation with your Assistant. The Assistant is very helpful and is eager to chat with you and answer your questions.', diff --git a/server.py b/server.py index 8cbe1f7c..225a1f4c 100644 --- a/server.py +++ b/server.py @@ -166,7 +166,7 @@ def create_settings_menus(default_preset): with gr.Column(): create_model_and_preset_menus() with gr.Column(): - shared.gradio['seed'] = gr.Number(value=-1, label='Seed (-1 for random)') + shared.gradio['seed'] = gr.Number(value=shared.settings['seed'], label='Seed (-1 for random)') with gr.Row(): with gr.Column(): diff --git a/settings-template.json b/settings-template.json index 047373f2..4ce0ca7a 100644 --- a/settings-template.json +++ b/settings-template.json @@ -2,6 +2,7 @@ "max_new_tokens": 200, "max_new_tokens_min": 1, "max_new_tokens_max": 2000, + "seed": -1, "name1": "You", "name2": "Assistant", "context": "This is a conversation with your Assistant. The Assistant is very helpful and is eager to chat with you and answer your questions.",