@shop-os/modelkit 0.3.2 → 0.3.4

package/CHANGELOG.md

@@ -9,6 +9,30 @@ header in the release PR.
 
 ## [Unreleased]
 
+## [0.3.4] - Unreleased
+
+### Added
+- Snapshot rows `flux-video-upscale-precise` and `flux-video-upscale-creative` (fal `blackforestlabs/flux-video-upscale`, `type: "video-tool"`, upscale 1.5x to 3x, 4K long-edge limit, 20-second source), listed on `space_builder`. They share one endpoint and differ only in fal's `creativity` mode, which fal prices differently, so pricing keys them as two models.
+- `constraints.tool.prompt` on upscale rows and `VideoToolRequest.prompt`: a row that sets it sends a trimmed, non-empty prompt to the provider. Other rows ignore the prompt.
+- `providerOptions.fal.input` on video-tool rows: fixed body fields sent on every call. The source, factor and prompt are set after them, so a row cannot replace those.
+
+### Changed
+- `topaz-precision` and `topaz-starlight` are also listed on `space_builder`.
+- An upscale row with no Topaz model name (`providerOptions.fal.model`) no longer gets `model` or `H264_output` in its body. Both Topaz upscale rows name a model, so their bodies are unchanged.
+
+### Live rows to add after publish
+Add the two FLUX rows, and add `space_builder` to the live Topaz Precision and Starlight rows, only after every app that calls them runs 0.3.4. An older kit sends `H264_output`, drops `creativity`, and so runs the precise row in creative mode.
+
+## [0.3.3] - Unreleased
+
+### Added
+- `inputSpec.arrays` joins several image inputs into one provider array field, for a model that takes its start frame, end frame and storyboard frames in one list. It maps a provider field to an ordered list of canonical keys: `arrays: { images: ["firstFrame", "referenceImages", "lastFrame"] }` sends the first frame, then the reference images, then the last frame. The field is omitted when none of the inputs is set. Video rows take `firstFrame`, `referenceImages` and `lastFrame`; image rows take `references`. A key is mapped once: in `fields` or in one array. An array name must not repeat a `fields` provider name or a `static` key, and `lastFrame` in an array needs `lastFrame` in `constraints.supports`.
+- `sourceVideo` is an `inputSpec.fields` key on video rows, so a Replicate video row can send a source clip (for example `sourceVideo: "start_video"`). The row also needs `capabilities.acceptsSourceVideo`, or the resolver drops the clip before the adapter runs.
+- `capabilities.sourceVideoExcludesFrames`: a source video is never sent with a first frame, a last frame or reference images. `resolveVideoOptions` refuses the mix under `"error"` and drops the images with an `option_ignored` warning for each under `"coerce"`.
+
+### Live rows to add after publish
+Add a Replicate video row that uses `inputSpec.arrays` or maps `sourceVideo` (for example `black-forest-labs/flux-3`) only after every app that will call it runs 0.3.3. An older kit reads such a spec as invalid: the row stays in the catalog and every call to it fails. A row of this shape should set `capabilities.lastFrameRequiresFirstFrame`, because a lone end frame would be sent as the first element of the array.
+
 ## [0.3.2] - Unreleased
 
 ### Added

package/README.md

