Main merge work #19

Merged
stringadmin merged 33 commits from main-merge-work into main 2026-06-16 06:38:21 +00:00
Showing only changes of commit bdedad0b90 - Show all commits
@@ -19,6 +19,7 @@ import {
saveVideoHistory, saveVideoHistory,
buildComplianceFailureMessage, buildComplianceFailureMessage,
} from "./ecommerceVideoService"; } from "./ecommerceVideoService";
import { waitForTask } from "../../api/taskSubscription";
import { import {
PLAN_STEP_LABELS, PLAN_STEP_LABELS,
PLAN_STEPS_DISPLAY, PLAN_STEPS_DISPLAY,
@@ -315,7 +316,6 @@ export default function EcommerceVideoWorkspace({
if (scene.status !== "running" && scene.status !== "pending") continue; if (scene.status !== "running" && scene.status !== "pending") continue;
if (!scene.imageTaskId) continue; if (!scene.imageTaskId) continue;
try { try {
const { waitForTask } = await import("../../api/taskSubscription");
const resultUrl = await waitForTask(scene.imageTaskId, { const resultUrl = await waitForTask(scene.imageTaskId, {
abortRef: renderAbortRef.current, abortRef: renderAbortRef.current,
onProgress: (e) => onProgress: (e) =>
@@ -349,7 +349,6 @@ export default function EcommerceVideoWorkspace({
if (scene.status !== "running" && scene.status !== "pending") continue; if (scene.status !== "running" && scene.status !== "pending") continue;
if (!scene.taskId) continue; if (!scene.taskId) continue;
try { try {
const { waitForTask } = await import("../../api/taskSubscription");
const resultUrl = await waitForTask(scene.taskId, { const resultUrl = await waitForTask(scene.taskId, {
abortRef: renderAbortRef.current, abortRef: renderAbortRef.current,
onProgress: (e) => onProgress: (e) =>