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

@@ -486,11 +486,14 @@ def init_temp_path(path: str | None, default_path: str) -> str:
     default_value=-1,
     validator=lambda x: isinstance(x, int),
     expected_type=int
+<<<<<<< HEAD
 )
 default_overwrite_upscale = get_config_item_or_set_default(
     key='default_overwrite_upscale',
     default_value=-1,
     validator=lambda x: isinstance(x, numbers.Number)
+=======
+>>>>>>> main_upstream
 )
 example_inpaint_prompts = get_config_item_or_set_default(
     key='example_inpaint_prompts',
@@ -505,6 +508,7 @@ def init_temp_path(path: str | None, default_path: str) -> str:
     default_value=False,
     validator=lambda x: isinstance(x, bool),
     expected_type=bool
+<<<<<<< HEAD
 )
 default_save_metadata_to_images = get_config_item_or_set_default(
     key='default_save_metadata_to_images',
@@ -536,6 +540,26 @@ def init_temp_path(path: str | None, default_path: str) -> str:
     key='default_inpaint_mask_model',
     default_value='isnet-general-use',
     validator=lambda x: x in modules.flags.inpaint_mask_models
+=======
+)
+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),
+    expected_type=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],
+    expected_type=str
+)
+metadata_created_by = get_config_item_or_set_default(
+    key='metadata_created_by',
+    default_value='',
+    validator=lambda x: isinstance(x, str),
+    expected_type=str
+>>>>>>> main_upstream
 )
 
 default_inpaint_mask_cloth_category = get_config_item_or_set_default(

modules/extra_utils.py

@@ -2,7 +2,6 @@
 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)