From 1242ba08e19f3d317bdc5924db2b73d0c9569a7f Mon Sep 17 00:00:00 2001
From: gayshub <zhangxianglei1234@gmail.com>
Date: Fri, 15 Dec 2023 16:57:17 +0800
Subject: add allow specify the task id and get the location of task in the
 queue of pending task

---
 modules/progress.py | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'modules/progress.py')

diff --git a/modules/progress.py b/modules/progress.py
index 69921de7..553866db 100644
--- a/modules/progress.py
+++ b/modules/progress.py
@@ -8,10 +8,13 @@ from pydantic import BaseModel, Field
 from modules.shared import opts
 
 import modules.shared as shared
-
+from collections import OrderedDict
+import string
+import random
+from typing import List
 
 current_task = None
-pending_tasks = {}
+pending_tasks = OrderedDict()
 finished_tasks = []
 recorded_results = []
 recorded_results_limit = 2
@@ -34,6 +37,11 @@ def finish_task(id_task):
     if len(finished_tasks) > 16:
         finished_tasks.pop(0)
 
+def create_task_id(task_type):
+    N = 7
+    res = ''.join(random.choices(string.ascii_uppercase +
+    string.digits, k=N))
+    return f"task({task_type}-{res})"
 
 def record_results(id_task, res):
     recorded_results.append((id_task, res))
@@ -44,6 +52,9 @@ def record_results(id_task, res):
 def add_task_to_queue(id_job):
     pending_tasks[id_job] = time.time()
 
+class PendingTasksResponse(BaseModel):
+    size: int = Field(title="Pending task size")
+    tasks: List[str] = Field(title="Pending task ids")
 
 class ProgressRequest(BaseModel):
     id_task: str = Field(default=None, title="Task ID", description="id of the task to get progress for")
@@ -63,8 +74,14 @@ class ProgressResponse(BaseModel):
 
 
 def setup_progress_api(app):
+    app.add_api_route("/internal/pendingTasks", get_pending_tasks, methods=["GET"])
     return app.add_api_route("/internal/progress", progressapi, methods=["POST"], response_model=ProgressResponse)
 
+def get_pending_tasks():
+    pending_tasks_ids = [x for x in pending_tasks]
+    pending_len = len(pending_tasks_ids)
+    return PendingTasksResponse(size=pending_len, tasks=pending_tasks_ids)
+
 
 def progressapi(req: ProgressRequest):
     active = req.id_task == current_task
-- 
cgit v1.2.3


From d859de37d9ec10cb6c804226328a11c87c444852 Mon Sep 17 00:00:00 2001
From: gayshub <zhangxianglei1234@gmail.com>
Date: Fri, 15 Dec 2023 17:48:20 +0800
Subject: fix the problem of ruff of github

---
 modules/api/api.py    | 4 ++--
 modules/processing.py | 2 +-
 modules/progress.py   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'modules/progress.py')

diff --git a/modules/api/api.py b/modules/api/api.py
index 5d000ae8..1f464806 100644
--- a/modules/api/api.py
+++ b/modules/api/api.py
@@ -338,7 +338,7 @@ class Api:
 
     def text2imgapi(self, txt2imgreq: models.StableDiffusionTxt2ImgProcessingAPI):
         task_id = create_task_id("text2img")
-        if txt2imgreq.force_task_id != None:
+        if txt2imgreq.force_task_id is None:
             task_id = txt2imgreq.force_task_id
             
         script_runner = scripts.scripts_txt2img
@@ -396,7 +396,7 @@ class Api:
 
     def img2imgapi(self, img2imgreq: models.StableDiffusionImg2ImgProcessingAPI):
         task_id = create_task_id("img2img")
-        if img2imgreq.force_task_id != None:
+        if img2imgreq.force_task_id is None:
             task_id = img2imgreq.force_task_id
 
         init_images = img2imgreq.init_images
diff --git a/modules/processing.py b/modules/processing.py
index 657cacfc..5added65 100644
--- a/modules/processing.py
+++ b/modules/processing.py
@@ -1359,7 +1359,7 @@ class StableDiffusionProcessingImg2Img(StableDiffusionProcessing):
     inpainting_mask_invert: int = 0
     initial_noise_multiplier: float = None
     latent_mask: Image = None
-    force_task_id: string = None
+    force_task_id: str = None
 
     image_mask: Any = field(default=None, init=False)
 
diff --git a/modules/progress.py b/modules/progress.py
index 553866db..6946fb1b 100644
--- a/modules/progress.py
+++ b/modules/progress.py
@@ -78,7 +78,7 @@ def setup_progress_api(app):
     return app.add_api_route("/internal/progress", progressapi, methods=["POST"], response_model=ProgressResponse)
 
 def get_pending_tasks():
-    pending_tasks_ids = [x for x in pending_tasks]
+    pending_tasks_ids = list(pending_tasks)
     pending_len = len(pending_tasks_ids)
     return PendingTasksResponse(size=pending_len, tasks=pending_tasks_ids)
 
-- 
cgit v1.2.3


From 86b3aa94e2d36a4f9d5ef1bb7c6ec995ff8eb517 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 16 Dec 2023 11:04:59 +0300
Subject: rename pending tasks api endpoint to be more in line with others

---
 modules/progress.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules/progress.py')

diff --git a/modules/progress.py b/modules/progress.py
index 6946fb1b..85255e82 100644
--- a/modules/progress.py
+++ b/modules/progress.py
@@ -74,9 +74,10 @@ class ProgressResponse(BaseModel):
 
 
 def setup_progress_api(app):
-    app.add_api_route("/internal/pendingTasks", get_pending_tasks, methods=["GET"])
+    app.add_api_route("/internal/pending-tasks", get_pending_tasks, methods=["GET"])
     return app.add_api_route("/internal/progress", progressapi, methods=["POST"], response_model=ProgressResponse)
 
+
 def get_pending_tasks():
     pending_tasks_ids = list(pending_tasks)
     pending_len = len(pending_tasks_ids)
-- 
cgit v1.2.3