From bd9700405a0686769b58437fd87d9106d3cd1346 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 29 Apr 2023 22:15:20 +0300
Subject: Revert "Merge pull request #7595 from
 siutin/feature/restore-progress"

This reverts commit 80987c36f9bfa33092ac7c75624b25d839cb2a06, reversing
changes made to 2e78e65a22bfa6b116ae18d12fdcb85ec8acd727.
---
 modules/call_queue.py | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'modules/call_queue.py')

diff --git a/modules/call_queue.py b/modules/call_queue.py
index 43f6ebe0..92097c15 100644
--- a/modules/call_queue.py
+++ b/modules/call_queue.py
@@ -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):
-- 
cgit v1.2.1