@shop-os/modelkit 0.2.3 → 0.2.5

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) {
@@ -355,7 +374,6 @@ var IMAGE_MODELS = [
     pricingKind: "image_size",
     display: {
       provider: "openai",
-      sortOrder: 20,
       description: "OpenAI's most capable GPT Image 2.5 tier, built for editing precision; takes text and image input and outputs images in low, medium, high, xhigh, or max quality."
     }
   },
@@ -390,7 +408,6 @@ var IMAGE_MODELS = [
     pricingKind: "image_size",
     display: {
       provider: "openai",
-      sortOrder: 10,
       description: "OpenAI's fastest GPT Image 2.5 tier for high-quality everyday image generation and editing; takes text and image input and outputs images."
     }
   },
@@ -2148,13 +2165,14 @@ function toEnvelope(data) {
   if (data.revision !== void 0) envelope.revision = data.revision;
   return envelope;
 }
+function describeError(err) {
+  return err instanceof Error ? err.message : String(err);
+}
 function logPrimed(logger, result) {
-  const { origin: loggedOrigin, rowCount: loggedCount, revision: loggedRevision } = result;
-  logger.info("[modelkit] catalog primed", {
-    origin: loggedOrigin,
-    rowCount: loggedCount,
-    revision: loggedRevision
-  });
+  const revision = result.revision === void 0 ? "" : ` revision=${result.revision}`;
+  logger.info(
+    `[modelkit] catalog primed origin=${result.origin} rowCount=${result.rowCount}${revision}`
+  );
 }
 async function fetchRemote(source, logger) {
   const fetchImpl = source.fetch ?? globalThis.fetch;
@@ -2178,7 +2196,7 @@ async function writeCache(source, logger, rows, rev) {
   try {
     await source.cache.set(JSON.stringify({ rows, revision: rev }));
   } catch (err) {
-    logger.warn("[modelkit] catalog cache write failed", err);
+    logger.warn(`[modelkit] catalog cache write failed: ${describeError(err)}`);
   }
 }
 async function prime(source, logger) {
@@ -2199,8 +2217,8 @@ async function prime(source, logger) {
     logPrimed(logger, result);
     return result;
   } catch (err) {
-    logger.warn("[modelkit] catalog remote failed, trying cache", err);
-    const error = err instanceof Error ? err.message : String(err);
+    logger.warn(`[modelkit] catalog remote failed, trying cache: ${describeError(err)}`);
+    const error = describeError(err);
     try {
       const cached = await source.cache?.get();
       if (!cached) throw new Error("no cached catalog");
@@ -2219,7 +2237,9 @@ async function prime(source, logger) {
       logPrimed(logger, result);
       return result;
     } catch (cacheErr) {
-      logger.warn("[modelkit] catalog cache failed, using snapshot", cacheErr);
+      logger.warn(
+        `[modelkit] catalog cache failed, using snapshot: ${describeError(cacheErr)}`
+      );
       liveCatalog.replace([...MODELS]);
       liveState.origin = "snapshot";
       liveState.revision = void 0;
@@ -2242,7 +2262,9 @@ async function refresh(source, logger) {
     liveState.revision = fetched.revision;
     await writeCache(source, logger, fetched.rows, fetched.revision);
   } catch (err) {
-    logger.warn("[modelkit] catalog refresh failed, keeping current rows", err);
+    logger.warn(
+      `[modelkit] catalog refresh failed, keeping current rows: ${describeError(err)}`
+    );
   }
 }
 function primeCatalog(source) {
@@ -7418,6 +7440,7 @@ var describe = (modelId) => createDefaultModelKit().describe(modelId);
   arkAdapter,
   aspectRatioToSize,
   classifyHttpError,
+  compareCatalogOrder,
   createDefaultModelKit,
   createModelKit,
   describe,
@@ -7455,6 +7478,7 @@ var describe = (modelId) => createDefaultModelKit().describe(modelId);
   resolveVideoOptions,
   shouldRetry,
   sleep,
+  sortCatalogRows,
   streamObject,
   streamText,
   textUsageEvent,