Merge branch 'main_upstream'

# Conflicts:
#	fooocus_version.py
#	modules/config.py
#	modules/extra_utils.py

fooocus_version.py

@@ -1 +1 @@
-version = '2.4.2 (mashb1t)'
+version = '2.4.3 (mashb1t)'

modules/config.py

@@ -530,24 +530,28 @@ example_inpaint_prompts = [[x] for x in example_inpaint_prompts]
 default_black_out_nsfw = get_config_item_or_set_default(
     key='default_black_out_nsfw',
     default_value=False,
-    validator=lambda x: isinstance(x, bool)
+    validator=lambda x: isinstance(x, bool),
+    expected_type=bool
 )
 default_inpaint_mask_model = get_config_item_or_set_default(
     key='default_inpaint_mask_model',
     default_value='isnet-general-use',
-    validator=lambda x: x in modules.flags.inpaint_mask_models
+    validator=lambda x: x in modules.flags.inpaint_mask_models,
+    expected_type=str
 )
 
 default_inpaint_mask_cloth_category = get_config_item_or_set_default(
     key='default_inpaint_mask_cloth_category',
     default_value='full',
-    validator=lambda x: x in modules.flags.inpaint_mask_cloth_category
+    validator=lambda x: x in modules.flags.inpaint_mask_cloth_category,
+    expected_type=str
 )
 
 default_inpaint_mask_sam_model = get_config_item_or_set_default(
     key='default_inpaint_mask_sam_model',
     default_value='sam_vit_b_01ec64',
-    validator=lambda x: x in modules.flags.inpaint_mask_sam_model
+    validator=lambda x: x in modules.flags.inpaint_mask_sam_model,
+    expected_type=str
 )
 
 config_dict["default_loras"] = default_loras = default_loras[:default_max_lora_number] + [[True, 'None', 1.0] for _ in range(default_max_lora_number - len(default_loras))]

modules/extra_utils.py

@@ -2,7 +2,6 @@ import os
 from ast import literal_eval
 
 
-
 def makedirs_with_log(path):
     try:
         os.makedirs(path, exist_ok=True)

update_log.md

@@ -1,3 +1,8 @@
+# [2.4.3](https://github.com/lllyasviel/Fooocus/releases/tag/v2.4.3)
+
+* Fix alphas_cumprod setter for TCD sampler
+* Add parser for env var strings to expected config value types to allow override of all non-path config keys 
+
 # [2.4.2](https://github.com/lllyasviel/Fooocus/releases/tag/v2.4.2)
 
 * Fix some small bugs (tcd scheduler when gamma is 0, chown in Dockerfile, update cmd args in readme, translation for aspect ratios, vae default after file reload)
@@ -6,7 +11,6 @@
 * Make textboxes (incl. positive prompt) resizable
 * Hide intermediate images when performance of Gradio would bottleneck the generation process (Extreme Speed, Lightning, Hyper-SD)
 
-
 # [2.4.1](https://github.com/lllyasviel/Fooocus/releases/tag/v2.4.1)
 
 * Fix some small bugs (e.g. adjust clip skip default value from 1 to 2, add type check to aspect ratios js update function)