Robert Wojciechowski
3058b11ff2
- Remove DistributedListSplitter and DistributedListCollector nodes - Remove /distributed/init_list_queue and /distributed/request_list_item endpoints - Clean up all references from prompt_transform, queue_orchestration, constants, and tests - Refactor and reorganize distributed modules for quality improvements
317 lines
11 KiB
Python
317 lines
11 KiB
Python
import asyncio
|
|
import json
|
|
import uuid
|
|
from typing import Any
|
|
|
|
import aiohttp
|
|
|
|
from ...utils.auth import distributed_auth_headers
|
|
from ...utils.config import load_config
|
|
from ...utils.logging import debug_log, log
|
|
from ...utils.network import build_worker_url, get_client_session, probe_worker
|
|
from ...utils.trace_logger import trace_debug, trace_info
|
|
from ..schemas import coerce_positive_int
|
|
|
|
_least_busy_rr_index = 0
|
|
|
|
|
|
async def worker_is_active(worker: dict[str, Any]) -> bool:
|
|
"""Ping worker's /prompt endpoint to confirm it's reachable."""
|
|
url = build_worker_url(worker)
|
|
return await probe_worker(url, timeout=3.0) is not None
|
|
|
|
|
|
async def worker_ws_is_active(worker: dict[str, Any]) -> bool:
|
|
"""Ping worker's websocket endpoint to confirm it's reachable."""
|
|
session = await get_client_session()
|
|
url = build_worker_url(worker, "/distributed/worker_ws")
|
|
headers = distributed_auth_headers(load_config())
|
|
try:
|
|
ws = await session.ws_connect(url, heartbeat=20, timeout=3, headers=headers)
|
|
await ws.close()
|
|
return True
|
|
except asyncio.TimeoutError:
|
|
debug_log(f"[Distributed] Worker WS probe timed out: {url}")
|
|
return False
|
|
except aiohttp.ClientConnectorError:
|
|
debug_log(f"[Distributed] Worker WS unreachable: {url}")
|
|
return False
|
|
except Exception as e:
|
|
debug_log(f"[Distributed] Worker WS probe unexpected error: {e}")
|
|
return False
|
|
|
|
|
|
async def _probe_worker_active(worker, use_websocket, semaphore):
|
|
async with semaphore:
|
|
is_active = await (worker_ws_is_active(worker) if use_websocket else worker_is_active(worker))
|
|
return worker, is_active
|
|
|
|
|
|
async def _dispatch_via_websocket(
|
|
worker_url,
|
|
payload,
|
|
client_id,
|
|
headers: dict[str, str],
|
|
timeout=60.0,
|
|
):
|
|
"""Open a fresh worker websocket, dispatch one prompt, wait for ack, then close."""
|
|
request_id = uuid.uuid4().hex
|
|
ws_payload = {
|
|
"type": "dispatch_prompt",
|
|
"request_id": request_id,
|
|
"prompt": payload.get("prompt"),
|
|
"workflow": payload.get("workflow"),
|
|
"client_id": client_id,
|
|
}
|
|
ws_url = worker_url.replace("http://", "ws://").replace("https://", "wss://")
|
|
ws_url = f"{ws_url}/distributed/worker_ws"
|
|
session = await get_client_session()
|
|
|
|
async with session.ws_connect(
|
|
ws_url,
|
|
heartbeat=20,
|
|
timeout=timeout,
|
|
headers=headers,
|
|
) as ws:
|
|
await ws.send_json(ws_payload)
|
|
async for msg in ws:
|
|
if msg.type == aiohttp.WSMsgType.TEXT:
|
|
data = json.loads(msg.data or "{}")
|
|
if data.get("type") == "dispatch_ack" and data.get("request_id") == request_id:
|
|
if data.get("ok"):
|
|
return
|
|
error_text = data.get("error") or "Worker rejected websocket dispatch."
|
|
validation_error = data.get("validation_error")
|
|
node_errors = data.get("node_errors")
|
|
if validation_error:
|
|
error_text = f"{error_text} | validation_error={validation_error}"
|
|
if node_errors:
|
|
error_text = f"{error_text} | node_errors={node_errors}"
|
|
raise RuntimeError(error_text)
|
|
elif msg.type in (aiohttp.WSMsgType.ERROR, aiohttp.WSMsgType.CLOSED):
|
|
raise RuntimeError(f"Worker websocket closed unexpectedly: {msg.type}")
|
|
|
|
raise RuntimeError("Worker websocket closed before dispatch_ack was received.")
|
|
|
|
|
|
async def dispatch_worker_prompt(
|
|
worker: dict[str, Any],
|
|
prompt_obj: dict[str, Any],
|
|
workflow_meta: dict[str, Any] | None,
|
|
client_id: str | None = None,
|
|
use_websocket: bool = False,
|
|
trace_execution_id: str | None = None,
|
|
) -> None:
|
|
"""Send the prepared prompt to a worker ComfyUI instance."""
|
|
worker_url = build_worker_url(worker)
|
|
url = build_worker_url(worker, "/prompt")
|
|
payload = {"prompt": prompt_obj}
|
|
extra_data = {}
|
|
if workflow_meta:
|
|
extra_data.setdefault("extra_pnginfo", {})["workflow"] = workflow_meta
|
|
if extra_data:
|
|
payload["extra_data"] = extra_data
|
|
|
|
if use_websocket:
|
|
ws_headers = distributed_auth_headers(load_config())
|
|
try:
|
|
await _dispatch_via_websocket(
|
|
worker_url,
|
|
{
|
|
"prompt": prompt_obj,
|
|
"workflow": workflow_meta,
|
|
},
|
|
client_id,
|
|
ws_headers,
|
|
)
|
|
return
|
|
except Exception as exc:
|
|
worker_id = worker.get("id")
|
|
if trace_execution_id:
|
|
trace_info(trace_execution_id, f"Websocket dispatch failed for worker {worker_id}: {exc}")
|
|
else:
|
|
log(f"[Distributed] Websocket dispatch failed for worker {worker_id}: {exc}")
|
|
raise
|
|
|
|
session = await get_client_session()
|
|
async with session.post(
|
|
url,
|
|
json=payload,
|
|
timeout=aiohttp.ClientTimeout(total=60),
|
|
) as resp:
|
|
resp.raise_for_status()
|
|
|
|
|
|
async def select_active_workers(
|
|
workers: list[dict[str, Any]],
|
|
use_websocket: bool,
|
|
delegate_master: bool,
|
|
trace_execution_id: str | None = None,
|
|
probe_concurrency: int = 8,
|
|
) -> tuple[list[dict[str, Any]], bool]:
|
|
"""Probe workers and return (active_workers, updated_delegate_master)."""
|
|
probe_limit = coerce_positive_int(probe_concurrency, 8)
|
|
probe_semaphore = asyncio.Semaphore(probe_limit)
|
|
|
|
if trace_execution_id and workers:
|
|
trace_debug(
|
|
trace_execution_id,
|
|
f"Probing {len(workers)} workers with probe_concurrency={probe_limit}",
|
|
)
|
|
|
|
probe_results = await asyncio.gather(
|
|
*[
|
|
_probe_worker_active(worker, use_websocket, probe_semaphore)
|
|
for worker in workers
|
|
]
|
|
)
|
|
|
|
active_workers = []
|
|
for worker, is_active in probe_results:
|
|
if is_active:
|
|
active_workers.append(worker)
|
|
else:
|
|
if trace_execution_id:
|
|
trace_info(trace_execution_id, f"Worker {worker['name']} ({worker['id']}) is offline, skipping.")
|
|
else:
|
|
log(f"[Distributed] Worker {worker['name']} ({worker['id']}) is offline, skipping.")
|
|
|
|
if trace_execution_id and workers:
|
|
trace_debug(
|
|
trace_execution_id,
|
|
f"Worker probe complete: active={len(active_workers)}/{len(workers)}",
|
|
)
|
|
|
|
if not active_workers and delegate_master:
|
|
if trace_execution_id:
|
|
trace_debug(trace_execution_id, "All workers offline while delegate-only requested; enabling master participation.")
|
|
else:
|
|
debug_log("All workers offline while delegate-only requested; enabling master participation.")
|
|
delegate_master = False
|
|
|
|
return active_workers, delegate_master
|
|
|
|
|
|
def _extract_queue_remaining(payload):
|
|
if not isinstance(payload, dict):
|
|
return 0
|
|
try:
|
|
queue_remaining = int(payload.get("exec_info", {}).get("queue_remaining", 0))
|
|
except (TypeError, ValueError):
|
|
queue_remaining = 0
|
|
return max(queue_remaining, 0)
|
|
|
|
|
|
async def _probe_worker_queue(worker, semaphore, probe_timeout):
|
|
async with semaphore:
|
|
worker_url = build_worker_url(worker)
|
|
payload = await probe_worker(worker_url, timeout=probe_timeout)
|
|
if payload is None:
|
|
return None
|
|
return {
|
|
"worker": worker,
|
|
"queue_remaining": _extract_queue_remaining(payload),
|
|
}
|
|
|
|
|
|
def _select_idle_round_robin(statuses):
|
|
global _least_busy_rr_index
|
|
if not statuses:
|
|
return None
|
|
index = _least_busy_rr_index % len(statuses)
|
|
_least_busy_rr_index += 1
|
|
return statuses[index]
|
|
|
|
|
|
async def select_least_busy_worker(
|
|
workers: list[dict[str, Any]],
|
|
trace_execution_id: str | None = None,
|
|
probe_concurrency: int = 8,
|
|
probe_timeout: float = 3.0,
|
|
) -> dict[str, Any] | None:
|
|
"""Select one worker by queue depth, round-robin among idle workers."""
|
|
if not workers:
|
|
return None
|
|
|
|
probe_limit = coerce_positive_int(probe_concurrency, 8)
|
|
probe_semaphore = asyncio.Semaphore(probe_limit)
|
|
statuses = await asyncio.gather(
|
|
*[
|
|
_probe_worker_queue(worker, probe_semaphore, probe_timeout)
|
|
for worker in workers
|
|
]
|
|
)
|
|
statuses = [status for status in statuses if status is not None]
|
|
if not statuses:
|
|
if trace_execution_id:
|
|
trace_info(trace_execution_id, "Least-busy selection failed: no worker queue probes succeeded.")
|
|
else:
|
|
log("[Distributed] Least-busy selection failed: no worker queue probes succeeded.")
|
|
return None
|
|
|
|
idle_statuses = [status for status in statuses if status["queue_remaining"] == 0]
|
|
if idle_statuses:
|
|
selected = _select_idle_round_robin(idle_statuses)
|
|
else:
|
|
selected = min(statuses, key=lambda status: status["queue_remaining"])
|
|
|
|
worker = selected["worker"]
|
|
queue_remaining = selected["queue_remaining"]
|
|
if trace_execution_id:
|
|
trace_debug(
|
|
trace_execution_id,
|
|
f"Least-busy worker selected: {worker.get('name')} ({worker.get('id')}), queue_remaining={queue_remaining}",
|
|
)
|
|
else:
|
|
debug_log(
|
|
f"Least-busy worker selected: {worker.get('name')} ({worker.get('id')}), queue_remaining={queue_remaining}"
|
|
)
|
|
return worker
|
|
|
|
|
|
async def rank_workers_by_load(
|
|
workers: list[dict[str, Any]],
|
|
trace_execution_id: str | None = None,
|
|
probe_concurrency: int = 8,
|
|
probe_timeout: float = 3.0,
|
|
) -> list[dict[str, Any]]:
|
|
"""Return all workers sorted by queue depth (ascending), preserving unreachable workers at the end."""
|
|
if not workers:
|
|
return []
|
|
|
|
probe_limit = coerce_positive_int(probe_concurrency, 8)
|
|
probe_semaphore = asyncio.Semaphore(probe_limit)
|
|
statuses = await asyncio.gather(
|
|
*[
|
|
_probe_worker_queue(worker, probe_semaphore, probe_timeout)
|
|
for worker in workers
|
|
]
|
|
)
|
|
|
|
ranked_statuses = []
|
|
unreachable_workers = []
|
|
for worker, status in zip(workers, statuses):
|
|
if status is None:
|
|
unreachable_workers.append(worker)
|
|
continue
|
|
ranked_statuses.append(status)
|
|
|
|
ranked_statuses.sort(key=lambda status: status["queue_remaining"])
|
|
ranked_workers = [status["worker"] for status in ranked_statuses] + unreachable_workers
|
|
|
|
if trace_execution_id:
|
|
trace_debug(
|
|
trace_execution_id,
|
|
"Ranked workers by load: "
|
|
+ ", ".join(
|
|
f"{status['worker'].get('id')}={status['queue_remaining']}"
|
|
for status in ranked_statuses
|
|
)
|
|
+ (
|
|
f"; unreachable={','.join(worker.get('id', '') for worker in unreachable_workers)}"
|
|
if unreachable_workers
|
|
else ""
|
|
),
|
|
)
|
|
return ranked_workers
|