@shop-os/modelkit 0.2.3 → 0.2.5

package/dist/catalog.d.cts

@@ -413,6 +413,7 @@ declare class Catalog {
     resolveId(idOrAlias: string): string | undefined;
     get(idOrAlias: string): CatalogModel | undefined;
     require(idOrAlias: string): CatalogModel;
+    /** Rows in picker order: `display.sortOrder` descending, then label. See `compareCatalogOrder`. */
     list(filter?: {
         type?: ModelType;
         lifecycle?: Lifecycle[];
@@ -423,6 +424,18 @@ declare class Catalog {
     replace(rows: CatalogModel[]): void;
 }
 
+/**
+ * Picker order for every surface: `display.sortOrder` descending (a higher
+ * number shows first), rows without one after the ordered ones, then `label`
+ * ascending (case-insensitive), then `id` so the order is total.
+ *
+ * pro-backend applies the same rule in SQL (`ORDER BY sortOrder DESC NULLS
+ * LAST, lower(label), id`); this comparator covers the snapshot and cache
+ * fallbacks and any consumer that sorts a subset.
+ */
+declare function compareCatalogOrder(a: CatalogModel, b: CatalogModel): number;
+declare function sortCatalogRows<T extends CatalogModel>(rows: readonly T[]): T[];
+
 /** Seeded from Cowork, Space Builder and trigger-workflows. See catalog/*.ts. */
 declare const MODELS: CatalogModel[];
 
@@ -532,4 +545,4 @@ declare function isModelKitError(err: unknown): err is ModelKitError;
 /** Resolve caller options against a catalog row, dispatching on `model.type`. */
 declare function resolveOptions(model: CatalogModel, request: ImageRequest | VideoRequest | AudioRequest, onUnsupported?: OnUnsupported): ResolveResult<ImageRequest | VideoRequest | AudioRequest>;
 
-export { ADAPTER_IDS, type AdapterEndpoints, type AdapterId, type AspectRatio, type AudioRequest, type AudioResult, type CallContext, Catalog, type CatalogAuth, type CatalogCache, type CatalogCapabilities, type CatalogDisplay, type CatalogEnvelope, type CatalogModel, CatalogModelSchema, type CatalogOrigin, CatalogSchema, type CatalogSource, type GeneratedImage, IMAGE_MODELS, type ImageBytes, type ImageCallOptions, type ImageCallResult, type ImageQuality, type ImageRequest, type ImageResult, type ImageSafetySetting, type ImageSize, type JsonObject, type JsonPrimitive, type JsonValue, type Lifecycle, type LiveCatalogState, MODELS, type MediaPart, type MediaRef, type ModelConstraints, type ModelKitConfig, ModelKitError, type ModelKitErrorCode, type ModelKitErrorInit, type ModelType, OTHER_MODELS, type OnUnsupported, type OutputFormat, type PricingKind, type PrimeCatalogResult, type ProviderErrorBody, type ProviderKeyName, type ProviderKeys, type ProviderOptionValue, type ProviderOptions, type ReferenceLimits, type RequiredInput, type ResolveResult, type Routing, type SupportedOption, TEXT_MODELS, type UpscaleOptions, type UsageEvent, type UsageModality, type UsageUnit, VIDEO_MODELS, type VideoCallJob, type VideoCallOptions, type VideoJob, type VideoModel, type VideoRequest, type VideoResolution, type VideoResult, type Warning, isModelKitError, liveCatalog, liveState, nearestAspectRatio, primeCatalog, resetLiveCatalog, resolveAudioOptions, resolveImageOptions, resolveOptions, resolveVideoOptions };
+export { ADAPTER_IDS, type AdapterEndpoints, type AdapterId, type AspectRatio, type AudioRequest, type AudioResult, type CallContext, Catalog, type CatalogAuth, type CatalogCache, type CatalogCapabilities, type CatalogDisplay, type CatalogEnvelope, type CatalogModel, CatalogModelSchema, type CatalogOrigin, CatalogSchema, type CatalogSource, type GeneratedImage, IMAGE_MODELS, type ImageBytes, type ImageCallOptions, type ImageCallResult, type ImageQuality, type ImageRequest, type ImageResult, type ImageSafetySetting, type ImageSize, type JsonObject, type JsonPrimitive, type JsonValue, type Lifecycle, type LiveCatalogState, MODELS, type MediaPart, type MediaRef, type ModelConstraints, type ModelKitConfig, ModelKitError, type ModelKitErrorCode, type ModelKitErrorInit, type ModelType, OTHER_MODELS, type OnUnsupported, type OutputFormat, type PricingKind, type PrimeCatalogResult, type ProviderErrorBody, type ProviderKeyName, type ProviderKeys, type ProviderOptionValue, type ProviderOptions, type ReferenceLimits, type RequiredInput, type ResolveResult, type Routing, type SupportedOption, TEXT_MODELS, type UpscaleOptions, type UsageEvent, type UsageModality, type UsageUnit, VIDEO_MODELS, type VideoCallJob, type VideoCallOptions, type VideoJob, type VideoModel, type VideoRequest, type VideoResolution, type VideoResult, type Warning, compareCatalogOrder, isModelKitError, liveCatalog, liveState, nearestAspectRatio, primeCatalog, resetLiveCatalog, resolveAudioOptions, resolveImageOptions, resolveOptions, resolveVideoOptions, sortCatalogRows };

package/dist/catalog.d.ts

@@ -413,6 +413,7 @@ declare class Catalog {
     resolveId(idOrAlias: string): string | undefined;
     get(idOrAlias: string): CatalogModel | undefined;
     require(idOrAlias: string): CatalogModel;
+    /** Rows in picker order: `display.sortOrder` descending, then label. See `compareCatalogOrder`. */
     list(filter?: {
         type?: ModelType;
         lifecycle?: Lifecycle[];
@@ -423,6 +424,18 @@ declare class Catalog {
     replace(rows: CatalogModel[]): void;
 }
 
+/**
+ * Picker order for every surface: `display.sortOrder` descending (a higher
+ * number shows first), rows without one after the ordered ones, then `label`
+ * ascending (case-insensitive), then `id` so the order is total.
+ *
+ * pro-backend applies the same rule in SQL (`ORDER BY sortOrder DESC NULLS
+ * LAST, lower(label), id`); this comparator covers the snapshot and cache
+ * fallbacks and any consumer that sorts a subset.
+ */
+declare function compareCatalogOrder(a: CatalogModel, b: CatalogModel): number;
+declare function sortCatalogRows<T extends CatalogModel>(rows: readonly T[]): T[];
+
 /** Seeded from Cowork, Space Builder and trigger-workflows. See catalog/*.ts. */
 declare const MODELS: CatalogModel[];
 
@@ -532,4 +545,4 @@ declare function isModelKitError(err: unknown): err is ModelKitError;
 /** Resolve caller options against a catalog row, dispatching on `model.type`. */
 declare function resolveOptions(model: CatalogModel, request: ImageRequest | VideoRequest | AudioRequest, onUnsupported?: OnUnsupported): ResolveResult<ImageRequest | VideoRequest | AudioRequest>;
 
-export { ADAPTER_IDS, type AdapterEndpoints, type AdapterId, type AspectRatio, type AudioRequest, type AudioResult, type CallContext, Catalog, type CatalogAuth, type CatalogCache, type CatalogCapabilities, type CatalogDisplay, type CatalogEnvelope, type CatalogModel, CatalogModelSchema, type CatalogOrigin, CatalogSchema, type CatalogSource, type GeneratedImage, IMAGE_MODELS, type ImageBytes, type ImageCallOptions, type ImageCallResult, type ImageQuality, type ImageRequest, type ImageResult, type ImageSafetySetting, type ImageSize, type JsonObject, type JsonPrimitive, type JsonValue, type Lifecycle, type LiveCatalogState, MODELS, type MediaPart, type MediaRef, type ModelConstraints, type ModelKitConfig, ModelKitError, type ModelKitErrorCode, type ModelKitErrorInit, type ModelType, OTHER_MODELS, type OnUnsupported, type OutputFormat, type PricingKind, type PrimeCatalogResult, type ProviderErrorBody, type ProviderKeyName, type ProviderKeys, type ProviderOptionValue, type ProviderOptions, type ReferenceLimits, type RequiredInput, type ResolveResult, type Routing, type SupportedOption, TEXT_MODELS, type UpscaleOptions, type UsageEvent, type UsageModality, type UsageUnit, VIDEO_MODELS, type VideoCallJob, type VideoCallOptions, type VideoJob, type VideoModel, type VideoRequest, type VideoResolution, type VideoResult, type Warning, isModelKitError, liveCatalog, liveState, nearestAspectRatio, primeCatalog, resetLiveCatalog, resolveAudioOptions, resolveImageOptions, resolveOptions, resolveVideoOptions };
+export { ADAPTER_IDS, type AdapterEndpoints, type AdapterId, type AspectRatio, type AudioRequest, type AudioResult, type CallContext, Catalog, type CatalogAuth, type CatalogCache, type CatalogCapabilities, type CatalogDisplay, type CatalogEnvelope, type CatalogModel, CatalogModelSchema, type CatalogOrigin, CatalogSchema, type CatalogSource, type GeneratedImage, IMAGE_MODELS, type ImageBytes, type ImageCallOptions, type ImageCallResult, type ImageQuality, type ImageRequest, type ImageResult, type ImageSafetySetting, type ImageSize, type JsonObject, type JsonPrimitive, type JsonValue, type Lifecycle, type LiveCatalogState, MODELS, type MediaPart, type MediaRef, type ModelConstraints, type ModelKitConfig, ModelKitError, type ModelKitErrorCode, type ModelKitErrorInit, type ModelType, OTHER_MODELS, type OnUnsupported, type OutputFormat, type PricingKind, type PrimeCatalogResult, type ProviderErrorBody, type ProviderKeyName, type ProviderKeys, type ProviderOptionValue, type ProviderOptions, type ReferenceLimits, type RequiredInput, type ResolveResult, type Routing, type SupportedOption, TEXT_MODELS, type UpscaleOptions, type UsageEvent, type UsageModality, type UsageUnit, VIDEO_MODELS, type VideoCallJob, type VideoCallOptions, type VideoJob, type VideoModel, type VideoRequest, type VideoResolution, type VideoResult, type Warning, compareCatalogOrder, isModelKitError, liveCatalog, liveState, nearestAspectRatio, primeCatalog, resetLiveCatalog, resolveAudioOptions, resolveImageOptions, resolveOptions, resolveVideoOptions, sortCatalogRows };

package/dist/catalog.js

@@ -24,6 +24,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();
@@ -80,11 +96,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) {
@@ -261,7 +278,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."
     }
   },
@@ -296,7 +312,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."
     }
   },
@@ -2054,13 +2069,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;
@@ -2084,7 +2100,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) {
@@ -2105,8 +2121,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");
@@ -2125,7 +2141,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;
@@ -2148,7 +2166,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) {
@@ -2568,6 +2588,7 @@ export {
   OTHER_MODELS,
   TEXT_MODELS,
   VIDEO_MODELS,
+  compareCatalogOrder,
   isModelKitError,
   liveCatalog,
   liveState,
@@ -2577,6 +2598,7 @@ export {
   resolveAudioOptions,
   resolveImageOptions,
   resolveOptions,
-  resolveVideoOptions
+  resolveVideoOptions,
+  sortCatalogRows
 };
 //# sourceMappingURL=catalog.js.map