Merge branch 'beta'

Update CHANGES.md

CHANGES.md

@@ -27,7 +27,6 @@
 - Support loading models in the safetensor format, for improved safety
 
 ### Detailed changelog
-* 2.4.21 - 23 Dec 2022 - Speed up image creation, by removing a delay (regression) of 4-5 seconds between clicking the `Make Image` button and calling the server.
 * 2.4.20 - 22 Dec 2022 - `Pause All` button to pause all the pending tasks. Thanks @JeLuf
 * 2.4.20 - 22 Dec 2022 - `Undo`/`Redo` buttons in the image editor. Thanks @JeLuf
 * 2.4.20 - 22 Dec 2022 - Drag handle to reorder the tasks. This fixed a bug where the metadata was no longer selectable (for copying). Thanks @JeLuf

scripts/on_sd_start.bat

@@ -101,19 +101,6 @@ if NOT DEFINED test_sd2 set test_sd2=N
     @echo conda_sd_env_created >> ..\scripts\install_status.txt
 )
 
-@rem allow rolling back the sdkit-based changes
-if exist "src-old" (
-    if not exist "src" (
-        rename "src-old" "src"
-
-        if exist "ldm-old" (
-            rd /s /q "ldm-old"
-        )
-
-        call pip uninstall -y sdkit stable-diffusion-sdkit
-    )
-)
-
 set PATH=C:\Windows\System32;%PATH%
 
 @>nul findstr /m "conda_sd_gfpgan_deps_installed" ..\scripts\install_status.txt

scripts/on_sd_start.sh

@@ -87,15 +87,6 @@ else
     echo conda_sd_env_created >> ../scripts/install_status.txt
 fi
 
-# allow rolling back the sdkit-based changes
-if [ -e "src-old" ] && [ ! -e "src" ]; then
-    mv src-old src
-
-    if [ -e "ldm-old" ]; then rm -r ldm-old; fi
-
-    pip uninstall -y sdkit stable-diffusion-sdkit
-fi
-
 if [ `grep -c conda_sd_gfpgan_deps_installed ../scripts/install_status.txt` -gt "0" ]; then
     echo "Packages necessary for GFPGAN (Face Correction) were already installed"
 else

ui/index.html

@@ -25,7 +25,7 @@
         <div id="logo">
             <h1>
                 Stable Diffusion UI
-                <small>v2.4.22 <span id="updateBranchLabel"></span></small>
+                <small>v2.4.20 <span id="updateBranchLabel"></span></small>
             </h1>
         </div>
         <div id="server-status">
@@ -195,7 +195,7 @@
                         <label for="height"><small>(height)</small></label>
                     </td></tr>
                     <tr class="pl-5"><td><label for="num_inference_steps">Inference Steps:</label></td><td> <input id="num_inference_steps" name="num_inference_steps" size="4" value="25" onkeypress="preventNonNumericalInput(event)"></td></tr>
-                    <tr class="pl-5"><td><label for="guidance_scale_slider">Guidance Scale:</label></td><td> <input id="guidance_scale_slider" name="guidance_scale_slider" class="editor-slider" value="75" type="range" min="11" max="500"> <input id="guidance_scale" name="guidance_scale" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"></td></tr>
+                    <tr class="pl-5"><td><label for="guidance_scale_slider">Guidance Scale:</label></td><td> <input id="guidance_scale_slider" name="guidance_scale_slider" class="editor-slider" value="75" type="range" min="10" max="500"> <input id="guidance_scale" name="guidance_scale" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"></td></tr>
                     <tr id="prompt_strength_container" class="pl-5"><td><label for="prompt_strength_slider">Prompt Strength:</label></td><td> <input id="prompt_strength_slider" name="prompt_strength_slider" class="editor-slider" value="80" type="range" min="0" max="99"> <input id="prompt_strength" name="prompt_strength" size="4" pattern="^[0-9\.]+$" onkeypress="preventNonNumericalInput(event)"><br/></td></tr>
                     <tr class="pl-5"><td><label for="hypernetwork_model">Hypernetwork:</i></label></td><td>
                         <select id="hypernetwork_model" name="hypernetwork_model">

