Update app.py

app.py

@@ -954,17 +954,6 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
     # New State variable for grounding checkbox
     use_grounding_state = gr.State(False)
 
-    # Define the inputs used for checking prerequisites using the RENAMED states
-    # Moved definition *after* the state variables are defined
-    send_button_interactive_binding_inputs = [
-        hf_profile,
-        hf_token,
-        gemini_api_key_state, # Use new state name
-        gemini_model_state    # Use new state name
-    ]
-    # Define the output for updating the send button interactivity
-    send_button_update_output = [send_btn]
-
 
     with gr.Row():
         # Sidebar column for inputs and status displays
@@ -1022,146 +1011,148 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             # Define chatbot, user_input, send_btn before send_btn.click
             chatbot    = gr.Chatbot(type='messages', label="AI Workflow Chat")
             user_input = gr.Textbox(placeholder="Type your message…", interactive=True)
-            # Define send_btn before its click handler
-            # Initial interactive state will be handled by the load event chain
+            # Define send_btn here, BEFORE it's used in send_button_update_output
             send_btn   = gr.Button("Send") # Starts disabled by default (interactive=False)
 
 
-            # Define iframe, build_txt, run_txt before they are used in send_btn.click inputs/outputs
+            # Define iframe, build_txt, run_txt after send_btn
             # These are UI components, NOT State variables
             iframe    = gr.HTML("<p>No Space created yet.</p>") # HTML element for the Space iframe
             build_txt = gr.Textbox(label="Build Logs", lines=10, interactive=False, value="", max_lines=20) # Set max_lines for scrollability
             run_txt   = gr.Textbox(label="Container Logs", lines=10, interactive=False, value="", max_lines=20) # Set max_lines for scrollability
 
 
-            # --- Define Event Handlers and Chains AFTER all components are defined ---
-
-            # Define the inputs used for checking prerequisites using the RENAMED states
-            # Moved definition *after* the state variables are defined
-            send_button_interactive_binding_inputs = [
-                hf_profile,
-                hf_token,
-                gemini_api_key_state, # Use new state name
-                gemini_model_state    # Use new state name
-            ]
-            # Define the output for updating the send button interactivity
-            send_button_update_output = [send_btn]
-
-            # Trigger check_send_button_ready whenever any prerequisite state changes
-            hf_profile.change(
-                check_send_button_ready,
-                inputs=send_button_interactive_binding_inputs,
-                outputs=send_button_update_output,
-                # run_as_event=True # Added this as a precaution if .change doesn't trigger correctly
-            )
-            hf_token.change(
-                check_send_button_ready,
-                inputs=send_button_interactive_binding_inputs,
-                outputs=send_button_update_output,
-                # run_as_event=True # Added this as a precaution
-            )
-            gemini_api_key_state.change(
-                check_send_button_ready,
-                inputs=send_button_interactive_binding_inputs,
-                outputs=send_button_update_output,
-                # run_as_event=True # Added this as a precaution
-            )
-            gemini_model_state.change(
-                check_send_button_ready,
-                inputs=send_button_interactive_binding_inputs,
-                outputs=send_button_update_output,
-                # run_as_event=True # Added this as a precaution
-            )
-
+    # --- Define Event Handlers and Chains AFTER all components and required lists are defined ---
 
-            # Handle login button click: Update profile/token state -> *Now rely on .change handlers to trigger check_send_button_ready*
-            login_btn.click(
-                 lambda x: (x[0], x[1]),
-                 inputs=[login_btn],
-                 outputs=[hf_profile, hf_token] # Updating these states will trigger their .change handlers
-            ) # Removed .then(check_send_button_ready, ...)
-
-            # Handle Gemini Key Input change: Update key state -> Configure Gemini status -> *Now rely on .change handlers to trigger check_send_button_ready*
-            gemini_input.change(
-                lambda k: k,
-                inputs=[gemini_input],
-                outputs=[gemini_api_key_state] # Updating this state will trigger its .change handler
-            ).then(
-                # Use RENAMED state variables as inputs to configure_gemini
-                configure_gemini,
-                inputs=[gemini_api_key_state, gemini_model_state],
-                outputs=[gemini_status] # Update Gemini status based on new key
-            ) # Removed .then(check_send_button_ready, ...)
-
-            # Handle Gemini Model Selector change: Update model state -> Configure Gemini status -> *Now rely on .change handlers to trigger check_send_button_ready*
-            model_selector.change(
-                lambda m: m,
-                inputs=[model_selector],
-                outputs=[gemini_model_state] # Updating this state will trigger its .change handler
-            ).then(
-                # Use RENAMED state variables as inputs to configure_gemini
-                configure_gemini,
-                inputs=[gemini_api_key_state, gemini_model_state],
-                outputs=[gemini_status] # Update Gemini status based on new model
-            ) # Removed .then(check_send_button_ready, ...)
-
-
-            # Handle Grounding checkbox change: update grounding state
-            use_grounding_checkbox.change(
-                lambda v: v, inputs=use_grounding_checkbox, outputs=use_grounding_state
-            )
+    # Define the inputs used for checking prerequisites using the RENAMED states
+    # This list should be defined AFTER the state variables
+    send_button_interactive_binding_inputs = [
+        hf_profile,
+        hf_token,
+        gemini_api_key_state, # Use new state name
+        gemini_model_state    # Use new state name
+    ]
+    # Define the output for updating the send button interactivity
+    # FIXED: Moved definition to *after* send_btn is defined
+    send_button_update_output = [send_btn]
 
