Update app.py

app.py

@@ -361,21 +361,20 @@ def generate_30(
     latent_file_4_scale: float = 1.0,
     latent_file_5_scale: float = 1.0,
     samples=1,
-    progress=gr.Progress(track_tqdm=True)  # Add progress as a keyword argument
-    
+    progress=gr.Progress(track_tqdm=True)
 ):
     global captioner_2
     captioner2=captioner_2
     seed = random.randint(0, MAX_SEED)
     generator = torch.Generator(device='cuda').manual_seed(seed)
-    if latent_file is not None:  # Check if a latent file is provided
+    if latent_file is not None:
         sd_image_a = Image.open(latent_file.name).convert('RGB')
         sd_image_a.resize((224,224), Image.LANCZOS)
         #sd_image_a.resize((height,width), Image.LANCZOS)
         caption=[]
         caption_2=[]
         #caption.append(captioner(sd_image_a))
-        #caption.append(captioner2(sd_image_a))
+        caption.append(captioner2(sd_image_a))
         #caption.append(captioner_3(sd_image_a))
         caption_2.append(captioning(sd_image_a))
         if latent_file_2 is not None:  # Check if a latent file is provided
@@ -521,14 +520,14 @@ def generate_60(
     captioner2=captioner_2
     seed = random.randint(0, MAX_SEED)
     generator = torch.Generator(device='cuda').manual_seed(seed)
-    if latent_file is not None:  # Check if a latent file is provided
+    if latent_file is not None:
         sd_image_a = Image.open(latent_file.name).convert('RGB')
         sd_image_a.resize((224,224), Image.LANCZOS)
         #sd_image_a.resize((height,width), Image.LANCZOS)
         caption=[]
         caption_2=[]
         #caption.append(captioner(sd_image_a))
-        #caption.append(captioner2(sd_image_a))
+        caption.append(captioner2(sd_image_a))
         #caption.append(captioner_3(sd_image_a))
         caption_2.append(captioning(sd_image_a))
         if latent_file_2 is not None:  # Check if a latent file is provided
@@ -579,7 +578,7 @@ def generate_60(
         captions = flatten_and_stringify(captions)
         captions = " ".join(captions)
         print(captions)
-        print("-- generating further caption --")
+        print("-- not generating further caption --")
         global model5
         global processor5
         del captioner2
@@ -595,6 +594,7 @@ def generate_60(
         print(new_prompt)
         print("-- FINAL PROMPT --")
         print("-- ------------ --")
+        
         #global model
         #global txt_tokenizer
         #del model
@@ -673,15 +673,14 @@ def generate_90(
     captioner2=captioner_2
     seed = random.randint(0, MAX_SEED)
     generator = torch.Generator(device='cuda').manual_seed(seed)
-    if latent_file is not None:  # Check if a latent file is provided
+    if latent_file is not None:
         sd_image_a = Image.open(latent_file.name).convert('RGB')
         sd_image_a.resize((224,224), Image.LANCZOS)
         #sd_image_a.resize((height,width), Image.LANCZOS)
         caption=[]
         caption_2=[]
         #caption.append(captioner(sd_image_a))
-        cap=captioner2(sd_image_a)
-        caption.append(cap)
+        caption.append(captioner2(sd_image_a))
         #caption.append(captioner_3(sd_image_a))
         caption_2.append(captioning(sd_image_a))
         if latent_file_2 is not None:  # Check if a latent file is provided
@@ -732,7 +731,7 @@ def generate_90(
         captions = flatten_and_stringify(captions)
         captions = " ".join(captions)
         print(captions)
-        print("-- generating further caption --")
+        print("-- not generating further caption --")
         global model5
         global processor5
         del captioner2
@@ -748,6 +747,7 @@ def generate_90(
         print(new_prompt)
         print("-- FINAL PROMPT --")
         print("-- ------------ --")
+        
         #global model
         #global txt_tokenizer
         #del model