fix: use fal edit as final scale adjust failover
This commit is contained in:
parent
d724a542bb
commit
4d4507489f
@ -3128,6 +3128,22 @@ function getCanvasScaleAdjustFailoverPriority(item: CanvasModelWithProvider) {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function isCanvasScaleAdjustEmergencyFalEditModel(item: CanvasModelWithProvider) {
|
||||||
|
if (item.provider.type !== "fal-image") return false;
|
||||||
|
const descriptor = JSON.stringify([
|
||||||
|
item.model.modelId,
|
||||||
|
item.model.displayName,
|
||||||
|
item.model.capabilities,
|
||||||
|
item.model.defaultParams,
|
||||||
|
]).toLowerCase();
|
||||||
|
return (
|
||||||
|
descriptor.includes("image-edit") ||
|
||||||
|
descriptor.includes("image_urls") ||
|
||||||
|
descriptor.includes("/edit") ||
|
||||||
|
descriptor.includes(" edit")
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
interface CanvasImageGenConfig {
|
interface CanvasImageGenConfig {
|
||||||
maxImages?: number;
|
maxImages?: number;
|
||||||
supports1K?: boolean;
|
supports1K?: boolean;
|
||||||
@ -3349,16 +3365,28 @@ function findCanvasFailoverModel(params: {
|
|||||||
.map((item) => String(item || "").trim())
|
.map((item) => String(item || "").trim())
|
||||||
.filter(Boolean);
|
.filter(Boolean);
|
||||||
|
|
||||||
const isUsableFallback = (item: CanvasModelWithProvider) => {
|
const isUsableFallback = (
|
||||||
|
item: CanvasModelWithProvider,
|
||||||
|
options: { allowEmergencyFalEdit?: boolean } = {}
|
||||||
|
) => {
|
||||||
const isSameFamilyScaleAdjustFallback = strictScaleAdjustModelFamily
|
const isSameFamilyScaleAdjustFallback = strictScaleAdjustModelFamily
|
||||||
? getCanvasScaleAdjustModelFamily(item) === strictScaleAdjustModelFamily
|
? getCanvasScaleAdjustModelFamily(item) === strictScaleAdjustModelFamily
|
||||||
: false;
|
: false;
|
||||||
|
const isEmergencyFalEditFallback =
|
||||||
|
options.allowEmergencyFalEdit === true &&
|
||||||
|
params.preferLowCostSameNameProviders &&
|
||||||
|
isCanvasScaleAdjustEmergencyFalEditModel(item);
|
||||||
const isSameNameScaleAdjustFallback =
|
const isSameNameScaleAdjustFallback =
|
||||||
params.preferLowCostSameNameProviders &&
|
params.preferLowCostSameNameProviders &&
|
||||||
(isSameFamilyScaleAdjustFallback ||
|
(isSameFamilyScaleAdjustFallback ||
|
||||||
|
isEmergencyFalEditFallback ||
|
||||||
scoreModelNameSimilarity(params.selectedModel, item) >=
|
scoreModelNameSimilarity(params.selectedModel, item) >=
|
||||||
CANVAS_FAILOVER_SAME_NAME_THRESHOLD);
|
CANVAS_FAILOVER_SAME_NAME_THRESHOLD);
|
||||||
if (strictScaleAdjustModelFamily && !isSameFamilyScaleAdjustFallback) {
|
if (
|
||||||
|
strictScaleAdjustModelFamily &&
|
||||||
|
!isSameFamilyScaleAdjustFallback &&
|
||||||
|
!isEmergencyFalEditFallback
|
||||||
|
) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
@ -3403,7 +3431,18 @@ function findCanvasFailoverModel(params: {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const usableModels = params.imageModels.filter(isUsableFallback);
|
let usingEmergencyFalEditFallback = false;
|
||||||
|
let usableModels = params.imageModels.filter((item) => isUsableFallback(item));
|
||||||
|
if (
|
||||||
|
usableModels.length === 0 &&
|
||||||
|
strictScaleAdjustModelFamily &&
|
||||||
|
params.preferLowCostSameNameProviders
|
||||||
|
) {
|
||||||
|
usingEmergencyFalEditFallback = true;
|
||||||
|
usableModels = params.imageModels.filter((item) =>
|
||||||
|
isUsableFallback(item, { allowEmergencyFalEdit: true })
|
||||||
|
);
|
||||||
|
}
|
||||||
const scoredModels = usableModels
|
const scoredModels = usableModels
|
||||||
.map((item, index) => ({
|
.map((item, index) => ({
|
||||||
item,
|
item,
|
||||||
@ -3412,6 +3451,12 @@ function findCanvasFailoverModel(params: {
|
|||||||
sameProviderType: item.provider.type === params.selectedModel.provider.type,
|
sameProviderType: item.provider.type === params.selectedModel.provider.type,
|
||||||
}))
|
}))
|
||||||
.sort((left, right) => {
|
.sort((left, right) => {
|
||||||
|
if (usingEmergencyFalEditFallback) {
|
||||||
|
const leftPriority = getCanvasScaleAdjustFailoverPriority(left.item);
|
||||||
|
const rightPriority = getCanvasScaleAdjustFailoverPriority(right.item);
|
||||||
|
if (leftPriority !== rightPriority) return leftPriority - rightPriority;
|
||||||
|
return left.index - right.index;
|
||||||
|
}
|
||||||
if (strictScaleAdjustModelFamily) {
|
if (strictScaleAdjustModelFamily) {
|
||||||
const leftPriority = getCanvasScaleAdjustFailoverPriority(left.item);
|
const leftPriority = getCanvasScaleAdjustFailoverPriority(left.item);
|
||||||
const rightPriority = getCanvasScaleAdjustFailoverPriority(right.item);
|
const rightPriority = getCanvasScaleAdjustFailoverPriority(right.item);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user