diff options
| author | AnyISalIn <anyisalin@gmail.com> | 2023-08-21 09:48:56 +0000 |
|---|---|---|
| committer | AnyISalIn <anyisalin@gmail.com> | 2023-08-21 09:49:58 +0000 |
| commit | 71a0f6ef85f2124d5fb25b55d6ec577a56265fe4 (patch) | |
| tree | 9d21f02c56d8dfc0316bc832207d5b0257365649 /modules/progress.py | |
| parent | 42b72fe2463bc06a97935bc7a7770a9d562269d8 (diff) | |
| download | stable-diffusion-webui-gfx803-71a0f6ef85f2124d5fb25b55d6ec577a56265fe4.tar.gz stable-diffusion-webui-gfx803-71a0f6ef85f2124d5fb25b55d6ec577a56265fe4.tar.bz2 stable-diffusion-webui-gfx803-71a0f6ef85f2124d5fb25b55d6ec577a56265fe4.zip | |
feat: replace threading.Lock() to FIFOLock
Signed-off-by: AnyISalIn <anyisalin@gmail.com>
Diffstat (limited to 'modules/progress.py')
| -rw-r--r-- | modules/progress.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/progress.py b/modules/progress.py index e32b59dd..a25a0113 100644 --- a/modules/progress.py +++ b/modules/progress.py @@ -72,7 +72,12 @@ def progressapi(req: ProgressRequest): completed = req.id_task in finished_tasks
if not active:
- return ProgressResponse(active=active, queued=queued, completed=completed, id_live_preview=-1, textinfo="In queue..." if queued else "Waiting...")
+ textinfo = "Waiting..."
+ if queued:
+ sorted_queued = sorted(pending_tasks.keys(), key=lambda x: pending_tasks[x])
+ queue_index = sorted_queued.index(req.id_task)
+ textinfo = "In queue: {}/{}".format(queue_index + 1, len(sorted_queued))
+ return ProgressResponse(active=active, queued=queued, completed=completed, id_live_preview=-1, textinfo=textinfo)
progress = 0
|