ui/media/js/engine.js

@@ -8,7 +8,7 @@
     const SERVER_STATE_VALIDITY_DURATION = 90 * 1000 // ms - 90 seconds to allow ping to timeout more than once before killing tasks.
     const HEALTH_PING_INTERVAL = 5000 // ms
     const IDLE_COOLDOWN = 2500 // ms
-    const CONCURRENT_TASK_INTERVAL = 100 // ms
+    const CONCURRENT_TASK_INTERVAL = 500 // ms
 
     /** Connects to an endpoint and resumes connection after reaching end of stream until all data is received.
      * Allows closing the connection while the server buffers more data.
@@ -839,10 +839,6 @@
          * @memberof Task
          */
         async post(timeout=-1) {
-            performance.mark('make-render-request')
-            if (performance.getEntriesByName('click-makeImage', 'mark').length > 0) {
-                console.log('delay between clicking and making the server request:', performance.measure('diff', 'click-makeImage', 'make-render-request').duration + ' ms')
-            }
             let jsonResponse = await super.post('/render', timeout)
             if (typeof jsonResponse?.task !== 'number') {
                 console.warn('Endpoint error response: ', jsonResponse)
@@ -1110,9 +1106,9 @@
                 idleEventPromise = makeQuerablePromise(eventSource.fireEvent(EVENT_IDLE, {capacity: serverCapacity, idle: true}))
             }
             // Calling idle could result in task being added to queue.
-            // if (task_queue.size <= 0 && concurrent_generators.size <= 0) {
-            //     return asyncDelay(IDLE_COOLDOWN).then(() => idleEventPromise)
-            // }
+            if (task_queue.size <= 0 && concurrent_generators.size <= 0) {
+                return asyncDelay(IDLE_COOLDOWN).then(() => idleEventPromise)
+            }
         }
         if (task_queue.size < serverCapacity) {
             if (!idleEventPromise?.isPending) {

ui/media/js/main.js

@@ -429,7 +429,6 @@ function getUncompletedTaskEntries() {
 }
 
 function makeImage() {
-    performance.mark('click-makeImage')
     if (!SD.isServerAvailable()) {
         alert('The server is not available.')
         return
@@ -828,20 +827,12 @@ function createTask(task) {
                             </div>`
 
     createCollapsibles(taskEntry)
-
+    
     let draghandle = taskEntry.querySelector('.drag-handle')
-    draghandle.addEventListener('mousedown', (e) => {
-        taskEntry.setAttribute('draggable', true)
-    })
-    // Add a debounce delay to allow mobile to bouble tap.
-    draghandle.addEventListener('mouseup', debounce((e) => {
-        taskEntry.setAttribute('draggable', false)
-    }, 2000))
-    draghandle.addEventListener('click', (e) => {
-        e.preventDefault() // Don't allow the results to be collapsed...
-    })
-    taskEntry.addEventListener('dragend', (e) => {
-        taskEntry.setAttribute('draggable', false);
+    draghandle.addEventListener('mousedown', (e) => { taskEntry.setAttribute('draggable',true)})
+    draghandle.addEventListener('mouseup',   (e) => { taskEntry.setAttribute('draggable',false)})
+    taskEntry.addEventListener('dragend',    (e) => { 
+        taskEntry.setAttribute('draggable',false);
         imagePreview.querySelectorAll(".imageTaskContainer").forEach(itc => {
             itc.classList.remove('dropTargetBefore','dropTargetAfter');
         });
@@ -854,6 +845,7 @@ function createTask(task) {
         startY = e.target.closest(".imageTaskContainer").offsetTop;
     })
 
+
     if (task.reqBody.init_image !== undefined) {
         createInitImageHover(taskEntry)
     }