Merge branch 'main_upstream' into feature/add-inpaint-mask-generation

# Conflicts: # launch.py # modules/config.py # modules/flags.py
2026-08-16 13:13:16 +02:00 · 2024-03-03 14:40:13 +01:00
parent f97e682e80 4ea3baff50
commit 9b31ff4e7f
91 changed files with 3950 additions and 774 deletions
@@ -7,19 +7,34 @@ import modules.flags
 import modules.sdxl_styles

 from modules.model_loader import load_file_from_url
-from modules.util import get_files_from_folder
+from modules.util import get_files_from_folder, makedirs_with_log
+from modules.flags import Performance, MetadataScheme

+def get_config_path(key, default_value):
+    env = os.getenv(key)
+    if env is not None and isinstance(env, str):
+        print(f"Environment: {key} = {env}")
+        return env
+    else:
+        return os.path.abspath(default_value)

-config_path = os.path.abspath("./config.txt")
-config_example_path = os.path.abspath("config_modification_tutorial.txt")
+config_path = get_config_path('config_path', "./config.txt")
+config_example_path = get_config_path('config_example_path', "config_modification_tutorial.txt")
 config_dict = {}
 always_save_keys = []
 visited_keys = []

+try:
+    with open(os.path.abspath(f'./presets/default.json'), "r", encoding="utf-8") as json_file:
+        config_dict.update(json.load(json_file))
+except Exception as e:
+    print(f'Load default preset failed.')
+    print(e)
+
 try:
    if os.path.exists(config_path):
        with open(config_path, "r", encoding="utf-8") as json_file:
-            config_dict = json.load(json_file)
+            config_dict.update(json.load(json_file))
            always_save_keys = list(config_dict.keys())
 except Exception as e:
    print(f'Failed to load config file "{config_path}" . The reason is: {str(e)}')
@@ -95,7 +110,19 @@ if isinstance(preset, str):
        print(e)


-def get_dir_or_set_default(key, default_value):
+def get_path_output() -> str:
+    """
+    Checking output path argument and overriding default path.
+    """
+    global config_dict
+    path_output = get_dir_or_set_default('path_outputs', '../outputs/', make_directory=True)
+    if args_manager.args.output_path:
+        print(f'[CONFIG] Overriding config value path_outputs with {args_manager.args.output_path}')
+        config_dict['path_outputs'] = path_output = args_manager.args.output_path
+    return path_output
+
+
+def get_dir_or_set_default(key, default_value, as_array=False, make_directory=False):
    global config_dict, visited_keys, always_save_keys

    if key not in visited_keys:
@@ -104,20 +131,44 @@ def get_dir_or_set_default(key, default_value):
    if key not in always_save_keys:
        always_save_keys.append(key)

-    v = config_dict.get(key, None)
-    if isinstance(v, str) and os.path.exists(v) and os.path.isdir(v):
-        return v
+    v = os.getenv(key)
+    if v is not None:
+        print(f"Environment: {key} = {v}")
+        config_dict[key] = v
+    else:
+        v = config_dict.get(key, None)
+
+    if isinstance(v, str):
+        if make_directory:
+            makedirs_with_log(v)
+        if os.path.exists(v) and os.path.isdir(v):
+            return v if not as_array else [v]
+    elif isinstance(v, list):
+        if make_directory:
+            for d in v:
+                makedirs_with_log(d)
+        if all([os.path.exists(d) and os.path.isdir(d) for d in v]):
+            return v
+
+    if v is not None:
+        print(f'Failed to load config key: {json.dumps({key:v})} is invalid or does not exist; will use {json.dumps({key:default_value})} instead.')
+    if isinstance(default_value, list):
+        dp = []
+        for path in default_value:
+            abs_path = os.path.abspath(os.path.join(os.path.dirname(__file__), path))
+            dp.append(abs_path)
+            os.makedirs(abs_path, exist_ok=True)
    else:
-        if v is not None:
-            print(f'Failed to load config key: {json.dumps({key:v})} is invalid or does not exist; will use {json.dumps({key:default_value})} instead.')
        dp = os.path.abspath(os.path.join(os.path.dirname(__file__), default_value))
        os.makedirs(dp, exist_ok=True)
-        config_dict[key] = dp
-        return dp
+        if as_array:
+            dp = [dp]
+    config_dict[key] = dp
+    return dp


-path_checkpoints = get_dir_or_set_default('path_checkpoints', '../models/checkpoints/')
-path_loras = get_dir_or_set_default('path_loras', '../models/loras/')
+paths_checkpoints = get_dir_or_set_default('path_checkpoints', ['../models/checkpoints/'], True)
+paths_loras = get_dir_or_set_default('path_loras', ['../models/loras/'], True)
 path_embeddings = get_dir_or_set_default('path_embeddings', '../models/embeddings/')
 path_vae_approx = get_dir_or_set_default('path_vae_approx', '../models/vae_approx/')
 path_upscale_models = get_dir_or_set_default('path_upscale_models', '../models/upscale_models/')
