Merge branch 'main_upstream' into develop

# Conflicts: # fooocus_version.py # language/en.json # update_log.md # webui.py
mashb1t · Aug 3, 2024 · 461c178 · 461c178
2 parents 97b51dd + 2c78cec
commit 461c178
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/fooocus_version.py b/fooocus_version.py
@@ -1 +1 @@
-version = '2.6.2 (mashb1t)'
+version = '2.6.3 (mashb1t)'
diff --git a/language/en.json b/language/en.json
@@ -17,7 +17,7 @@
     "Content Type": "Content Type",
     "Photograph": "Photograph",
     "Art/Anime": "Art/Anime",
-    "Appy Styles": "Appy Styles",
+    "Apply Styles": "Apply Styles",
     "Describe this Image into Prompt": "Describe this Image into Prompt",
     "Image Size and Recommended Size": "Image Size and Recommended Size",
     "Upscale or Variation:": "Upscale or Variation:",

diff --git a/update_log.md b/update_log.md
@@ -1,3 +1,8 @@
+# [2.6.3](https://github.com/mashb1t/Fooocus/releases/tag/v2.6.3)
+
+* Only load weights from non-safetensors files, preventing harmful code injection
+* Add checkbox for applying/resetting styles when describing images, also allowing multiple describe content types
+
 # [2.6.2](https://github.com/mashb1t/Fooocus/releases/tag/v2.6.2)
 
 * Fix not adding positive prompt when styles didn't have a {prompt} placeholder in the positive prompt

diff --git a/webui.py b/webui.py
@@ -341,7 +341,7 @@ def generate_mask(image, mask_model, cloth_category, dino_prompt_text, sam_model
                                     label='Content Type',
                                     choices=flags.describe_types,
                                     value=modules.config.default_describe_content_type)
-                                describe_apply_styles = gr.Checkbox(label='Appy Styles', value=modules.config.default_describe_apply_prompts_checkbox)
+                                describe_apply_styles = gr.Checkbox(label='Apply Styles', value=modules.config.default_describe_apply_prompts_checkbox)
                                 describe_btn = gr.Button(value='Describe this Image into Prompt')
                                 describe_image_size = gr.Textbox(label='Image Size and Recommended Size', elem_id='describe_image_size', visible=False)
                                 gr.HTML('<a href="https://github.com/lllyasviel/Fooocus/discussions/1363" target="_blank">\U0001F4D4 Documentation</a>')
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		version = '2.6.2 (mashb1t)'
		version = '2.6.3 (mashb1t)'