Update app.py

app.py

@@ -41,7 +41,6 @@ else:
 
 pipe = FluxPipeline.from_pretrained(model, torch_dtype=torch.bfloat16).to(device)
 pipe.load_lora_weights(default_lora, weight_name = default_weight_name) # default load lora
-pipe.fuse_lora(lora_scale=0.9)
 
 def scrape_lora_link(url):
     try:
@@ -65,7 +64,7 @@ def scrape_lora_link(url):
     except requests.RequestException as e:
         raise gr.Error(f"An error occurred while fetching the URL: {e}")
 
-def enable_lora(lora_scale,lora_add,progress=gr.Progress(track_tqdm=True)):
+def enable_lora(lora_add,progress=gr.Progress(track_tqdm=True)):
     pipe.unload_lora_weights()
     if not lora_add:
         gr.Info("No Lora Loaded, Use basemodel")
@@ -76,13 +75,11 @@ def enable_lora(lora_scale,lora_add,progress=gr.Progress(track_tqdm=True)):
         if lora_name:
             print(f'lora loading: {lora_add}/{lora_name}')
             pipe.load_lora_weights(lora_add, weight_name=lora_name)
-            pipe.fuse_lora(lora_scale=lora_scale)
             gr.Info(f"{lora_add} Loaded")
             return gr.update(label="LoRA Loaded Now")
         else:
             try:
                 pipe.load_lora_weights(lora_add)
-                pipe.fuse_lora(lora_scale=lora_scale)
                 gr.Info(f"{lora_add} Loaded")
                 return gr.update(label="LoRA Loaded Now")
             except:
@@ -92,6 +89,7 @@ def enable_lora(lora_scale,lora_add,progress=gr.Progress(track_tqdm=True)):
 def generate_image(
     prompt:str,
     lora_word:str,
+    lora_scale:float=0.0,
     width:int=768,
     height:int=1024,
     scales:float=3.5,
@@ -106,7 +104,8 @@ def generate_image(
         seed = random.randint(0, MAX_SEED)
     seed = int(seed)
     
-    text = str(translator.translate(prompt, 'English')) + "," + lora_word
+    prompt = str(translator.translate(prompt, 'English')) 
+    text = f"{prompt} {lora_word}"
 
     print(f"Prompt: {text}")
 
@@ -122,6 +121,7 @@ def generate_image(
         max_sequence_length=512,
         num_images_per_prompt=nums,
         generator=generator,
+        joint_attention_kwargs={"scale": lora_scale},
     ).images
 
     return image, seed
@@ -218,7 +218,7 @@ with gr.Blocks(css=CSS, js=JS, theme="Nymbo/Nymbo_Theme") as demo:
         examples_per_page=4,
     )
 
-    load_lora.click(fn=enable_lora, inputs=[lora_scale,lora_add], outputs=lora_add)
+    load_lora.click(fn=enable_lora, inputs=[lora_add], outputs=lora_add)
     
     gr.on(
         triggers=[
@@ -229,6 +229,7 @@ with gr.Blocks(css=CSS, js=JS, theme="Nymbo/Nymbo_Theme") as demo:
         inputs=[
             prompt,
             lora_word,
+            lora_scale,
             width, 
             height, 
             scales,