zlei6/ComfyUI
1
0
Fork 0
mirror of https://github.com/Comfy-Org/ComfyUI.git synced 2026-08-25 02:20:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Include workflow_id in all execution WebSocket messages (CORE-198) (#…" (#13901)

Browse Source 
This reverts commit 4f6018982d.
This commit is contained in:
comfyanonymous
2026-05-14 15:35:42 -07:00
committed by GitHub
parent 4f6018982d
commit 616cab4f97
7 changed files with 21 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
comfy_execution/jobs.py
View File

@@ -93,27 +93,6 @@ def _create_text_preview(value: str) -> dict:
}
def extract_workflow_id(extra_data: Optional[dict]) -> Optional[str]:
"""Extract the workflow id from a prompt's ``extra_data``.
The frontend stores the id at ``extra_data["extra_pnginfo"]["workflow"]["id"]``
when a prompt is queued. Any value that is not a non-empty string is treated as
missing so callers can rely on the return being either ``None`` or a string.
"""
if not isinstance(extra_data, dict):
return None
extra_pnginfo = extra_data.get('extra_pnginfo')
if not isinstance(extra_pnginfo, dict):
return None
workflow = extra_pnginfo.get('workflow')
if not isinstance(workflow, dict):
return None
workflow_id = workflow.get('id')
if isinstance(workflow_id, str) and workflow_id:
return workflow_id
return None
def _extract_job_metadata(extra_data: dict) -> tuple[Optional[int], Optional[str]]:
"""Extract create_time and workflow_id from extra_data.
@@ -121,7 +100,8 @@ def _extract_job_metadata(extra_data: dict) -> tuple[Optional[int], Optional[str
tuple: (create_time, workflow_id)
"""
create_time = extra_data.get('create_time')
workflow_id = extract_workflow_id(extra_data)
extra_pnginfo = extra_data.get('extra_pnginfo', {})
workflow_id = extra_pnginfo.get('workflow', {}).get('id')
return create_time, workflow_id

13
comfy_execution/progress.py
View File

@@ -164,8 +164,6 @@ class WebUIProgressHandler(ProgressHandler):
if self.server_instance is None:
return
workflow_id = self.registry.workflow_id if self.registry else None
# Only send info for non-pending nodes
active_nodes = {
node_id: {
@@ -174,7 +172,6 @@ class WebUIProgressHandler(ProgressHandler):
"state": state["state"].value,
"node_id": node_id,
"prompt_id": prompt_id,
"workflow_id": workflow_id,
"display_node_id": self.registry.dynprompt.get_display_node_id(node_id),
"parent_node_id": self.registry.dynprompt.get_parent_node_id(node_id),
"real_node_id": self.registry.dynprompt.get_real_node_id(node_id),
@@ -186,7 +183,7 @@ class WebUIProgressHandler(ProgressHandler):
# Send a combined progress_state message with all node states
# Include client_id to ensure message is only sent to the initiating client
self.server_instance.send_sync(
"progress_state", {"prompt_id": prompt_id, "workflow_id": workflow_id, "nodes": active_nodes}, self.server_instance.client_id
"progress_state", {"prompt_id": prompt_id, "nodes": active_nodes}, self.server_instance.client_id
)
@override
@@ -218,7 +215,6 @@ class WebUIProgressHandler(ProgressHandler):
metadata = {
"node_id": node_id,
"prompt_id": prompt_id,
"workflow_id": self.registry.workflow_id if self.registry else None,
"display_node_id": self.registry.dynprompt.get_display_node_id(
node_id
),
@@ -244,10 +240,9 @@ class ProgressRegistry:
Registry that maintains node progress state and notifies registered handlers.
"""
def __init__(self, prompt_id: str, dynprompt: "DynamicPrompt", workflow_id: Optional[str] = None):
def __init__(self, prompt_id: str, dynprompt: "DynamicPrompt"):
self.prompt_id = prompt_id
self.dynprompt = dynprompt
self.workflow_id = workflow_id
self.nodes: Dict[str, NodeProgressState] = {}
self.handlers: Dict[str, ProgressHandler] = {}
@@ -327,7 +322,7 @@ class ProgressRegistry:
# Global registry instance
global_progress_registry: ProgressRegistry | None = None
def reset_progress_state(prompt_id: str, dynprompt: "DynamicPrompt", workflow_id: Optional[str] = None) -> None:
def reset_progress_state(prompt_id: str, dynprompt: "DynamicPrompt") -> None:
global global_progress_registry
# Reset existing handlers if registry exists
@@ -335,7 +330,7 @@ def reset_progress_state(prompt_id: str, dynprompt: "DynamicPrompt", workflow_id
global_progress_registry.reset_handlers()
# Create new registry
global_progress_registry = ProgressRegistry(prompt_id, dynprompt, workflow_id)
global_progress_registry = ProgressRegistry(prompt_id, dynprompt)
def add_progress_handler(handler: ProgressHandler) -> None: