Update app.py

app.py

@@ -243,7 +243,7 @@ def uploadNote(prompt,num_inference_steps,guidance_scale,timestamp):
         f.write(f"Model UNET: ford442/RealVisXL_V5.0_BF16 \n")
     upload_to_ftp(filename)
 
-def captioning(img, prompts_array):
+def captioning(img, prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)):
     '''prompts_array = [
         "Adjectives describing this scene are:",
       #  "The color scheme of this image is",
@@ -310,8 +310,17 @@ def captioning(img, prompts_array):
     generated_textb = generated_textb.replace(cap_prompt, "").strip() #Or could try .split(prompt, 1)[-1].strip()
     output_prompt.append(generated_text)
     print(generated_text)
-    # Loop through prompts array:
-    '''
+    prompt_array=[]
+    if prompt_1 in not None:
+            prompt_array.append(prompt_1)
+    if prompt_2 in not None:
+            prompt_array.append(prompt_2)
+    if prompt_3 in not None:
+            prompt_array.append(prompt_3)
+    if prompt_4 in not None:
+            prompt_array.append(prompt_4)
+    if prompt_5 in not None:
+            prompt_array.append(prompt_5)
     for prompt in prompts_array:
         inputs = processor5(images=img, text=prompt, return_tensors="pt").to('cuda')
         #with torch.no_grad():
@@ -350,7 +359,7 @@ def captioning(img, prompts_array):
     response_text = generated_texta.replace(generated_text, "").strip()
     print(f"{response_text}\n")
     output_prompt.append(response_text)
