@shop-os/modelkit 0.4.4 → 0.4.6

package/dist/index.d.cts

@@ -1144,6 +1144,8 @@ interface Adapter {
     id: string;
     generateImage?(req: ImageRequest, ctx: AdapterContext): Promise<ImageResult>;
     generateVideo?(req: VideoRequest, ctx: AdapterContext): Promise<VideoJob>;
+    /** Reconnect to a job `generateVideo` submitted earlier; never submits. */
+    resumeVideo?(req: VideoRequest, jobId: string, ctx: AdapterContext): VideoJob;
     generateAudio?(req: AudioRequest, ctx: AdapterContext): Promise<AudioResult>;
     /** Video tools run as provider jobs the caller tracks; see ModelKit.submitVideoTool. */
     submitVideoTool?(req: VideoToolRequest, ctx: AdapterContext, opts: {
@@ -1350,6 +1352,12 @@ interface ModelKit extends TextMethods {
      * `model` is a catalog id or an AI SDK video model instance.
      */
     generateVideo(req: VideoCallOptions, call?: CallContext): Promise<VideoCallJob>;
+    /**
+     * Reconnect to a video job submitted earlier with `generateVideo` (same request), by its
+     * `jobId`. Never submits a new job. Await `job.result()` as usual; usage is emitted once.
+     * A resumed job reports only the resumed wait in `latencyMs`.
+     */
+    resumeVideo(req: VideoCallOptions, jobId: string, call?: CallContext): Promise<VideoCallJob>;
     /** AI SDK LanguageModel for chat models. Pair with the catalog's providerOptions. */
     languageModel(modelId: string, call?: CallContext): LanguageModelHandle;
     /** Usage-event `provider` for a catalog model, without building it: "bedrock" on Bedrock, else the vendor. */

package/dist/index.d.ts

@@ -1144,6 +1144,8 @@ interface Adapter {
     id: string;
     generateImage?(req: ImageRequest, ctx: AdapterContext): Promise<ImageResult>;
     generateVideo?(req: VideoRequest, ctx: AdapterContext): Promise<VideoJob>;
+    /** Reconnect to a job `generateVideo` submitted earlier; never submits. */
+    resumeVideo?(req: VideoRequest, jobId: string, ctx: AdapterContext): VideoJob;
     generateAudio?(req: AudioRequest, ctx: AdapterContext): Promise<AudioResult>;
     /** Video tools run as provider jobs the caller tracks; see ModelKit.submitVideoTool. */
     submitVideoTool?(req: VideoToolRequest, ctx: AdapterContext, opts: {
@@ -1350,6 +1352,12 @@ interface ModelKit extends TextMethods {
      * `model` is a catalog id or an AI SDK video model instance.
      */
     generateVideo(req: VideoCallOptions, call?: CallContext): Promise<VideoCallJob>;
+    /**
+     * Reconnect to a video job submitted earlier with `generateVideo` (same request), by its
+     * `jobId`. Never submits a new job. Await `job.result()` as usual; usage is emitted once.
+     * A resumed job reports only the resumed wait in `latencyMs`.
+     */
+    resumeVideo(req: VideoCallOptions, jobId: string, call?: CallContext): Promise<VideoCallJob>;
     /** AI SDK LanguageModel for chat models. Pair with the catalog's providerOptions. */
     languageModel(modelId: string, call?: CallContext): LanguageModelHandle;
     /** Usage-event `provider` for a catalog model, without building it: "bedrock" on Bedrock, else the vendor. */

package/dist/index.js

@@ -3651,6 +3651,11 @@ var arkAdapter = {
   async generateVideo(req, ctx) {
     throwIfAborted(ctx.signal);
     return generateSeedanceVideo(req, ctx);
+  },
+  resumeVideo(req, jobId, ctx) {
+    throwIfAborted(ctx.signal);
+    const key = arkKey(ctx);
+    return seedanceJob(ctx, key, jobId, seedanceUsage(ctx, req, seedanceInitialDuration(req)));
   }
 };
 function arkKey(ctx) {
@@ -3820,6 +3825,9 @@ function seedanceUsage(ctx, req, duration) {
   if (req.resolution !== void 0) usage2.resolution = req.resolution;
   return usage2;
 }
+function seedanceInitialDuration(req) {
+  return req.durationSeconds ?? 5;
+}
 function seedanceErrorMessage(error, status) {
   const asString = z7.string().safeParse(error);
   if (asString.success) return asString.data;
@@ -3827,6 +3835,78 @@ function seedanceErrorMessage(error, status) {
   if (asObject.success && asObject.data.message !== void 0) return asObject.data.message;
   return `Seedance task ${status}`;
 }
+function seedanceJob(ctx, key, jobId, usage2) {
+  const modelId = ctx.model.id;
+  const fetchStatus = async () => {
+    const res = await arkFetch(ctx, `${arkBaseUrl(ctx)}${SUBMIT_PATH}/${jobId}`, {
+      headers: { Authorization: `Bearer ${key}` }
+    });
+    if (!res.ok) {
+      if (ctx.call.maxRetries !== 0 && (res.status === 429 || res.status >= 500))
+        return void 0;
+      const text2 = await res.text().catch(() => "");
+      throwArkError(res.status, text2, modelId);
+    }
+    const parsed = SeedanceResponseSchema.safeParse(await res.json());
+    if (!parsed.success) return {};
+    return parsed.data;
+  };
+  return {
+    jobId,
+    async poll() {
+      const polled = await fetchStatus();
+      if (!polled) return { status: "running" };
+      const status = (polled.status ?? "queued").toLowerCase();
+      if (status === "succeeded") return { status: "succeeded", raw: polled };
+      if (status === "failed" || status === "expired" || status === "cancelled") {
+        return { status: "failed", raw: polled };
+      }
+      if (status === "queued" || status === "pending")
+        return { status: "pending", raw: polled };
+      return { status: "running", raw: polled };
+    },
+    async result(opts) {
+      const optSignal = opts?.signal ?? ctx.signal;
+      const pollOpts = {
+        intervalMs: opts?.pollIntervalMs ?? SEEDANCE_POLL_INTERVAL_MS,
+        timeoutMs: opts?.timeoutMs ?? RESULT_TIMEOUT_MS
+      };
+      if (optSignal !== void 0) pollOpts.signal = optSignal;
+      return pollUntil(async () => {
+        const polled = await fetchStatus();
+        if (!polled) return void 0;
+        const status = (polled.status ?? "queued").toLowerCase();
+        if (status === "succeeded") {
+          const url = polled.content?.video_url;
+          if (!url)
+            throwArkError(
+              void 0,
+              "Seedance task succeeded but returned no video_url",
+              modelId
+            );
+          if (polled.duration !== void 0 && polled.duration > 0) {
+            usage2.quantity = polled.duration;
+            usage2.durationSeconds = polled.duration;
+          }
+          const tokens = polled.usage;
+          if (tokens?.total_tokens !== void 0 && tokens.completion_tokens !== void 0) {
+            usage2.inputTokens = tokens.total_tokens - tokens.completion_tokens;
+            usage2.outputTokens = tokens.completion_tokens;
+          }
+          return {
+            video: { url, expiresAt: new Date(Date.now() + VIDEO_URL_TTL_MS) },
+            usage: usage2,
+            raw: polled
+          };
+        }
+        if (status === "failed" || status === "expired" || status === "cancelled") {
+          throwArkError(void 0, seedanceErrorMessage(polled.error, status), modelId);
+        }
+        return void 0;
+      }, pollOpts);
+    }
+  };
+}
 async function generateSeedanceVideo(req, ctx) {
   const modelId = ctx.model.id;
   const taskType = req.taskType;
@@ -3841,7 +3921,7 @@ async function generateSeedanceVideo(req, ctx) {
     });
   }
   const key = arkKey(ctx);
-  const requestedDuration = req.durationSeconds ?? 5;
+  const requestedDuration = seedanceInitialDuration(req);
   let duration = requestedDuration;
   if (taskType === "edit") duration = -1;
   const resolution = req.resolution ?? "720p";
@@ -3922,75 +4002,7 @@ async function generateSeedanceVideo(req, ctx) {
   if (!submit.id) throwArkError(void 0, "Seedance task create returned no id", modelId);
   const jobId = submit.id;
   const usage2 = seedanceUsage(ctx, req, taskType === "edit" ? requestedDuration : duration);
-  const fetchStatus = async () => {
-    const res = await arkFetch(ctx, `${arkBaseUrl(ctx)}${SUBMIT_PATH}/${jobId}`, {
-      headers: { Authorization: `Bearer ${key}` }
-    });
-    if (!res.ok) {
-      if (ctx.call.maxRetries !== 0 && (res.status === 429 || res.status >= 500))
-        return void 0;
-      const text2 = await res.text().catch(() => "");
-      throwArkError(res.status, text2, modelId);
-    }
-    const parsed = SeedanceResponseSchema.safeParse(await res.json());
-    if (!parsed.success) return {};
-    return parsed.data;
-  };
-  return {
-    jobId,
-    async poll() {
-      const polled = await fetchStatus();
-      if (!polled) return { status: "running" };
-      const status = (polled.status ?? "queued").toLowerCase();
-      if (status === "succeeded") return { status: "succeeded", raw: polled };
-      if (status === "failed" || status === "expired" || status === "cancelled") {
-        return { status: "failed", raw: polled };
-      }
-      if (status === "queued" || status === "pending")
-        return { status: "pending", raw: polled };
-      return { status: "running", raw: polled };
-    },
-    async result(opts) {
-      const optSignal = opts?.signal ?? ctx.signal;
-      const pollOpts = {
-        intervalMs: opts?.pollIntervalMs ?? SEEDANCE_POLL_INTERVAL_MS,
-        timeoutMs: opts?.timeoutMs ?? RESULT_TIMEOUT_MS
-      };
-      if (optSignal !== void 0) pollOpts.signal = optSignal;
-      return pollUntil(async () => {
-        const polled = await fetchStatus();
-        if (!polled) return void 0;
-        const status = (polled.status ?? "queued").toLowerCase();
-        if (status === "succeeded") {
-          const url = polled.content?.video_url;
-          if (!url)
-            throwArkError(
-              void 0,
-              "Seedance task succeeded but returned no video_url",
-              modelId
-            );
-          if (polled.duration !== void 0 && polled.duration > 0) {
-            usage2.quantity = polled.duration;
-            usage2.durationSeconds = polled.duration;
-          }
-          const tokens = polled.usage;
-          if (tokens?.total_tokens !== void 0 && tokens.completion_tokens !== void 0) {
-            usage2.inputTokens = tokens.total_tokens - tokens.completion_tokens;
-            usage2.outputTokens = tokens.completion_tokens;
-          }
-          return {
-            video: { url, expiresAt: new Date(Date.now() + VIDEO_URL_TTL_MS) },
-            usage: usage2,
-            raw: polled
-          };
-        }
-        if (status === "failed" || status === "expired" || status === "cancelled") {
-          throwArkError(void 0, seedanceErrorMessage(polled.error, status), modelId);
-        }
-        return void 0;
-      }, pollOpts);
-    }
-  };
+  return seedanceJob(ctx, key, jobId, usage2);
 }
 
 // src/adapters/fal.ts
@@ -4132,6 +4144,20 @@ import { z as z11 } from "zod";
 
 // src/catalog/video-tools-spec.ts
 import { z as z10 } from "zod";
+
+// src/video-length.ts
+function tenths(seconds2) {
+  return Math.round(seconds2 * 10) / 10;
+}
+function overMax(seconds2, max) {
+  return seconds2 > max && tenths(seconds2) > max;
+}
+function overTotal(lengths, total) {
+  const sum = (values) => values.reduce((acc, len) => acc + len, 0);
+  return sum(lengths) > total && tenths(sum(lengths.map(tenths))) > total;
+}
+
+// src/catalog/video-tools-spec.ts
 var RangeSchema2 = z10.object({ min: z10.number(), max: z10.number() });
 var ToolSchema = z10.object({
   kind: z10.enum(["upscale", "interpolate", "hdr"]),
@@ -4175,7 +4201,7 @@ function planVideoTool(row, req) {
     return fail("The source video's width, height and duration are required");
   }
   const maxSeconds = row.constraints.sourceVideoSeconds?.max;
-  if (maxSeconds !== void 0 && durationSeconds > maxSeconds) {
+  if (maxSeconds !== void 0 && overMax(durationSeconds, maxSeconds)) {
     return fail(`${row.label} takes source videos up to ${maxSeconds} seconds.`);
   }
   const base = {
@@ -8579,7 +8605,7 @@ function videoLengthViolation(model, input) {
   const lengths = (input.referenceVideos ?? []).map(knownLength);
   if (limits?.max !== void 0) {
     const max = limits.max;
-    const i = lengths.findIndex((len) => len !== void 0 && len > max);
+    const i = lengths.findIndex((len) => len !== void 0 && overMax(len, max));
     if (i >= 0)
       return `${model.label} takes reference videos up to ${String(max)} s each; video ${i + 1} is ${seconds(lengths[i], max)} s.`;
   }
@@ -8591,14 +8617,17 @@ function videoLengthViolation(model, input) {
   const source = knownLength(input.sourceVideo);
   const sourceLimits = model.constraints.sourceVideoSeconds;
   if (limits?.total !== void 0) {
-    const refSum = lengths.reduce((acc, len) => acc + (len ?? 0), 0);
-    const sum = refSum + (sourceLimits?.inReferenceTotal ? source ?? 0 : 0);
-    if (sum > limits.total)
+    const counted = [
+      ...lengths.filter((len) => len !== void 0),
+      ...sourceLimits?.inReferenceTotal && source !== void 0 ? [source] : []
+    ];
+    const sum = counted.reduce((acc, len) => acc + len, 0);
+    if (overTotal(counted, limits.total))
       return `${model.label} takes reference videos up to ${String(limits.total)} s combined; these add up to ${seconds(sum, limits.total)} s.`;
   }
   if (source === void 0) return void 0;
   const sourceMin = effectiveMin(sourceLimits, input.taskType);
-  if (sourceLimits?.max !== void 0 && source > sourceLimits.max)
+  if (sourceLimits?.max !== void 0 && overMax(source, sourceLimits.max))
     return `${model.label} takes a source video up to ${String(sourceLimits.max)} s; this one is ${seconds(source, sourceLimits.max)} s.`;
   if (sourceMin !== void 0 && source < sourceMin)
     return `${model.label} takes a source video of at least ${String(sourceMin)} s; this one is ${seconds(source, sourceMin)} s.`;
@@ -9562,6 +9591,33 @@ function createModelKit(config, adapters) {
       result: () => done
     };
   }
+  function wrapVideoJob(model, job, warnings, startedAt) {
+    const result = job.result.bind(job);
+    let settled;
+    return {
+      ...job,
+      warnings,
+      result(opts) {
+        if (settled) return settled;
+        const pending = result(opts).then(
+          async (out) => {
+            const usage2 = timed(
+              { ...out.usage, model: model.id, unit: model.usage.unit },
+              startedAt
+            );
+            await emit(usage2);
+            return { ...out, usage: usage2 };
+          },
+          (cause) => {
+            settled = void 0;
+            throw cause;
+          }
+        );
+        settled = pending;
+        return pending;
+      }
+    };
+  }
   return {
     catalog,
     describe: (id) => catalog.require(id),
@@ -9646,31 +9702,52 @@ function createModelKit(config, adapters) {
         });
       const startedAt = Date.now();
       const job = await adapter.generateVideo(request, ctx);
-      const result = job.result.bind(job);
-      let settled;
-      return {
-        ...job,
-        warnings,
-        result(opts) {
-          if (settled) return settled;
-          const pending = result(opts).then(
-            async (out) => {
-              const usage2 = timed(
-                { ...out.usage, model: model.id, unit: model.usage.unit },
-                startedAt
-              );
-              await emit(usage2);
-              return { ...out, usage: usage2 };
-            },
-            (cause) => {
-              settled = void 0;
-              throw cause;
-            }
-          );
-          settled = pending;
-          return pending;
-        }
-      };
+      return wrapVideoJob(model, job, warnings, startedAt);
+    },
+    async resumeVideo(req, jobId, call = {}) {
+      mediaRetryOptions(call);
+      if (!jobId) {
+        throw new ModelKitError({
+          code: "missing_input",
+          message: "resumeVideo needs a jobId",
+          retryable: false
+        });
+      }
+      if (!isCatalogId(req.model)) {
+        throw new ModelKitError({
+          code: "unsupported_option",
+          message: "resumeVideo needs a catalog model id"
+        });
+      }
+      const model = catalog.require(req.model);
+      if (model.type !== "video")
+        throw new ModelKitError({
+          code: "unsupported_option",
+          message: `${model.id} is not a video model`,
+          model: model.id
+        });
+      const { request: input, warnings: inputWarnings } = videoRequestOf({
+        ...req,
+        model: req.model
+      });
+      const { request, warnings } = resolveVideoOptions(
+        model,
+        input,
+        call.onUnsupported ?? "error"
+      );
+      warnings.push(...inputWarnings);
+      logCoercions(logger, model.id, warnings);
+      const signal = combineSignals(req.abortSignal, call.signal);
+      const { adapter, ctx } = context(model, signal ? { ...call, signal } : call, warnings);
+      if (!adapter.resumeVideo)
+        throw new ModelKitError({
+          code: "unsupported_option",
+          message: `${adapter.id} cannot resume a video job`,
+          model: model.id
+        });
+      const startedAt = Date.now();
+      const job = adapter.resumeVideo(request, jobId, ctx);
+      return wrapVideoJob(model, { ...job, jobId }, warnings, startedAt);
     },
     async generateAudio(req, call = {}) {
       mediaRetryOptions(call);