From 5b4c0155f6ec084e18f481b42f06f68bc2072421 Mon Sep 17 00:00:00 2001
From: oobabooga <112222186+oobabooga@users.noreply.github.com>
Date: Sun, 18 Jun 2023 01:56:43 -0300
Subject: [PATCH 1/2] Move a button

---
 server.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server.py b/server.py
index 1e1760ce..9cdd33d1 100644
--- a/server.py
+++ b/server.py
@@ -708,6 +708,7 @@ def create_interface():
 
             with gr.Row():
                 shared.gradio['interface_modes_menu'] = gr.Dropdown(choices=modes, value=current_mode, label="Mode")
+                shared.gradio['reset_interface'] = gr.Button("Apply and restart the interface", elem_classes="small-button")
                 shared.gradio['toggle_dark_mode'] = gr.Button('Toggle dark/light mode', elem_classes="small-button")
 
             with gr.Row():
@@ -717,7 +718,6 @@ def create_interface():
                 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['reset_interface'] = gr.Button("Apply and restart the interface")
             with gr.Row():
                 extension_name = gr.Textbox(lines=1, label='Install or update an extension', info='Enter the GitHub URL below. 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.')
                 extension_install = gr.Button('Install or update', elem_classes="small-button")

From 3cae1221d492127837647742b0f4b60b24b13465 Mon Sep 17 00:00:00 2001
From: Forkoz <59298527+Ph0rk0z@users.noreply.github.com>
Date: Sun, 18 Jun 2023 16:26:30 +0000
Subject: [PATCH 2/2] Update exllama.py - Respect model dir parameter (#2744)

---
 modules/exllama.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/exllama.py b/modules/exllama.py
index 17ed13ea..150a6e82 100644
--- a/modules/exllama.py
+++ b/modules/exllama.py
@@ -17,7 +17,7 @@ class ExllamaModel:
     @classmethod
     def from_pretrained(self, path_to_model):
 
-        path_to_model = Path("models") / Path(path_to_model)
+        path_to_model = Path(f'{shared.args.model_dir}') / Path(path_to_model)
         tokenizer_model_path = path_to_model / "tokenizer.model"
         model_config_path = path_to_model / "config.json"