xinyun/ComfyUI-Manager
1
0
Fork 0
mirror of https://git.datalinker.icu/ltdrdata/ComfyUI-Manager synced 2025-12-14 08:34:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] Use tuples in TaskQueue heap for proper comparison support

Browse Source
This commit is contained in:
bymyself 2025-06-17 13:42:47 -07:00
parent d081db0c30
commit ddc9cd0fd5
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
comfyui_manager/glob/manager_server.py
View File

@ -66,7 +66,6 @@ from ..data_models import (
ComfyUIVersionInfo, ComfyUIVersionInfo,
InstallPackParams, InstallPackParams,
UpdatePackParams, UpdatePackParams,
UpdateAllPacksParams,
UpdateComfyUIParams, UpdateComfyUIParams,
FixPackParams, FixPackParams,
UninstallPackParams, UninstallPackParams,
@ -268,7 +267,13 @@ class TaskQueue:
if isinstance(item, dict): if isinstance(item, dict):
item = QueueTaskItem(**item) item = QueueTaskItem(**item)
heapq.heappush(self.pending_tasks, item) # Use current_index as priority (earlier tasks have lower numbers)
priority = self.current_index
self.current_index += 1
# Push tuple: (priority, task_counter, item)
# task_counter ensures stable sort for items with same priority
heapq.heappush(self.pending_tasks, (priority, self.task_counter, item))
logging.debug( logging.debug(
"[ComfyUI-Manager] Task added to queue: kind=%s, ui_id=%s, client_id=%s, pending_count=%d", "[ComfyUI-Manager] Task added to queue: kind=%s, ui_id=%s, client_id=%s, pending_count=%d",
item.kind, item.ui_id, item.client_id, len(self.pending_tasks) item.kind, item.ui_id, item.client_id, len(self.pending_tasks)
@ -293,7 +298,8 @@ class TaskQueue:
if timeout is not None and len(self.pending_tasks) == 0: if timeout is not None and len(self.pending_tasks) == 0:
logging.debug("[ComfyUI-Manager] Task queue get timed out") logging.debug("[ComfyUI-Manager] Task queue get timed out")
return None return None
item = heapq.heappop(self.pending_tasks) # Pop tuple and extract the item
priority, counter, item = heapq.heappop(self.pending_tasks)
task_index = self.task_counter task_index = self.task_counter
self.running_tasks[task_index] = copy.deepcopy(item) self.running_tasks[task_index] = copy.deepcopy(item)
self.task_counter += 1 self.task_counter += 1
@ -381,7 +387,8 @@ class TaskQueue:
"""Get current running and remaining tasks""" """Get current running and remaining tasks"""
with self.mutex: with self.mutex:
running = list(self.running_tasks.values()) running = list(self.running_tasks.values())
remaining = copy.copy(self.pending_tasks) # Extract items from tuples, maintaining heap order
remaining = [item for priority, counter, item in sorted(self.pending_tasks)]
return running, remaining return running, remaining
def get_tasks_remaining(self) -> int: def get_tasks_remaining(self) -> int: