@howells/motif-sdk 7.1.0 → 7.2.0

package/dist/image.js

@@ -119,7 +119,7 @@ const MODELS = {
 			"xhigh",
 			"max"
 		],
-		supportsResolution: false,
+		supportsResolution: true,
 		supportsSyncMode: true,
 		type: "generation",
 		useQueue: true
@@ -186,7 +186,7 @@ const MODELS = {
 			"xhigh",
 			"max"
 		],
-		supportsResolution: false,
+		supportsResolution: true,
 		supportsSyncMode: true,
 		type: "generation",
 		useQueue: true

package/dist/index.cjs

@@ -142,6 +142,9 @@ function scaleWithin(longEdge, longTerm, unit) {
 function roundUpTo(value, unit) {
 	return unit * Math.ceil(value / unit);
 }
+function roundDownTo(value, unit) {
+	return unit * Math.floor(value / unit);
+}
 /**
 * Exact pixel dimensions for an aspect ratio at a resolution tier, or null for
 * `"auto"`.
@@ -171,8 +174,9 @@ function withinImageSizeBounds(size, bounds) {
 }
 /**
 * The exact size for an aspect on an endpoint with limits: the long edge as
-* close to `longEdge` as the ratio allows without passing it, then scaled up
-* only as far as a minimum edge or pixel count demands. Null for `"auto"`.
+* close to `longEdge` as the ratio allows without passing it or the endpoint's
+* maximum edge or pixel count, then scaled up only as far as a minimum edge or
+* pixel count demands. Null for `"auto"`.
 * Undefined when no size in that ratio fits the limits: the caller refuses,
 * because rounding to another ratio is the defect this exists to remove.
 */
@@ -182,6 +186,8 @@ function boundedImageSize(aspect, longEdge, bounds) {
 	const [width, height] = terms;
 	const unit = bounds.multipleOf ?? EDGE_MULTIPLE;
 	let scale = scaleWithin(longEdge, Math.max(width, height), unit);
+	if (bounds.maxEdge !== void 0) scale = Math.min(scale, roundDownTo(bounds.maxEdge / Math.max(width, height), unit));
+	if (bounds.maxPixels !== void 0) scale = Math.min(scale, roundDownTo(Math.sqrt(bounds.maxPixels / (width * height)), unit));
 	if (bounds.minEdge !== void 0) scale = Math.max(scale, roundUpTo(bounds.minEdge / Math.min(width, height), unit));
 	if (bounds.minPixels !== void 0) scale = Math.max(scale, roundUpTo(Math.sqrt(bounds.minPixels / (width * height)), unit));
 	const size = {
@@ -760,7 +766,7 @@ const MODELS = {
 			"xhigh",
 			"max"
 		],
-		supportsResolution: false,
+		supportsResolution: true,
 		supportsSyncMode: true,
 		type: "generation",
 		useQueue: true
@@ -827,7 +833,7 @@ const MODELS = {
 			"xhigh",
 			"max"
 		],
-		supportsResolution: false,
+		supportsResolution: true,
 		supportsSyncMode: true,
 		type: "generation",
 		useQueue: true
@@ -2124,15 +2130,16 @@ function normalizeImageSize(imageSize, sizeMode) {
 	throw new Error(`fal image_size must be one of ${FAL_IMAGE_SIZE_PRESETS.join(", ")} or WIDTHxHEIGHT`);
 }
 /**
-* `image_size` for an aspect: fal's named preset where one holds the ratio
-* exactly, else exact dimensions where the endpoint takes them, else the
-* nearest preset. A Model without a resolution setting is sized to the preset
+* `image_size` for an aspect: exact dimensions at the requested resolution
+* where the endpoint takes them and has a resolution setting; otherwise fal's
+* named preset where one holds the ratio exactly, else exact dimensions where
+* the endpoint takes them, else the nearest preset. A Model without a resolution setting is sized to the preset
 * long edge, so an exact size costs what a preset would. Out of the Model's
 * limits it throws rather than rounding to another ratio.
 */
 function falImageSizeFor(config, aspect, resolution) {
 	const bounds = config.customImageSize;
-	if (bounds === void 0 || FAL_PRESET_ASPECTS.includes(aspect)) return aspectToFalImageSize(aspect);
+	if (bounds === void 0 || !config.supportsResolution && FAL_PRESET_ASPECTS.includes(aspect)) return aspectToFalImageSize(aspect);
 	const size = boundedImageSize(aspect, config.supportsResolution ? RESOLUTION_LONG_EDGE[resolution] : FAL_PRESET_LONG_EDGE, bounds);
 	if (size === void 0) throw new ImageSizeBoundsError(config.name, aspect, bounds);
 	return size ?? aspectToFalImageSize(aspect);
@@ -2145,6 +2152,7 @@ function validateGenerateOptions(options, config, sizeMode, hasEditImages) {
 	if (options.editImageUrls !== void 0 && options.editImageUrls.length > 0 && !config.supportsEdit) unsupported(config, "image editing");
 	if (options.aspect !== void 0 && sizeMode === "none") unsupported(config, "aspect");
 	if (options.resolution !== void 0 && options.resolution !== "2K" && !config.supportsResolution) unsupported(config, "resolution");
+	if (config.autoEditSize === true && hasEditImages && options.aspect === void 0 && options.imageSize === void 0 && options.resolution !== void 0) throw new Error(`${config.name} sizes an edit from its source image; pass an aspect with resolution`);
 	if (options.aspect !== void 0 && config.supportedAspects !== void 0 && !config.supportedAspects.includes(options.aspect)) throw new Error(`${config.name} aspect must be one of ${config.supportedAspects.join(", ")}`);
 	if (options.resolution !== void 0 && config.supportedResolutions !== void 0 && !config.supportedResolutions.includes(options.resolution)) throw new Error(`${config.name} resolution must be one of ${config.supportedResolutions.join(", ")}`);
 	if (options.numImages !== void 0 && options.numImages !== 1 && !config.supportsNumImages) unsupported(config, "numImages");

package/dist/index.js

@@ -141,6 +141,9 @@ function scaleWithin(longEdge, longTerm, unit) {
 function roundUpTo(value, unit) {
 	return unit * Math.ceil(value / unit);
 }
+function roundDownTo(value, unit) {
+	return unit * Math.floor(value / unit);
+}
 /**
 * Exact pixel dimensions for an aspect ratio at a resolution tier, or null for
 * `"auto"`.
@@ -170,8 +173,9 @@ function withinImageSizeBounds(size, bounds) {
 }
 /**
 * The exact size for an aspect on an endpoint with limits: the long edge as
-* close to `longEdge` as the ratio allows without passing it, then scaled up
-* only as far as a minimum edge or pixel count demands. Null for `"auto"`.
+* close to `longEdge` as the ratio allows without passing it or the endpoint's
+* maximum edge or pixel count, then scaled up only as far as a minimum edge or
+* pixel count demands. Null for `"auto"`.
 * Undefined when no size in that ratio fits the limits: the caller refuses,
 * because rounding to another ratio is the defect this exists to remove.
 */
@@ -181,6 +185,8 @@ function boundedImageSize(aspect, longEdge, bounds) {
 	const [width, height] = terms;
 	const unit = bounds.multipleOf ?? EDGE_MULTIPLE;
 	let scale = scaleWithin(longEdge, Math.max(width, height), unit);
+	if (bounds.maxEdge !== void 0) scale = Math.min(scale, roundDownTo(bounds.maxEdge / Math.max(width, height), unit));
+	if (bounds.maxPixels !== void 0) scale = Math.min(scale, roundDownTo(Math.sqrt(bounds.maxPixels / (width * height)), unit));
 	if (bounds.minEdge !== void 0) scale = Math.max(scale, roundUpTo(bounds.minEdge / Math.min(width, height), unit));
 	if (bounds.minPixels !== void 0) scale = Math.max(scale, roundUpTo(Math.sqrt(bounds.minPixels / (width * height)), unit));
 	const size = {
@@ -759,7 +765,7 @@ const MODELS = {
 			"xhigh",
 			"max"
 		],
-		supportsResolution: false,
+		supportsResolution: true,
 		supportsSyncMode: true,
 		type: "generation",
 		useQueue: true
@@ -826,7 +832,7 @@ const MODELS = {
 			"xhigh",
 			"max"
 		],
-		supportsResolution: false,
+		supportsResolution: true,
 		supportsSyncMode: true,
 		type: "generation",
 		useQueue: true
@@ -2123,15 +2129,16 @@ function normalizeImageSize(imageSize, sizeMode) {
 	throw new Error(`fal image_size must be one of ${FAL_IMAGE_SIZE_PRESETS.join(", ")} or WIDTHxHEIGHT`);
 }
 /**
-* `image_size` for an aspect: fal's named preset where one holds the ratio
-* exactly, else exact dimensions where the endpoint takes them, else the
-* nearest preset. A Model without a resolution setting is sized to the preset
+* `image_size` for an aspect: exact dimensions at the requested resolution
+* where the endpoint takes them and has a resolution setting; otherwise fal's
+* named preset where one holds the ratio exactly, else exact dimensions where
+* the endpoint takes them, else the nearest preset. A Model without a resolution setting is sized to the preset
 * long edge, so an exact size costs what a preset would. Out of the Model's
 * limits it throws rather than rounding to another ratio.
 */
 function falImageSizeFor(config, aspect, resolution) {
 	const bounds = config.customImageSize;
-	if (bounds === void 0 || FAL_PRESET_ASPECTS.includes(aspect)) return aspectToFalImageSize(aspect);
+	if (bounds === void 0 || !config.supportsResolution && FAL_PRESET_ASPECTS.includes(aspect)) return aspectToFalImageSize(aspect);
 	const size = boundedImageSize(aspect, config.supportsResolution ? RESOLUTION_LONG_EDGE[resolution] : FAL_PRESET_LONG_EDGE, bounds);
 	if (size === void 0) throw new ImageSizeBoundsError(config.name, aspect, bounds);
 	return size ?? aspectToFalImageSize(aspect);
@@ -2144,6 +2151,7 @@ function validateGenerateOptions(options, config, sizeMode, hasEditImages) {
 	if (options.editImageUrls !== void 0 && options.editImageUrls.length > 0 && !config.supportsEdit) unsupported(config, "image editing");
 	if (options.aspect !== void 0 && sizeMode === "none") unsupported(config, "aspect");
 	if (options.resolution !== void 0 && options.resolution !== "2K" && !config.supportsResolution) unsupported(config, "resolution");
+	if (config.autoEditSize === true && hasEditImages && options.aspect === void 0 && options.imageSize === void 0 && options.resolution !== void 0) throw new Error(`${config.name} sizes an edit from its source image; pass an aspect with resolution`);
 	if (options.aspect !== void 0 && config.supportedAspects !== void 0 && !config.supportedAspects.includes(options.aspect)) throw new Error(`${config.name} aspect must be one of ${config.supportedAspects.join(", ")}`);
 	if (options.resolution !== void 0 && config.supportedResolutions !== void 0 && !config.supportedResolutions.includes(options.resolution)) throw new Error(`${config.name} resolution must be one of ${config.supportedResolutions.join(", ")}`);
 	if (options.numImages !== void 0 && options.numImages !== 1 && !config.supportsNumImages) unsupported(config, "numImages");

package/dist/registry.js

@@ -96,7 +96,7 @@ const MODELS = {
 			"xhigh",
 			"max"
 		],
-		supportsResolution: false,
+		supportsResolution: true,
 		supportsSyncMode: true,
 		type: "generation",
 		useQueue: true
@@ -163,7 +163,7 @@ const MODELS = {
 			"xhigh",
 			"max"
 		],
-		supportsResolution: false,
+		supportsResolution: true,
 		supportsSyncMode: true,
 		type: "generation",
 		useQueue: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@howells/motif-sdk",
-  "version": "7.1.0",
+  "version": "7.2.0",
   "description": "Node SDK for Motif: image, video and 3D Tasks on fal.ai, with Motif choosing the Model.",
   "keywords": [
     "fal",