Merge remote-tracking branch 'upstream/main' into external-models

This commit is contained in:
Alexander Eichhorn
2026-04-12 04:29:17 +02:00
parent 17157d7c60
commit ec90b2fbe9
7 changed files with 13 additions and 8 deletions

View File

@@ -1108,6 +1108,7 @@ openai_dall_e_2 = StarterModel(
),
default_settings=ExternalApiModelDefaultSettings(width=1024, height=1024, num_images=1),
panel_schema=ExternalModelPanelSchema(image=[{"name": "dimensions"}]),
)
# region Anima
anima_qwen3_encoder = StarterModel(
name="Anima Qwen3 0.6B Text Encoder",

View File

@@ -4,10 +4,10 @@ import { bboxSyncedToOptimalDimension, rgRefImageModelChanged } from 'features/c
import { buildSelectIsStaging, selectCanvasSessionId } from 'features/controlLayers/store/canvasStagingAreaSlice';
import { loraIsEnabledChanged } from 'features/controlLayers/store/lorasSlice';
import {
aspectRatioIdChanged,
animaQwen3EncoderModelSelected,
animaT5EncoderModelSelected,
animaVaeModelSelected,
aspectRatioIdChanged,
kleinQwen3EncoderModelSelected,
kleinVaeModelSelected,
modelChanged,

View File

@@ -207,7 +207,7 @@ describe('StagingAreaApi Utility Functions', () => {
},
} as unknown as S['SessionQueueItem'];
expect(getOutputImageName(queueItem)).toBe('first.png');
expect(getOutputImageNames(queueItem)).toEqual(['first.png', 'second.png']);
});
it('should handle empty session mapping', () => {

View File

@@ -32,9 +32,11 @@ export const getOutputImageNames = (item: S['SessionQueueItem']): string[] => {
if (isImageField(value)) {
imageNames.push(value.image_name);
}
}
if (isImageFieldCollection(value)) {
return value[0]?.image_name ?? null;
if (isImageFieldCollection(value)) {
for (const img of value) {
imageNames.push(img.image_name);
}
}
}
}

View File

@@ -2,8 +2,8 @@ import { NUMPY_RAND_MAX } from 'app/constants';
import { roundToMultiple } from 'common/util/roundDownToMultiple';
import { buildZodTypeGuard } from 'common/util/zodUtils';
import {
zExternalModelIdentifierField,
zAnimaSchedulerField,
zExternalModelIdentifierField,
zFluxDypeExponentField,
zFluxDypePresetField,
zFluxDypeScaleField,

View File

@@ -4,8 +4,8 @@ import { skipToken } from '@reduxjs/toolkit/query';
import { createMemoizedSelector } from 'app/store/createMemoizedSelector';
import { useAppSelector } from 'app/store/storeHooks';
import {
selectIsExternal,
selectIsAnima,
selectIsExternal,
selectIsFLUX,
selectIsFlux2,
selectIsSD3,

View File

@@ -94,7 +94,9 @@ export const GenerationSettingsAccordion = memo(() => {
<Expander label={t('accordions.advanced.options')} isOpen={isOpenExpander} onToggle={onToggleExpander}>
<Flex gap={4} flexDir="column" pb={4}>
<FormControlGroup formLabelProps={formLabelProps}>
{!isExternal && !isFLUX && !isFlux2 && !isSD3 && !isCogView4 && !isZImage && !isAnima && <ParamScheduler />}
{!isExternal && !isFLUX && !isFlux2 && !isSD3 && !isCogView4 && !isZImage && !isAnima && (
<ParamScheduler />
)}
{!isExternal && isFLUX && <ParamFluxScheduler />}
{!isExternal && isZImage && <ParamZImageScheduler />}
{!isExternal && isAnima && <ParamAnimaScheduler />}