ima2-gen 1.1.20 → 1.1.21

package/node_modules/progrok/dist/index.js

@@ -1247,101 +1247,200 @@ function imageToDataUri(filePath) {
   const ext = abs.toLowerCase().endsWith(".png") ? "png" : "jpeg";
   return `data:image/${ext};base64,${buf.toString("base64")}`;
 }
+async function pollUntilDone(requestId, bearer, timeout, json) {
+  const deadline = Date.now() + timeout;
+  let lastProgress = -1;
+  while (Date.now() < deadline) {
+    await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
+    const poll = await fetch(`${XAI_API_BASE_URL}/videos/${requestId}`, {
+      headers: { Authorization: `Bearer ${bearer}` }
+    });
+    if (!poll.ok) {
+      throw new Error(`Poll HTTP ${poll.status}: ${(await poll.text()).slice(0, 200)}`);
+    }
+    const data = await poll.json();
+    const status = data.status;
+    if (status === "done") return data;
+    if (status === "failed") {
+      const err = data.error;
+      throw new Error(`Generation failed: ${err?.code ?? "unknown"} \u2014 ${err?.message ?? ""}`);
+    }
+    if (status === "expired") throw new Error("Generation expired");
+    if (!json && typeof data.progress === "number" && data.progress !== lastProgress) {
+      lastProgress = data.progress;
+      process.stdout.write(`\r  Progress: ${Math.round(lastProgress * 100)}%`);
+    }
+  }
+  throw new Error(`Timeout after ${timeout / 1e3}s \u2014 video still pending`);
+}
+async function downloadAndSave(videoUrl, outPath) {
+  const videoRes = await fetch(videoUrl);
+  if (!videoRes.ok) throw new Error(`Download failed: HTTP ${videoRes.status}`);
+  const videoBuffer = Buffer.from(await videoRes.arrayBuffer());
+  writeFileSync2(outPath, videoBuffer);
+}
 function videoCommand() {
-  return new Command10("video").description(
-    `Generate video with Grok Imagine Video (T2V / I2V).
-  Async: submits generation, polls until done, downloads result.
+  const cmd = new Command10("video").description(
+    `Generate, edit, or extend video with Grok Imagine Video.
+
+  Subcommands:
+    generate (default)  Text-to-video or image-to-video
+    edit                Edit existing video with text prompt (V2V)
+    extend              Continue video from its last frame
 
   Examples:
     $ progrok video "A cat playing piano"
-    $ progrok video "Animate this photo" --image photo.jpg
-    $ progrok video "prompt" --model grok-imagine-video-1.5-preview --duration 10`
-  ).argument("<prompt>", "video generation prompt").option("--model <id>", "video model", DEFAULT_VIDEO_MODEL).option("--duration <s>", "duration in seconds (1-15)", "5").option("--aspect <ratio>", "aspect ratio", "16:9").option("--resolution <r>", "480p or 720p", "480p").option("--image <path>", "source image for image-to-video").option("--output <path>", "output file path").option("--json", "output structured JSON").option("--timeout <s>", "polling timeout in seconds", "600").action(async (prompt, opts) => {
-    try {
-      const bearer = await getValidBearer();
-      const duration = parseInt(opts.duration ?? "5", 10);
-      const timeout = parseInt(opts.timeout ?? "600", 10) * 1e3;
-      const body = {
-        model: opts.model ?? DEFAULT_VIDEO_MODEL,
-        prompt,
-        duration,
-        aspect_ratio: opts.aspect ?? "16:9",
-        resolution: opts.resolution ?? "480p"
-      };
-      if (opts.image) {
-        const uri = opts.image.startsWith("data:") ? opts.image : imageToDataUri(opts.image);
-        body.image = { url: uri };
-      } else if (opts.model?.includes("1.5") && !opts.image) {
-        body.image = { url: WHITE_PIXEL_PNG };
-        body.prompt = `${prompt}
+    $ progrok video "Animate this" --image photo.jpg
+    $ progrok video edit "Make it sunset colors" --video input.mp4
+    $ progrok video extend "Camera pulls back slowly" --video input.mp4 --duration 5`
+  );
+  cmd.argument("[prompt]", "video generation prompt").option("--model <id>", "video model", DEFAULT_VIDEO_MODEL).option("--duration <s>", "duration in seconds (1-15)", "5").option("--aspect <ratio>", "aspect ratio", "16:9").option("--resolution <r>", "480p or 720p", "480p").option("--image <path>", "source image for image-to-video").option("--output <path>", "output file path").option("--json", "output structured JSON").option("--timeout <s>", "polling timeout in seconds", "600").action(async (prompt, opts) => {
+    if (!prompt) {
+      cmd.help();
+      return;
+    }
+    await generateAction(prompt, opts);
+  });
+  cmd.command("edit <prompt>").description("Edit existing video with a text prompt (real V2V). Model: grok-imagine-video only.").requiredOption("--video <url-or-path>", "source video URL or local .mp4 path").option("--model <id>", "video model (must be grok-imagine-video)", DEFAULT_VIDEO_MODEL).option("--output <path>", "output file path").option("--json", "output structured JSON").option("--timeout <s>", "polling timeout in seconds", "600").action(async (prompt, opts) => {
+    await editAction(prompt, opts);
+  });
+  cmd.command("extend <prompt>").description("Extend video from its last frame. Model: grok-imagine-video only.").requiredOption("--video <url-or-path>", "source video URL or local .mp4 path").option("--model <id>", "video model (must be grok-imagine-video)", DEFAULT_VIDEO_MODEL).option("--duration <s>", "extension duration 2-10s (default 6)", "6").option("--output <path>", "output file path").option("--json", "output structured JSON").option("--timeout <s>", "polling timeout in seconds", "600").action(async (prompt, opts) => {
+    await extendAction(prompt, opts);
+  });
+  return cmd;
+}
+async function generateAction(prompt, opts) {
+  try {
+    const bearer = await getValidBearer();
+    const duration = parseInt(opts.duration ?? "5", 10);
+    const timeout = parseInt(opts.timeout ?? "600", 10) * 1e3;
+    const body = {
+      model: opts.model ?? DEFAULT_VIDEO_MODEL,
+      prompt,
+      duration,
+      aspect_ratio: opts.aspect ?? "16:9",
+      resolution: opts.resolution ?? "480p"
+    };
+    if (opts.image) {
+      const uri = opts.image.startsWith("data:") ? opts.image : imageToDataUri(opts.image);
+      body.image = { url: uri };
+    } else if (opts.model?.includes("1.5") && !opts.image) {
+      body.image = { url: WHITE_PIXEL_PNG };
+      body.prompt = `${prompt}
 
 This is not a start frame \u2014 generate freely as a new video.`;
-      }
-      const res = await fetch(`${XAI_API_BASE_URL}/videos/generations`, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${bearer}`,
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(body)
-      });
-      if (!res.ok) {
-        const errBody = await res.text();
-        throw new Error(`HTTP ${res.status}: ${errBody.slice(0, 300)}`);
-      }
-      const { request_id } = await res.json();
-      if (!opts.json) {
-        log.info(`Video generation started (${request_id})`);
-        log.dim(`Model: ${body.model} | ${duration}s | ${opts.aspect} | ${opts.resolution}`);
-      }
-      const deadline = Date.now() + timeout;
-      let lastProgress = -1;
-      while (Date.now() < deadline) {
-        await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
-        const poll = await fetch(`${XAI_API_BASE_URL}/videos/${request_id}`, {
-          headers: { Authorization: `Bearer ${bearer}` }
-        });
-        if (!poll.ok) {
-          throw new Error(`Poll HTTP ${poll.status}: ${(await poll.text()).slice(0, 200)}`);
-        }
-        const data = await poll.json();
-        if (data.status === "done" && data.video) {
-          if (opts.json) {
-            console.log(JSON.stringify(data, null, 2));
-            return;
-          }
-          const videoRes = await fetch(data.video.url);
-          if (!videoRes.ok) throw new Error(`Download failed: HTTP ${videoRes.status}`);
-          const videoBuffer = Buffer.from(await videoRes.arrayBuffer());
-          const outPath = opts.output ?? `progrok-video-${request_id.slice(0, 8)}.mp4`;
-          writeFileSync2(outPath, videoBuffer);
-          log.success(`
-Video saved: ${outPath}`);
-          log.info(`Duration: ${data.video.duration}s`);
-          if (data.usage?.cost_in_usd_ticks) {
-            log.dim(`Cost: $${(data.usage.cost_in_usd_ticks / 1e10).toFixed(4)}`);
-          }
-          return;
-        }
-        if (data.status === "failed") {
-          throw new Error(
-            `Generation failed: ${data.error?.code ?? "unknown"} \u2014 ${data.error?.message ?? ""}`
-          );
-        }
-        if (data.status === "expired") {
-          throw new Error("Generation expired");
-        }
-        if (!opts.json && data.progress !== void 0 && data.progress !== lastProgress) {
-          lastProgress = data.progress;
-          process.stdout.write(`\r  Progress: ${Math.round(data.progress * 100)}%`);
-        }
-      }
-      throw new Error(`Timeout after ${timeout / 1e3}s \u2014 video still pending`);
-    } catch (err) {
-      log.error(err.message);
-      process.exit(1);
     }
