Update image and video workflow nodes

nodes/K3_video_firstlast.py

@@ -13,6 +13,17 @@ import aiohttp
 from ..utils.config import get_api_key_or_raise, get_async_api_base_url, NETWORK_ROUTE_OPTIONS, get_base_url_by_route
 from ..utils.image_utils import tensor_to_pil, encode_image_to_base64
 from ..utils.http_error import async_request_with_retry
+from ..utils.video_task import (
+    check_interrupt,
+    extract_error_message,
+    extract_progress,
+    extract_status,
+    extract_video_url,
+    interruptible_sleep,
+    is_failure_status,
+    is_success_status,
+    run_with_interrupt,
+)
 
 try:
     from comfy_api.latest import InputImpl
@@ -185,11 +196,13 @@ class K3VideoFirstLast:
         async with aiohttp.ClientSession(connector=connector) as session:
 
             # 1. 提交
+            check_interrupt()
             _stage("submitting")
             create_url = f"{base_url}{_ENDPOINT_CREATE}"
-            resp = await async_request_with_retry(
+            resp = await run_with_interrupt(async_request_with_retry(
                 session, "POST", create_url, json=body, headers=headers, prefix="K3 首尾帧提交: "
-            )
+            ))
+            check_interrupt()
             text = await resp.text()
             create_resp = json.loads(text)
 
@@ -208,6 +221,7 @@ class K3VideoFirstLast:
             video_url  = None
 
             while True:
+                check_interrupt()
                 async with session.get(status_url, headers=headers) as resp:
                     text = await resp.text()
                     if resp.status != 200:
@@ -220,39 +234,27 @@ class K3VideoFirstLast:
                     sr = json.loads(text)
 
                 data   = sr.get("data", sr)
-                status = (data.get("status") or sr.get("status") or "").lower()
+                status = extract_status(sr)
 
-                pct_raw = data.get("progress", 0)
-                try:
-                    pct = int(str(pct_raw).rstrip("%").strip())
-                except (ValueError, AttributeError):
-                    pct = 0
+                pct = extract_progress(sr)
                 print(f"[K3 首尾帧] 生成中 {pct}%")
                 _progress(pct)
 
-                if status in ("success", "completed", "done", "finished", "succeed"):
-                    video_url = (
-                        data.get("video_url")
-                        or data.get("result_url")
-                        or data.get("url")
-                        or (data.get("result", {}) or {}).get("url")
-                        or sr.get("video_url")
-                        or sr.get("url")
-                    )
+                if is_success_status(status):
+                    video_url = extract_video_url(sr)
                     break
-                if status in ("failed", "fail"):
-                    err_info = data.get("error") or sr.get("error") or {}
-                    err_msg  = (err_info.get("message", "未知错误")
-                                if isinstance(err_info, dict) else str(err_info))
+                if is_failure_status(status, sr):
+                    err_msg = extract_error_message(sr)
                     raise RuntimeError(f"K3 首尾帧生成失败：{err_msg}")
 
-                await asyncio.sleep(interval)
+                await interruptible_sleep(interval)
                 interval = min(interval * 1.5, _POLL_MAX)
 
             if not video_url:
                 raise RuntimeError(f"API 未返回视频 URL，响应：{sr}")
 
             # 3. 下载
+            check_interrupt()
             _stage("downloading")
             async with session.get(video_url, allow_redirects=True) as resp:
                 if resp.status != 200:
@@ -260,6 +262,7 @@ class K3VideoFirstLast:
                 os.close(tmp_fd)
                 with open(save_path, "wb") as f:
                     async for chunk in resp.content.iter_chunked(8192):
+                        check_interrupt()
                         f.write(chunk)
 
         _stage("done")