Upload 3 files

app.py

@@ -11,6 +11,7 @@ import copy
 import random
 import time
 
+
 from mod import (models, clear_cache, get_repo_safetensors, is_repo_name, is_repo_exists,
                  description_ui, num_loras, compose_lora_json, is_valid_lora, fuse_loras,
                  get_trigger_word, enhance_prompt, deselect_lora, num_cns, set_control_union_image,
@@ -21,11 +22,14 @@ from flux import (search_civitai_lora, select_civitai_lora, search_civitai_lora_
 from tagger.tagger import predict_tags_wd, compose_prompt_to_copy
 from tagger.fl2flux import predict_tags_fl2_flux
 
+
+dtype = torch.bfloat16
+#dtype = torch.float8_e4m3fn
 # Initialize the base model
 base_model = models[0]
 controlnet_model_union_repo = 'InstantX/FLUX.1-dev-Controlnet-Union'
 #controlnet_model_union_repo = 'InstantX/FLUX.1-dev-Controlnet-Union-alpha'
-pipe = DiffusionPipeline.from_pretrained(base_model, torch_dtype=torch.bfloat16)
+pipe = DiffusionPipeline.from_pretrained(base_model, torch_dtype=dtype)
 controlnet_union = None
 controlnet = None
 last_model = models[0]
@@ -33,14 +37,13 @@ last_cn_on = False
 
 # https://huggingface.co/InstantX/FLUX.1-dev-Controlnet-Union
 # https://huggingface.co/spaces/jiuface/FLUX.1-dev-Controlnet-Union
-def change_base_model(repo_id: str, cn_on: bool):
+def change_base_model(repo_id: str, cn_on: bool, progress=gr.Progress(track_tqdm=True)):
     global pipe
     global controlnet_union
     global controlnet
     global last_model
     global last_cn_on
-    dtype = torch.bfloat16
-    #dtype = torch.float8_e4m3fn
+    global dtype
     try:
         if (repo_id == last_model and cn_on is last_cn_on) or not is_repo_name(repo_id) or not is_repo_exists(repo_id): return gr.update(visible=True)
         if cn_on:
@@ -65,7 +68,7 @@ def change_base_model(repo_id: str, cn_on: bool):
             print(f"Model loaded: {repo_id}")
     except Exception as e:
         print(f"Model load Error: {e}")
-        raise gr.Error(f"Model load Error: {e}")
+        raise gr.Error(f"Model load Error: {e}") from e
     return gr.update(visible=True)
 
 change_base_model.zerogpu = True
@@ -156,7 +159,7 @@ def generate_image(prompt_mash, steps, seed, cfg_scale, width, height, lora_scal
                 ).images[0]
     except Exception as e:
         print(e)
-        raise gr.Error(f"Inference Error: {e}")
+        raise gr.Error(f"Inference Error {e}") from e
     return image
 
 def run_lora(prompt, cfg_scale, steps, selected_index, randomize_seed, seed, width, height,
@@ -210,7 +213,7 @@ def run_lora(prompt, cfg_scale, steps, selected_index, randomize_seed, seed, wid
     if controlnet is not None: controlnet.to("cpu")
     if controlnet_union is not None: controlnet_union.to("cpu")
     clear_cache()
-    return image, seed  
+    return image, seed
 
 def get_huggingface_safetensors(link):
   split_link = link.split("/")
@@ -299,6 +302,10 @@ css = '''
 .card_internal{display: flex;height: 100px;margin-top: .5em}
 .card_internal img{margin-right: 1em}
 .styler{--form-gap-width: 0px !important}
+#progress{height:30px}
+#progress .generating{display:none}
+.progress-container {width: 100%;height: 30px;background-color: #f0f0f0;border-radius: 15px;overflow: hidden;margin-bottom: 20px}
+.progress-bar {height: 100%;background-color: #4f46e5;width: calc(var(--current) / var(--total) * 100%);transition: width 0.5s ease-in-out}
 #model-info {text-align: center; !important}
 '''
 with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=css, delete_cache=(60, 3600)) as app:
@@ -444,7 +451,7 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=css, delete_cache
         fn=change_base_model,
         inputs=[model_name, cn_on],
         outputs=[result],
-        queue=False,
+        queue=True,
         show_api=False,
         trigger_mode="once",
     ).success(
@@ -457,7 +464,7 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=css, delete_cache
     )
 
     deselect_lora_button.click(deselect_lora, None, [prompt, selected_info, selected_index, width, height], queue=False, show_api=False)
-    gr.on(
+    """gr.on(
         triggers=[model_name.change, cn_on.change],
         fn=change_base_model,
         inputs=[model_name, cn_on],
@@ -465,7 +472,16 @@ with gr.Blocks(theme='Nymbo/Nymbo_Theme', fill_width=True, css=css, delete_cache
         queue=True,
         show_api=False,
         trigger_mode="once",
-    ).then(get_t2i_model_info, [model_name], [model_info], queue=False, show_api=False)
+    ).then(get_t2i_model_info, [model_name], [model_info], queue=True, show_api=False)"""
+    gr.on(
+        triggers=[model_name.change, cn_on.change],
+        fn=get_t2i_model_info,
+        inputs=[model_name], 
+        outputs=[model_info],
+        queue=False,
+        show_api=False,
+        trigger_mode="once",
+    ).then(change_base_model, [model_name, cn_on], [result], queue=True, show_api=False)
     prompt_enhance.click(enhance_prompt, [prompt], [prompt], queue=False, show_api=False)
 
     gr.on(

mod.py

@@ -69,7 +69,7 @@ def is_repo_exists(repo_id):
         if api.repo_exists(repo_id=repo_id): return True
         else: return False
     except Exception as e:
-        print(f"Error: Failed to connect {repo_id}. ")
+        print(f"Error: Failed to connect {repo_id}.")
         print(e)
         return True # for safe
 
@@ -82,6 +82,7 @@ def clear_cache():
         gc.collect()
     except Exception as e:
         print(e)
+        raise Exception(f"Cache clearing error: {e}") from e
 
 
 def deselect_lora():
@@ -108,6 +109,7 @@ def get_repo_safetensors(repo_id: str):
     except Exception as e:
         print(f"Error: Failed to get {repo_id}'s info.")
         print(e)
+        gr.Warning(f"Error: Failed to get {repo_id}'s info.")
         return gr.update(choices=[])
     files = [f for f in files if f.endswith(".safetensors")]
     if len(files) == 0: return gr.update(value="", choices=[])
@@ -290,28 +292,32 @@ def get_trigger_word(lorajson: list[dict]):
 # https://huggingface.co/docs/diffusers/v0.23.1/en/api/loaders#diffusers.loaders.LoraLoaderMixin.fuse_lora
 # https://github.com/huggingface/diffusers/issues/4919
 def fuse_loras(pipe, lorajson: list[dict]):
-    if not lorajson or not isinstance(lorajson, list): return
-    a_list = []
-    w_list = []
-    for d in lorajson:
-        if not d or not isinstance(d, dict) or not d["name"] or d["name"] == "None": continue
-        k = d["name"]
-        if is_repo_name(k) and is_repo_exists(k):
-            a_name = Path(k).stem
-            pipe.load_lora_weights(k, weight_name=d["filename"], adapter_name = a_name)
-        elif not Path(k).exists():
-            print(f"LoRA not found: {k}")
-            continue
-        else:
-            w_name = Path(k).name
-            a_name = Path(k).stem
-            pipe.load_lora_weights(k, weight_name = w_name, adapter_name = a_name)
-        a_list.append(a_name)
-        w_list.append(d["scale"])
-    if not a_list: return
-    pipe.set_adapters(a_list, adapter_weights=w_list)
-    pipe.fuse_lora(adapter_names=a_list, lora_scale=1.0)
-    #pipe.unload_lora_weights()
+    try:
+        if not lorajson or not isinstance(lorajson, list): return
+        a_list = []
+        w_list = []
+        for d in lorajson:
+            if not d or not isinstance(d, dict) or not d["name"] or d["name"] == "None": continue
+            k = d["name"]
+            if is_repo_name(k) and is_repo_exists(k):
+                a_name = Path(k).stem
+                pipe.load_lora_weights(k, weight_name=d["filename"], adapter_name = a_name)
+            elif not Path(k).exists():
+                print(f"LoRA not found: {k}")
+                continue
+            else:
+                w_name = Path(k).name
+                a_name = Path(k).stem
+                pipe.load_lora_weights(k, weight_name = w_name, adapter_name = a_name)
+            a_list.append(a_name)
+            w_list.append(d["scale"])
+        if not a_list: return
+        pipe.set_adapters(a_list, adapter_weights=w_list)
+        pipe.fuse_lora(adapter_names=a_list, lora_scale=1.0)
+        #pipe.unload_lora_weights()
+    except Exception as e:
+        print(f"External LoRA Error: {e}")
+        raise Exception(f"External LoRA Error: {e}") from e
 
 
 def description_ui():

requirements.txt

@@ -1,12 +1,11 @@
 spaces
+torch
 git+https://github.com/huggingface/diffusers
-torch==2.2.0
-torchvision
-huggingface_hub
-accelerate
 transformers
 peft
 sentencepiece
+torchvision
+huggingface_hub
 timm
 einops
 controlnet_aux