Update app.py

app.py

@@ -257,6 +257,14 @@ def generate_30(
     num_inference_steps: int = 125,
     latent_file = gr.File(),  # Add latents file input
     latent_file_2 = gr.File(),  # Add latents file input
+    latent_file_3 = gr.File(),  # Add latents file input
+    latent_file_4 = gr.File(),  # Add latents file input
+    latent_file_5 = gr.File(),  # Add latents file input
+    latent_file_1_scale: float = 3.8,
+    latent_file_2_scale: float = 3.8,
+    latent_file_3_scale: float = 3.8,
+    latent_file_4_scale: float = 3.8,
+    latent_file_5_scale: float = 3.8,
     samples=1,
     progress=gr.Progress(track_tqdm=True)  # Add progress as a keyword argument
 ):
@@ -268,6 +276,18 @@ def generate_30(
             sd_image_b = Image.open(latent_file_2.name)
         else:
             sd_image_b = None
+        if latent_file_3 is not None:  # Check if a latent file is provided
+            sd_image_c = Image.open(latent_file_3.name)
+        else:
+            sd_image_c = None
+        if latent_file_4 is not None:  # Check if a latent file is provided
+            sd_image_d = Image.open(latent_file_4.name)
+        else:
+            sd_image_d = None
+        if latent_file_5 is not None:  # Check if a latent file is provided
+            sd_image_e = Image.open(latent_file_5.name)
+        else:
+            sd_image_e = None
         timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
         filename= f'rv_IP_{timestamp}.png'
         print("-- using image file --")
@@ -276,9 +296,16 @@ def generate_30(
         sd_image = ip_model.generate(
                 pil_image=sd_image_a,
                 pil_image_2=sd_image_b,
+                pil_image_3=sd_image_c,
+                pil_image_4=sd_image_d,
+                pil_image_5=sd_image_e,
                 prompt=prompt,
                 negative_prompt=negative_prompt,
-                scale=1.0,
+                scale_1=latent_file_1_scale,
+                scale_2=latent_file_2_scale,
+                scale_3=latent_file_3_scale,
+                scale_4=latent_file_4_scale,
+                scale_5=latent_file_5_scale,
                 num_samples=samples,
                 seed=seed,
                 num_inference_steps=num_inference_steps,
@@ -299,7 +326,7 @@ def generate_30(
         print('-- IMAGE REQUIRED --')
     return image_paths
 
-@spaces.GPU(duration=60)
+@spaces.GPU(duration=70)
 def generate_60(
     prompt: str = "",
     negative_prompt: str = "",
@@ -311,6 +338,14 @@ def generate_60(
     num_inference_steps: int = 125,
     latent_file = gr.File(),  # Add latents file input
     latent_file_2 = gr.File(),  # Add latents file input
+    latent_file_3 = gr.File(),  # Add latents file input
+    latent_file_4 = gr.File(),  # Add latents file input
+    latent_file_5 = gr.File(),  # Add latents file input
+    latent_file_1_scale: float = 3.8,
+    latent_file_2_scale: float = 3.8,
+    latent_file_3_scale: float = 3.8,
+    latent_file_4_scale: float = 3.8,
+    latent_file_5_scale: float = 3.8,
     samples=1,
     progress=gr.Progress(track_tqdm=True)  # Add progress as a keyword argument
 ):
@@ -322,6 +357,18 @@ def generate_60(
             sd_image_b = Image.open(latent_file_2.name)
         else:
             sd_image_b = None
+        if latent_file_3 is not None:  # Check if a latent file is provided
+            sd_image_c = Image.open(latent_file_3.name)
+        else:
+            sd_image_c = None
+        if latent_file_4 is not None:  # Check if a latent file is provided
+            sd_image_d = Image.open(latent_file_4.name)
+        else:
+            sd_image_d = None
+        if latent_file_5 is not None:  # Check if a latent file is provided
+            sd_image_e = Image.open(latent_file_5.name)
+        else:
+            sd_image_e = None
         timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
         filename= f'rv_IP_{timestamp}.png'
         print("-- using image file --")
@@ -330,9 +377,16 @@ def generate_60(
         sd_image = ip_model.generate(
                 pil_image=sd_image_a,
                 pil_image_2=sd_image_b,
+                pil_image_3=sd_image_c,
+                pil_image_4=sd_image_d,
+                pil_image_5=sd_image_e,
                 prompt=prompt,
                 negative_prompt=negative_prompt,
-                scale=1.0,
+                scale_1=latent_file_1_scale,
+                scale_2=latent_file_2_scale,
+                scale_3=latent_file_3_scale,
+                scale_4=latent_file_4_scale,
+                scale_5=latent_file_5_scale,
                 num_samples=samples,
                 seed=seed,
                 num_inference_steps=num_inference_steps,
@@ -353,7 +407,7 @@ def generate_60(
         print('-- IMAGE REQUIRED --')
     return image_paths
 
-@spaces.GPU(duration=90)
+@spaces.GPU(duration=100)
 def generate_90(
     prompt: str = "",
     negative_prompt: str = "",
@@ -365,6 +419,14 @@ def generate_90(
     num_inference_steps: int = 125,
     latent_file = gr.File(),  # Add latents file input
     latent_file_2 = gr.File(),  # Add latents file input
+    latent_file_3 = gr.File(),  # Add latents file input
+    latent_file_4 = gr.File(),  # Add latents file input
+    latent_file_5 = gr.File(),  # Add latents file input
+    latent_file_1_scale: float = 3.8,
+    latent_file_2_scale: float = 3.8,
+    latent_file_3_scale: float = 3.8,
+    latent_file_4_scale: float = 3.8,
+    latent_file_5_scale: float = 3.8,
     samples=1,
     progress=gr.Progress(track_tqdm=True)  # Add progress as a keyword argument
 ):
@@ -376,6 +438,18 @@ def generate_90(
             sd_image_b = Image.open(latent_file_2.name)
         else:
             sd_image_b = None
+        if latent_file_3 is not None:  # Check if a latent file is provided
+            sd_image_c = Image.open(latent_file_3.name)
+        else:
+            sd_image_c = None
+        if latent_file_4 is not None:  # Check if a latent file is provided
+            sd_image_d = Image.open(latent_file_4.name)
+        else:
+            sd_image_d = None
+        if latent_file_5 is not None:  # Check if a latent file is provided
+            sd_image_e = Image.open(latent_file_5.name)
+        else:
+            sd_image_e = None
         timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
         filename= f'rv_IP_{timestamp}.png'
         print("-- using image file --")
@@ -384,9 +458,16 @@ def generate_90(
         sd_image = ip_model.generate(
                 pil_image=sd_image_a,
                 pil_image_2=sd_image_b,
+                pil_image_3=sd_image_c,
+                pil_image_4=sd_image_d,
+                pil_image_5=sd_image_e,
                 prompt=prompt,
                 negative_prompt=negative_prompt,
-                scale=1.0,
+                scale_1=latent_file_1_scale,
+                scale_2=latent_file_2_scale,
+                scale_3=latent_file_3_scale,
+                scale_4=latent_file_4_scale,
+                scale_5=latent_file_5_scale,
                 num_samples=samples,
                 seed=seed,
                 num_inference_steps=num_inference_steps,
@@ -452,7 +533,45 @@ with gr.Blocks(theme=gr.themes.Origin(),css=css) as demo:
 
     with gr.Row():
         latent_file = gr.File(label="Image Prompt (Required)")
+        file_1_strength =  gr.Slider(
+            label="Img 1 Str",
+            minimum=0.0,
+            maximum=16.0,
+            step=0.01,
+            value=3.8,
+        )
         latent_file_2 = gr.File(label="Image Prompt 2 (Optional)")
+        file_2_strength =  gr.Slider(
+            label="Img 2 Str",
+            minimum=0.0,
+            maximum=16.0,
+            step=0.01,
+            value=3.8,
+        )
+        latent_file_3 = gr.File(label="Image Prompt 3 (Optional)")
+        file_3_strength =  gr.Slider(
+            label="Img 3 Str",
+            minimum=0.0,
+            maximum=16.0,
+            step=0.01,
+            value=3.8,
+        )
+        latent_file_4 = gr.File(label="Image Prompt 4 (Optional)")
+        file_4_strength =  gr.Slider(
+            label="Img 4 Str",
+            minimum=0.0,
+            maximum=16.0,
+            step=0.01,
+            value=3.8,
+        )
+        latent_file_5 = gr.File(label="Image Prompt 5 (Optional)")
+        file_5_strength =  gr.Slider(
+            label="Img 5 Str",
+            minimum=0.0,
+            maximum=16.0,
+            step=0.01,
+            value=3.8,
+        )
         style_selection = gr.Radio(
             show_label=True,
             container=True,
@@ -541,6 +660,14 @@ with gr.Blocks(theme=gr.themes.Origin(),css=css) as demo:
             num_inference_steps,
             latent_file,
             latent_file_2,
+            latent_file_3,
+            latent_file_4,
+            latent_file_5,
+            file_1_strength,
+            file_2_strength,
+            file_3_strength,
+            file_4_strength,
+            file_5_strength,
             samples,
         ],
         outputs=[result],
@@ -563,6 +690,14 @@ with gr.Blocks(theme=gr.themes.Origin(),css=css) as demo:
             num_inference_steps,
             latent_file,
             latent_file_2,
+            latent_file_3,
+            latent_file_4,
+            latent_file_5,
+            file_1_strength,
+            file_2_strength,
+            file_3_strength,
+            file_4_strength,
+            file_5_strength,
             samples,
         ],
         outputs=[result],
@@ -585,6 +720,14 @@ with gr.Blocks(theme=gr.themes.Origin(),css=css) as demo:
             num_inference_steps,
             latent_file,
             latent_file_2,
+            latent_file_3,
+            latent_file_4,
+            latent_file_5,
+            file_1_strength,
+            file_2_strength,
+            file_3_strength,
+            file_4_strength,
+            file_5_strength,
             samples,
         ],
         outputs=[result],