gitea-mirror/stable-diffusion-webui
1
0
Fork 0
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git synced 2025-12-21 23:00:59 -08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #7595 from siutin/feature/restore-progress"

Browse Source 
This reverts commit 80987c36f9, reversing
changes made to 2e78e65a22.
This commit is contained in:
AUTOMATIC
2023-04-29 22:15:20 +03:00
parent 80987c36f9
commit bd9700405a
6 changed files with 18 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
modules/call_queue.py
View File

@@ -4,16 +4,10 @@ import threading
import traceback
import time
import gradio as gr
from modules import shared, progress
queue_lock = threading.Lock()
queue_lock_condition = threading.Condition(lock=queue_lock)
def wrap_session_call(func):
def f(request: gr.Request, *args, **kwargs):
return func(request, *args, **kwargs)
return f
def wrap_queued_call(func):
def f(*args, **kwargs):
@@ -26,31 +20,29 @@ def wrap_queued_call(func):
def wrap_gradio_gpu_call(func, extra_outputs=None):
def f(request: gr.Request, *args, **kwargs):
user = request.username
def f(*args, **kwargs):
# if the first argument is a string that says "task(...)", it is treated as a job id
if len(args) > 0 and type(args[0]) == str and args[0][0:5] == "task(" and args[0][-1] == ")":
id_task = args[0]
progress.add_task_to_queue(user, id_task)
progress.add_task_to_queue(id_task)
else:
id_task = None
with queue_lock:
shared.state.begin()
progress.start_task(user, id_task)
progress.start_task(id_task)
try:
res = func(*args, **kwargs)
finally:
progress.finish_task(user, id_task)
progress.set_last_task_result(user, id_task, res)
progress.finish_task(id_task)
shared.state.end()
return res
return wrap_session_call(wrap_gradio_call(f, extra_outputs=extra_outputs, add_stats=True))
return wrap_gradio_call(f, extra_outputs=extra_outputs, add_stats=True)
def wrap_gradio_call(func, extra_outputs=None, add_stats=False):