@@ -218,12 +218,13 @@ instead of a kit change. It is read by the Replicate and fal adapters only. `fie
 `values` remaps canonical values per key, and `static` merges literal provider fields
 last. Video rows use `VIDEO_INPUT_SPEC_KEYS` (`prompt`, `durationSeconds`,
 `aspectRatio`, `resolution`, `firstFrame`, `lastFrame`, `seed`, `negativePrompt`,
-`generateAudio`, `cfgScale`, `promptExpansion`, `referenceImages`); image rows use
+`generateAudio`, `cfgScale`, `promptExpansion`, `referenceImages`, `sourceVideo`); image rows use
 `IMAGE_INPUT_SPEC_KEYS` (`prompt`, `references`, `aspectRatio`, `size`, `outputFormat`,
 `seed`; map `references` to the provider's array field and remap `size` and `outputFormat`
 with `values`); audio rows use
 `AUDIO_INPUT_SPEC_KEYS` (`prompt`, `durationSeconds`, `seed`, `negativePrompt`,
 `references`, `sourceVideo`, `instrumental`). `aspectRatio: "adaptive"` is omitted. A fal image row has no kind and builds its whole input from the spec; the optional `editEndpoint` (fal rows only) is the fal endpoint called instead of `providerModelId` when the request has references. fal rows without an `inputSpec` keep the Muse-shaped request and Ideogram keeps its own path; an `inputSpec` on an Ideogram row replaces that path. `editEndpoint` needs a `references` entry in `fields`. `inputSpec` on fal video rows is not supported.
+`arrays` joins several image inputs into one provider array field, in the listed order: `arrays: { images: ["firstFrame", "referenceImages", "lastFrame"] }` (video rows: `firstFrame`, `referenceImages`, `lastFrame`; image rows: `references`). A key is mapped once, in `fields` or in one array, and the field is omitted when none of its inputs is set. A row that maps `sourceVideo` also needs `capabilities.acceptsSourceVideo`; set `capabilities.sourceVideoExcludesFrames` when the provider rejects a source video next to images.
 `validateInputSpec` is the shared contract the write schema, `dataOnlyCapable`, and
 the Replicate mapper all check. `dataOnlyCapable(row)` reports whether such a row would
 be served.

package/dist/catalog.cjs

@@ -2066,8 +2066,16 @@ var VIDEO_MODELS = [
 
 // src/catalog/video-tools.ts
 var TOPAZ_LOGO = "https://cdn.jsdelivr.net/npm/@lobehub/icons-static-png@1.97.0/light/topazlabs.png";
+var FLUX_LOGO = "https://cdn.jsdelivr.net/npm/@lobehub/icons-static-png@1.97.0/light/flux.png";
 var TOPAZ_SOURCE_SECONDS = { max: 300 };
-var TOPAZ_USAGE = { unit: "seconds" };
+var SECONDS_USAGE = { unit: "seconds" };
+var FLUX_SOURCE_SECONDS = { max: 20 };
+var FLUX_UPSCALE_TOOL = {
+  kind: "upscale",
+  upscaleFactor: { min: 1.5, max: 3 },
+  maxOutputLongEdge: 3840,
+  prompt: true
+};
 var VIDEO_TOOL_MODELS = [
   {
     id: "topaz-precision",
@@ -2077,7 +2085,7 @@ var VIDEO_TOOL_MODELS = [
     adapter: "fal",
     providerModelId: "topaz/upscale/video/precision",
     lifecycle: "active",
-    exposure: ["cowork"],
+    exposure: ["cowork", "space_builder"],
     constraints: {
       supports: [],
       sourceVideoSeconds: TOPAZ_SOURCE_SECONDS,
@@ -2085,7 +2093,7 @@ var VIDEO_TOOL_MODELS = [
     },
     defaults: {},
     providerOptions: { fal: { model: "Proteus" } },
-    usage: TOPAZ_USAGE,
+    usage: SECONDS_USAGE,
     pricingKind: "video_per_second",
     display: {
       provider: "topaz",
@@ -2102,7 +2110,7 @@ var VIDEO_TOOL_MODELS = [
     adapter: "fal",
     providerModelId: "topaz/upscale/video/generative",
     lifecycle: "active",
-    exposure: ["cowork"],
+    exposure: ["cowork", "space_builder"],
     constraints: {
       supports: [],
       sourceVideoSeconds: TOPAZ_SOURCE_SECONDS,
@@ -2110,7 +2118,7 @@ var VIDEO_TOOL_MODELS = [
     },
     defaults: {},
     providerOptions: { fal: { model: "Starlight Precise 2.6" } },
-    usage: TOPAZ_USAGE,
+    usage: SECONDS_USAGE,
     pricingKind: "video_per_second",
     display: {
       provider: "topaz",
@@ -2135,7 +2143,7 @@ var VIDEO_TOOL_MODELS = [
     },
     defaults: {},
     providerOptions: { fal: { model: "Apollo" } },
-    usage: TOPAZ_USAGE,
+    usage: SECONDS_USAGE,
     pricingKind: "video_per_second",
     display: {
       provider: "topaz",
@@ -2158,13 +2166,63 @@ var VIDEO_TOOL_MODELS = [
       tool: { kind: "hdr", outputFormats: ["h265", "prores"] }
     },
     defaults: {},
-    usage: TOPAZ_USAGE,
+    usage: SECONDS_USAGE,
     pricingKind: "video_per_second",
     display: {
       provider: "topaz",
       logo: TOPAZ_LOGO,
       description: "Topaz Hyperion 2.5 SDR to HDR: a 10-bit HDR master in H.265 (HDR10) or ProRes 422 HQ, at the source's size and frame rate."
     }
+  },
+  {
+    id: "flux-video-upscale-precise",
+    aliases: [],
+    label: "FLUX Upscale Precise",
+    type: "video-tool",
+    adapter: "fal",
+    providerModelId: "blackforestlabs/flux-video-upscale",
+    lifecycle: "active",
+    exposure: ["space_builder"],
+    constraints: {
+      supports: [],
+      sourceVideoSeconds: FLUX_SOURCE_SECONDS,
+      tool: FLUX_UPSCALE_TOOL
+    },
+    defaults: {},
+    providerOptions: { fal: { input: { creativity: 0 } } },
+    usage: SECONDS_USAGE,
+    pricingKind: "video_per_second",
+    display: {
+      provider: "black-forest-labs",
+      logo: FLUX_LOGO,
+      description: "FLUX 3 super-resolution, source-faithful: 1.5x to 3x, up to 4K, for clips up to 20 seconds.",
+      sortOrder: 30
+    }
+  },
+  {
+    id: "flux-video-upscale-creative",
+    aliases: [],
+    label: "FLUX Upscale Creative",
+    type: "video-tool",
+    adapter: "fal",
+    providerModelId: "blackforestlabs/flux-video-upscale",
+    lifecycle: "active",
+    exposure: ["space_builder"],
+    constraints: {
+      supports: [],
+      sourceVideoSeconds: FLUX_SOURCE_SECONDS,
+      tool: FLUX_UPSCALE_TOOL
+    },
+    defaults: {},
+    providerOptions: { fal: { input: { creativity: 1 } } },
+    usage: SECONDS_USAGE,
+    pricingKind: "video_per_second",
+    display: {
+      provider: "black-forest-labs",
+      logo: FLUX_LOGO,
+      description: "FLUX 3 super-resolution that adds fine detail, optionally guided by a prompt: 1.5x to 3x, up to 4K, for clips up to 20 seconds. Costs more than Precise.",
+      sortOrder: 40
+    }
   }
 ];
 
@@ -2303,7 +2361,8 @@ var VIDEO_INPUT_SPEC_KEYS = [
   "generateAudio",
   "cfgScale",
   "promptExpansion",
-  "referenceImages"
+  "referenceImages",
+  "sourceVideo"
 ];
 var IMAGE_INPUT_SPEC_KEYS = [
   "prompt",
@@ -2322,6 +2381,12 @@ var AUDIO_INPUT_SPEC_KEYS = [
   "sourceVideo",
   "instrumental"
 ];
+var ARRAY_INPUT_SPEC_KEYS = [
+  "firstFrame",
+  "referenceImages",
+  "lastFrame",
+  "references"
+];
 var INPUT_SPEC_SUPPORTS_KEYS = [
   "lastFrame",
   "seed",
@@ -2335,6 +2400,7 @@ var INPUT_SPEC_SUPPORTS_KEYS = [
 var VIDEO_KEY_SET = new Set(VIDEO_INPUT_SPEC_KEYS);
 var IMAGE_KEY_SET = new Set(IMAGE_INPUT_SPEC_KEYS);
 var AUDIO_KEY_SET = new Set(AUDIO_INPUT_SPEC_KEYS);
+var ARRAY_KEY_SET = new Set(ARRAY_INPUT_SPEC_KEYS);
 var ALL_KEY_SET = /* @__PURE__ */ new Set([
   ...VIDEO_INPUT_SPEC_KEYS,
   ...IMAGE_INPUT_SPEC_KEYS,
@@ -2379,13 +2445,30 @@ var ValuesSchema = import_zod2.z.record(import_zod2.z.string(), import_zod2.z.re
   }
 });
 var StaticSchema = import_zod2.z.record(import_zod2.z.string(), ProviderScalarSchema);
+var ArraysSchema = import_zod2.z.record(import_zod2.z.string().min(1), import_zod2.z.array(import_zod2.z.string()).min(1)).superRefine((arrays, ctx) => {
+  for (const [name, keys] of Object.entries(arrays)) {
+    for (const key of keys) {
+      if (!ARRAY_KEY_SET.has(key)) {
+        ctx.addIssue({
+          code: "custom",
+          path: [name],
+          message: `inputSpec.arrays "${name}" has unknown image key "${key}"`
+        });
+      }
+    }
+  }
+});
 var InputSpecSchema = import_zod2.z.strictObject({
   fields: FieldsSchema,
   values: ValuesSchema.optional(),
   static: StaticSchema.optional(),
+  arrays: ArraysSchema.optional(),
   editEndpoint: import_zod2.z.string().min(1).optional()
 }).superRefine((spec, ctx) => {
-  const mappedNames = new Set(Object.values(spec.fields));
+  const mappedNames = /* @__PURE__ */ new Set([
+    ...Object.values(spec.fields),
+    ...Object.keys(spec.arrays ?? {})
+  ]);
   for (const key of Object.keys(spec.static ?? {})) {
     if (mappedNames.has(key)) {
       ctx.addIssue({
@@ -2474,14 +2557,54 @@ function validateInputSpec(raw, row) {
       });
     }
   }
+  const arrayOwner = /* @__PURE__ */ new Map();
+  for (const [name, keys] of Object.entries(spec.arrays ?? {})) {
+    const fieldKey = seenNames.get(name);
+    if (fieldKey !== void 0) {
+      issues.push({
+        path: ["arrays", name],
+        message: `inputSpec.arrays "${name}" is also the provider field of inputSpec.fields "${fieldKey}"`
+      });
+    }
+    for (const key of keys) {
+      if (allowed !== void 0 && !allowed.has(key)) {
+        issues.push({
+          path: ["arrays", name],
+          message: `inputSpec.arrays "${key}" is not supported for ${row.type} rows`
+        });
+      }
+      if (key in spec.fields) {
+        issues.push({
+          path: ["arrays", name],
+          message: `inputSpec.arrays "${key}" is already mapped in inputSpec.fields`
+        });
+      }
+      const owner = arrayOwner.get(key);
+      if (owner === void 0) arrayOwner.set(key, name);
+      else {
+        issues.push({
+          path: ["arrays", name],
+          message: owner === name ? `inputSpec.arrays "${name}" lists "${key}" twice` : `inputSpec.arrays "${owner}" and "${name}" both take "${key}"`
+        });
+      }
+    }
+  }
   const supports = row.constraints.supports ?? [];
   for (const key of INPUT_SPEC_SUPPORTS_KEYS) {
-    if (key in spec.fields && !supports.includes(key)) {
+    if (supports.includes(key)) continue;
+    if (key in spec.fields) {
       issues.push({
         path: ["fields", key],
         message: `inputSpec.fields "${key}" needs "${key}" in constraints.supports`
       });
     }
+    const arrayName = arrayOwner.get(key);
+    if (arrayName !== void 0) {
+      issues.push({
+        path: ["arrays", arrayName],
+        message: `inputSpec.arrays "${key}" needs "${key}" in constraints.supports`
+      });
+    }
   }
   if (issues.length > 0) return { ok: false, issues };
   return { ok: true, spec };
@@ -2606,6 +2729,7 @@ var VideoToolConstraintsSchema = import_zod3.z.looseObject({
   kind: import_zod3.z.enum(["upscale", "interpolate", "hdr"]),
   upscaleFactor: RangeSchema.optional(),
   maxOutputLongEdge: import_zod3.z.number().positive().optional(),
+  prompt: import_zod3.z.boolean().optional(),
   fps: RangeSchema.optional(),
   outputFormats: import_zod3.z.array(import_zod3.z.enum(["h265", "prores"])).min(1).optional()
 });
@@ -2703,6 +2827,7 @@ var CatalogCapabilitiesSchema = import_zod3.z.looseObject({
   acceptsSourceVideo: import_zod3.z.boolean().optional(),
   videoEdit: import_zod3.z.boolean().optional(),
   framesExcludeReferences: import_zod3.z.boolean().optional(),
+  sourceVideoExcludesFrames: import_zod3.z.boolean().optional(),
   lastFrameRequiresFirstFrame: import_zod3.z.boolean().optional(),
   reasoning: import_zod3.z.boolean().optional(),
   vision: import_zod3.z.boolean().optional(),
@@ -3063,6 +3188,7 @@ var ToolSchema = import_zod6.z.object({
   kind: import_zod6.z.enum(["upscale", "interpolate", "hdr"]),
   upscaleFactor: RangeSchema2.optional(),
   maxOutputLongEdge: import_zod6.z.number().positive().optional(),
+  prompt: import_zod6.z.boolean().optional(),
   fps: RangeSchema2.optional(),
   outputFormats: import_zod6.z.array(import_zod6.z.enum(["h265", "prores"])).min(1).optional()
 });
@@ -3070,11 +3196,12 @@ function videoToolConstraints(row) {
   if (row.type !== "video-tool") return void 0;
   const parsed = ToolSchema.safeParse(row.constraints.tool);
   if (!parsed.success) return void 0;
-  const { kind, upscaleFactor, maxOutputLongEdge, fps, outputFormats } = parsed.data;
+  const { kind, upscaleFactor, maxOutputLongEdge, prompt, fps, outputFormats } = parsed.data;
   return {
     kind,
     ...upscaleFactor !== void 0 && { upscaleFactor },
     ...maxOutputLongEdge !== void 0 && { maxOutputLongEdge },
+    ...prompt !== void 0 && { prompt },
     ...fps !== void 0 && { fps },
     ...outputFormats !== void 0 && { outputFormats }
   };
@@ -3400,6 +3527,26 @@ function resolveVideoOptions(model, request, onUnsupported = "error") {
     });
     delete merged.sourceVideo;
   }
+  const imageInputs = ["firstFrame", "lastFrame", "referenceImages"].filter(
+    (field) => field === "referenceImages" ? compact(merged.referenceImages).length > 0 : merged[field] !== void 0
+  );
+  if (merged.sourceVideo !== void 0 && imageInputs.length > 0 && model.capabilities?.sourceVideoExcludesFrames) {
+    if (onUnsupported === "error") {
+      throw new ModelKitError({
+        code: "unsupported_option",
+        message: `${model.id} takes a source video or images, not both`,
+        model: model.id
+      });
+    }
+    for (const field of imageInputs) {
+      warnings.push({
+        code: "option_ignored",
+        field,
+        message: `${model.id} takes a source video or images, not both; ${field} dropped`
+      });
+      delete merged[field];
+    }
+  }
   if (merged.lastFrame !== void 0 && merged.firstFrame === void 0 && model.capabilities?.lastFrameRequiresFirstFrame) {
     if (onUnsupported === "error") {
       throw new ModelKitError({