Merge pull request #689 from cmdr2/beta

Speed up image creation, by removing a delay (regression) of 4-5 seconds between clicking Make Image and calling the server
This commit is contained in:
cmdr2 2022-12-23 11:25:14 +05:30 committed by GitHub
commit 4e765a7948
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions

View File

@ -25,7 +25,7 @@
<div id="logo">
<h1>
Stable Diffusion UI
<small>v2.4.20 <span id="updateBranchLabel"></span></small>
<small>v2.4.21 <span id="updateBranchLabel"></span></small>
</h1>
</div>
<div id="server-status">

View File

@ -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 = 500 // ms
const CONCURRENT_TASK_INTERVAL = 100 // 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,6 +839,10 @@
* @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)
@ -1106,9 +1110,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) {

View File

@ -429,6 +429,7 @@ function getUncompletedTaskEntries() {
}
function makeImage() {
performance.mark('click-makeImage')
if (!SD.isServerAvailable()) {
alert('The server is not available.')
return