From 3bebc69ad73fec5ad5633b53cdc4159e4331aea9 Mon Sep 17 00:00:00 2001
From: Vladimir Mandic <mandic00@live.com>
Date: Mon, 2 Sep 2024 16:21:15 -0400
Subject: [PATCH] minor update

---
 CHANGELOG.md              | 5 +----
 modules/model_flux.py     | 6 ++++--
 modules/model_flux_nf4.py | 2 +-
 wiki                      | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 453a2ee4f..e2482339e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,10 +54,7 @@ Major refactor of FLUX.1 support: faster, more flexible loading, full ControlNet
 **Fixes:**
 - fix handling of model configs if offline config is not available  
 - fix vae decode in backend original
-
-Work-in-progress:
-- TBD: flux controlnet XLabs-AI models
-- TBD: flux img2img/inpaint  
+- fix model path typos
 
 *notes*:
 - (*1) requires `diffusers==0.31.0.dev0`
diff --git a/modules/model_flux.py b/modules/model_flux.py
index 152aa1d12..6c00a47f7 100644
--- a/modules/model_flux.py
+++ b/modules/model_flux.py
@@ -5,10 +5,11 @@ import diffusers
 import transformers
 from safetensors.torch import load_file
 from huggingface_hub import hf_hub_download
-from modules import shared, devices
+from modules import shared, devices, modelloader
 
 
 debug = shared.log.trace if os.environ.get('SD_LOAD_DEBUG', None) is not None else lambda *args, **kwargs: None
+base_repo = 'black-forest-labs/FLUX.1-dev'
 
 
 def get_quant(file_path):
@@ -132,6 +133,7 @@ def load_transformer(file_path, transformer): # triggered by opts.sd_unet change
 def load_flux(checkpoint_info, diffusers_load_config): # triggered by opts.sd_checkpoint change
     quant = get_quant(checkpoint_info.path)
     shared.log.debug(f'Loading FLUX: model="{checkpoint_info.name}" unet="{shared.opts.sd_unet}" t5="{shared.opts.sd_text_encoder}" vae="{shared.opts.sd_vae}" quant={quant} offload={shared.opts.diffusers_offload_mode} dtype={devices.dtype}')
+    modelloader.hf_login()
 
     transformer = None
     text_encoder_2 = None
@@ -171,5 +173,5 @@ def load_flux(checkpoint_info, diffusers_load_config): # triggered by opts.sd_ch
     if vae is not None:
         components['vae'] = vae
     debug(f'Loading FLUX: preloaded={list(components)}')
-    pipe = diffusers.FluxPipeline.from_pretrained('black-forest-labs/FLUX.1-dev', cache_dir=shared.opts.diffusers_dir, **components, **diffusers_load_config)
+    pipe = diffusers.FluxPipeline.from_pretrained(base_repo, cache_dir=shared.opts.diffusers_dir, **components, **diffusers_load_config)
     return pipe
diff --git a/modules/model_flux_nf4.py b/modules/model_flux_nf4.py
index 79b7df961..bfe70f72a 100644
--- a/modules/model_flux_nf4.py
+++ b/modules/model_flux_nf4.py
@@ -190,7 +190,7 @@ def load_flux_nf4(checkpoint_info, diffusers_load_config, transformer, text_enco
 
     with init_empty_weights():
         from diffusers import FluxTransformer2DModel
-        config = FluxTransformer2DModel.load_config("black-forest-labs/FLUX.1-dev", subfolder="transformer")
+        config = FluxTransformer2DModel.load_config(os.path.join('configs', 'flux'), subfolder="transformer")
         transformer = FluxTransformer2DModel.from_config(config).to(devices.dtype)
         expected_state_dict_keys = list(transformer.state_dict().keys())
 
diff --git a/wiki b/wiki
index c846c6ad5..24de45b89 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit c846c6ad5ff3e616ebc86f87c28c6be7eeff39a9
+Subproject commit 24de45b8964ca0c7fb6a2500d6e62b774f8d446f