Skip to content

Fix compatibility with ComfyUI 0.3.76 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sw-dkreider wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix compatibility with ComfyUI 0.3.76 #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions utils/access_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def user_queue_get(self, timeout=None):
return (item["prompt"], i)

def user_queue_task_done(
self, item_id, history_result, status: Optional["PromptQueue.ExecutionStatus"]
self, item_id, history_result, status: Optional["PromptQueue.ExecutionStatus"], process_item=None
):
"""Mark a user-specific queue task as done."""
with self.__prompt_queue.mutex:
Expand All @@ -187,8 +187,18 @@ def user_queue_get_current_queue(self):
with self.__prompt_queue.mutex:
out = []
for x in self.__prompt_queue.currently_running.values():
out += [x]
return (out, copy.deepcopy(self.__prompt_queue.queue))
# Unwrap Sentinel format to original tuple format
if isinstance(x, dict) and "prompt" in x:
out.append(x["prompt"])
else:
out.append(x)
queued = []
for x in self.__prompt_queue.queue:
if isinstance(x, dict) and "prompt" in x:
queued.append(x["prompt"])
else:
queued.append(x)
return (out, queued)

def user_queue_wipe_queue(self):
"""Wipe the user-specific queue."""
Expand Down Expand Up @@ -258,6 +268,7 @@ def patch_prompt_queue(self):
self.__prompt_queue.get = self.user_queue_get
self.__prompt_queue.task_done = self.user_queue_task_done
self.__prompt_queue.get_current_queue = self.user_queue_get_current_queue
self.__prompt_queue.get_current_queue_volatile = self.user_queue_get_current_queue
self.__prompt_queue.wipe_queue = self.user_queue_wipe_queue
self.__prompt_queue.delete_queue_item = self.user_queue_delete_queue_item
self.__prompt_queue.get_history = self.user_queue_get_history
Expand Down