@shop-os/modelkit 0.3.0 → 0.3.1

package/dist/index.d.cts

@@ -1031,6 +1031,7 @@ declare const InputSpecSchema: z.ZodObject<{
     fields: z.ZodRecord<z.ZodString, z.ZodString>;
     values: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>>>>;
     static: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>>>;
+    editEndpoint: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
 type InputSpec = z.infer<typeof InputSpecSchema>;
 interface InputSpecIssue {

package/dist/index.d.ts

@@ -1031,6 +1031,7 @@ declare const InputSpecSchema: z.ZodObject<{
     fields: z.ZodRecord<z.ZodString, z.ZodString>;
     values: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>>>>;
     static: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<readonly [z.ZodString, z.ZodNumber, z.ZodBoolean]>>>;
+    editEndpoint: z.ZodOptional<z.ZodString>;
 }, z.core.$strict>;
 type InputSpec = z.infer<typeof InputSpecSchema>;
 interface InputSpecIssue {

package/dist/index.js

@@ -2252,6 +2252,10 @@ var ALL_KEY_SET = /* @__PURE__ */ new Set([
   ...IMAGE_INPUT_SPEC_KEYS,
   ...AUDIO_INPUT_SPEC_KEYS
 ]);
+var TYPES_BY_ADAPTER = /* @__PURE__ */ new Map([
+  ["replicate", ["video", "image", "audio"]],
+  ["fal", ["image"]]
+]);
 var ALLOWED_KEYS_BY_TYPE = /* @__PURE__ */ new Map([
   ["video", VIDEO_KEY_SET],
   ["image", IMAGE_KEY_SET],
@@ -2290,7 +2294,8 @@ var StaticSchema = z2.record(z2.string(), ProviderScalarSchema);
 var InputSpecSchema = z2.strictObject({
   fields: FieldsSchema,
   values: ValuesSchema.optional(),
-  static: StaticSchema.optional()
+  static: StaticSchema.optional(),
+  editEndpoint: z2.string().min(1).optional()
 }).superRefine((spec, ctx) => {
   const mappedNames = new Set(Object.values(spec.fields));
   for (const key of Object.keys(spec.static ?? {})) {
@@ -2318,18 +2323,21 @@ function validateInputSpec(raw, row) {
     };
   }
   const spec = parsed.data;
-  if (row.adapter !== "replicate") {
+  const supportedTypes = TYPES_BY_ADAPTER.get(row.adapter);
+  if (supportedTypes === void 0) {
     return {
       ok: false,
-      issues: [{ path: [], message: "inputSpec is only supported on replicate rows" }]
+      issues: [
+        { path: [], message: "inputSpec is only supported on replicate and fal rows" }
+      ]
     };
   }
   const issues = [];
   const allowed = ALLOWED_KEYS_BY_TYPE.get(row.type);
-  if (allowed === void 0) {
+  if (allowed === void 0 || !supportedTypes.includes(row.type)) {
     issues.push({
       path: [],
-      message: `inputSpec is not supported for "${row.type}" rows`
+      message: row.adapter === "fal" ? `inputSpec on fal rows is only supported for image rows, not "${row.type}"` : `inputSpec is not supported for "${row.type}" rows`
     });
   } else {
     for (const key of Object.keys(spec.fields)) {
@@ -2349,6 +2357,19 @@ function validateInputSpec(raw, row) {
       }
     }
   }
+  if (spec.editEndpoint !== void 0) {
+    if (row.adapter !== "fal") {
+      issues.push({
+        path: ["editEndpoint"],
+        message: "inputSpec.editEndpoint is only supported on fal rows"
+      });
+    } else if (!("references" in spec.fields)) {
+      issues.push({
+        path: ["editEndpoint"],
+        message: 'inputSpec.editEndpoint needs a "references" entry in inputSpec.fields'
+      });
+    }
+  }
   const seenNames = /* @__PURE__ */ new Map();
   for (const [key, name] of Object.entries(spec.fields)) {
     const first = seenNames.get(name);
@@ -4093,6 +4114,70 @@ async function cancelFalVideoTool(sub, ctx) {
   throw falError(res.status, await readBody(res), ctx.model.id);
 }
 
+// src/adapters/input-spec-mapper.ts
+function canonicalValue(req, key) {
+  return req[key];
+}
+function isMediaRef(value) {
+  return value instanceof Object && ("url" in value || "bytes" in value);
+}
+function toProviderValue(value, refToUrl2) {
+  if (Array.isArray(value)) {
+    return value.map(refToUrl2);
+  }
+  if (isMediaRef(value)) {
+    return refToUrl2(value);
+  }
+  return value;
+}
+function applyInputSpec(spec, req, refToUrl2, opts) {
+  const out = {};
+  for (const [canonical, providerField] of Object.entries(spec.fields)) {
+    if (!isInputSpecKey(canonical)) continue;
+    const value = canonicalValue(req, canonical);
+    if (value === void 0) continue;
+    if (opts?.omit?.(canonical, value)) continue;
+    const serialised = toProviderValue(value, refToUrl2);
+    const mapped = spec.values?.[canonical]?.[String(value)];
+    out[providerField] = mapped ?? serialised;
+  }
+  for (const [key, value] of Object.entries(spec.static ?? {})) {
+    out[key] = value;
+  }
+  return out;
+}
+function resolveRowInputSpec(req, ctx) {
+  const raw = ctx.model.providerOptions?.["modelkit"]?.["inputSpec"];
+  if (raw === void 0) return { kind: "absent" };
+  const result = validateInputSpec(raw, ctx.model);
+  if (!result.ok) {
+    ctx.logger.warn(
+      `[modelkit] ${ctx.model.id} has an invalid providerOptions.modelkit.inputSpec; the call fails`
+    );
+    return { kind: "invalid", issues: result.issues };
+  }
+  return {
+    kind: "ok",
+    spec: result.spec,
+    input: applyInputSpec(result.spec, req, refToUrl, {
+      omit: (key, value) => key === "aspectRatio" && value === "adaptive"
+    })
+  };
+}
+function describeInputSpecIssue(issue) {
+  if (!issue) return "invalid inputSpec";
+  return issue.path.length === 0 ? issue.message : `${issue.path.map((part) => String(part)).join(".")} ${issue.message}`;
+}
+function invalidInputSpecError(provider, ctx, issues) {
+  return new ModelKitError({
+    code: "unsupported_option",
+    message: `${provider} row "${ctx.model.id}" has an invalid providerOptions.modelkit.inputSpec: ${describeInputSpecIssue(issues[0])}`,
+    provider,
+    model: ctx.model.id,
+    retryable: false
+  });
+}
+
 // src/adapters/fal.ts
 var MUSE_T2I_ENDPOINT = "meta/muse-image/text-to-image";
 var MUSE_EDIT_ENDPOINT = "meta/muse-image/edit";
@@ -4147,6 +4232,11 @@ function createFalAdapter(deps = defaultDeps) {
     id: "fal",
     generateImage: (req, ctx) => {
       throwIfAborted(ctx.signal);
+      const spec = resolveRowInputSpec(req, ctx);
+      if (spec.kind === "invalid") {
+        return Promise.reject(invalidInputSpecError("fal", ctx, spec.issues));
+      }
+      if (spec.kind === "ok") return generateSpecImage(req, ctx, deps, spec);
       if (isIdeogram(ctx.model.providerModelId)) return generateIdeogramImage(req, ctx, deps);
       return generateMuseImage(req, ctx, deps);
     },
@@ -4326,6 +4416,36 @@ var museImageResultSchema = z12.object({
     })
   ).optional()
 });
+async function collectFalImages(payload, ctx, req, label) {
+  const parsed = museImageResultSchema.safeParse(payload);
+  const images = parsed.success ? parsed.data.images ?? [] : [];
+  const files = await Promise.all(
+    images.flatMap((img) => {
+      if (img.url === void 0) return [];
+      return [decodeImage(ctx, img.url, img.content_type ?? void 0)];
+    })
+  );
+  if (files.length === 0) {
+    throw new ModelKitError({
+      code: "provider_rejected",
+      message: `${label} returned no image`,
+      provider: "fal",
+      model: ctx.model.id,
+      retryable: false
+    });
+  }
+  return {
+    images: files.map((f) => ({ bytes: f.bytes, mime: f.mime })),
+    usage: imageUsage(ctx, req, files.length),
+    raw: payload
+  };
+}
+async function generateSpecImage(req, ctx, deps, spec) {
+  const hasReferences = (req.references ?? []).length > 0;
+  const endpoint = hasReferences && spec.spec.editEndpoint !== void 0 ? spec.spec.editEndpoint : ctx.model.providerModelId;
+  const payload = await runJob(ctx, deps, endpoint, spec.input);
+  return collectFalImages(payload, ctx, req, `fal ${endpoint}`);
+}
 async function generateMuseImage(req, ctx, deps) {
   const refs = (req.references ?? []).map(refToUrl);
   const isEdit = refs.length > 0;
@@ -4342,29 +4462,7 @@ async function generateMuseImage(req, ctx, deps) {
   const custom = id.includes("/") && !id.startsWith("meta/muse-image") ? id : void 0;
   const endpoint = custom ?? (isEdit ? MUSE_EDIT_ENDPOINT : MUSE_T2I_ENDPOINT);
   const payload = await runJob(ctx, deps, endpoint, input);
-  const parsed = museImageResultSchema.safeParse(payload);
-  const images = parsed.success ? parsed.data.images ?? [] : [];
-  const firstUrl = images[0]?.url;
-  if (images.length === 0 || firstUrl === void 0) {
-    throw new ModelKitError({
-      code: "provider_rejected",
-      message: "fal Meta Muse returned no image",
-      provider: "fal",
-      model: ctx.model.id,
-      retryable: false
-    });
-  }
-  const files = await Promise.all(
-    images.flatMap((img) => {
-      if (img.url === void 0) return [];
-      return [decodeImage(ctx, img.url, img.content_type ?? void 0)];
-    })
-  );
-  return {
-    images: files.map((f) => ({ bytes: f.bytes, mime: f.mime })),
-    usage: imageUsage(ctx, req, files.length),
-    raw: payload
-  };
+  return collectFalImages(payload, ctx, req, "fal Meta Muse");
 }
 var IDEOGRAM_MODEL_IDS = /* @__PURE__ */ new Set(["ideogram/v4.5"]);
 function isIdeogram(providerModelId) {
@@ -4409,28 +4507,7 @@ async function generateIdeogramImage(req, ctx, deps) {
     if (references.length > 0) input.reference_image_urls = references;
   }
   const payload = await runJob(ctx, deps, endpoint, input);
-  const parsed = museImageResultSchema.safeParse(payload);
-  const images = parsed.success ? parsed.data.images ?? [] : [];
-  const files = await Promise.all(
-    images.flatMap((img) => {
-      if (img.url === void 0) return [];
-      return [decodeImage(ctx, img.url, img.content_type ?? void 0)];
-    })
-  );
-  if (files.length === 0) {
-    throw new ModelKitError({
-      code: "provider_rejected",
-      message: "fal Ideogram returned no image",
-      provider: "fal",
-      model: ctx.model.id,
-      retryable: false
-    });
-  }
-  return {
-    images: files.map((f) => ({ bytes: f.bytes, mime: f.mime })),
-    usage: imageUsage(ctx, req, files.length),
-    raw: payload
-  };
+  return collectFalImages(payload, ctx, req, "fal Ideogram");
 }
 var H3_MAX_MODEL_IDS = /* @__PURE__ */ new Set([
   "minimax/h3-max",
@@ -6781,41 +6858,6 @@ function createReplicateHttpClient(opts) {
 
 // src/adapters/replicate.ts
 import { z as z19 } from "zod";
-
-// src/adapters/input-spec-mapper.ts
-function canonicalValue(req, key) {
-  return req[key];
-}
-function isMediaRef(value) {
-  return value instanceof Object && ("url" in value || "bytes" in value);
-}
-function toProviderValue(value, refToUrl2) {
-  if (Array.isArray(value)) {
-    return value.map(refToUrl2);
-  }
-  if (isMediaRef(value)) {
-    return refToUrl2(value);
-  }
-  return value;
-}
-function applyInputSpec(spec, req, refToUrl2, opts) {
-  const out = {};
-  for (const [canonical, providerField] of Object.entries(spec.fields)) {
-    if (!isInputSpecKey(canonical)) continue;
-    const value = canonicalValue(req, canonical);
-    if (value === void 0) continue;
-    if (opts?.omit?.(canonical, value)) continue;
-    const serialised = toProviderValue(value, refToUrl2);
-    const mapped = spec.values?.[canonical]?.[String(value)];
-    out[providerField] = mapped ?? serialised;
-  }
-  for (const [key, value] of Object.entries(spec.static ?? {})) {
-    out[key] = value;
-  }
-  return out;
-}
-
-// src/adapters/replicate.ts
 var POLL_INTERVAL_MS = 1e3;
 var POLL_TIMEOUT_MS = 15 * 6e4;
 var defaultReplicateDeps = {
@@ -7058,38 +7100,6 @@ function replicateNoMapper(ctx, section) {
     retryable: false
   });
 }
-function describeInputSpecIssue(issue) {
-  if (!issue) return "invalid inputSpec";
-  return issue.path.length === 0 ? issue.message : `${issue.path.map((part) => String(part)).join(".")} ${issue.message}`;
-}
-function replicateInvalidSpec(ctx, issues) {
-  const detail = describeInputSpecIssue(issues[0]);
-  return new ModelKitError({
-    code: "unsupported_option",
-    message: `replicate row "${ctx.model.id}" has an invalid providerOptions.modelkit.inputSpec: ${detail}`,
-    provider: "replicate",
-    model: ctx.model.id,
-    retryable: false
-  });
-}
-function omitAdaptive(key, value) {
-  return key === "aspectRatio" && value === "adaptive";
-}
-function replicateInputSpec(req, ctx) {
-  const raw = ctx.model.providerOptions?.["modelkit"]?.["inputSpec"];
-  if (raw === void 0) return { kind: "absent" };
-  const result = validateInputSpec(raw, ctx.model);
-  if (!result.ok) {
-    ctx.logger.warn(
-      `[modelkit] ${ctx.model.id} has an invalid providerOptions.modelkit.inputSpec; the call fails`
-    );
-    return { kind: "invalid", issues: result.issues };
-  }
-  return {
-    kind: "ok",
-    input: applyInputSpec(result.spec, req, refToUrl, { omit: omitAdaptive })
-  };
-}
 var QWEN_IMAGE_RATIOS = /* @__PURE__ */ new Set([
   "1:1",
   "16:9",
@@ -7233,8 +7243,9 @@ async function generateReplicateImage(req, ctx, deps) {
       break;
     }
     default: {
-      const specResult = replicateInputSpec(req, ctx);
-      if (specResult.kind === "invalid") throw replicateInvalidSpec(ctx, specResult.issues);
+      const specResult = resolveRowInputSpec(req, ctx);
+      if (specResult.kind === "invalid")
+        throw invalidInputSpecError("replicate", ctx, specResult.issues);
       if (specResult.kind === "ok") {
         input = specResult.input;
         break;
@@ -7314,9 +7325,10 @@ async function generateReplicateVideo(req, ctx, deps) {
   else if (kind === "kling-omni") input = klingOmniInput(req);
   else if (kind === "hailuo") input = hailuoInput(req);
   else {
-    const specResult = replicateInputSpec(req, ctx);
+    const specResult = resolveRowInputSpec(req, ctx);
     if (specResult.kind === "absent") throw replicateNoMapper(ctx, "video");
-    if (specResult.kind === "invalid") throw replicateInvalidSpec(ctx, specResult.issues);
+    if (specResult.kind === "invalid")
+      throw invalidInputSpecError("replicate", ctx, specResult.issues);
     input = specResult.input;
   }
   const api = client(ctx, deps);
@@ -7471,9 +7483,10 @@ async function generateReplicateAudio(req, ctx, deps) {
   else if (kind === "elevenlabs") input = elevenLabsMusicInput(req, ctx);
   else if (kind === "lyria") input = lyriaAudioInput(req, ctx);
   else {
-    const specResult = replicateInputSpec(req, ctx);
+    const specResult = resolveRowInputSpec(req, ctx);
     if (specResult.kind === "absent") throw replicateNoMapper(ctx, "audio");
-    if (specResult.kind === "invalid") throw replicateInvalidSpec(ctx, specResult.issues);
+    if (specResult.kind === "invalid")
+      throw invalidInputSpecError("replicate", ctx, specResult.issues);
     input = specResult.input;
   }
   const { url, predictTime, raw } = await runPrediction(ctx, input, deps);