release: bump version to 2.4.1, update changelog (#3027)

* feat: build docker image on push to main branch

* feat: add tag "edge" for main when building the docker image

* feat: update name of build container workflow

.github/workflows/build_container.yml

@@ -1,9 +1,11 @@
-name: Create and publish a container image
+name: Docker image build
 
 on:
   push:
+    branches:
+      - main
     tags:
-      - 'v*'
+      - v*
 
 jobs:
   build-and-push-image:
@@ -33,6 +35,7 @@ jobs:
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
+            type=edge,branch=main
 
       - name: Build and push Docker image
         uses: docker/build-push-action@v5

fooocus_version.py

@@ -1 +1 @@
-version = '2.4.0'
+version = '2.4.1'

javascript/localization.js

@@ -81,9 +81,12 @@ function refresh_style_localization() {
 }
 
 function refresh_aspect_ratios_label(value) {
-    label = document.querySelector('#aspect_ratios_accordion div span[data-original-text="Aspect Ratios"]')
-    translation = getTranslation("Aspect Ratios")
-    label.textContent = translation + " " + htmlDecode(value)
+    label = document.querySelector('#aspect_ratios_accordion div span[data-original-text="Aspect Ratios"]');
+    translation = getTranslation("Aspect Ratios");
+    if (typeof translation == "undefined") {
+        translation = "Aspect Ratios";
+    }
+    label.textContent = translation + " " + htmlDecode(value);
 }
 
 function localizeWholePage() {

language/en.json

@@ -321,6 +321,7 @@
     "CFG Mimicking from TSNR": "CFG Mimicking from TSNR",
     "Enabling Fooocus's implementation of CFG mimicking for TSNR (effective when real CFG > mimicked CFG).": "Enabling Fooocus's implementation of CFG mimicking for TSNR (effective when real CFG > mimicked CFG).",
     "CLIP Skip": "CLIP Skip",
+    "Bypass CLIP layers to avoid overfitting (use 1 to not skip any layers, 2 is recommended).": "Bypass CLIP layers to avoid overfitting (use 1 to not skip any layers, 2 is recommended).",
     "Sampler": "Sampler",
     "dpmpp_2m_sde_gpu": "dpmpp_2m_sde_gpu",
     "Only effective in non-inpaint mode.": "Only effective in non-inpaint mode.",

modules/config.py

@@ -436,8 +436,8 @@ default_cfg_tsnr = get_config_item_or_set_default(
 )
 default_clip_skip = get_config_item_or_set_default(
     key='default_clip_skip',
-    default_value=1,
-    validator=lambda x: isinstance(x, numbers.Number)
+    default_value=2,
+    validator=lambda x: isinstance(x, int) and 1 <= x <= modules.flags.clip_skip_max
 )
 default_overwrite_step = get_config_item_or_set_default(
     key='default_overwrite_step',

modules/flags.py

@@ -54,6 +54,8 @@ SAMPLER_NAMES = KSAMPLER_NAMES + list(SAMPLER_EXTRA.keys())
 sampler_list = SAMPLER_NAMES
 scheduler_list = SCHEDULER_NAMES
 
+clip_skip_max = 12
+
 default_vae = 'Default (model)'
 
 refiner_swap_method = 'joint'

update_log.md

@@ -1,3 +1,8 @@
+# [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)
+* Add automated docker build on push to main, tagged with `edge`. See [available docker images](https://github.com/lllyasviel/Fooocus/pkgs/container/fooocus).
+
 # [2.4.0](https://github.com/lllyasviel/Fooocus/releases/tag/v2.4.0)
 
 * Change settings tab elements to be more compact

webui.py

@@ -421,9 +421,9 @@ with shared.gradio_root:
                                                  value=modules.config.default_cfg_tsnr,
                                                  info='Enabling Fooocus\'s implementation of CFG mimicking for TSNR '
                                                       '(effective when real CFG > mimicked CFG).')
-                        clip_skip = gr.Slider(label='CLIP Skip', minimum=1, maximum=10, step=1,
+                        clip_skip = gr.Slider(label='CLIP Skip', minimum=1, maximum=flags.clip_skip_max, step=1,
                                                  value=modules.config.default_clip_skip,
-                                                 info='Bypass CLIP layers to avoid overfitting (use 1 to disable).')
+                                                 info='Bypass CLIP layers to avoid overfitting (use 1 to not skip any layers, 2 is recommended).')
                         sampler_name = gr.Dropdown(label='Sampler', choices=flags.sampler_list,
                                                    value=modules.config.default_sampler)
                         scheduler_name = gr.Dropdown(label='Scheduler', choices=flags.scheduler_list,