Update app.py

app.py

@@ -426,6 +426,15 @@ def generate_30(
         expanded = expand_prompt(prompt+caption+caption_2)
         expanded_1 = expanded[0]
         expanded_2 = expanded[1]
+
+        expanded_1 = flatten_and_stringify(expanded_1)
+        expanded_1 = " ".join(expanded_1)
+        expanded_2 = flatten_and_stringify(expanded_2)
+        expanded_2 = " ".join(expanded_2)
+        
+        prompt = flatten_and_stringify(prompt+expanded_1+expanded_2)
+        prompt = " ".join(prompt)
+        
         global model
         global txt_tokenizer
         del model
@@ -445,7 +454,6 @@ def generate_30(
                 pil_image_4=sd_image_d,
                 pil_image_5=sd_image_e,
                 prompt=prompt+' '+expanded_1,
-                prompt_2=expanded_2,
                 negative_prompt=negative_prompt,
                 text_scale=text_scale,
                 ip_scale=ip_scale,
@@ -572,6 +580,15 @@ def generate_60(
         expanded = expand_prompt(prompt+caption+caption_2)
         expanded_1 = expanded[0]
         expanded_2 = expanded[1]
+
+        expanded_1 = flatten_and_stringify(expanded_1)
+        expanded_1 = " ".join(expanded_1)
+        expanded_2 = flatten_and_stringify(expanded_2)
+        expanded_2 = " ".join(expanded_2)
+        
+        prompt = flatten_and_stringify(prompt+expanded_1+expanded_2)
+        prompt = " ".join(prompt)
+        
         global model
         global txt_tokenizer
         del model
@@ -591,7 +608,6 @@ def generate_60(
                 pil_image_4=sd_image_d,
                 pil_image_5=sd_image_e,
                 prompt=prompt+' '+expanded_1,
-                prompt_2=expanded_2,
                 negative_prompt=negative_prompt,
                 text_scale=text_scale,
                 ip_scale=ip_scale,
@@ -718,6 +734,15 @@ def generate_90(
         expanded = expand_prompt(prompt+caption+caption_2)
         expanded_1 = expanded[0]
         expanded_2 = expanded[1]
+
+        expanded_1 = flatten_and_stringify(expanded_1)
+        expanded_1 = " ".join(expanded_1)
+        expanded_2 = flatten_and_stringify(expanded_2)
+        expanded_2 = " ".join(expanded_2)
+        
+        prompt = flatten_and_stringify(prompt+expanded_1+expanded_2)
+        prompt = " ".join(prompt)
+        
         global model
         global txt_tokenizer
         del model
@@ -737,7 +762,6 @@ def generate_90(
                 pil_image_4=sd_image_d,
                 pil_image_5=sd_image_e,
                 prompt=prompt+' '+expanded_1,
-                prompt_2=expanded_2,
                 negative_prompt=negative_prompt,
                 text_scale=text_scale,
                 ip_scale=ip_scale,