@shop-os/modelkit 0.3.2 → 0.3.3

package/dist/index.cjs

@@ -33,6 +33,7 @@ var index_exports = {};
 __export(index_exports, {
   ADAPTER_IDS: () => ADAPTER_IDS,
   ADAPTER_KEYS: () => ADAPTER_KEYS,
+  ARRAY_INPUT_SPEC_KEYS: () => ARRAY_INPUT_SPEC_KEYS,
   AUDIO_INPUT_SPEC_KEYS: () => AUDIO_INPUT_SPEC_KEYS,
   Catalog: () => Catalog,
   CatalogModelSchema: () => CatalogModelSchema,
@@ -75,6 +76,7 @@ __export(index_exports, {
   googleImageAdapter: () => googleImageAdapter,
   hasAwsCredentials: () => hasAwsCredentials,
   higgsfieldAdapter: () => higgsfieldAdapter,
+  isArrayInputSpecKey: () => isArrayInputSpecKey,
   isInputSpecKey: () => isInputSpecKey,
   isListed: () => isListed,
   isListedOn: () => isListedOn,
@@ -2355,7 +2357,8 @@ var VIDEO_INPUT_SPEC_KEYS = [
   "generateAudio",
   "cfgScale",
   "promptExpansion",
-  "referenceImages"
+  "referenceImages",
+  "sourceVideo"
 ];
 var IMAGE_INPUT_SPEC_KEYS = [
   "prompt",
@@ -2374,6 +2377,12 @@ var AUDIO_INPUT_SPEC_KEYS = [
   "sourceVideo",
   "instrumental"
 ];
+var ARRAY_INPUT_SPEC_KEYS = [
+  "firstFrame",
+  "referenceImages",
+  "lastFrame",
+  "references"
+];
 var INPUT_SPEC_SUPPORTS_KEYS = [
   "lastFrame",
   "seed",
@@ -2387,6 +2396,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,
@@ -2431,13 +2441,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({
@@ -2451,6 +2478,9 @@ var InputSpecSchema = import_zod2.z.strictObject({
 function isInputSpecKey(key) {
   return ALL_KEY_SET.has(key);
 }
+function isArrayInputSpecKey(key) {
+  return ARRAY_KEY_SET.has(key);
+}
 function validateInputSpec(raw, row) {
   const parsed = InputSpecSchema.safeParse(raw);
   if (!parsed.success) {
@@ -2529,14 +2559,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 };
@@ -2758,6 +2828,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(),
@@ -4285,6 +4356,17 @@ function applyInputSpec(spec, req, refToUrl2, opts) {
     const mapped = spec.values?.[canonical]?.[String(value)];
     out[providerField] = mapped ?? serialised;
   }
+  for (const [providerField, keys] of Object.entries(spec.arrays ?? {})) {
+    const urls = [];
+    for (const key of keys) {
+      if (!isArrayInputSpecKey(key)) continue;
+      const value = canonicalValue(req, key);
+      if (value === void 0) continue;
+      if (Array.isArray(value)) urls.push(...value.map(refToUrl2));
+      else if (isMediaRef(value)) urls.push(refToUrl2(value));
+    }
+    if (urls.length > 0) out[providerField] = urls;
+  }
   for (const [key, value] of Object.entries(spec.static ?? {})) {
     out[key] = value;
   }
@@ -8404,6 +8486,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({
@@ -9514,6 +9616,7 @@ var describe = (modelId) => createDefaultModelKit().describe(modelId);
 0 && (module.exports = {
   ADAPTER_IDS,
   ADAPTER_KEYS,
+  ARRAY_INPUT_SPEC_KEYS,
   AUDIO_INPUT_SPEC_KEYS,
   Catalog,
   CatalogModelSchema,
@@ -9556,6 +9659,7 @@ var describe = (modelId) => createDefaultModelKit().describe(modelId);
   googleImageAdapter,
   hasAwsCredentials,
   higgsfieldAdapter,
+  isArrayInputSpecKey,
   isInputSpecKey,
   isListed,
   isListedOn,