@shop-os/modelkit 0.1.2 → 0.1.4

package/dist/index.js

@@ -83,7 +83,18 @@ var Catalog = class _Catalog {
 
 // src/catalog/image.ts
 var IMAGE_USAGE = { unit: "images", modality: "IMAGE" };
-var GEMINI_RATIOS = ["1:1", "16:9", "9:16", "4:3", "3:4", "21:9", "4:5", "5:4"];
+var GEMINI_RATIOS = [
+  "1:1",
+  "2:3",
+  "3:2",
+  "16:9",
+  "9:16",
+  "4:3",
+  "3:4",
+  "21:9",
+  "4:5",
+  "5:4"
+];
 function geminiImage(id, label, aliases, sizes) {
   const model = {
     id,
@@ -106,7 +117,8 @@ var IMAGE_MODELS = [
     "gemini-3.1-flash-image-preview",
     "Nano Banana Flash",
     ["nb-2"],
-    ["1K", "2K", "4K"]
+    // Flash 3.1 is the only Gemini image model with the 512 tier.
+    ["512", "1K", "2K", "4K"]
   ),
   geminiImage("gemini-3.1-flash-lite-image", "Nano Banana Lite", ["nb-lite"], ["1K"]),
   // trigger-workflows validates 1K only; pricing seeds 2K/4K rows so allow all three.
@@ -210,7 +222,10 @@ var IMAGE_MODELS = [
     constraints: {
       aspectRatios: ["1:1", "4:3", "3:4", "16:9", "9:16", "3:2", "2:3", "21:9", "4:5", "5:4"],
       sizes: ["1K", "2K"],
-      references: { images: 10 }
+      references: { images: 10 },
+      // Ark's Images API has no output-format, quality or count field; only
+      // the seed is forwarded, so anything else must warn, not vanish.
+      supports: ["seed"]
     },
     defaults: { size: "1K", aspectRatio: "1:1" },
     usage: { ...IMAGE_USAGE },
@@ -225,21 +240,12 @@ var IMAGE_MODELS = [
     providerModelId: "seedream-4-5-251128",
     lifecycle: "active",
     constraints: {
-      aspectRatios: [
-        "1:1",
-        "2:3",
-        "3:2",
-        "4:3",
-        "3:4",
-        "4:5",
-        "5:4",
-        "9:16",
-        "16:9",
-        "21:9",
-        "97:30"
-      ],
+      // 97:30 has no Ark size spelling; the A+ flow pads inputs to 97:30 and
+      // omits the ratio instead. Advertise only sizes the adapter can send.
+      aspectRatios: ["1:1", "2:3", "3:2", "4:3", "3:4", "4:5", "5:4", "9:16", "16:9", "21:9"],
       sizes: ["1K", "2K"],
-      references: { images: 10 }
+      references: { images: 10 },
+      supports: ["seed"]
     },
     defaults: { size: "1K", aspectRatio: "1:1" },
     usage: { ...IMAGE_USAGE },
@@ -263,6 +269,9 @@ var IMAGE_MODELS = [
     pricingKind: "image_size"
   },
   {
+    // Prodia's gemini-3-pro jobs take aspect_ratio + resolution (1K/2K/4K), not
+    // width/height; 97:30 is outside its aspect_ratio enum.
+    // https://docs.prodia.com/models/gemini-3/
     id: "prodia-nano-banana-pro",
     aliases: [],
     label: "Nano Banana Pro via Prodia",
@@ -271,19 +280,7 @@ var IMAGE_MODELS = [
     providerModelId: "inference.gemini-3-pro.img2img.v1",
     lifecycle: "active",
     constraints: {
-      aspectRatios: [
-        "1:1",
-        "2:3",
-        "3:2",
-        "4:3",
-        "3:4",
-        "4:5",
-        "5:4",
-        "9:16",
-        "16:9",
-        "21:9",
-        "97:30"
-      ],
+      aspectRatios: ["1:1", "2:3", "3:2", "4:3", "3:4", "4:5", "5:4", "9:16", "16:9", "21:9"],
       sizes: ["1K", "2K", "4K"],
       requires: ["references"]
     },
@@ -292,6 +289,8 @@ var IMAGE_MODELS = [
     pricingKind: "image_size"
   },
   {
+    // Nano Banana (img2img.v2) is flat-rate with aspect_ratio only; 3:2, 4:5,
+    // 5:4 and 97:30 are not in its enum. https://docs.prodia.com/models/nano-banana/
     id: "prodia-nano-banana",
     aliases: [],
     label: "Nano Banana via Prodia",
@@ -300,19 +299,7 @@ var IMAGE_MODELS = [
     providerModelId: "inference.nano-banana.img2img.v2",
     lifecycle: "active",
     constraints: {
-      aspectRatios: [
-        "1:1",
-        "2:3",
-        "3:2",
-        "4:3",
-        "3:4",
-        "4:5",
-        "5:4",
-        "9:16",
-        "16:9",
-        "21:9",
-        "97:30"
-      ],
+      aspectRatios: ["1:1", "2:3", "3:4", "4:3", "9:16", "16:9", "21:9"],
       sizes: ["1K"],
       requires: ["references"]
     },
@@ -321,6 +308,9 @@ var IMAGE_MODELS = [
     pricingKind: "image_size"
   },
   {
+    // WAN 2.7 takes `images` (up to 9) and a `size` enum whose exact values
+    // cover 1:1/16:9/9:16/4:3/3:4 only; other ratios have no spelling.
+    // https://replicate.com/wan-video/wan-2.7-image-pro (input schema)
     id: "wan-2.7-image-pro",
     aliases: [],
     label: "WAN 2.7 Image Pro",
@@ -329,19 +319,7 @@ var IMAGE_MODELS = [
     providerModelId: "wan-video/wan-2.7-image-pro",
     lifecycle: "active",
     constraints: {
-      aspectRatios: [
-        "1:1",
-        "2:3",
-        "3:2",
-        "4:3",
-        "3:4",
-        "4:5",
-        "5:4",
-        "9:16",
-        "16:9",
-        "21:9",
-        "97:30"
-      ],
+      aspectRatios: ["1:1", "16:9", "9:16", "4:3", "3:4"],
       sizes: ["1K", "2K", "4K"],
       references: { images: 9 }
     },
@@ -350,6 +328,9 @@ var IMAGE_MODELS = [
     pricingKind: "image_size"
   },
   {
+    // Qwen Image 2 Pro has aspect_ratio but no size input; resolution follows
+    // the reference image (match_input_image) or the provider default.
+    // https://replicate.com/qwen/qwen-image-2-pro (input schema)
     id: "qwen-image-2-pro",
     aliases: [],
     label: "Qwen Image 2 Pro",
@@ -358,28 +339,19 @@ var IMAGE_MODELS = [
     providerModelId: "qwen/qwen-image-2-pro",
     lifecycle: "active",
     constraints: {
-      aspectRatios: [
-        "1:1",
-        "2:3",
-        "3:2",
-        "4:3",
-        "3:4",
-        "4:5",
-        "5:4",
-        "9:16",
-        "16:9",
-        "21:9",
-        "97:30"
-      ],
-      sizes: ["1K", "2K", "4K"],
+      aspectRatios: ["1:1", "16:9", "9:16", "4:3", "3:4", "3:2", "2:3"],
+      sizes: [],
       references: { images: 1 },
       requires: ["references"]
     },
-    defaults: { size: "1K", aspectRatio: "1:1" },
+    defaults: { aspectRatio: "1:1" },
     usage: { unit: "compute_seconds", modality: "IMAGE" },
     pricingKind: "image_size"
   },
   {
+    // Qwen Image Edit Plus takes aspect_ratio (or match_input_image) and
+    // output_format, but no size; no default ratio so edits keep following
+    // the input image. https://replicate.com/qwen-edit-apps/qwen-image-edit-plus-lora-skin
     id: "qwen-image-edit-plus-lora-skin",
     aliases: [],
     label: "Qwen Image Edit Plus",
@@ -388,25 +360,13 @@ var IMAGE_MODELS = [
     providerModelId: "qwen-edit-apps/qwen-image-edit-plus-lora-skin",
     lifecycle: "active",
     constraints: {
-      aspectRatios: [
-        "1:1",
-        "2:3",
-        "3:2",
-        "4:3",
-        "3:4",
-        "4:5",
-        "5:4",
-        "9:16",
-        "16:9",
-        "21:9",
-        "97:30"
-      ],
-      sizes: ["1K", "2K", "4K"],
+      aspectRatios: ["1:1", "16:9", "9:16", "4:3", "3:4"],
+      sizes: [],
       references: { images: 1 },
       requires: ["references"],
       supports: ["outputFormat"]
     },
-    defaults: { size: "1K", aspectRatio: "1:1", outputFormat: "png" },
+    defaults: { outputFormat: "png" },
     usage: { unit: "compute_seconds", modality: "IMAGE" },
     pricingKind: "image_size"
   }
@@ -503,8 +463,12 @@ var OTHER_MODELS = [
     adapter: "replicate",
     providerModelId: "topazlabs/image-upscale",
     lifecycle: "active",
-    constraints: {},
-    defaults: {},
+    constraints: {
+      references: { images: 1 },
+      requires: ["references"],
+      supports: ["scaleFactor", "outputFormat"]
+    },
+    defaults: { scaleFactor: 2, outputFormat: "png" },
     usage: { unit: "compute_seconds", modality: "IMAGE" },
     pricingKind: "flat"
   },
@@ -560,7 +524,7 @@ var TEXT_MODELS = [
   text("gpt-5.6-sol", "GPT-5.6 Sol", "gpt-5.6-sol"),
   // Library key "claude-sonnet-4.5" maps to the SDK id "claude-sonnet-4-5".
   text("claude-sonnet-4-5", "Claude Sonnet 4.5", "claude-sonnet-4-5", {
-    aliases: ["claude-sonnet-4.5"]
+    aliases: ["claude-sonnet-4.5", "claude-sonnet-4-5-20250929"]
   }),
   // Anthropic retired the dated 4.0 ids; callers that still send them get 4.6.
   text("claude-sonnet-4-6", "Claude Sonnet 4.6", "claude-sonnet-4-6", {
@@ -576,7 +540,7 @@ var TEXT_MODELS = [
     aliases: ["claude-opus-4.8", "claude-opus-4", "claude-opus-4.0", "claude-opus-4-20250514"]
   }),
   text("claude-haiku-4-5", "Claude Haiku 4.5", "claude-haiku-4-5", {
-    aliases: ["claude-haiku-4.5", "claude-haiku-4-5-20251001"]
+    aliases: ["claude-haiku-4.5", "claude-haiku-4-5-20251001", "claude-haiku-4"]
   }),
   text("claude-opus-5", "Claude Opus 5", "claude-opus-5", {
     aliases: ["claude-opus-5.0"]
@@ -1059,7 +1023,7 @@ var MODELS = [
 ];
 
 // src/resolve-options.ts
-var SIZE_ORDER = ["1K", "2K", "4K"];
+var SIZE_ORDER = ["512", "1K", "2K", "4K"];
 var RESOLUTION_ORDER = ["360p", "480p", "720p", "768p", "1080p", "2k", "4k"];
 function ratioValue(r) {
   if (r === "adaptive") return 1;
@@ -1191,7 +1155,13 @@ function resolveImageOptions(model, request, onUnsupported = "error") {
       model: model.id
     });
   }
-  dropUnsupported(merged, model, warnings, ["seed", "quality", "count", "outputFormat"]);
+  dropUnsupported(merged, model, warnings, [
+    "seed",
+    "quality",
+    "count",
+    "outputFormat",
+    "scaleFactor"
+  ]);
   return { request: merged, warnings };
 }
 function resolveVideoOptions(model, request, onUnsupported = "error") {
@@ -1823,7 +1793,11 @@ var aiSdkTextAdapter = {
 function requiredKeys(model, config) {
   if (model.adapter === "fal" && config.routing?.fal === "cloudflare-passthrough")
     return ["cloudflare"];
-  if (model.adapter === "ai-sdk-text") return [textKeyName(model, config.routing ?? {})];
+  if (model.adapter === "ai-sdk-text") {
+    const names = [textKeyName(model, config.routing ?? {})];
+    if (config.routing?.text === "cloudflare") names.push("cloudflare");
+    return names;
+  }
   return ADAPTER_KEYS[model.adapter];
 }
 var IMAGE_OUTPUT_TYPES = /* @__PURE__ */ new Set(["image", "upscale", "bg-remove"]);
@@ -1881,6 +1855,20 @@ function sdkAspectRatio(ratio) {
   const parsed = sdkRatio.safeParse(ratio);
   return parsed.success ? parsed.data : void 0;
 }
+function sdkDataContent(ref) {
+  return "url" in ref ? ref.url : ref.bytes;
+}
+function sdkReference(ref) {
+  return "url" in ref ? ref.url : { data: ref.bytes, mediaType: ref.mime };
+}
+function pushIgnored(warnings, field, from, modelId) {
+  warnings.push({
+    code: "option_ignored",
+    field,
+    from,
+    message: `${modelId} provider instance does not support ${field}; ignored`
+  });
+}
 function createModelKit(config, adapters) {
   const catalog = new Catalog(MODELS).withOverrides(config.catalogOverride ?? []);
   const logger = config.logger ?? console;
@@ -1903,6 +1891,7 @@ function createModelKit(config, adapters) {
       call,
       warnings
     };
+    if (config.endpoints) ctx.endpoints = config.endpoints;
     if (call.signal) ctx.signal = call.signal;
     return { adapter, ctx };
   }
@@ -1942,16 +1931,45 @@ function createModelKit(config, adapters) {
     };
   }
   async function passthroughImage(req, call) {
-    const { model, prompt, n, count, size, aspectRatio, seed, providerOptions } = req;
+    const {
+      model,
+      prompt,
+      n,
+      count,
+      size,
+      aspectRatio,
+      seed,
+      providerOptions,
+      references,
+      exactSize: exactSizeField,
+      scaleFactor,
+      quality: _quality,
+      outputFormat: _outputFormat
+    } = req;
     const options = { model, prompt };
+    const warnings = [];
     const quantity = n ?? count;
     if (quantity !== void 0) options.n = quantity;
-    const exact = exactSize.safeParse(size);
-    if (exact.success) options.size = exact.data;
+    if (references !== void 0 && references.length > 0)
+      options.prompt = { images: references.map(sdkDataContent), text: prompt };
+    const exact = exactSizeField === void 0 ? void 0 : exactSize.safeParse(exactSizeField);
+    if (exact?.success) options.size = exact.data;
+    else if (exactSizeField !== void 0)
+      pushIgnored(warnings, "exactSize", exactSizeField, model.modelId);
+    const requested = size === void 0 ? void 0 : exactSize.safeParse(size);
+    if (requested?.success) options.size ??= requested.data;
+    else if (size !== void 0) pushIgnored(warnings, "size", size, model.modelId);
     const ratio = sdkAspectRatio(aspectRatio);
     if (ratio) options.aspectRatio = ratio;
+    else if (aspectRatio !== void 0)
+      pushIgnored(warnings, "aspectRatio", aspectRatio, model.modelId);
     if (seed !== void 0) options.seed = seed;
     if (providerOptions) options.providerOptions = providerOptions;
+    if (_quality !== void 0) pushIgnored(warnings, "quality", _quality, model.modelId);
+    if (_outputFormat !== void 0)
+      pushIgnored(warnings, "outputFormat", _outputFormat, model.modelId);
+    if (scaleFactor !== void 0)
+      pushIgnored(warnings, "scaleFactor", scaleFactor, model.modelId);
     const abortSignal = combineSignals(req.abortSignal, call.signal);
     if (abortSignal) options.abortSignal = abortSignal;
     const result = await aiGenerateImage(options);
@@ -1966,17 +1984,73 @@ function createModelKit(config, adapters) {
       quantity: images.length
     };
     await emit(usage2);
-    return { image: images[0], images, usage: usage2, raw: result, warnings: [] };
+    return { image: images[0], images, usage: usage2, raw: result, warnings };
   }
   function passthroughVideo(req, call) {
-    const { model, prompt, aspectRatio, duration, durationSeconds, seed, providerOptions } = req;
+    const {
+      model,
+      prompt,
+      aspectRatio,
+      duration,
+      durationSeconds,
+      seed,
+      providerOptions,
+      firstFrame,
+      lastFrame,
+      sourceVideo,
+      referenceImages,
+      referenceVideos,
+      referenceAudios,
+      resolution,
+      generateAudio: generateAudio2,
+      negativePrompt: _negativePrompt,
+      cfgScale: _cfgScale,
+      promptExpansion: _promptExpansion,
+      mode: _mode
+    } = req;
     const seconds = duration ?? durationSeconds;
     const abortSignal = combineSignals(req.abortSignal, call.signal);
     const options = { model, prompt };
-    const ratio = sdkAspectRatio(aspectRatio);
+    const warnings = [];
+    const ratio = sdkAspectRatio(aspectRatio) ?? (aspectRatio === "adaptive" ? "adaptive" : void 0);
     if (ratio) options.aspectRatio = ratio;
+    else if (aspectRatio !== void 0)
+      pushIgnored(warnings, "aspectRatio", aspectRatio, model.modelId);
     if (seconds !== void 0) options.duration = seconds;
     if (seed !== void 0) options.seed = seed;
+    if (generateAudio2 !== void 0) options.generateAudio = generateAudio2;
+    const frames = [
+      ...firstFrame ? [{ image: sdkDataContent(firstFrame), frameType: "first_frame" }] : [],
+      ...lastFrame ? [{ image: sdkDataContent(lastFrame), frameType: "last_frame" }] : []
+    ];
+    if (frames.length > 0) options.frameImages = frames;
+    const references = [
+      ...(referenceImages ?? []).map(sdkDataContent),
+      ...(referenceVideos ?? []).map(sdkReference)
+    ];
+    if (references.length > 0) {
+      if (frames.length > 0) {
+        warnings.push({
+          code: "option_ignored",
+          field: "inputReferences",
+          from: references.length,
+          message: `${model.modelId} provider instance ignores references when frames are set`
+        });
+      } else {
+        options.inputReferences = references;
+      }
+    }
+    if (sourceVideo) pushIgnored(warnings, "sourceVideo", void 0, model.modelId);
+    if (referenceAudios?.length)
+      pushIgnored(warnings, "referenceAudios", referenceAudios.length, model.modelId);
+    if (resolution !== void 0)
+      pushIgnored(warnings, "resolution", resolution, model.modelId);
+    if (_negativePrompt !== void 0)
+      pushIgnored(warnings, "negativePrompt", void 0, model.modelId);
+    if (_cfgScale !== void 0) pushIgnored(warnings, "cfgScale", _cfgScale, model.modelId);
+    if (_promptExpansion !== void 0)
+      pushIgnored(warnings, "promptExpansion", _promptExpansion, model.modelId);
+    if (_mode !== void 0) pushIgnored(warnings, "mode", _mode, model.modelId);
     if (providerOptions) options.providerOptions = providerOptions;
     if (abortSignal) options.abortSignal = abortSignal;
     const pending = aiGenerateVideo(options);
@@ -2004,7 +2078,7 @@ function createModelKit(config, adapters) {
     });
     return {
       jobId: `ai-sdk:${model.provider}:${model.modelId}`,
-      warnings: [],
+      warnings,
       async poll() {
         if (settled) return { status: "succeeded", raw: settled.raw };
         if (failed) return { status: "failed" };
@@ -2228,6 +2302,9 @@ var SUBMIT_PATH = "/contents/generations/tasks";
 var SEEDANCE_POLL_INTERVAL_MS = 15e3;
 var RESULT_TIMEOUT_MS = 15 * 60 * 1e3;
 var VIDEO_URL_TTL_MS = 24 * 60 * 60 * 1e3;
+function arkBaseUrl(ctx) {
+  return ctx.endpoints?.ark ?? ARK_BASE_URL;
+}
 var SEEDREAM_SIZES = {
   "1K": {
     "1:1": "1024x1024",
@@ -2238,7 +2315,8 @@ var SEEDREAM_SIZES = {
     "3:2": "1248x832",
     "2:3": "832x1248",
     "21:9": "1568x672",
-    "4:5": "864x1080"
+    "4:5": "864x1080",
+    "5:4": "1080x864"
   },
   "2K": {
     "1:1": "2048x2048",
@@ -2249,7 +2327,8 @@ var SEEDREAM_SIZES = {
     "3:2": "2496x1664",
     "2:3": "1664x2496",
     "21:9": "3136x1344",
-    "4:5": "1728x2160"
+    "4:5": "1728x2160",
+    "5:4": "2160x1728"
   }
 };
 var arkAdapter = {
@@ -2296,9 +2375,11 @@ function seedreamSize(aspect, size) {
   const table = SEEDREAM_SIZES[tier];
   return table[aspect ?? ""] ?? table["1:1"] ?? "2048x2048";
 }
-function outputMime(format) {
-  if (format === "png") return "image/png";
-  if (format === "webp") return "image/webp";
+function sniffedImageMime(bytes) {
+  if (bytes.length >= 4 && bytes[0] === 137 && bytes[1] === 80 && bytes[2] === 78 && bytes[3] === 71)
+    return "image/png";
+  if (bytes.length >= 12 && bytes[0] === 82 && bytes[1] === 73 && bytes[2] === 70 && bytes[3] === 70 && bytes[8] === 87 && bytes[9] === 69 && bytes[10] === 66 && bytes[11] === 80)
+    return "image/webp";
   return "image/jpeg";
 }
 function arkUrl(ref) {
@@ -2340,7 +2421,7 @@ async function generateSeedreamImage(req, ctx) {
   else if (refs.length > 1) body.image = refs;
   const data = await withRetry(async () => {
     const res = await ctx.fetch(
-      `${ARK_BASE_URL}/images/generations`,
+      `${arkBaseUrl(ctx)}/images/generations`,
       fetchInitFor(ctx, {
         method: "POST",
         headers: { Authorization: `Bearer ${key}`, "Content-Type": "application/json" },
@@ -2379,7 +2460,7 @@ async function generateSeedreamImage(req, ctx) {
   };
   if (req.size !== void 0) usage2.imageSize = req.size;
   if (req.quality !== void 0) usage2.imageQuality = req.quality;
-  return { images: [{ bytes, mime: outputMime(req.outputFormat) }], usage: usage2, raw: data };
+  return { images: [{ bytes, mime: sniffedImageMime(bytes) }], usage: usage2, raw: data };
 }
 var SeedanceResponseSchema = z4.object({
   id: z4.string().optional(),
@@ -2467,7 +2548,7 @@ async function generateSeedanceVideo(req, ctx) {
   if (req.seed !== void 0) body.seed = req.seed;
   const submit = await withRetry(async () => {
     const res = await ctx.fetch(
-      `${ARK_BASE_URL}${SUBMIT_PATH}`,
+      `${arkBaseUrl(ctx)}${SUBMIT_PATH}`,
       fetchInitFor(ctx, {
         method: "POST",
         headers: { Authorization: `Bearer ${key}`, "Content-Type": "application/json" },
@@ -2487,7 +2568,7 @@ async function generateSeedanceVideo(req, ctx) {
   const usage2 = seedanceUsage(ctx, req, duration);
   const fetchStatus = async () => {
     const res = await ctx.fetch(
-      `${ARK_BASE_URL}${SUBMIT_PATH}/${jobId}`,
+      `${arkBaseUrl(ctx)}${SUBMIT_PATH}/${jobId}`,
       fetchInitFor(ctx, {
         headers: { Authorization: `Bearer ${key}` }
       })
@@ -3548,60 +3629,6 @@ async function generateOmniVideo(req, ctx, createGenAIClient) {
     uploadedNames.push(file.fileName);
     return file.fileUri;
   };
-  const parts = [];
-  if (req.sourceVideo) {
-    const media = await resolveMedia(
-      req.sourceVideo,
-      ctx.fetch,
-      ctx.signal,
-      "video/mp4",
-      modelId
-    );
-    parts.push({
-      type: "video",
-      uri: await uploadOne("video", media.bytes, media.mime),
-      mime_type: media.mime
-    });
-  }
-  for (const ref of videos) {
-    const media = await resolveMedia(ref, ctx.fetch, ctx.signal, "video/mp4", modelId);
-    parts.push({
-      type: "video",
-      uri: await uploadOne("video", media.bytes, media.mime),
-      mime_type: media.mime
-    });
-  }
-  if (req.firstFrame) {
-    const media = await resolveMedia(
-      req.firstFrame,
-      ctx.fetch,
-      ctx.signal,
-      "image/png",
-      modelId
-    );
-    if (media.bytes.length > OMNI_INLINE_LIMIT_BYTES) {
-      parts.push({
-        type: "image",
-        uri: await uploadOne("image", media.bytes, media.mime),
-        mime_type: media.mime
-      });
-    } else {
-      parts.push({ type: "image", data: toBase64(media.bytes), mime_type: media.mime });
-    }
-  }
-  for (const ref of images) {
-    const media = await resolveMedia(ref, ctx.fetch, ctx.signal, "image/png", modelId);
-    if (media.bytes.length > OMNI_INLINE_LIMIT_BYTES) {
-      parts.push({
-        type: "image",
-        uri: await uploadOne("image", media.bytes, media.mime),
-        mime_type: media.mime
-      });
-    } else {
-      parts.push({ type: "image", data: toBase64(media.bytes), mime_type: media.mime });
-    }
-  }
-  parts.push({ type: "text", text: req.prompt });
   const cleanupUploads = async () => {
     for (const fileName of uploadedNames) await deleteGoogleFile(fileName, apiKey, ctx.fetch);
   };
@@ -3615,6 +3642,60 @@ async function generateOmniVideo(req, ctx, createGenAIClient) {
   if (ctx.signal !== void 0) createRetryOptions.signal = ctx.signal;
   let interaction;
   try {
+    const parts = [];
+    if (req.sourceVideo) {
+      const media = await resolveMedia(
+        req.sourceVideo,
+        ctx.fetch,
+        ctx.signal,
+        "video/mp4",
+        modelId
+      );
+      parts.push({
+        type: "video",
+        uri: await uploadOne("video", media.bytes, media.mime),
+        mime_type: media.mime
+      });
+    }
+    for (const ref of videos) {
+      const media = await resolveMedia(ref, ctx.fetch, ctx.signal, "video/mp4", modelId);
+      parts.push({
+        type: "video",
+        uri: await uploadOne("video", media.bytes, media.mime),
+        mime_type: media.mime
+      });
+    }
+    if (req.firstFrame) {
+      const media = await resolveMedia(
+        req.firstFrame,
+        ctx.fetch,
+        ctx.signal,
+        "image/png",
+        modelId
+      );
+      if (media.bytes.length > OMNI_INLINE_LIMIT_BYTES) {
+        parts.push({
+          type: "image",
+          uri: await uploadOne("image", media.bytes, media.mime),
+          mime_type: media.mime
+        });
+      } else {
+        parts.push({ type: "image", data: toBase64(media.bytes), mime_type: media.mime });
+      }
+    }
+    for (const ref of images) {
+      const media = await resolveMedia(ref, ctx.fetch, ctx.signal, "image/png", modelId);
+      if (media.bytes.length > OMNI_INLINE_LIMIT_BYTES) {
+        parts.push({
+          type: "image",
+          uri: await uploadOne("image", media.bytes, media.mime),
+          mime_type: media.mime
+        });
+      } else {
+        parts.push({ type: "image", data: toBase64(media.bytes), mime_type: media.mime });
+      }
+    }
+    parts.push({ type: "text", text: req.prompt });
     try {
       interaction = await withRetry(async () => {
         try {
@@ -3948,6 +4029,10 @@ function createGoogleImageAdapter(deps = defaultGoogleImageDeps) {
         imageQuality: "auto"
       };
       if (req.size !== void 0) usage2.imageSize = req.size;
+      if (result.usage?.inputTokens !== void 0)
+        usage2.inputTokens = result.usage.inputTokens;
+      if (result.usage?.outputTokens !== void 0)
+        usage2.outputTokens = result.usage.outputTokens;
       return { images, usage: usage2, raw: result };
     }
   };
@@ -4479,7 +4564,7 @@ function aspectRatioToSize(ratio, tier) {
   };
   const MIN_PIXELS = 655360;
   const MAX_PIXELS = 8294400;
-  const maxLong = TIER_LONG_EDGE[tier];
+  const maxLong = TIER_LONG_EDGE[tier] ?? 1024;
   const RATIO_MAP = /* @__PURE__ */ new Map([
     ["1:1", [1, 1]],
     ["16:9", [16, 9]],
@@ -4680,7 +4765,8 @@ var RATIO_TO_DIMS = {
   "9:16": { width: 768, height: 1360 },
   "3:4": { width: 768, height: 1024 },
   "2:3": { width: 768, height: 1152 },
-  "4:5": { width: 896, height: 1120 }
+  "4:5": { width: 896, height: 1120 },
+  "5:4": { width: 1120, height: 896 }
 };
 function dimsFor(aspectRatio) {
   if (aspectRatio !== void 0) {
@@ -4689,6 +4775,27 @@ function dimsFor(aspectRatio) {
   }
   return { width: 1024, height: 1024 };
 }
+var GEMINI_JOB_RATIOS = /* @__PURE__ */ new Set([
+  "1:1",
+  "2:3",
+  "3:2",
+  "3:4",
+  "4:3",
+  "4:5",
+  "5:4",
+  "9:16",
+  "16:9",
+  "21:9"
+]);
+var NANO_BANANA_RATIOS = /* @__PURE__ */ new Set([
+  "1:1",
+  "2:3",
+  "3:4",
+  "4:3",
+  "9:16",
+  "16:9",
+  "21:9"
+]);
 async function refToBytes(ctx, ref) {
   if ("bytes" in ref) return { bytes: ref.bytes, mime: ref.mime };
   const res = await ctx.fetch(ref.url);
@@ -4788,7 +4895,7 @@ async function generateProdiaImage(req, ctx) {
     inputs = refs.length > 0 && firstRef !== void 0 ? [firstRef] : [];
     accept = req.outputFormat === "png" ? "image/png" : "image/jpeg";
     mime = accept;
-  } else if (providerModelId === "flux-2-pro" || providerModelId === FLUX_2_PRO_JOB || providerModelId === "inference.gemini-3-pro.img2img.v1" || providerModelId === "inference.nano-banana.img2img.v2") {
+  } else if (providerModelId === "flux-2-pro" || providerModelId === FLUX_2_PRO_JOB) {
     const dims = dimsFor(req.aspectRatio);
     const config = {
       prompt: req.prompt,
@@ -4797,8 +4904,30 @@ async function generateProdiaImage(req, ctx) {
       safety_tolerance: 5
     };
     if (req.seed !== void 0) config.seed = req.seed;
-    const jobType = providerModelId === "flux-2-pro" ? FLUX_2_PRO_JOB : providerModelId;
-    job = { type: jobType, config };
+    job = { type: FLUX_2_PRO_JOB, config };
+    inputs = refs;
+    accept = "image/png";
+    mime = "image/png";
+  } else if (providerModelId === "inference.gemini-3-pro.img2img.v1" || providerModelId === "inference.nano-banana.img2img.v2") {
+    const allowed = providerModelId === "inference.nano-banana.img2img.v2" ? NANO_BANANA_RATIOS : GEMINI_JOB_RATIOS;
+    const config = {
+      prompt: req.prompt,
+      safety_tolerance: 5
+    };
+    if (req.aspectRatio !== void 0 && req.aspectRatio !== "adaptive") {
+      if (allowed.has(req.aspectRatio)) config.aspect_ratio = req.aspectRatio;
+      else
+        ctx.warnings.push({
+          code: "option_ignored",
+          field: "aspectRatio",
+          from: req.aspectRatio,
+          message: `${providerModelId} has no ${req.aspectRatio} aspect_ratio; using the provider default`
+        });
+    }
+    if (providerModelId === "inference.gemini-3-pro.img2img.v1")
+      config.resolution = req.size ?? "1K";
+    if (req.seed !== void 0) config.seed = req.seed;
+    job = { type: providerModelId, config };
     inputs = refs;
     accept = "image/png";
     mime = "image/png";
@@ -5069,13 +5198,88 @@ function isUpscaler(providerModelId) {
   const id = isLower(providerModelId);
   return id.includes("upscal") || id.includes("crystal") || id.includes("topaz");
 }
+function isTopazUpscaler(providerModelId) {
+  return isLower(providerModelId).includes("topazlabs/image-upscale");
+}
 function isQwen(providerModelId) {
   return isLower(providerModelId).includes("qwen");
 }
+function isWanImage(providerModelId) {
+  return isLower(providerModelId).includes("wan-2.7");
+}
+function isQwenEditPlus(providerModelId) {
+  return isLower(providerModelId).includes("edit");
+}
+var QWEN_IMAGE_RATIOS = /* @__PURE__ */ new Set([
+  "1:1",
+  "16:9",
+  "9:16",
+  "4:3",
+  "3:4",
+  "3:2",
+  "2:3"
+]);
+var QWEN_EDIT_RATIOS = /* @__PURE__ */ new Set(["1:1", "16:9", "9:16", "4:3", "3:4"]);
+var WAN_IMAGE_SIZES = {
+  "1K": {
+    "1:1": "1024*1024",
+    "16:9": "1280*720",
+    "9:16": "720*1280",
+    "4:3": "1024*768",
+    "3:4": "768*1024"
+  },
+  "2K": {
+    "1:1": "2048*2048",
+    "16:9": "2048*1152",
+    "9:16": "1152*2048",
+    "4:3": "2048*1536",
+    "3:4": "1536*2048"
+  },
+  "4K": {
+    "1:1": "4096*4096",
+    "16:9": "4096*2304",
+    "9:16": "2304*4096",
+    "4:3": "4096*3072",
+    "3:4": "3072*4096"
+  }
+};
+function wanImageSize(aspectRatio, size) {
+  const tier = size === "2K" || size === "4K" ? size : "1K";
+  const table = WAN_IMAGE_SIZES[tier];
+  return table[aspectRatio ?? ""] ?? table["1:1"] ?? "1024*1024";
+}
 async function generateReplicateImage(req, ctx, deps) {
   const id = ctx.model.providerModelId;
-  const input = { prompt: req.prompt };
-  if (isUpscaler(id)) {
+  let input;
+  if (isTopazUpscaler(id)) {
+    const first = (req.references ?? [])[0];
+    if (!first) {
+      throw new ModelKitError({
+        code: "missing_input",
+        message: `${ctx.model.id} requires a reference image to upscale`,
+        provider: "replicate",
+        model: ctx.model.id,
+        retryable: false
+      });
+    }
+    let format = req.outputFormat === "jpeg" ? "jpg" : req.outputFormat ?? "png";
+    if (format !== "png" && format !== "jpg") {
+      ctx.warnings.push({
+        code: "option_ignored",
+        field: "outputFormat",
+        from: format,
+        message: "topazlabs/image-upscale supports only png and jpg; using png"
+      });
+      format = "png";
+    }
+    input = {
+      image: refToUrl3(first),
+      enhance_model: "Standard V2",
+      output_format: format,
+      upscale_factor: `${req.scaleFactor ?? 2}x`,
+      face_enhancement: true
+    };
+  } else if (isUpscaler(id)) {
     const refs = req.references ?? [];
     const first = refs[0];
     if (!first) {
@@ -5087,28 +5291,53 @@ async function generateReplicateImage(req, ctx, deps) {
         retryable: false
       });
     }
-    input.image = refToUrl3(first);
-    input.creativity = 0;
-    input.scale_factor = 2;
-    input.output_format = "png";
+    const imageInput = { prompt: req.prompt };
+    imageInput.image = refToUrl3(first);
+    imageInput.creativity = 0;
+    imageInput.scale_factor = 2;
+    imageInput.output_format = "png";
+    input = imageInput;
+  } else if (isWanImage(id)) {
+    const refs = (req.references ?? []).map(refToUrl3);
+    const imageInput = { prompt: req.prompt };
+    if (refs.length > 0) imageInput.images = refs;
+    imageInput.size = wanImageSize(req.aspectRatio, req.size);
+    input = imageInput;
   } else if (isQwen(id)) {
     const refs = (req.references ?? []).map(refToUrl3);
     const firstUrl = refs[0];
+    const imageInput = { prompt: req.prompt };
     if (firstUrl !== void 0) {
-      input.image = firstUrl;
-      input.match_input_image = true;
+      imageInput.image = firstUrl;
+      if (!isQwenEditPlus(id)) imageInput.match_input_image = true;
+    }
+    const ratios = isQwenEditPlus(id) ? QWEN_EDIT_RATIOS : QWEN_IMAGE_RATIOS;
+    if (req.aspectRatio !== void 0) {
+      if (ratios.has(req.aspectRatio)) imageInput.aspect_ratio = req.aspectRatio;
+      else
+        ctx.warnings.push({
+          code: "option_ignored",
+          field: "aspectRatio",
+          from: req.aspectRatio,
+          message: `${id} has no ${req.aspectRatio} aspect_ratio; using the provider default`
+        });
+    }
+    if (isQwenEditPlus(id) && req.outputFormat !== void 0) {
+      imageInput.output_format = req.outputFormat === "jpeg" ? "jpg" : req.outputFormat;
     }
-    if (req.outputFormat !== void 0) input.output_format = req.outputFormat;
+    input = imageInput;
   } else {
     const refs = req.references ?? [];
     const first = refs[0];
-    if (first) input.image = refToUrl3(first);
+    const imageInput = { prompt: req.prompt };
+    if (first) imageInput.image = refToUrl3(first);
+    input = imageInput;
   }
   const { url, predictTime, raw } = await runPrediction(ctx, input, deps);
   const file = await download(ctx, url);
   const usage2 = imageUsage2(ctx, req);
   usage2.quantity = predictTime;
-  return { images: [{ bytes: file.bytes, mime: file.mime }], usage: usage2, raw };
+  return { images: [{ bytes: file.bytes, mime: file.mime }], usage: usage2, raw, outputUrl: url };
 }
 function wanSize(aspectRatio) {
   if (!aspectRatio || aspectRatio === "adaptive" || aspectRatio === "1:1") return "2K";