@shop-os/modelkit 0.2.4 → 0.2.6

package/dist/index.cjs

@@ -45,6 +45,7 @@ __export(index_exports, {
   arkAdapter: () => arkAdapter,
   aspectRatioToSize: () => aspectRatioToSize,
   classifyHttpError: () => classifyHttpError,
+  compareCatalogOrder: () => compareCatalogOrder,
   createDefaultModelKit: () => createDefaultModelKit,
   createModelKit: () => createModelKit,
   describe: () => describe,
@@ -82,6 +83,7 @@ __export(index_exports, {
   resolveVideoOptions: () => resolveVideoOptions,
   shouldRetry: () => shouldRetry,
   sleep: () => sleep,
+  sortCatalogRows: () => sortCatalogRows,
   streamObject: () => streamObject,
   streamText: () => streamText,
   textUsageEvent: () => textUsageEvent,
@@ -118,6 +120,22 @@ function isModelKitError(err) {
   return err instanceof ModelKitError;
 }
 
+// src/catalog/order.ts
+function compareCatalogOrder(a, b) {
+  const sa = a.display?.sortOrder;
+  const sb = b.display?.sortOrder;
+  if (sa !== void 0 && sb !== void 0 && sa !== sb) return sb - sa;
+  if (sa !== void 0 && sb === void 0) return -1;
+  if (sa === void 0 && sb !== void 0) return 1;
+  return compareText(a.label.toLowerCase(), b.label.toLowerCase()) || compareText(a.id, b.id);
+}
+function compareText(a, b) {
+  return a < b ? -1 : a > b ? 1 : 0;
+}
+function sortCatalogRows(rows) {
+  return [...rows].sort(compareCatalogOrder);
+}
+
 // src/catalog/registry.ts
 var Catalog = class _Catalog {
   byId = /* @__PURE__ */ new Map();
@@ -174,11 +192,12 @@ var Catalog = class _Catalog {
     }
     return model;
   }
+  /** Rows in picker order: `display.sortOrder` descending, then label. See `compareCatalogOrder`. */
   list(filter = {}) {
     const lifecycles = filter.lifecycle ?? ["active"];
     return [...this.byId.values()].filter(
       (m) => (filter.type ? m.type === filter.type : true) && lifecycles.includes(m.lifecycle)
-    );
+    ).sort(compareCatalogOrder);
   }
   /** Merge rows by id. Used for catalogOverride. */
   withOverrides(rows) {
@@ -1416,7 +1435,7 @@ var VIDEO_MODELS = [
       // reference clip keeps its own framing.
       aspectRatios: [...OMNI_RATIOS],
       durations: [3, 4, 5, 6, 7, 8, 9, 10],
-      references: { images: 6, videos: 3 },
+      references: { images: 6, videos: 1 },
       supports: []
     },
     defaults: {},
@@ -1442,7 +1461,7 @@ var VIDEO_MODELS = [
       aspectRatios: [...OMNI_RATIOS],
       resolutions: ["360p", "720p", "1080p", "4k"],
       durations: [3, 4, 5, 6, 7, 8, 9, 10],
-      references: { images: 6, videos: 3 },
+      references: { images: 6, videos: 1 },
       supports: []
     },
     defaults: {},
@@ -1569,7 +1588,7 @@ var VIDEO_MODELS = [
       resolutions: ["480p", "720p"],
       durations: { min: 1, max: 15 },
       durationPresets: [4, 6, 8, 10],
-      references: { images: 7 },
+      references: { images: 5 },
       supports: []
     },
     // No resolution default: xAI picks its own unless the caller asks.
@@ -1578,7 +1597,7 @@ var VIDEO_MODELS = [
     pricingKind: "video_per_second",
     display: {
       provider: "xai",
-      description: "xAI's reference-to-video model. Generates short clips conditioned on up to 7 reference images with flexible aspect ratios.",
+      description: "xAI's reference-to-video model. Generates short clips conditioned on up to 5 reference images with flexible aspect ratios.",
       logo: "https://d31vvfpk2ppdyq.cloudfront.net/assets/image/858b7fcc-9bd5-411d-aea1-a7b35ecfffab_compressed.png"
     },
     capabilities: { ...FRAMES_EXCLUDE_REFERENCES }
@@ -7245,7 +7264,7 @@ async function generateXaiVideo(req, ctx, deps) {
       retryable: false
     });
   }
-  const refUrls = (req.referenceImages ?? []).map(refToUrl).slice(0, 7);
+  const refUrls = (req.referenceImages ?? []).map(refToUrl).slice(0, 5);
   const xaiOptions = {
     pollIntervalMs: POLL_INTERVAL_MS2,
     pollTimeoutMs: POLL_TIMEOUT_MS2
@@ -7421,6 +7440,7 @@ var describe = (modelId) => createDefaultModelKit().describe(modelId);
   arkAdapter,
   aspectRatioToSize,
   classifyHttpError,
+  compareCatalogOrder,
   createDefaultModelKit,
   createModelKit,
   describe,
@@ -7458,6 +7478,7 @@ var describe = (modelId) => createDefaultModelKit().describe(modelId);
   resolveVideoOptions,
   shouldRetry,
   sleep,
+  sortCatalogRows,
   streamObject,
   streamText,
   textUsageEvent,