Further reorganize the UI

oobabooga · oobabooga · commit d30a14087f3b · 2023-03-15T13:24:54.000-03:00
diff --git a/css/chat.css b/css/chat.css
@@ -1,22 +1,25 @@
 .h-\[40vh\], .wrap.svelte-byatnx.svelte-byatnx.svelte-byatnx {
     height: 66.67vh
 }
+
 .gradio-container {
-    max-width: 800px !important;
     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;
 }
-
diff --git a/css/main.js b/css/main.js
@@ -1,3 +1,3 @@
-document.getElementById("main").parentNode.childNodes[0].style = "border: none; background-color: #8080802b; margin-bottom: 40px"
-document.getElementById("main").parentNode.style = "padding: 0; margin: 0"
-document.getElementById("main").parentNode.parentNode.parentNode.style = "padding: 0"
+document.getElementById("main").parentNode.childNodes[0].style = "border: none; background-color: #8080802b; margin-bottom: 40px";
+document.getElementById("main").parentNode.style = "padding: 0; margin: 0";
+document.getElementById("main").parentNode.parentNode.parentNode.style = "padding: 0";
diff --git a/modules/ui.py b/modules/ui.py
@@ -9,7 +9,9 @@
 with open(Path(__file__).resolve().parent / '../css/chat.css', 'r') as f:
     chat_css = f.read()
 with open(Path(__file__).resolve().parent / '../css/main.js', 'r') as f:
-    page_js = f.read()
+    main_js = f.read()
+with open(Path(__file__).resolve().parent / '../css/chat.js', 'r') as f:
+    chat_js = f.read()
 
 class ToolButton(gr.Button, gr.components.FormComponent):
     """Small button with single emoji as text, fits inside gradio forms"""
diff --git a/server.py b/server.py
@@ -115,36 +115,37 @@ def create_model_and_preset_menus():
 def create_settings_menus(default_preset):
     generate_params = load_preset_values(default_preset if not shared.args.flexgen else 'Naive', return_dict=True)
 
-    with gr.Box():
-        gr.Markdown('Custom generation parameters')
-        with gr.Row():
-            with gr.Column():
-                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')
-                shared.gradio['typical_p'] = gr.Slider(0.0,1.0,value=generate_params['typical_p'],step=0.01,label='typical_p')
-            with gr.Column():
-                shared.gradio['repetition_penalty'] = gr.Slider(1.0, 1.5, value=generate_params['repetition_penalty'],step=0.01,label='repetition_penalty')
-                shared.gradio['encoder_repetition_penalty'] = gr.Slider(0.8, 1.5, value=generate_params['encoder_repetition_penalty'],step=0.01,label='encoder_repetition_penalty')
-                shared.gradio['no_repeat_ngram_size'] = gr.Slider(0, 20, step=1, value=generate_params['no_repeat_ngram_size'], label='no_repeat_ngram_size')
-                shared.gradio['min_length'] = gr.Slider(0, 2000, step=1, value=generate_params['min_length'] if shared.args.no_stream else 0, label='min_length', interactive=shared.args.no_stream)
-        shared.gradio['do_sample'] = gr.Checkbox(value=generate_params['do_sample'], label='do_sample')
-
-    with gr.Box():
-        gr.Markdown('Contrastive search:')
-        shared.gradio['penalty_alpha'] = gr.Slider(0, 5, value=generate_params['penalty_alpha'], label='penalty_alpha')
-
-    with gr.Box():
-        gr.Markdown('Beam search (uses a lot of VRAM):')
-        with gr.Row():
-            with gr.Column():
-                shared.gradio['num_beams'] = gr.Slider(1, 20, step=1, value=generate_params['num_beams'], label='num_beams')
-            with gr.Column():
-                shared.gradio['length_penalty'] = gr.Slider(-5, 5, value=generate_params['length_penalty'], label='length_penalty')
-        shared.gradio['early_stopping'] = gr.Checkbox(value=generate_params['early_stopping'], label='early_stopping')
-
-    with gr.Box():
-        gr.Markdown('Soft prompt')
+    with gr.Row():
+        with gr.Column():
+            with gr.Box():
+                gr.Markdown('Custom generation parameters')
+                with gr.Row():
+                    with gr.Column():
+                        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')
+                        shared.gradio['typical_p'] = gr.Slider(0.0,1.0,value=generate_params['typical_p'],step=0.01,label='typical_p')
+                    with gr.Column():
+                        shared.gradio['repetition_penalty'] = gr.Slider(1.0, 1.5, value=generate_params['repetition_penalty'],step=0.01,label='repetition_penalty')
+                        shared.gradio['encoder_repetition_penalty'] = gr.Slider(0.8, 1.5, value=generate_params['encoder_repetition_penalty'],step=0.01,label='encoder_repetition_penalty')
+                        shared.gradio['no_repeat_ngram_size'] = gr.Slider(0, 20, step=1, value=generate_params['no_repeat_ngram_size'], label='no_repeat_ngram_size')
+                        shared.gradio['min_length'] = gr.Slider(0, 2000, step=1, value=generate_params['min_length'] if shared.args.no_stream else 0, label='min_length', interactive=shared.args.no_stream)
+                shared.gradio['do_sample'] = gr.Checkbox(value=generate_params['do_sample'], label='do_sample')
+        with gr.Column():
+            with gr.Box():
+                gr.Markdown('Contrastive search')
+                shared.gradio['penalty_alpha'] = gr.Slider(0, 5, value=generate_params['penalty_alpha'], label='penalty_alpha')
+
+            with gr.Box():
+                gr.Markdown('Beam search (uses a lot of VRAM)')
+                with gr.Row():
+                    with gr.Column():
+                        shared.gradio['num_beams'] = gr.Slider(1, 20, step=1, value=generate_params['num_beams'], label='num_beams')
+                    with gr.Column():
+                        shared.gradio['length_penalty'] = gr.Slider(-5, 5, value=generate_params['length_penalty'], label='length_penalty')
+                shared.gradio['early_stopping'] = gr.Checkbox(value=generate_params['early_stopping'], label='early_stopping')
+
+    with gr.Accordion('Soft prompt', open=False):
         with gr.Row():
             shared.gradio['softprompts_menu'] = gr.Dropdown(choices=available_softprompts, value='None', label='Soft prompt')
             ui.create_refresh_button(shared.gradio['softprompts_menu'], lambda : None, lambda : {'choices': get_available_softprompts()}, 'refresh-button')