-  });
+    const res = await fetch(`${XAI_API_BASE_URL}/videos/generations`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${bearer}`, "Content-Type": "application/json" },
+      body: JSON.stringify(body)
+    });
+    if (!res.ok) throw new Error(`HTTP ${res.status}: ${(await res.text()).slice(0, 300)}`);
+    const { request_id } = await res.json();
+    if (!opts.json) {
+      log.info(`Video generation started (${request_id})`);
+      log.dim(`Model: ${body.model} | ${duration}s | ${opts.aspect} | ${opts.resolution}`);
+    }
+    const data = await pollUntilDone(request_id, bearer, timeout, opts.json);
+    if (opts.json) {
+      console.log(JSON.stringify(data, null, 2));
+      return;
+    }
+    const video = data.video;
+    if (!video) throw new Error("No video in response");
+    const outPath = opts.output ?? `progrok-video-${request_id.slice(0, 8)}.mp4`;
+    await downloadAndSave(video.url, outPath);
+    if (!opts.json) process.stdout.write("\n");
+    log.success(`Video saved: ${outPath}`);
+    log.info(`Duration: ${video.duration}s`);
+    const usage = data.usage;
+    if (usage?.cost_in_usd_ticks) log.dim(`Cost: $${(usage.cost_in_usd_ticks / 1e10).toFixed(4)}`);
+  } catch (err) {
+    log.error(err.message);
+    process.exit(1);
+  }
+}
+async function editAction(prompt, opts) {
+  try {
+    const bearer = await getValidBearer();
+    const timeout = parseInt(opts.timeout ?? "600", 10) * 1e3;
+    const model = opts.model ?? DEFAULT_VIDEO_MODEL;
+    if (model.includes("1.5")) {
+      throw new Error("Video editing is only supported by grok-imagine-video (not 1.5-preview).");
+    }
+    const videoUrl = opts.video.startsWith("http") ? opts.video : (() => {
+      throw new Error("--video must be a URL (local file upload not yet supported for editing).");
+    })();
+    const res = await fetch(`${XAI_API_BASE_URL}/videos/edits`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${bearer}`, "Content-Type": "application/json" },
+      body: JSON.stringify({ model, prompt, video: { url: videoUrl } })
+    });
+    if (!res.ok) throw new Error(`HTTP ${res.status}: ${(await res.text()).slice(0, 300)}`);
+    const { request_id } = await res.json();
+    if (!opts.json) {
+      log.info(`Video edit started (${request_id})`);
+      log.dim(`Model: ${model} | Edit: "${prompt.slice(0, 60)}"`);
+    }
+    const data = await pollUntilDone(request_id, bearer, timeout, opts.json);
+    if (opts.json) {
+      console.log(JSON.stringify(data, null, 2));
+      return;
+    }
+    const video = data.video;
+    if (!video) throw new Error("No video in response");
+    const outPath = opts.output ?? `progrok-edit-${request_id.slice(0, 8)}.mp4`;
+    await downloadAndSave(video.url, outPath);
+    if (!opts.json) process.stdout.write("\n");
+    log.success(`Edited video saved: ${outPath}`);
+    log.info(`Duration: ${video.duration}s`);
+  } catch (err) {
+    log.error(err.message);
+    process.exit(1);
+  }
+}
+async function extendAction(prompt, opts) {
+  try {
+    const bearer = await getValidBearer();
+    const timeout = parseInt(opts.timeout ?? "600", 10) * 1e3;
+    const duration = parseInt(opts.duration ?? "6", 10);
+    const model = opts.model ?? DEFAULT_VIDEO_MODEL;
+    if (model.includes("1.5")) {
+      throw new Error("Video extension is only supported by grok-imagine-video (not 1.5-preview).");
+    }
+    if (duration < 2 || duration > 10) {
+      throw new Error("Extension duration must be 2-10 seconds.");
+    }
+    const videoUrl = opts.video.startsWith("http") ? opts.video : (() => {
+      throw new Error("--video must be a URL (local file upload not yet supported for extension).");
+    })();
+    const res = await fetch(`${XAI_API_BASE_URL}/videos/extensions`, {
+      method: "POST",
+      headers: { Authorization: `Bearer ${bearer}`, "Content-Type": "application/json" },
+      body: JSON.stringify({ model, prompt, duration, video: { url: videoUrl } })
+    });
+    if (!res.ok) throw new Error(`HTTP ${res.status}: ${(await res.text()).slice(0, 300)}`);
+    const { request_id } = await res.json();
+    if (!opts.json) {
+      log.info(`Video extension started (${request_id})`);
+      log.dim(`Model: ${model} | Extend: +${duration}s | "${prompt.slice(0, 60)}"`);
+    }
+    const data = await pollUntilDone(request_id, bearer, timeout, opts.json);
+    if (opts.json) {
+      console.log(JSON.stringify(data, null, 2));
+      return;
+    }
+    const video = data.video;
+    if (!video) throw new Error("No video in response");
+    const outPath = opts.output ?? `progrok-extend-${request_id.slice(0, 8)}.mp4`;
+    await downloadAndSave(video.url, outPath);
+    if (!opts.json) process.stdout.write("\n");
+    log.success(`Extended video saved: ${outPath}`);
+    log.info(`Total duration: ${video.duration}s (original + ${duration}s extension)`);
+  } catch (err) {
+    log.error(err.message);
+    process.exit(1);
+  }
 }
 
 // src/commands/image.ts