feat(ui): use default settings for control adapters for processor

This commit is contained in:
psychedelicious
2024-03-08 19:45:46 +11:00
committed by Brandon
parent dbd7c94e7c
commit 53b7f6be37
11 changed files with 138 additions and 68 deletions

View File

@ -1,4 +1,5 @@
import { CONTROLNET_PROCESSORS } from 'features/controlAdapters/store/constants';
import { isControlAdapterProcessorType } from 'features/controlAdapters/store/types';
import {
initialControlNet,
initialIPAdapter,
@ -253,8 +254,9 @@ const parseControlNet: MetadataParseFunc<ControlNetConfigMetadata> = async (meta
.catch(null)
.parse(getProperty(metadataItem, 'resize_mode'));
const processorType = 'none';
const processorNode = CONTROLNET_PROCESSORS.none.default;
const defaultPreprocessor = controlNetModel.default_settings?.preprocessor;
const processorType = isControlAdapterProcessorType(defaultPreprocessor) ? defaultPreprocessor : 'none';
const processorNode = CONTROLNET_PROCESSORS[processorType].default;
const controlNet: ControlNetConfigMetadata = {
type: 'controlnet',
@ -305,8 +307,9 @@ const parseT2IAdapter: MetadataParseFunc<T2IAdapterConfigMetadata> = async (meta
.catch(null)
.parse(getProperty(metadataItem, 'resize_mode'));
const processorType = 'none';
const processorNode = CONTROLNET_PROCESSORS.none.default;
const defaultPreprocessor = t2iAdapterModel.default_settings?.preprocessor;
const processorType = isControlAdapterProcessorType(defaultPreprocessor) ? defaultPreprocessor : 'none';
const processorNode = CONTROLNET_PROCESSORS[processorType].default;
const t2iAdapter: T2IAdapterConfigMetadata = {
type: 't2i_adapter',