mirror of
https://github.com/lllyasviel/Fooocus.git
synced 2026-08-16 13:13:16 +02:00
feat: add configs for controlnet
default_controlnet_image_count, ip_images, ip_stop_ats, ip_weights and ip_types
This commit is contained in:
@@ -9,7 +9,7 @@ patch_all()
|
||||
|
||||
class AsyncTask:
|
||||
def __init__(self, args):
|
||||
from modules.flags import Performance, MetadataScheme, ip_list, controlnet_image_count, disabled
|
||||
from modules.flags import Performance, MetadataScheme, ip_list, disabled
|
||||
from modules.util import get_enabled_loras
|
||||
from modules.config import default_max_lora_number
|
||||
import args_manager
|
||||
@@ -101,7 +101,7 @@ class AsyncTask:
|
||||
args.pop()) if not args_manager.args.disable_metadata else MetadataScheme.FOOOCUS
|
||||
|
||||
self.cn_tasks = {x: [] for x in ip_list}
|
||||
for _ in range(controlnet_image_count):
|
||||
for _ in range(modules.config.default_controlnet_image_count):
|
||||
cn_img = args.pop()
|
||||
cn_stop = args.pop()
|
||||
cn_weight = args.pop()
|
||||
|
||||
@@ -499,6 +499,46 @@ default_uov_method = get_config_item_or_set_default(
|
||||
validator=lambda x: x in modules.flags.uov_list,
|
||||
expected_type=int
|
||||
)
|
||||
default_controlnet_image_count = get_config_item_or_set_default(
|
||||
key='default_controlnet_image_count',
|
||||
default_value=4,
|
||||
validator=lambda x: x > 0,
|
||||
expected_type=int
|
||||
)
|
||||
default_ip_images = {}
|
||||
default_ip_stop_ats = {}
|
||||
default_ip_weights = {}
|
||||
default_ip_types = {}
|
||||
|
||||
for image_count in range(default_controlnet_image_count):
|
||||
default_ip_images[image_count] = get_config_item_or_set_default(
|
||||
key=f'default_ip_image_{image_count}',
|
||||
default_value=None,
|
||||
validator=lambda x: x is None or isinstance(x, str) and os.path.exists(x),
|
||||
expected_type=str
|
||||
)
|
||||
default_ip_types[image_count] = get_config_item_or_set_default(
|
||||
key=f'default_ip_type_{image_count}',
|
||||
default_value=modules.flags.default_ip,
|
||||
validator=lambda x: x in modules.flags.ip_list,
|
||||
expected_type=str
|
||||
)
|
||||
|
||||
default_end, default_weight = modules.flags.default_parameters[default_ip_types[image_count]]
|
||||
|
||||
default_ip_stop_ats[image_count] = get_config_item_or_set_default(
|
||||
key=f'default_ip_stop_at_{image_count}',
|
||||
default_value=default_end,
|
||||
validator=lambda x: x is None or isinstance(x, str) and os.path.exists(x),
|
||||
expected_type=float
|
||||
)
|
||||
default_ip_weights[image_count] = get_config_item_or_set_default(
|
||||
key=f'default_ip_weight_{image_count}',
|
||||
default_value=default_weight,
|
||||
validator=lambda x: x is None or isinstance(x, str) and os.path.exists(x),
|
||||
expected_type=float
|
||||
)
|
||||
|
||||
default_inpaint_advanced_masking_checkbox = get_config_item_or_set_default(
|
||||
key='default_inpaint_advanced_masking_checkbox',
|
||||
default_value=False,
|
||||
|
||||
@@ -113,8 +113,6 @@ metadata_scheme = [
|
||||
(f'{MetadataScheme.A1111.value} (plain text)', MetadataScheme.A1111.value),
|
||||
]
|
||||
|
||||
controlnet_image_count = 4
|
||||
|
||||
|
||||
class OutputFormat(Enum):
|
||||
PNG = 'png'
|
||||
|
||||
Reference in New Issue
Block a user