minor fixes

app_v3.py

@@ -67,12 +67,19 @@ def generate_image(prompt, scale, steps, control_image, controlnet_conditioning_
         ).images[0]
     return image
 
+def combine_caption_focus(caption, focus):
+    if caption is None:
+        caption = ""
+    if focus is None:
+        focus = ""
+    return (caption + "\n\n" + focus).strip()
+
 def generate_caption(control_image):
     if control_image is None:
         return None, None
     
     # Generate a detailed caption
-    mcaption = model.caption(control_image, length="long")
+    mcaption = model.caption(control_image, length="normal")
     detailed_caption = mcaption["caption"]
     print(f"Detailed caption: {detailed_caption}")
     
@@ -80,8 +87,9 @@ def generate_caption(control_image):
 
 def generate_focus(control_image, focus_list):
     if control_image is None:
-        return None, None
-    
+        return None
+    if focus_list is None:
+        return ""
     # Generate a detailed caption
     focus_query = model.query(control_image, "Please provide a concise but illustrative description of the following area(s) of focus: " + focus_list)
     focus_description = focus_query["answer"]
@@ -177,7 +185,10 @@ with gr.Blocks(title="FLUX Turbo Upscaler", fill_height=True) as demo:
         log_prompt = gr.Checkbox(value=True, label="Log", visible=False)  # Changed to visible
     
     gr.Markdown("**Tips:** 8 steps is all you need!")
-    
+
+    caption_state = gr.State()
+    focus_state = gr.State()
+
     generate_button.click(
         fn=process_image,
         inputs=[
@@ -190,12 +201,15 @@ with gr.Blocks(title="FLUX Turbo Upscaler", fill_height=True) as demo:
     control_image.change(
         generate_caption,
         inputs=[control_image],
-        outputs=[prompt]
+        outputs=[caption_state]
     ).then(
         generate_focus,
         inputs=[control_image, focus],
-        outputs=[prompt],
-        _js="(caption, focus) => caption + ' ' + focus"
+        outputs=[prompt]
+    ).then(
+        combine_caption_focus,
+        inputs=[prompt, prompt],
+        outputs=[prompt]
     )
     caption_button.click(
         fn=generate_caption,
@@ -203,4 +217,4 @@ with gr.Blocks(title="FLUX Turbo Upscaler", fill_height=True) as demo:
         outputs=[prompt]
     )
 
-demo.launch(show_error=True)
+demo.launch(show_error=True)