@shop-os/modelkit 0.2.10 → 0.2.11

package/dist/catalog.d.cts

@@ -368,17 +368,36 @@ type ProviderKeys = Partial<Record<ProviderKeyName, string>> & {
     higgsfieldSecret?: string;
     /** Bedrock runtime credentials for Anthropic models when routing.anthropic = "bedrock". */
     aws?: {
-        accessKeyId: string;
-        secretAccessKey: string;
+        /** Bedrock region. Must serve the chosen inference profile (us-east-1 for "us"). */
         region: string;
+        accessKeyId?: string;
+        secretAccessKey?: string;
         sessionToken?: string;
+        /** Bedrock API key (AWS_BEARER_TOKEN_BEDROCK). Wins over SigV4. */
+        apiKey?: string;
+        /** For ECS task roles and other chains. The kit has no AWS SDK dependency; the app passes e.g. defaultProvider(). */
+        credentialProvider?: () => PromiseLike<{
+            accessKeyId: string;
+            secretAccessKey: string;
+            sessionToken?: string;
+        }>;
     };
 };
+/** Key names a call can require, including the Bedrock credentials object. */
+type RequiredKeyName = ProviderKeyName | "aws";
+/** True when region is set AND (apiKey OR credentialProvider OR both static keys). */
+declare function hasAwsCredentials(aws: ProviderKeys["aws"]): aws is NonNullable<ProviderKeys["aws"]>;
 interface Routing {
     /** Text models: direct provider or the Cloudflare AI Gateway. */
     text?: "direct" | "cloudflare";
-    /** Anthropic chat via Bedrock (us. prefixed ids) or the Anthropic API. */
+    /**
+     * Anthropic chat via Bedrock or the Anthropic API. Default "direct". A row's
+     * `providerOptions.modelkit.transport` wins over this. When the chosen transport has
+     * no credentials and the other one has, the kit uses the other one and warns.
+     */
     anthropic?: "direct" | "bedrock";
+    /** Inference profile prefix for Bedrock ids. Default "us". */
+    bedrockProfile?: "us" | "global" | "eu" | "jp" | "au";
     /** fal from geo-blocked regions goes through the Cloudflare passthrough. */
     fal?: "direct" | "cloudflare-passthrough";
     cloudflare?: {
@@ -566,4 +585,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 Exposure, ExposureSchema, 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, SURFACES, type SupportedOption, type Surface, SurfaceSchema, 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, isListed, isListedOn, isModelKitError, liveCatalog, liveState, nearestAspectRatio, normalizeExposure, primeCatalog, resetLiveCatalog, resolveAudioOptions, resolveImageOptions, resolveOptions, resolveVideoOptions, sortCatalogRows };
+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 Exposure, ExposureSchema, 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 RequiredKeyName, type ResolveResult, type Routing, SURFACES, type SupportedOption, type Surface, SurfaceSchema, 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, hasAwsCredentials, isListed, isListedOn, isModelKitError, liveCatalog, liveState, nearestAspectRatio, normalizeExposure, primeCatalog, resetLiveCatalog, resolveAudioOptions, resolveImageOptions, resolveOptions, resolveVideoOptions, sortCatalogRows };

package/dist/catalog.d.ts

@@ -368,17 +368,36 @@ type ProviderKeys = Partial<Record<ProviderKeyName, string>> & {
     higgsfieldSecret?: string;
     /** Bedrock runtime credentials for Anthropic models when routing.anthropic = "bedrock". */
     aws?: {
-        accessKeyId: string;
-        secretAccessKey: string;
+        /** Bedrock region. Must serve the chosen inference profile (us-east-1 for "us"). */
         region: string;
+        accessKeyId?: string;
+        secretAccessKey?: string;
         sessionToken?: string;
+        /** Bedrock API key (AWS_BEARER_TOKEN_BEDROCK). Wins over SigV4. */
+        apiKey?: string;
+        /** For ECS task roles and other chains. The kit has no AWS SDK dependency; the app passes e.g. defaultProvider(). */
+        credentialProvider?: () => PromiseLike<{
+            accessKeyId: string;
+            secretAccessKey: string;
+            sessionToken?: string;
+        }>;
     };
 };
+/** Key names a call can require, including the Bedrock credentials object. */
+type RequiredKeyName = ProviderKeyName | "aws";
+/** True when region is set AND (apiKey OR credentialProvider OR both static keys). */
+declare function hasAwsCredentials(aws: ProviderKeys["aws"]): aws is NonNullable<ProviderKeys["aws"]>;
 interface Routing {
     /** Text models: direct provider or the Cloudflare AI Gateway. */
     text?: "direct" | "cloudflare";
-    /** Anthropic chat via Bedrock (us. prefixed ids) or the Anthropic API. */
+    /**
+     * Anthropic chat via Bedrock or the Anthropic API. Default "direct". A row's
+     * `providerOptions.modelkit.transport` wins over this. When the chosen transport has
+     * no credentials and the other one has, the kit uses the other one and warns.
+     */
     anthropic?: "direct" | "bedrock";
+    /** Inference profile prefix for Bedrock ids. Default "us". */
+    bedrockProfile?: "us" | "global" | "eu" | "jp" | "au";
     /** fal from geo-blocked regions goes through the Cloudflare passthrough. */
     fal?: "direct" | "cloudflare-passthrough";
     cloudflare?: {
@@ -566,4 +585,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 Exposure, ExposureSchema, 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, SURFACES, type SupportedOption, type Surface, SurfaceSchema, 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, isListed, isListedOn, isModelKitError, liveCatalog, liveState, nearestAspectRatio, normalizeExposure, primeCatalog, resetLiveCatalog, resolveAudioOptions, resolveImageOptions, resolveOptions, resolveVideoOptions, sortCatalogRows };
+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 Exposure, ExposureSchema, 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 RequiredKeyName, type ResolveResult, type Routing, SURFACES, type SupportedOption, type Surface, SurfaceSchema, 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, hasAwsCredentials, isListed, isListedOn, isModelKitError, liveCatalog, liveState, nearestAspectRatio, normalizeExposure, primeCatalog, resetLiveCatalog, resolveAudioOptions, resolveImageOptions, resolveOptions, resolveVideoOptions, sortCatalogRows };

package/dist/catalog.js

@@ -2034,7 +2034,18 @@ var CatalogModelSchemaBase = z.looseObject({
     });
   }
 });
-var CatalogModelSchema = CatalogModelSchemaBase;
+var CatalogModelSchema = CatalogModelSchemaBase.superRefine(
+  (row, ctx) => {
+    const transport = row.providerOptions?.["modelkit"]?.["transport"];
+    if (transport !== void 0 && transport !== "direct" && transport !== "bedrock") {
+      ctx.addIssue({
+        code: "custom",
+        path: ["providerOptions", "modelkit", "transport"],
+        message: 'transport must be "direct" or "bedrock"'
+      });
+    }
+  }
+);
 var CatalogSchema = z.array(CatalogModelSchemaBase).superRefine((rows, ctx) => {
   const seenIds = /* @__PURE__ */ new Map();
   rows.forEach((row, index) => {