@@ -320,7 +321,7 @@ def create_settings_menus(default_preset):
         shared.gradio['upload_img_me'].upload(reload_func, reload_inputs, [shared.gradio['display']])
         shared.gradio['Stop'].click(reload_func, reload_inputs, [shared.gradio['display']])
 
-        shared.gradio['interface'].load(None, None, None, _js=f"() => {{{ui.page_js}}}")
+        shared.gradio['interface'].load(None, None, None, _js=f"() => {{{ui.main_js+ui.chat_js}}}")
         shared.gradio['interface'].load(lambda : chat.load_default_history(shared.settings[f'name1{suffix}'], shared.settings[f'name2{suffix}']), None, None)
         shared.gradio['interface'].load(reload_func, reload_inputs, [shared.gradio['display']], show_progress=True)
 
@@ -351,7 +352,7 @@ def create_settings_menus(default_preset):
         gen_events.append(shared.gradio['Generate'].click(generate_reply, shared.input_params, output_params, show_progress=shared.args.no_stream, api_name='textgen'))
         gen_events.append(shared.gradio['textbox'].submit(generate_reply, shared.input_params, output_params, show_progress=shared.args.no_stream))
         shared.gradio['Stop'].click(None, None, None, cancels=gen_events)
-        shared.gradio['interface'].load(None, None, None, _js=f"() => {{{ui.page_js}}}")
+        shared.gradio['interface'].load(None, None, None, _js=f"() => {{{ui.main_js}}}")
 
 else:
     with gr.Blocks(css=ui.css, analytics_enabled=False, title=title) as shared.gradio['interface']:
@@ -387,7 +388,7 @@ def create_settings_menus(default_preset):
         gen_events.append(shared.gradio['textbox'].submit(generate_reply, shared.input_params, output_params, show_progress=shared.args.no_stream))
         gen_events.append(shared.gradio['Continue'].click(generate_reply, [shared.gradio['output_textbox']] + shared.input_params[1:], output_params, show_progress=shared.args.no_stream))
         shared.gradio['Stop'].click(None, None, None, cancels=gen_events)
-        shared.gradio['interface'].load(None, None, None, _js=f"() => {{{ui.page_js}}}")
+        shared.gradio['interface'].load(None, None, None, _js=f"() => {{{ui.main_js}}}")
 
 shared.gradio['interface'].queue()
 if shared.args.listen:

Original file line number	Diff line number	Diff line change
`@@ -1,22 +1,25 @@`
`1`	`1`	`.h-\[40vh\], .wrap.svelte-byatnx.svelte-byatnx.svelte-byatnx {`
`2`	`2`	`height: 66.67vh`
`3`	`3`	`}`
	`4`	`+`
`4`	`5`	`.gradio-container {`
`5`		`- max-width: 800px !important;`
`6`	`6`	`margin-left: auto !important;`
`7`	`7`	`margin-right: auto !important;`
`8`	`8`	`}`
	`9`	`+`
`9`	`10`	`.w-screen {`
`10`	`11`	`width: unset`
`11`	`12`	`}`
	`13`	`+`
`12`	`14`	`div.svelte-362y77>, div.svelte-362y77>.form> {`
`13`	`15`	`flex-wrap: nowrap`
`14`	`16`	`}`
	`17`	`+`
`15`	`18`	`/* fixes the API documentation in chat mode */`
`16`	`19`	`.api-docs.svelte-1iguv9h.svelte-1iguv9h.svelte-1iguv9h {`
`17`	`20`	`display: grid;`
`18`	`21`	`}`
	`22`	`+`
`19`	`23`	`.pending.svelte-1ed2p3z {`
`20`	`24`	`opacity: 1;`
`21`	`25`	`}`
`22`		`-`