Update app.py

app.py

@@ -38,7 +38,11 @@ def get_upscale_finegrain(prompt, img_path, upscale_factor):
 
 async def gen(prompt, basemodel, width, height, scales, steps, seed, upscale_factor, process_upscale, lora_model, process_lora):
     model = enable_lora(lora_model, basemodel) if process_lora else basemodel
-    image, seed = await generate_image(prompt, model, "", width, height, scales, steps, seed)
+    
+    improved_prompt = await improve_prompt(prompt)
+    combined_prompt = f"{prompt} {improved_prompt}"
+
+    image, seed = await generate_image(combined_prompt, model, "", width, height, scales, steps, seed)
     
     if isinstance(image, str) and image.startswith("Error"):
         return [image, None]
@@ -47,7 +51,7 @@ async def gen(prompt, basemodel, width, height, scales, steps, seed, upscale_fac
     image.save(image_path, format="JPEG")
     
     if process_upscale:
-        upscale_image_path = get_upscale_finegrain(prompt, image_path, upscale_factor)
+        upscale_image_path = get_upscale_finegrain(combined_prompt, image_path, upscale_factor)
         if upscale_image_path is not None:
             upscale_image = Image.open(upscale_image_path)
             upscale_image.save("upscale_image.jpg", format="JPEG")
@@ -57,9 +61,9 @@ async def gen(prompt, basemodel, width, height, scales, steps, seed, upscale_fac
     else:
         return [image_path, image_path]
 
-def improve_prompt(prompt):
+async def improve_prompt(prompt):
     try:
-        instruction = "Mejora mi prompt y desarrolla mi idea para texto a imagen en inglés con estilo para el modelo FLUX, cinematografía, cámaras, atmósfera e iluminación para la mejor calidad, de máximo 200 palabras."
+        instruction = "Mejora mi prompt para texto a imagen en inglés con estilo, cinematografía, cámaras, atmósfera e iluminación para la mejor calidad, de máximo 200 palabras."
         formatted_prompt = f"{instruction}: {prompt}"
         response = llm_client.text_generation(formatted_prompt, max_new_tokens=200)
         improved_text = response['generated_text'].strip() if 'generated_text' in response else response.strip()
@@ -79,13 +83,18 @@ with gr.Blocks(css=css, theme="Nymbo/Nymbo_Theme") as demo:
                 output_res = ImageSlider(label="Flux / Upscaled")
             with gr.Column(scale=2):
                 prompt = gr.Textbox(label="Descripción de imágen")
-                improved_prompt = gr.Textbox(label="Mejorada mi idea", interactive=False)
-                improve_btn = gr.Button("Mejora mi prompt")
                 basemodel_choice = gr.Dropdown(label="Modelo", choices=["black-forest-labs/FLUX.1-schnell", "black-forest-labs/FLUX.1-DEV"], value="black-forest-labs/FLUX.1-schnell")
                 lora_model_choice = gr.Dropdown(label="LORA Realismo", choices=["Shakker-Labs/FLUX.1-dev-LoRA-add-details", "XLabs-AI/flux-RealismLora"], value="XLabs-AI/flux-RealismLora")
+                
                 with gr.Row():
-                                    process_lora = gr.Checkbox(label="Procesar LORA")
-                                    process_upscale = gr.Checkbox(label="Procesar Escalador")
+                    process_lora = gr.Checkbox(label="Procesar LORA")
+                    process_upscale = gr.Checkbox(label="Procesar Escalador")
+
+                upscale_factor = gr.Radio(label="Factor de Escala", choices=[2, 4, 8], value=2)
+
+                improved_prompt = gr.Textbox(label="Prompt Mejorado", interactive=False)
+
+                improve_btn = gr.Button("Mejora mi prompt")
                 improve_btn.click(fn=improve_prompt, inputs=[prompt], outputs=improved_prompt)
                 
                 with gr.Accordion(label="Opciones Avanzadas", open=False):
@@ -93,9 +102,8 @@ with gr.Blocks(css=css, theme="Nymbo/Nymbo_Theme") as demo:
                     height = gr.Slider(label="Alto", minimum=512, maximum=1280, step=8, value=768)
                     scales = gr.Slider(label="Escalado", minimum=1, maximum=20, step=1, value=10)
                     steps = gr.Slider(label="Pasos", minimum=1, maximum=100, step=1, value=20)
-                    upscale_factor = gr.Radio(label="Factor de Escala", choices=[2, 4, 8], value=2)
                     seed = gr.Number(label="Semilla", value=-1)
     
                 btn = gr.Button("Generar")
-                btn.click(fn=gen, inputs=[improved_prompt, basemodel_choice, width, height, scales, steps, seed, upscale_factor, process_upscale, lora_model_choice, process_lora], outputs=output_res)
-    demo.launch()
+                btn.click(fn=gen, inputs=[prompt, basemodel_choice, width, height, scales, steps, seed, upscale_factor, process_upscale, lora_model_choice, process_lora], outputs=output_res)
+    demo.launch()