Update app.py

app.py

@@ -230,7 +230,8 @@ def greet():
 
 # Helper function to update send button interactivity based on prereqs
 # Now takes explicit arguments, intended to be called with all necessary states.
-def check_send_button_ready(hf_profile: gr.OAuthProfile | None, hf_token: gr.OAuthToken | None, gemini_key: str | None, gemini_model: str | None) -> gr.update:
+# Modified to accept extra positional and keyword arguments passed by Gradio event chains
+def check_send_button_ready(hf_profile: gr.OAuthProfile | None, hf_token: gr.OAuthToken | None, gemini_key: str | None, gemini_model: str | None, *args, **kwargs) -> gr.update:
     """Checks if HF login and Gemini configuration are complete and returns update for button interactivity."""
     # --- START ENHANCED DEBUGGING LOGS ---
     print("\n--- check_send_button_ready START ---")
@@ -240,6 +241,8 @@ def check_send_button_ready(hf_profile: gr.OAuthProfile | None, hf_token: gr.OAu
     api_key_display = gemini_key[:5] if isinstance(gemini_key, str) and gemini_key else ('Empty String' if isinstance(gemini_key, str) and gemini_key == "" else 'None')
     print(f"  Received gemini_key: Value starts with '{api_key_display}'")
     print(f"  Received gemini_model: {gemini_model}")
+    print(f"  Received extra args: {args}") # Added debug for extra args
+    print(f"  Received extra kwargs: {kwargs}") # Added debug for extra kwargs
     # --- END ENHANCED DEBUGGING LOGS ---
 
     is_logged_in    = hf_profile is not None and hf_token is not None
@@ -252,6 +255,16 @@ def check_send_button_ready(hf_profile: gr.OAuthProfile | None, hf_token: gr.OAu
 
     return gr.update(interactive=is_ready)
 
+# Wrapper function for configure_gemini when called in a .then() chain
+# It accepts the output of the previous function as the first arg and discards it.
+def wrapper_configure_gemini(prev_output, api_key: str | None, model_name: str | None) -> str:
+     return configure_gemini(api_key, model_name)
+
+# Wrapper function for greet when called in a .then() chain
+# It accepts the output of the previous function as the first arg and discards it.
+def wrapper_greet(prev_output):
+     return greet()
+
 
 # This is the main generator function for the workflow, triggered by the 'Send' button
 # NOTE: This function MUST accept ALL state variables as inputs that it might need to modify or pass through.
@@ -278,7 +291,7 @@ def ai_workflow_chat(
     repo_name_state: str | None,
     generated_code_state: str | None,
     use_grounding_state: bool, # Value from use_grounding_checkbox
-    # Absorb potential extra args passed by Gradio event listeners
+    # Absorb potential extra args passed by Gradio event listeners (important for generators)
     *args,
     **kwargs
 ) -> tuple[
@@ -979,59 +992,54 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
 
     # Trigger check_send_button_ready whenever any prerequisite state changes
     # Bind the check function directly. The inputs list passes the required state values.
+    # The check_send_button_ready function signature now handles the implicit first argument.
     hf_profile.change(
-        check_send_button_ready, # Call the core check function directly
-        inputs=send_button_interactive_binding_inputs, # Pass all 4 prerequisite states
-        outputs=send_button_update_output, # Update only the send button
+        check_send_button_ready,
+        inputs=send_button_interactive_binding_inputs,
+        outputs=send_button_update_output,
     )
     hf_token.change(
-        check_send_button_ready, # Call the core check function directly
-        inputs=send_button_interactive_binding_inputs, # Pass all 4 prerequisite states
-        outputs=send_button_update_output, # Update only the send button
-    )
-    # gemini_input.change updates gemini_api_key_state, which triggers gemini_api_key_state.change
-    gemini_api_key_state.change(
-        check_send_button_ready, # Call the core check function directly
-        inputs=send_button_interactive_binding_inputs, # Pass all 4 prerequisite states
-        outputs=send_button_update_output, # Update only the send button
-    )
-    # model_selector.change updates gemini_model_state, which triggers gemini_model_state.change
-    gemini_model_state.change(
-        check_send_button_ready, # Call the core check function directly
-        inputs=send_button_interactive_binding_inputs, # Pass all 4 prerequisite states
-        outputs=send_button_update_output, # Update only the send button
-    )
-
-
-    # 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]), # Lambda takes the LoginButton output (profile, token tuple) and returns it
-         inputs=[login_btn],
-         outputs=[hf_profile, hf_token] # Update state variables
+        check_send_button_ready,
+        inputs=send_button_interactive_binding_inputs,
+        outputs=send_button_update_output,
     )
-
-    # Handle Gemini Key Input change: Update key state -> Configure Gemini status -> State .change handler triggers check_send_button_ready
+    # gemini_input.change updates gemini_api_key_state (in the first lambda).
+    # The .then() chain attached to gemini_input.change will then trigger.
+    # The function in the first .then() will receive the *output* of the previous lambda + its inputs.
+    # This requires the wrapper for configure_gemini.
     gemini_input.change(
-        lambda k: k, # Lambda takes the textbox value and returns it
+        lambda k: k, # Updates gemini_api_key_state
         inputs=[gemini_input],
-        outputs=[gemini_api_key_state] # Update state variable
+        outputs=[gemini_api_key_state] # This output becomes the implicit first arg for the .then() chain
     ).then(
-        # Configure Gemini using the updated state variables
-        configure_gemini,
-        inputs=[gemini_api_key_state, gemini_model_state],
+        # Wrap configure_gemini because it's in a .then() chain and receives the output of the prior step
+        wrapper_configure_gemini, # Use the wrapper
+        inputs=[gemini_api_key_state, gemini_model_state], # Explicitly pass the required states
         outputs=[gemini_status] # Update Gemini status display
+    ).then(
+        # Trigger check_send_button_ready after status update
+        # check_send_button_ready signature now handles the implicit previous output + explicit inputs
+        check_send_button_ready,
+        inputs=send_button_interactive_binding_inputs,
+        outputs=send_button_update_output
     )
 
-    # Handle Gemini Model Selector change: Update model state -> Configure Gemini status -> State .change handler triggers check_send_button_ready
+    # Handle Gemini Model Selector change: Update model state -> Configure Gemini status -> Update send button state
     model_selector.change(
-        lambda m: m, # Lambda takes the radio value and returns it
+        lambda m: m, # Updates gemini_model_state
         inputs=[model_selector],
-        outputs=[gemini_model_state] # Update state variable
+        outputs=[gemini_model_state] # This output becomes the implicit first arg for the .then() chain
     ).then(
-        # Configure Gemini using the updated state variables
-        configure_gemini,
-        inputs=[gemini_api_key_state, gemini_model_state],
+        # Wrap configure_gemini because it's in a .then() chain
+        wrapper_configure_gemini, # Use the wrapper
+        inputs=[gemini_api_key_state, gemini_model_state], # Explicitly pass the required states
         outputs=[gemini_status] # Update Gemini status display
+    ).then(
+        # Trigger check_send_button_ready after status update
+        # check_send_button_ready signature now handles the implicit previous output + explicit inputs
+        check_send_button_ready,
+        inputs=send_button_interactive_binding_inputs,
+        outputs=send_button_update_output
     )
 
 
@@ -1049,18 +1057,14 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
     workflow.change(lambda s: s, inputs=workflow, outputs=status_text)
 
     # Link Repo ID State variable change to UI status display
-    # This binding seems correct and should update the Textbox with the value of repo_id state.
-    # The API key appearing here means the API key value is somehow ending up *in* the repo_id state.
-    repo_id.change(lambda r: r if r else "None", inputs=repo_id, outputs=repo_id_text)
+    # Fix: The lambda here only needs the implicit new value of repo_id, remove inputs=[repo_id]
+    repo_id.change(lambda r: r if r else "None", inputs=None, 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
-    # Ensure inputs and outputs match the ai_workflow_chat signature and yield tuple EXACTLY.
+    # The main event handler for the Send button (generator)
+    # This call is direct, not in a .then() chain, so no implicit previous output is passed
     send_btn.click(
-        ai_workflow_chat, # The generator function to run
+        ai_workflow_chat, # The generator function to run (signature now handles potential args)
         inputs=[
             user_input, chatbot, # UI component inputs (message, current chat history)
             hf_profile, hf_token, # HF State variables
@@ -1090,24 +1094,26 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
     # This chain runs once when the app loads
     ai_builder_tab.load(
         # Action 1: Show profile (loads cached login if available)
-        show_profile,
+        show_profile, # Called directly by load, expects one arg (profile), should handle None initially
         inputs=None,
-        outputs=login_status # Updates UI
+        outputs=login_status # Updates UI. This output becomes the implicit first arg for the next .then()
     ).then(
-        # Action 2: Configure Gemini using initial state (gemini_api_key_state is "", model_state is default)
-        configure_gemini,
-        inputs=[gemini_api_key_state, gemini_model_state],
-        outputs=[gemini_status] # Update Gemini status display
+        # Action 2: Configure Gemini using initial state
+        # Wrap configure_gemini because it's in a .then() chain and receives the output of the prior step (show_profile)
+        wrapper_configure_gemini, # Use the wrapper
+        inputs=[gemini_api_key_state, gemini_model_state], # Explicitly pass the required states
+        outputs=[gemini_status] # Update Gemini status display. This output becomes the implicit first arg for the next .then()
     ).then(
         # Action 3: After initial load checks, update the button state based on initial states
-        # Call check_send_button_ready directly on load with initial state values
+        # check_send_button_ready signature now handles the implicit previous output + explicit inputs
         check_send_button_ready,
         inputs=send_button_interactive_binding_inputs, # Pass all 4 prerequisite states
-        outputs=send_button_update_output, # Update the send button
+        outputs=send_button_update_output, # Update the send button. This output becomes implicit first arg for next .then()
     ).then(
         # Action 4: Add the initial welcome message to the chat history
-        greet,
-        inputs=None,
+        # Wrap greet because it's in a .then() chain and receives the output of the prior step (check_send_button_ready)
+        wrapper_greet, # Use the wrapper
+        inputs=None, # Greet takes no explicit inputs
         outputs=chatbot # Updates the chatbot display
     )