Merge branch 'main' into moonride-main

Author: MoonRide303

.gitignore

@@ -3,6 +3,7 @@ __pycache__
 **/*.safetensors
 **/*.pth
 **/*.pt
+**/*.bin
 **/*.yaml
 **/*.png
 !taesdxl_decoder.pth

fooocus_version.py

@@ -1,2 +1,2 @@
-version = '1.0.45.1 MRE'
+version = '1.0.50 MRE'
 full_version = 'Fooocus ' + version

launch.py

@@ -7,7 +7,8 @@
 from modules.launch_util import is_installed, run, python, \
     run_pip, repo_dir, git_clone, requirements_met, script_path, dir_repos
 from modules.model_loader import load_file_from_url
-from modules.path import modelfile_path, lorafile_path, clip_vision_path, controlnet_path
+from modules.path import modelfile_path, lorafile_path, clip_vision_path, controlnet_path, vae_approx_path, fooocus_expansion_path
+
 
 REINSTALL_ALL = False
 DEFAULT_ARGS = ['--disable-smart-memory']
@@ -22,7 +23,7 @@ def prepare_environment():
     xformers_package = os.environ.get('XFORMERS_PACKAGE', 'xformers==0.0.21')
 
     comfy_repo = os.environ.get('COMFY_REPO', "https://github.com/comfyanonymous/ComfyUI")
-    comfy_commit_hash = os.environ.get('COMFY_COMMIT_HASH', "07691e80c3bf9be16c629169e259105ca5327bf0")
+    comfy_commit_hash = os.environ.get('COMFY_COMMIT_HASH', "9261587d8975bb0c3f929433345e9918bf659460")
 
     print(f"Python {sys.version}")
     print(f"Fooocus version: {fooocus_version.version}")
@@ -81,6 +82,11 @@ def prepare_environment():
      'https://huggingface.co/stabilityai/control-lora/resolve/main/control-LoRAs-rank256/control-lora-depth-rank256.safetensors')
 ]
 
+vae_approx_filenames = [
+    ('taesdxl_decoder.pth',
+     'https://huggingface.co/lllyasviel/misc/resolve/main/taesdxl_decoder.pth')
+]
+
 
 def download_models():
     for file_name, url in model_filenames:
@@ -91,6 +97,15 @@ def download_models():
         load_file_from_url(url=url, model_dir=clip_vision_path, file_name=file_name)
     for file_name, url in controlnet_filenames:
         load_file_from_url(url=url, model_dir=controlnet_path, file_name=file_name)
+    for file_name, url in vae_approx_filenames:
+        load_file_from_url(url=url, model_dir=vae_approx_path, file_name=file_name)
+
+    load_file_from_url(
+        url='https://huggingface.co/lllyasviel/misc/resolve/main/fooocus_expansion.bin',
+        model_dir=fooocus_expansion_path,
+        file_name='pytorch_model.bin'
+    )
+
     return
 
 

models/prompt_expansion/fooocus_expansion/config.json

@@ -0,0 +1,39 @@
+{
+  "_name_or_path": "gpt2",
+  "activation_function": "gelu_new",
+  "architectures": [
+    "GPT2LMHeadModel"
+  ],
+  "attn_pdrop": 0.1,
+  "bos_token_id": 50256,
+  "embd_pdrop": 0.1,
+  "eos_token_id": 50256,
+  "initializer_range": 0.02,
+  "layer_norm_epsilon": 1e-05,
+  "model_type": "gpt2",
+  "n_ctx": 1024,
+  "n_embd": 768,
+  "n_head": 12,
+  "n_inner": null,
+  "n_layer": 12,
+  "n_positions": 1024,
+  "reorder_and_upcast_attn": false,
+  "resid_pdrop": 0.1,
+  "scale_attn_by_inverse_layer_idx": false,
+  "scale_attn_weights": true,
+  "summary_activation": null,
+  "summary_first_dropout": 0.1,
+  "summary_proj_to_labels": true,
+  "summary_type": "cls_index",
+  "summary_use_proj": true,
+  "task_specific_params": {
+    "text-generation": {
+      "do_sample": true,
+      "max_length": 50
+    }
+  },
+  "torch_dtype": "float32",
+  "transformers_version": "4.23.0.dev0",
+  "use_cache": true,
+  "vocab_size": 50257
+}