Upload app.py

app.py

@@ -86,16 +86,22 @@ with gr.Blocks(css=css) as demo:
         gr.Markdown("<br>" * 10)
 
         with gr.Row():
-            prompt = gr.Text(label="Prompt", show_label=False, max_lines=1, placeholder="Enter your prompt", value="", container=False)
+            prompt = gr.Text(
+                label="Prompt", show_label=False, max_lines=1,
+                placeholder="Enter your prompt",
+                value="", container=False,
+            )
             run_button = gr.Button("Generate", scale=0, interactive=False)
-            # <<< 変更: UIの状態管理を行わないため、ボタンは常に表示・有効
             consecutive_button = gr.Button("Consecutive", scale=0, variant="primary", interactive=False)
-            stop_button = gr.Button("Stop", scale=0, variant="stop", interactive=False)
+            stop_button = gr.Button("Stop", scale=0, variant="stop", visible=False)
             lock_button = gr.Button("Lock", scale=0, variant="secondary")
             clear_button = gr.Button("Trash", scale=0, variant="secondary")
             
         with gr.Accordion("Advanced Settings", open=False):
-            negative_prompt = gr.Text(label="Negative prompt", max_lines=1, placeholder="Enter a negative prompt", value="bad quality, low quality, worst quality, worst detail")
+            negative_prompt = gr.Text(
+                label="Negative prompt", max_lines=1, placeholder="Enter a negative prompt",
+                value="bad quality, low quality, worst quality, worst detail"
+            )
             seed = gr.Slider(label="Seed", minimum=0, maximum=MAX_SEED, step=1, value=0)
             randomize_seed = gr.Checkbox(label="Randomize seed", value=True)
             with gr.Row():
@@ -115,24 +121,50 @@ with gr.Blocks(css=css) as demo:
             inputs=[prompt],
             label="Examples (Click to copy to prompt)"
         )
-
-    # UIの状態管理を行う関数はすべて削除
     
+    # 連続生成のループ処理 (この関数は変更なし)
     def generation_loop(prompt, negative_prompt, current_seed, randomize_seed, width, height, guidance_scale, num_inference_steps, interval_sec):
-        # 最初の1枚を即時生成
-        image, new_seed = infer(prompt, negative_prompt, current_seed, True, width, height, guidance_scale, num_inference_steps)
-        yield {result: image, seed: new_seed}
-        
-        # 2枚目以降をループで生成
-        try:
-            while True:
-                time.sleep(interval_sec)
-                image, new_seed = infer(prompt, negative_prompt, new_seed, True, width, height, guidance_scale, num_inference_steps)
+        while True:
+            try:
+                image, new_seed = infer(prompt, negative_prompt, current_seed, True, width, height, guidance_scale, num_inference_steps)
                 yield {result: image, seed: new_seed}
-        except gr.exceptions.CancelledError:
-            print("Generation loop cancelled by user.")
-            return
+                time.sleep(interval_sec)
+            except gr.exceptions.CancelledError:
+                # ユーザーがStopボタンを押したときに発生する例外をキャッチ
+                print("Generation loop cancelled by user.")
+                # ループを正常に終了させる
+                break
+
+    # --- 削除 ---
+    # 多くのUIコンポーネントを管理していたリストは不要になったため削除
+    # ui_components = [ ... ]
+
+    # --- 変更 ---
+    # 連続生成開始時の処理を簡略化
+    def start_consecutive(prompt_text):
+        if not prompt_text.strip():
+            raise gr.Error("Prompt cannot be empty.")
+        
+        # UI全体の無効化をやめ、最低限のボタン制御のみ行う
+        return {
+            consecutive_button: gr.update(visible=False),
+            stop_button: gr.update(visible=True),
+            run_button: gr.update(interactive=False), # 通常のGenerateボタンは無効化
+        }
+
+    # --- 変更 ---
+    # 連続生成停止時の処理を簡略化
+    def stop_consecutive(prompt_text, is_locked):
+        is_prompt_valid = bool(prompt_text.strip())
+        
+        # UI全体の有効化をやめ、最低限のボタン制御のみ元に戻す
+        return {
+            consecutive_button: gr.update(visible=True, interactive=is_prompt_valid),
+            stop_button: gr.update(visible=False),
+            run_button: gr.update(interactive=is_prompt_valid and not is_locked),
+        }
 
+    # 以下のUI制御ロジックは元のまま変更なし
     def toggle_lock(is_locked, current_prompt):
         new_lock_state = not is_locked
         if new_lock_state:
@@ -141,4 +173,70 @@ with gr.Blocks(css=css) as demo:
             is_prompt_valid = bool(current_prompt.strip())
             return False, gr.update(value="Lock"), gr.update(interactive=is_prompt_valid)
     
-    # プロンプト入力に応じて
+    def update_buttons_state(prompt_text, is_locked):
+        is_prompt_valid = bool(prompt_text.strip())
+        run_interactive = is_prompt_valid and not is_locked
+        consecutive_interactive = is_prompt_valid
+        return {
+            run_button: gr.update(interactive=run_interactive),
+            consecutive_button: gr.update(interactive=consecutive_interactive)
+        }
+
+    prompt.change(
+        fn=update_buttons_state,
+        inputs=[prompt, lock_state],
+        outputs=[run_button, consecutive_button],
+    )
+
+    lock_button.click(
+        fn=toggle_lock,
+        inputs=[lock_state, prompt],
+        outputs=[lock_state, lock_button, run_button],
+    )
+    
+    clear_button.click(
+        fn=None,
+        inputs=None,
+        outputs=[prompt, run_button, consecutive_button, lock_button, lock_state],
+        js="""
+        function() {
+            return ["", { "interactive": false, "__type__": "update" }, { "interactive": false, "__type__": "update" }, { "value": "Lock", "__type__": "update" }, false];
+        }
+        """
+    )
+
+    run_button.click(
+        fn=infer,
+        inputs=[prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps],
+        outputs=[result, seed]
+    )
+
+    gen_inputs = [
+        prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps,
+        interval_seconds
+    ]
+    
+    # --- 変更 ---
+    # consecutive_button.click イベントの outputs を修正
+    consecutive_event = consecutive_button.click(
+        fn=start_consecutive,
+        inputs=[prompt],
+        # 更新対象を実際に変更するコンポーネントのみに限定
+        outputs=[consecutive_button, stop_button, run_button]
+    ).then(
+        fn=generation_loop,
+        inputs=gen_inputs,
+        outputs=[result, seed]
+    )
+
+    # --- 変更 ---
+    # stop_button.click イベントの outputs を修正
+    stop_button.click(
+        fn=stop_consecutive,
+        inputs=[prompt, lock_state],
+        # 更新対象を実際に変更するコンポーネントのみに限定
+        outputs=[consecutive_button, stop_button, run_button],
+        cancels=[consecutive_event]
+    )
+
+demo.queue().launch()