Update app.py

app.py

@@ -229,8 +229,11 @@ def greet():
     return [{"role": "assistant", "content": "Welcome! Please log in to Hugging Face and provide your Google AI Studio API key to start building Spaces. Once ready, type 'generate me a gradio app called myapp' or 'create' to begin."}]
 
 # Helper function to update send button interactivity based on prereqs
-# FIXED: Added *args, **kwargs back for debugging purposes to see what is passed
-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:
+# MODIFIED: Signature takes exactly 4 inputs, removed *args, **kwargs
+# FIXED: Return type hint corrected to gr.update
+# MODIFIED: Internal logic uses bool() check for simplicity
+# REMOVED: problematic debug prints involving *args, **kwargs
+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:
     """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,9 +243,6 @@ 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: Type={type(gemini_key)}, Value={api_key_display}")
     print(f"  Received gemini_model: Type={type(gemini_model)}, Value={gemini_model}")
-    # DEBUG PRINTS for unexpected args/kwargs
-    print(f"  Received *args: {args}")
-    print(f"  Received **kwargs: {kwargs}")
     # --- END ENHANCED DEBUGGING LOGS ---
 
     is_logged_in    = hf_profile is not None and hf_token is not None
@@ -267,6 +267,7 @@ def check_send_button_ready(hf_profile: gr.OAuthProfile | None, hf_token: gr.OAu
 # It MUST also yield/return ALL state variables in the same order they appear in the `outputs` list of the `.click()` event.
 # MODIFIED: Input parameter names align with renamed states for clarity
 # MODIFIED: Output tuple includes renamed gemini state variables
+# REMOVED: *args, **kwargs from signature
 def ai_workflow_chat(
     message: str,
     history: list[dict],
@@ -287,7 +288,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 (e.g. old value, event data)
+    # Absorb potential extra args passed by Gradio event listeners (e.g. old value, event data) - RE-ADDED for safety in generator context
     *args,
     **kwargs
 ) -> tuple[
@@ -925,7 +926,6 @@ Return **only** the python code block for app.py. Do not include any extra text,
         error_message = f"Workflow step failed unexpectedly ({state}): {e}. Click 'Send' to re-attempt this step or 'reset'."
         history = add_bot_message(history, error_message)
         print(f"Critical Error in state {state}: {e}") # Log the error for debugging purposes
-        # Yield an error state and reset essential workflow variables on critical failure
         yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                None, None, None, use_grounding,
                current_gemini_key, current_gemini_model) # Include use_grounding and Gemini states
@@ -962,6 +962,8 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
         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():
@@ -1034,55 +1036,75 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
 
             # --- 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
+            )
 
-            # Handle login button click: Update profile/token state -> Check prereqs and update button interactivity
-            # LoginButton outputs a tuple (OAuthProfile, OAuthToken) on success
+
+            # 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] # Update HF State variables
-            ).then( # Chain the next action after state is updated
-                 # Call the update function and bind its output to the button component
-                 check_send_button_ready,
-                 inputs=send_button_interactive_binding_inputs, # Use the explicit list with renamed states
-                 outputs=[send_btn] # Update button interactivity using gr.update return value
-            )
+                 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 -> Check prereqs and update button interactivity
-            # This chain is crucial for the new key handling logic
+            # 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] # Update RENAMED gemini_api_key_state with textbox value
+                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
-            ).then(
-                # Call the update function and bind its output to the button component
-                check_send_button_ready,
-                inputs=send_button_interactive_binding_inputs, # Use the explicit list with renamed states
-                outputs=[send_btn] # Update button interactivity using gr.update return value
-            )
+            ) # Removed .then(check_send_button_ready, ...)
 
-            # Handle Gemini Model Selector change: Update model state -> Configure Gemini status -> Check prereqs and update button interactivity
-            # This chain is crucial for the new key handling logic
+            # 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] # Update RENAMED gemini_model_state with selected model
+                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
-            ).then(
-                # Call the update function and bind its output to the button component
-                check_send_button_ready,
-                inputs=send_button_interactive_binding_inputs, # Use the explicit list with renamed states
-                outputs=[send_btn] # Update button interactivity using gr.update return value
-            )
+            ) # Removed .then(check_send_button_ready, ...)
+
 
             # Handle Grounding checkbox change: update grounding state
             use_grounding_checkbox.change(
@@ -1107,6 +1129,8 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             # 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=[
@@ -1140,29 +1164,19 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
     # --- Initial Load Event Chain (Defined INSIDE gr.Blocks, AFTER components and initial bindings) ---
     # This chain runs once when the app loads
     ai_builder_tab.load(
-        # Action 1: Show profile (loads cached login if available), does NOT need inputs
+        # Action 1: Show profile (loads cached login if available)
+        # This calls show_profile, which updates the login_status UI.
+        # The LoginButton component itself implicitly handles updating hf_profile/hf_token states on load if cached creds exist.
         show_profile,
         inputs=None,
-        outputs=login_status # Update login status markdown
+        outputs=login_status # Updates UI
     ).then(
-        # Action 2: Configure Gemini using the initial state values.
-        # Since gemini_api_key_state state starts as "", this will initially show a "key is not set" message.
-        # Use RENAMED state variables as inputs
+        # 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],
+        inputs=[gemini_api_key_state, gemini_model_state], # Use RENAMED state variables as inputs
         outputs=[gemini_status] # Update Gemini status display
-    ).then(
-        # Action 3: Check prereqs and update send button interactivity based on initial states.
-        # Since gemini_api_key_state state starts as "", button will initially be disabled.
-        check_send_button_ready,
-        inputs=send_button_interactive_binding_inputs, # Use the explicit list with renamed states
-        outputs=[send_btn] # Update button interactivity using gr.update return value
-    ).then(
-        # Action 4: Add the initial welcome message to the chatbot
-        greet,
-        inputs=None,
-        outputs=chatbot
-    )
+    ) # Removed .then(check_send_button_ready, ...). The state changes from LoginButton/Gemini init *should* trigger the .change handlers above.
+    # The greet message will be added automatically by the chat UI initialization.
 
 
 # The main workflow function and other helper functions are correctly defined OUTSIDE the gr.Blocks context