@shop-os/modelkit 0.4.3 → 0.4.5

package/dist/catalog.js

@@ -2499,16 +2499,26 @@ var ArraysSchema = z2.record(z2.string().min(1), z2.array(z2.string()).min(1)).s
     }
   }
 });
+var DimensionsSchema = z2.strictObject({
+  field: z2.string().min(1),
+  areas: z2.record(z2.string(), z2.number().int().positive()).refine((a) => Object.keys(a).length > 0, {
+    message: "inputSpec.dimensions.areas must name at least one size"
+  }),
+  maxSide: z2.number().int().positive().optional(),
+  multipleOf: z2.number().int().positive().optional()
+});
 var InputSpecSchema = z2.strictObject({
   fields: FieldsSchema,
   values: ValuesSchema.optional(),
   static: StaticSchema.optional(),
   arrays: ArraysSchema.optional(),
-  editEndpoint: z2.string().min(1).optional()
+  editEndpoint: z2.string().min(1).optional(),
+  dimensions: DimensionsSchema.optional()
 }).superRefine((spec, ctx) => {
   const mappedNames = /* @__PURE__ */ new Set([
     ...Object.values(spec.fields),
-    ...Object.keys(spec.arrays ?? {})
+    ...Object.keys(spec.arrays ?? {}),
+    ...spec.dimensions ? [spec.dimensions.field] : []
   ]);
   for (const key of Object.keys(spec.static ?? {})) {
     if (mappedNames.has(key)) {
@@ -2537,7 +2547,10 @@ function validateInputSpec(raw, row) {
     return {
       ok: false,
       issues: [
-        { path: [], message: "inputSpec is only supported on replicate and fal rows" }
+        {
+          path: [],
+          message: "inputSpec is only supported on replicate and fal rows"
+        }
       ]
     };
   }
@@ -2630,6 +2643,29 @@ function validateInputSpec(raw, row) {
       }
     }
   }
+  if (spec.dimensions !== void 0) {
+    if (row.type !== "image") {
+      issues.push({
+        path: ["dimensions"],
+        message: "inputSpec.dimensions is only supported on image rows"
+      });
+    }
+    for (const key of ["aspectRatio", "size"]) {
+      if (key in spec.fields) {
+        issues.push({
+          path: ["fields", key],
+          message: `inputSpec.fields "${key}" cannot be set with inputSpec.dimensions, which sends it`
+        });
+      }
+    }
+    const owner = seenNames.get(spec.dimensions.field);
+    if (owner !== void 0 || spec.dimensions.field in (spec.arrays ?? {})) {
+      issues.push({
+        path: ["dimensions", "field"],
+        message: `inputSpec.dimensions.field "${spec.dimensions.field}" is already a mapped provider field`
+      });
+    }
+  }
   const supports = row.constraints.supports ?? [];
   for (const key of INPUT_SPEC_SUPPORTS_KEYS) {
     if (supports.includes(key)) continue;
@@ -3224,6 +3260,20 @@ function resetLiveCatalog() {
 
 // src/catalog/video-tools-spec.ts
 import { z as z6 } 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 = z6.object({ min: z6.number(), max: z6.number() });
 var ToolSchema = z6.object({
   kind: z6.enum(["upscale", "interpolate", "hdr"]),
@@ -3267,7 +3317,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 = {
@@ -3464,7 +3514,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.`;
   }
@@ -3476,14 +3526,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.`;