-            # Handle SDK selector change: update sdk state
-            sdk_selector.change(
-                lambda s: s, inputs=sdk_selector, outputs=sdk_state
-            )
 
-            # Link Workflow State variable change to UI status display
-            workflow.change(lambda s: s, inputs=workflow, outputs=status_text)
-
-            # Link Repo ID State variable change to UI status display
-            repo_id.change(lambda r: r if r else "None", inputs=repo_id, outputs=repo_id_text)
-
-
-            # The main event handler for the Send button
-            # This .click() event triggers the ai_workflow_chat generator function
-            # Inputs are read from UI components AND State variables
-            # Outputs are updated by the values yielded from the generator
-            # MODIFIED: Inputs use renamed gemini state variables
-            # MODIFIED: Outputs include renamed gemini state variables
-            # Added back *args, **kwargs to the generator function signature and yield for robustness,
-            # as the previous attempt suggested this might be necessary for state consistency within the generator's lifecycle.
-            send_btn.click(
-                ai_workflow_chat, # The generator function to run
-                inputs=[
-                    user_input, chatbot, # UI component inputs (message, current chat history)
-                    hf_profile, hf_token, # HF State variables
-                    # Pass RENAMED gemini state variables as inputs
-                    gemini_api_key_state, gemini_model_state,
-                    repo_id, workflow, sdk_state, # Workflow State variables
-                    # UI component inputs whose *current values* are needed by the generator
-                    iframe, run_txt, build_txt, # UI component inputs (current values)
-                    debug_attempts, app_description, repo_name_state, generated_code_state, # Other State variables
-                    use_grounding_state # Grounding state input
-                ],
-                outputs=[
-                    chatbot, # Update Chatbot with new messages
-                    repo_id, workflow, # Update workflow State variables
-                    iframe, run_txt, build_txt, # Update UI component outputs
-                    debug_attempts, app_description, repo_name_state, generated_code_state, # Update other State variables
-                    use_grounding_state, # Update the grounding state output
-                    # Include RENAMED gemini state variables in outputs to ensure consistency
-                    gemini_api_key_state, gemini_model_state
-                ]
-            ).success( # Chain a .success() event to run *after* the .click() handler completes without error
-                 # Clear the user input textbox after the message is sent and processed
-                 lambda: gr.update(value=""),
-                 inputs=None,
-                 outputs=user_input # Update the user input textbox
-            )
+    # Trigger check_send_button_ready whenever any prerequisite state changes
+    # These now directly call check_send_button_ready with the specific state variables
+    hf_profile.change(
+        check_send_button_ready,
+        inputs=send_button_interactive_binding_inputs,
+        outputs=send_button_update_output,
+        # run_as_event=True # Removed this unless necessary, simplifies behavior
+    )
+    hf_token.change(
+        check_send_button_ready,
+        inputs=send_button_interactive_binding_inputs,
+        outputs=send_button_update_output,
+        # run_as_event=True # Removed
+    )
+    gemini_api_key_state.change(
+        check_send_button_ready,
+        inputs=send_button_interactive_binding_inputs,
+        outputs=send_button_update_output,
+        # run_as_event=True # Removed
+    )
+    gemini_model_state.change(
+        check_send_button_ready,
+        inputs=send_button_interactive_binding_inputs,
+        outputs=send_button_update_output,
+        # run_as_event=True # Removed
+    )
+
+
+    # Handle login button click: Update profile/token state -> Their .change handlers trigger check_send_button_ready
+    login_btn.click(
+         lambda x: (x[0], x[1]),
+         inputs=[login_btn],
+         outputs=[hf_profile, hf_token] # Updating these states will trigger their .change handlers
+    ) # Removed .then(check_send_button_ready, ...)
+
+    # Handle Gemini Key Input change: Update key state -> Configure Gemini status -> State .change handler triggers check_send_button_ready
+    gemini_input.change(
+        lambda k: k,
+        inputs=[gemini_input],
+        outputs=[gemini_api_key_state] # Updating this state will trigger its .change handler
+    ).then(
+        # Use RENAMED state variables as inputs to configure_gemini
+        configure_gemini,
+        inputs=[gemini_api_key_state, gemini_model_state],
+        outputs=[gemini_status] # Update Gemini status based on new key
+    ) # Removed .then(check_send_button_ready, ...)
+
+    # Handle Gemini Model Selector change: Update model state -> Configure Gemini status -> State .change handler triggers check_send_button_ready
+    model_selector.change(
+        lambda m: m,
+        inputs=[model_selector],
+        outputs=[gemini_model_state] # Updating this state will trigger its .change handler
+    ).then(
+        # Use RENAMED state variables as inputs to configure_gemini
+        configure_gemini,
+        inputs=[gemini_api_key_state, gemini_model_state],
+        outputs=[gemini_status] # Update Gemini status based on new model
+    ) # Removed .then(check_send_button_ready, ...)
+
+
+    # Handle Grounding checkbox change: update grounding state
+    use_grounding_checkbox.change(
+        lambda v: v, inputs=use_grounding_checkbox, outputs=use_grounding_state
+    )
+
+    # Handle SDK selector change: update sdk state
+    sdk_selector.change(
+        lambda s: s, inputs=sdk_selector, outputs=sdk_state
+    )
+
+    # Link Workflow State variable change to UI status display
+    workflow.change(lambda s: s, inputs=workflow, outputs=status_text)
+
+    # Link Repo ID State variable change to UI status display
+    repo_id.change(lambda r: r if r else "None", inputs=repo_id, outputs=repo_id_text)
+
+
+    # The main event handler for the Send button
+    # This .click() event triggers the ai_workflow_chat generator function
+    # Inputs are read from UI components AND State variables
+    # Outputs are updated by the values yielded from the generator
+    # MODIFIED: Inputs use renamed gemini state variables
+    # MODIFIED: Outputs include renamed gemini state variables
+    # Added back *args, **kwargs to the generator function signature and yield for robustness,
+    # as the previous attempt suggested this might be necessary for state consistency within the generator's lifecycle.
+    send_btn.click(
+        ai_workflow_chat, # The generator function to run
+        inputs=[
+            user_input, chatbot, # UI component inputs (message, current chat history)
+            hf_profile, hf_token, # HF State variables
+            # Pass RENAMED gemini state variables as inputs
+            gemini_api_key_state, gemini_model_state,
+            repo_id, workflow, sdk_state, # Workflow State variables
+            # UI component inputs whose *current values* are needed by the generator
+            iframe, run_txt, build_txt, # UI component inputs (current values)
+            debug_attempts, app_description, repo_name_state, generated_code_state, # Other State variables
+            use_grounding_state # Grounding state input
+        ],
+        outputs=[
+            chatbot, # Update Chatbot with new messages
+            repo_id, workflow, # Update workflow State variables
+            iframe, run_txt, build_txt, # Update UI component outputs
+            debug_attempts, app_description, repo_name_state, generated_code_state, # Update other State variables
+            use_grounding_state, # Update the grounding state output
+            # Include RENAMED gemini state variables in outputs to ensure consistency
+            gemini_api_key_state, gemini_model_state
+        ]
+    ).success( # Chain a .success() event to run *after* the .click() handler completes without error
+         # Clear the user input textbox after the message is sent and processed
+         lambda: gr.update(value=""),
+         inputs=None,
+         outputs=user_input # Update the user input textbox
+    )
 
 
-    # --- Initial Load Event Chain (Defined INSIDE gr.Blocks, AFTER components and initial bindings) ---
+    # --- Initial Load Event Chain (Defined INSIDE gr.Blocks, AFTER components and required lists are defined) ---
     # This chain runs once when the app loads
     ai_builder_tab.load(
         # Action 1: Show profile (loads cached login if available)