@@ -125,8 +176,7 @@ path_inpaint = get_dir_or_set_default('path_inpaint', '../models/inpaint/')
 path_controlnet = get_dir_or_set_default('path_controlnet', '../models/controlnet/')
 path_clip_vision = get_dir_or_set_default('path_clip_vision', '../models/clip_vision/')
 path_fooocus_expansion = get_dir_or_set_default('path_fooocus_expansion', '../models/prompt_expansion/fooocus_expansion')
-path_outputs = get_dir_or_set_default('path_outputs', '../outputs/')
-
+path_outputs = get_path_output()

 def get_config_item_or_set_default(key, default_value, validator, disable_empty_as_none=False):
    global config_dict, visited_keys
@@ -134,6 +184,11 @@ def get_config_item_or_set_default(key, default_value, validator, disable_empty_
    if key not in visited_keys:
        visited_keys.append(key)
    
+    v = os.getenv(key)
+    if v is not None:
+        print(f"Environment: {key} = {v}")
+        config_dict[key] = v
+
    if key not in config_dict:
        config_dict[key] = default_value
        return default_value
@@ -153,9 +208,14 @@ def get_config_item_or_set_default(key, default_value, validator, disable_empty_

 default_base_model_name = get_config_item_or_set_default(
    key='default_model',
-    default_value='juggernautXL_version6Rundiffusion.safetensors',
+    default_value='model.safetensors',
    validator=lambda x: isinstance(x, str)
 )
+previous_default_models = get_config_item_or_set_default(
+    key='previous_default_models',
+    default_value=[],
+    validator=lambda x: isinstance(x, list) and all(isinstance(k, str) for k in x)
+)
 default_refiner_model_name = get_config_item_or_set_default(
    key='default_refiner',
    default_value='None',
@@ -163,15 +223,25 @@ default_refiner_model_name = get_config_item_or_set_default(
 )
 default_refiner_switch = get_config_item_or_set_default(
    key='default_refiner_switch',
-    default_value=0.5,
+    default_value=0.8,
    validator=lambda x: isinstance(x, numbers.Number) and 0 <= x <= 1
 )
+default_loras_min_weight = get_config_item_or_set_default(
+    key='default_loras_min_weight',
+    default_value=-2,
+    validator=lambda x: isinstance(x, numbers.Number) and -10 <= x <= 10
+)
+default_loras_max_weight = get_config_item_or_set_default(
+    key='default_loras_max_weight',
+    default_value=2,
+    validator=lambda x: isinstance(x, numbers.Number) and -10 <= x <= 10
+)
 default_loras = get_config_item_or_set_default(
    key='default_loras',
    default_value=[
        [
-            "sd_xl_offset_example-lora_1.0.safetensors",
-            0.1
+            "None",
+            1.0
        ],
        [
            "None",
@@ -192,9 +262,14 @@ default_loras = get_config_item_or_set_default(
    ],
    validator=lambda x: isinstance(x, list) and all(len(y) == 2 and isinstance(y[0], str) and isinstance(y[1], numbers.Number) for y in x)
 )
+default_max_lora_number = get_config_item_or_set_default(
+    key='default_max_lora_number',
+    default_value=len(default_loras),
+    validator=lambda x: isinstance(x, int) and x >= 1
+)
 default_cfg_scale = get_config_item_or_set_default(
    key='default_cfg_scale',
-    default_value=4.0,
+    default_value=7.0,
    validator=lambda x: isinstance(x, numbers.Number)
 )
 default_sample_sharpness = get_config_item_or_set_default(
@@ -235,8 +310,8 @@ default_prompt = get_config_item_or_set_default(
 )
 default_performance = get_config_item_or_set_default(
    key='default_performance',
-    default_value='Speed',
-    validator=lambda x: x in modules.flags.performance_selections
+    default_value=Performance.SPEED.value,
+    validator=lambda x: x in Performance.list()
 )
 default_advanced_checkbox = get_config_item_or_set_default(
    key='default_advanced_checkbox',
@@ -248,6 +323,11 @@ default_max_image_number = get_config_item_or_set_default(
    default_value=32,
    validator=lambda x: isinstance(x, int) and x >= 1
 )
+default_output_format = get_config_item_or_set_default(
+    key='default_output_format',
+    default_value='png',
+    validator=lambda x: x in modules.flags.output_formats
+)
 default_image_number = get_config_item_or_set_default(
    key='default_image_number',
    default_value=2,
@@ -255,16 +335,12 @@ default_image_number = get_config_item_or_set_default(
 )
 checkpoint_downloads = get_config_item_or_set_default(
    key='checkpoint_downloads',
-    default_value={
-        "juggernautXL_version6Rundiffusion.safetensors": "https://huggingface.co/lllyasviel/fav_models/resolve/main/fav/juggernautXL_version6Rundiffusion.safetensors"
-    },
+    default_value={},
    validator=lambda x: isinstance(x, dict) and all(isinstance(k, str) and isinstance(v, str) for k, v in x.items())
 )
 lora_downloads = get_config_item_or_set_default(
    key='lora_downloads',
-    default_value={
-        "sd_xl_offset_example-lora_1.0.safetensors": "https://huggingface.co/stabilityai/stable-diffusion-xl-base-1.0/resolve/main/sd_xl_offset_example-lora_1.0.safetensors"
-    },
+    default_value={},
    validator=lambda x: isinstance(x, dict) and all(isinstance(k, str) and isinstance(v, str) for k, v in x.items())
 )
 embeddings_downloads = get_config_item_or_set_default(
@@ -315,6 +391,21 @@ example_inpaint_prompts = get_config_item_or_set_default(
    ],
    validator=lambda x: isinstance(x, list) and all(isinstance(v, str) for v in x)
 )
+default_save_metadata_to_images = get_config_item_or_set_default(
+    key='default_save_metadata_to_images',
+    default_value=False,
+    validator=lambda x: isinstance(x, bool)
+)
+default_metadata_scheme = get_config_item_or_set_default(
+    key='default_metadata_scheme',
+    default_value=MetadataScheme.FOOOCUS.value,
+    validator=lambda x: x in [y[1] for y in modules.flags.metadata_scheme if y[1] == x]
+)
+metadata_created_by = get_config_item_or_set_default(
+    key='metadata_created_by',
+    default_value='',
+    validator=lambda x: isinstance(x, str)
+)

 example_inpaint_prompts = [[x] for x in example_inpaint_prompts]

@@ -336,13 +427,16 @@ default_inpaint_mask_sam_model = get_config_item_or_set_default(
    validator=lambda x: x in modules.flags.inpaint_mask_sam_model
 )

-config_dict["default_loras"] = default_loras = default_loras[:5] + [['None', 1.0] for _ in range(5 - len(default_loras))]
+config_dict["default_loras"] = default_loras = default_loras[:default_max_lora_number] + [['None', 1.0] for _ in range(default_max_lora_number - len(default_loras))]

 possible_preset_keys = [
    "default_model",
    "default_refiner",
    "default_refiner_switch",
+    "default_loras_min_weight",
+    "default_loras_max_weight",
    "default_loras",
+    "default_max_lora_number",
    "default_cfg_scale",
    "default_sample_sharpness",
    "default_sampler",
@@ -352,6 +446,7 @@ possible_preset_keys = [
    "default_prompt_negative",
    "default_styles",
    "default_aspect_ratio",
+    "default_save_metadata_to_images",
    "checkpoint_downloads",
    "embeddings_downloads",
    "lora_downloads",
@@ -395,21 +490,23 @@ with open(config_example_path, "w", encoding="utf-8") as json_file:
                      'and there is no "," before the last "}". \n\n\n')
    json.dump({k: config_dict[k] for k in visited_keys}, json_file, indent=4)

-
-os.makedirs(path_outputs, exist_ok=True)
-
 model_filenames = []
 lora_filenames = []
+sdxl_lcm_lora = 'sdxl_lcm_lora.safetensors'


-def get_model_filenames(folder_path, name_filter=None):
-    return get_files_from_folder(folder_path, ['.pth', '.ckpt', '.bin', '.safetensors', '.fooocus.patch'], name_filter)
+def get_model_filenames(folder_paths, name_filter=None):
+    extensions = ['.pth', '.ckpt', '.bin', '.safetensors', '.fooocus.patch']
+    files = []
+    for folder in folder_paths:
+        files += get_files_from_folder(folder, extensions, name_filter)
+    return files


 def update_all_model_names():
    global model_filenames, lora_filenames
-    model_filenames = get_model_filenames(path_checkpoints)
-    lora_filenames = get_model_filenames(path_loras)
+    model_filenames = get_model_filenames(paths_checkpoints)
+    lora_filenames = get_model_filenames(paths_loras)
    return


@@ -454,10 +551,10 @@ def downloading_inpaint_models(v):
 def downloading_sdxl_lcm_lora():
    load_file_from_url(
        url='https://huggingface.co/lllyasviel/misc/resolve/main/sdxl_lcm_lora.safetensors',
-        model_dir=path_loras,
-        file_name='sdxl_lcm_lora.safetensors'
+        model_dir=paths_loras[0],
+        file_name=sdxl_lcm_lora
    )
-    return 'sdxl_lcm_lora.safetensors'
+    return sdxl_lcm_lora


 def downloading_controlnet_canny():