From 1595f1ed05d3e03c58a55da3d7f2d3f9f2e27650 Mon Sep 17 00:00:00 2001
From: cmdr2 <secondary.cmdr2@gmail.com>
Date: Sat, 17 Dec 2022 16:45:43 +0530
Subject: [PATCH] Add 6 new samplers; Fix a bug where new tasks wouldn't
 started if a previous task was stopped

---
 ui/index.html              | 22 ++++++++++++++--------
 ui/sd_internal/renderer.py |  1 +
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/ui/index.html b/ui/index.html
index c746f6ea..9f36033f 100644
--- a/ui/index.html
+++ b/ui/index.html
@@ -133,14 +133,20 @@
                     </td></tr>
                     <tr id="samplerSelection" class="pl-5"><td><label for="sampler_name">Sampler:</label></td><td>
                         <select id="sampler_name" name="sampler_name">
-                            <option value="plms">plms</option>
-                            <option value="ddim">ddim</option>
-                            <option value="heun">heun</option>
-                            <option value="euler">euler</option>
-                            <option value="euler_a" selected>euler_a</option>
-                            <option value="dpm2">dpm2</option>
-                            <option value="dpm2_a">dpm2_a</option>
-                            <option value="lms">lms</option>
+                            <option value="plms">PLMS</option>
+                            <option value="ddim">DDIM</option>
+                            <option value="heun">Heun</option>
+                            <option value="euler">Euler</option>
+                            <option value="euler_a" selected>Euler Ancestral</option>
+                            <option value="dpm2">DPM2</option>
+                            <option value="dpm2_a">DPM2 Ancestral</option>
+                            <option value="lms">LMS</option>
+                            <option value="dpm_solver_stability">DPM Solver (Stability AI)</option>
+                            <option value="dpmpp_2s_a" selected>DPM++ 2s Ancestral</option>
+                            <option value="dpmpp_2m">DPM++ 2m</option>
+                            <option value="dpmpp_sde">DPM++ SDE</option>
+                            <option value="dpm_fast">DPM Fast</option>
+                            <option value="dpm_adaptive">DPM Adaptive</option>
                         </select>
                         <a href="https://github.com/cmdr2/stable-diffusion-ui/wiki/How-to-Use#samplers" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about samplers</span></i></a>
                     </td></tr>
diff --git a/ui/sd_internal/renderer.py b/ui/sd_internal/renderer.py
index ce6032bc..d9ab3f0d 100644
--- a/ui/sd_internal/renderer.py
+++ b/ui/sd_internal/renderer.py
@@ -27,6 +27,7 @@ def init(device):
     device_manager.device_init(context, device)
 
 def make_images(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback):
+    context.stop_processing = False
     log.info(f'request: {save_utils.get_printable_request(req)}')
     log.info(f'task data: {task_data.dict()}')