-    '''
+
     output_prompt = " ".join(output_prompt)
     return output_prompt, generated_textb
 
@@ -443,8 +452,12 @@ def generate_30(
     latent_file_3_scale: float = 1.0,
     latent_file_4_scale: float = 1.0,
     latent_file_5_scale: float = 1.0,
-    samples: int = 1,
-    prompt_array: list[str] = None,
+    samples=1,
+    prompt_1: str = "",
+    prompt_2: str = "",
+    prompt_3: str = "",
+    prompt_4: str = "",
+    prompt_5: str = "",
     progress=gr.Progress(track_tqdm=True)  # Add progress as a keyword argument
 ):
     prompt1=None
@@ -462,14 +475,14 @@ def generate_30(
         #sd_image_a.resize((height,width), Image.LANCZOS)
         caption=[]
         #caption.append(captioning(sd_image_a))
-        prompt1, cap=captioning(sd_image_a,prompt_array)
+        prompt1, cap=captioning(sd_image_a,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
         capt.append(cap)
         if latent_file_2 is not None:  # Check if a latent file is provided
             sd_image_b = Image.open(latent_file_2.name).convert('RGB')
             #sd_image_b.resize((height,width), Image.LANCZOS)
             sd_image_b.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_b))
-            prompt2, cap=captioning(sd_image_b,prompt_array)
+            prompt2, cap=captioning(sd_image_b,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_b = None
@@ -478,7 +491,7 @@ def generate_30(
             #sd_image_c.resize((height,width), Image.LANCZOS)
             sd_image_c.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_c))
-            prompt3, cap=captioning(sd_image_c,prompt_array)
+            prompt3, cap=captioning(sd_image_c,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_c = None
@@ -487,7 +500,7 @@ def generate_30(
             #sd_image_d.resize((height,width), Image.LANCZOS)
             sd_image_d.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_d))
-            prompt4, cap=captioning(sd_image_d,prompt_array)
+            prompt4, cap=captioning(sd_image_d,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_d = None
@@ -496,7 +509,7 @@ def generate_30(
             #sd_image_e.resize((height,width), Image.LANCZOS)
             sd_image_e.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_e))
-            prompt5, cap=captioning(sd_image_e,prompt_array)
+            prompt5, cap=captioning(sd_image_e,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_e = None
@@ -595,8 +608,12 @@ def generate_60(
     latent_file_3_scale: float = 1.0,
     latent_file_4_scale: float = 1.0,
     latent_file_5_scale: float = 1.0,
-    samples: int = 1,
-    prompt_array: list[str] = None,
+    samples=1,
+    prompt_1: str = "",
+    prompt_2: str = "",
+    prompt_3: str = "",
+    prompt_4: str = "",
+    prompt_5: str = "",
     progress=gr.Progress(track_tqdm=True)  # Add progress as a keyword argument
 ):
     prompt1=None
@@ -614,14 +631,14 @@ def generate_60(
         #sd_image_a.resize((height,width), Image.LANCZOS)
         caption=[]
         #caption.append(captioning(sd_image_a))
-        prompt1, cap=captioning(sd_image_a,prompt_array)
+        prompt1, cap=captioning(sd_image_a,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
         capt.append(cap)
         if latent_file_2 is not None:  # Check if a latent file is provided
             sd_image_b = Image.open(latent_file_2.name).convert('RGB')
             #sd_image_b.resize((height,width), Image.LANCZOS)
             sd_image_b.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_b))
-            prompt2, cap=captioning(sd_image_b,prompt_array)
+            prompt2, cap=captioning(sd_image_b,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_b = None
@@ -630,7 +647,7 @@ def generate_60(
             #sd_image_c.resize((height,width), Image.LANCZOS)
             sd_image_c.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_c))
-            prompt3, cap=captioning(sd_image_c,prompt_array)
+            prompt3, cap=captioning(sd_image_c,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_c = None
@@ -639,7 +656,7 @@ def generate_60(
             #sd_image_d.resize((height,width), Image.LANCZOS)
             sd_image_d.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_d))
-            prompt4, cap=captioning(sd_image_d,prompt_array)
+            prompt4, cap=captioning(sd_image_d,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_d = None
@@ -648,7 +665,7 @@ def generate_60(
             #sd_image_e.resize((height,width), Image.LANCZOS)
             sd_image_e.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_e))
-            prompt5, cap=captioning(sd_image_e,prompt_array)
+            prompt5, cap=captioning(sd_image_e,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_e = None
@@ -747,9 +764,13 @@ def generate_90(
     latent_file_3_scale: float = 1.0,
     latent_file_4_scale: float = 1.0,
     latent_file_5_scale: float = 1.0,
-    samples: int = 1,
-    prompt_array: list[str] = None,
-    progress=gr.Progress(track_tqdm=True)  # Add progress as a keyword argument
+    samples=1,
+    prompt_1: str = "",
+    prompt_2: str = "",
+    prompt_3: str = "",
+    prompt_4: str = "",
+    prompt_5: str = "",
+    progress=gr.Progress(track_tqdm=True) # Add progress as a keyword argument
 ):
     prompt1=None
     prompt2=None
@@ -766,14 +787,14 @@ def generate_90(
         #sd_image_a.resize((height,width), Image.LANCZOS)
         caption=[]
         #caption.append(captioning(sd_image_a))
-        prompt1, cap=captioning(sd_image_a,prompt_array)
+        prompt1, cap=captioning(sd_image_a,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
         capt.append(cap)
         if latent_file_2 is not None:  # Check if a latent file is provided
             sd_image_b = Image.open(latent_file_2.name).convert('RGB')
             #sd_image_b.resize((height,width), Image.LANCZOS)
             sd_image_b.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_b))
-            prompt2, cap=captioning(sd_image_b,prompt_array)
+            prompt2, cap=captioning(sd_image_b,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_b = None
@@ -782,7 +803,7 @@ def generate_90(
             #sd_image_c.resize((height,width), Image.LANCZOS)
             sd_image_c.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_c))
-            prompt3, cap=captioning(sd_image_c,prompt_array)
+            prompt3, cap=captioning(sd_image_c,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_c = None
@@ -791,7 +812,7 @@ def generate_90(
             #sd_image_d.resize((height,width), Image.LANCZOS)
             sd_image_d.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_d))
-            prompt4, cap=captioning(sd_image_d,prompt_array)
+            prompt4, cap=captioning(sd_image_d,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_d = None
@@ -800,7 +821,7 @@ def generate_90(
             #sd_image_e.resize((height,width), Image.LANCZOS)
             sd_image_e.resize((768,768), Image.LANCZOS)
             #caption.append(captioning(sd_image_e))
-            prompt5, cap=captioning(sd_image_e,prompt_array)
+            prompt5, cap=captioning(sd_image_e,prompt_1,prompt_2,prompt_3,prompt_4,prompt_5)
             capt.append(cap)
         else:
             sd_image_e = None
@@ -994,10 +1015,12 @@ with gr.Blocks(theme=gr.themes.Origin(),css=css) as demo:
                     value="('deformed', 'distorted', 'disfigured':1.3),'not photorealistic':1.5, 'poorly drawn', 'bad anatomy', 'wrong anatomy', 'extra limb', 'missing limb', 'floating limbs', 'poorly drawn hands', 'poorly drawn feet', 'poorly drawn face':1.3, 'out of frame', 'extra limbs', 'bad anatomy', 'bad art', 'beginner',  'distorted face','amateur'",
                     visible=True,
                 )
-                prompts_array = []
-                for i in range(5):  # Create 5 text fields for prompts
-                    prompts_array.append(gr.Textbox(label=f"Prompt {i+1}", lines=1))
-        samples = gr.Slider(
+            prompt_1 = gr.Textbox(label="Custom Prompt 1", lines=2, placeholder="Enter custom prompt 1")
+            prompt_2 = gr.Textbox(label="Custom Prompt 2", lines=2, placeholder="Enter custom prompt 2")
+            prompt_3 = gr.Textbox(label="Custom Prompt 3", lines=2, placeholder="Enter custom prompt 3")
+            prompt_4 = gr.Textbox(label="Custom Prompt 4", lines=2, placeholder="Enter custom prompt 4")
+            prompt_5 = gr.Textbox(label="Custom Prompt 5", lines=2, placeholder="Enter custom prompt 5")
+            samples = gr.Slider(
             label="Samples",
             minimum=0,
             maximum=20,
@@ -1077,7 +1100,11 @@ with gr.Blocks(theme=gr.themes.Origin(),css=css) as demo:
             file_4_strength,
             file_5_strength,
             samples,
-            *prompts_array,  # Pass prompts_array to the generate function
+            prompt_1,
+            prompt_2,
+            prompt_3,
+            prompt_4,
+            prompt_5,
         ],
         outputs=[result],
     )
@@ -1110,7 +1137,11 @@ with gr.Blocks(theme=gr.themes.Origin(),css=css) as demo:
             file_4_strength,
             file_5_strength,
             samples,
-            *prompts_array,  # Pass prompts_array to the generate function
+            prompt_1,
+            prompt_2,
+            prompt_3,
+            prompt_4,
+            prompt_5,
         ],
         outputs=[result],
     )
@@ -1143,7 +1174,11 @@ with gr.Blocks(theme=gr.themes.Origin(),css=css) as demo:
             file_4_strength,
             file_5_strength,
             samples,
-            *prompts_array,  # Pass prompts_array to the generate function
+            prompt_1,
+            prompt_2,
+            prompt_3,
+            prompt_4,
+            prompt_5,
         ],
         outputs=[result],
     )