Upload 2 files

app.py

@@ -20,7 +20,6 @@ from flux import (search_civitai_lora, select_civitai_lora, search_civitai_lora_
                   download_my_lora, get_all_lora_tupled_list, apply_lora_prompt,
                   update_loras)
 from tagger.tagger import predict_tags_wd, compose_prompt_to_copy
-from tagger.fl2cog import predict_tags_fl2_cog
 from tagger.fl2flux import predict_tags_fl2_flux
 
 # Initialize the base model
@@ -45,7 +44,9 @@ def change_base_model(repo_id: str, cn_on: bool, progress=gr.Progress(track_tqdm
             controlnet_union = FluxControlNetModel.from_pretrained(controlnet_model_union_repo, torch_dtype=torch.bfloat16)
             controlnet = FluxMultiControlNetModel([controlnet_union])
             pipe = FluxControlNetPipeline.from_pretrained(repo_id, controlnet=controlnet, torch_dtype=torch.bfloat16)
+            pipe.enable_model_cpu_offload()
             last_model = repo_id
+            last_cn_on = cn_on
             progress(1, desc=f"Model loaded: {repo_id} / ControlNet Loaded: {controlnet_model_union_repo}")
             print(f"Model loaded: {repo_id} / ControlNet Loaded: {controlnet_model_union_repo}")
         else:
@@ -53,7 +54,9 @@ def change_base_model(repo_id: str, cn_on: bool, progress=gr.Progress(track_tqdm
             print(f"Loading model: {repo_id}")
             clear_cache()
             pipe = DiffusionPipeline.from_pretrained(repo_id, torch_dtype=torch.bfloat16)
+            pipe.enable_model_cpu_offload()
             last_model = repo_id
+            last_cn_on = cn_on
             progress(1, desc=f"Model loaded: {repo_id}")
             print(f"Model loaded: {repo_id}")
     except Exception as e:
@@ -296,7 +299,7 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=css) as app:
                             v2_character = gr.Textbox(label="Character", placeholder="hatsune miku", scale=2, visible=False)
                             v2_series = gr.Textbox(label="Series", placeholder="vocaloid", scale=2, visible=False)
                             v2_copy = gr.Button(value="Copy to clipboard", size="sm", interactive=False, visible=False)
-                        tagger_algorithms = gr.CheckboxGroup(["Use WD Tagger", "Use CogFlorence-2.1-Large", "Use Florence-2-Flux"], label="Algorithms", value=["Use WD Tagger"])
+                        tagger_algorithms = gr.CheckboxGroup(["Use WD Tagger", "Use Florence-2-Flux"], label="Algorithms", value=["Use WD Tagger"])
                         tagger_generate_from_image = gr.Button(value="Generate Prompt from Image")
                     prompt = gr.Textbox(label="Prompt", lines=1, max_lines=8, placeholder="Type a prompt")
                     prompt_enhance = gr.Button(value="Enhance your prompt", variant="secondary")
@@ -481,8 +484,6 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=css) as app:
         show_api=False,
     ).success(
         predict_tags_fl2_flux, [tagger_image, prompt, tagger_algorithms], [prompt], show_api=False,
-    ).success(
-        predict_tags_fl2_cog, [tagger_image, prompt, tagger_algorithms], [prompt], show_api=False,
     ).success(
         compose_prompt_to_copy, [v2_character, v2_series, prompt], [prompt], queue=False, show_api=False,
     )

mod.py

@@ -114,6 +114,7 @@ def resize_image(image, target_width, target_height, crop=True):
 
 
 # https://huggingface.co/spaces/jiuface/FLUX.1-dev-Controlnet-Union/blob/main/app.py
+# https://huggingface.co/InstantX/FLUX.1-dev-Controlnet-Union
 controlnet_union_modes = {
     "None": -1,
     #"scribble_hed": 0,
@@ -128,14 +129,16 @@ controlnet_union_modes = {
 }
 
 
+# https://github.com/pytorch/pytorch/issues/123834
 def get_control_params():
+    from diffusers.utils import load_image
     modes = []
     images = []
     scales = []
     for i, mode in enumerate(control_modes):
         if mode == -1 or control_images[i] is None: continue
         modes.append(control_modes[i])
-        images.append(control_images[i])
+        images.append(load_image(control_images[i]))
         scales.append(control_scales[i])
     return modes, images, scales
 
@@ -274,7 +277,7 @@ def description_ui():
     gr.Markdown(
         """
 - Mod of [multimodalart/flux-lora-the-explorer](https://huggingface.co/spaces/multimodalart/flux-lora-the-explorer),
- [jiuface/FLUX.1-dev-Controlnet-Union](https://huggingface.co/spaces/jiuface/),
+ [jiuface/FLUX.1-dev-Controlnet-Union](https://huggingface.co/spaces/jiuface/FLUX.1-dev-Controlnet-Union),
  [DamarJati/FLUX.1-DEV-Canny](https://huggingface.co/spaces/DamarJati/FLUX.1-DEV-Canny),
  [gokaygokay/FLUX-Prompt-Generator](https://huggingface.co/spaces/gokaygokay/FLUX-Prompt-Generator).
 """
@@ -305,4 +308,5 @@ def enhance_prompt(input_prompt):
 
 
 load_prompt_enhancer.zerogpu = True
-fuse_loras.zerogpu = True
+fuse_loras.zerogpu = True
+