Update app.py

app.py

@@ -256,7 +256,7 @@ 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
-# This function has the clean signature it expects. Wrappers handle Gradio's argument passing.
+# This function has the clean signature it expects. Lambdas handle Gradio's argument passing.
 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 ---
@@ -279,84 +279,6 @@ def check_send_button_ready(hf_profile: gr.OAuthProfile | None, hf_token: gr.OAu
 
     return gr.update(interactive=is_ready)
 
-# --- Wrappers to handle Gradio's argument passing in event chains ---
-# These wrappers accept whatever Gradio passes (*args, **kwargs) and call the target function
-# with the specific arguments it expects, extracted from *args based on the expected call signature.
-
-# Wrapper for functions called in .then() chains with specific inputs list: expects (prev_output, *input_values)
-# e.g., .then(wrapper, inputs=[s1, s2]) -> wrapper receives (prev_out, s1_val, s2_val)
-def wrapper_from_then_inputs(func, num_inputs):
-    def wrapped(*args, **kwargs):
-        # We expect num_inputs values at the end of *args, after prev_output (index 0)
-        if len(args) > num_inputs:
-            required_args = args[-num_inputs:]
-            try:
-                return func(*required_args)
-            except Exception as e:
-                print(f"Error calling wrapped function {func.__name__} with args {required_args}: {e}")
-                # Provide a fallback or re-raise depending on context
-                if func == configure_gemini: return f"❌ Error configuring Gemini: {e}"
-                if func == get_model_description: return f"Error getting description: {e}"
-                if func == check_send_button_ready: return gr.update(interactive=False)
-                raise # Re-raise if no specific fallback
-        else:
-            print(f"Warning: wrapper_from_then_inputs for {func.__name__} received unexpected args (expecting at least {num_inputs+1}): {args}")
-            # Provide a fallback or re-raise
-            if func == configure_gemini: return "❌ Error configuring Gemini: unexpected arguments received."
-            if func == get_model_description: return "No description available (unexpected arguments received)."
-            if func == check_send_button_ready: return gr.update(interactive=False)
-            raise ValueError(f"Unexpected args received for {func.__name__}: {args}")
-    return wrapped
-
-# Wrapper for functions called by .change() trigger with specific inputs list: expects (changed_value, *input_values)
-# e.g., component.change(wrapper, inputs=[s1, s2]) -> wrapper receives (changed_val, s1_val, s2_val)
-def wrapper_from_change_inputs(func, num_inputs):
-    def wrapped(*args, **kwargs):
-         # We expect num_inputs values at the end of *args, after the changed_value (index 0)
-         if len(args) > num_inputs:
-              required_args = args[-num_inputs:]
-              try:
-                   return func(*required_args)
-              except Exception as e:
-                   print(f"Error calling wrapped function {func.__name__} with args {required_args}: {e}")
-                   if func == check_send_button_ready: return gr.update(interactive=False)
-                   raise # Re-raise if no specific fallback
-         else:
-              print(f"Warning: wrapper_from_change_inputs for {func.__name__} received unexpected args (expecting at least {num_inputs+1}): {args}")
-              if func == check_send_button_ready: return gr.update(interactive=False)
-              raise ValueError(f"Unexpected args received for {func.__name__}: {args}")
-    return wrapped
-
-
-# Wrapper for functions called in .then() chains with inputs=None: expects (prev_output,)
-# e.g., .then(wrapper, inputs=None) -> wrapper receives (prev_out,)
-def wrapper_from_prev_output(func):
-    def wrapped(*args, **kwargs):
-        # We expect only prev_output, or sometimes nothing if the chain starts
-        if len(args) >= 0: # Just accept anything here
-            try:
-                 # The target function expects 0 args, so call it with no args
-                 return func()
-            except Exception as e:
-                 print(f"Error calling wrapped function {func.__name__} with args {args}: {e}")
-                 # Provide a fallback or re-raise
-                 if func == greet: return [{"role": "assistant", "content": f"❌ Error loading initial message: {e}"}]
-                 raise # Re-raise if no specific fallback
-        else:
-             print(f"Warning: wrapper_from_prev_output for {func.__name__} received unexpected args: {args}")
-             if func == greet: return [{"role": "assistant", "content": "❌ Error loading initial message: unexpected arguments received."}]
-             raise ValueError(f"Unexpected args received for {func.__name__}: {args}")
-    return wrapped
-
-# Instantiate specific wrappers using the generic ones
-wrapper_check_button_change = wrapper_from_change_inputs(check_send_button_ready, 4) # Expects (changed, s1, s2, s3, s4)
-wrapper_check_button_then = wrapper_from_then_inputs(check_send_button_ready, 4)   # Expects (prev_out, s1, s2, s3, s4)
-
-wrapper_configure_gemini_then = wrapper_from_then_inputs(configure_gemini, 2) # Expects (prev_out, s1, s2) -> api_key, model_name
-wrapper_get_model_description_then = wrapper_from_then_inputs(get_model_description, 1) # Expects (prev_out, s1) -> model_name
-
-wrapper_greet_then = wrapper_from_prev_output(greet) # Expects (prev_out,), needs 0 args
-
 
 # This is the main generator function for the workflow, triggered by the 'Send' button
 # Inputs and Outputs list must match exactly. The generator receives values from the inputs list.
@@ -380,9 +302,9 @@ 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 (important for generators)
-    *args, # Generators might receive extra args, need to accept them but don't need to yield unless they are state
-    **kwargs # Generators might receive extra kwargs
+    # Accept any extra args/kwargs passed by Gradio, common for generators
+    *args,
+    **kwargs
 ) -> tuple[
     list[dict],       # 0: Updated chat history (for chatbot)
     str | None,       # 1: Updated repo_id (for repo_id state)
@@ -918,6 +840,9 @@ Return **only** the python code block for app.py. Do not include any extra text,
                          attempts, app_desc, repo_name, generated_code, use_grounding,
                          current_gemini_key, current_gemini_model) # Correctly yielding back the received Gemini states
 
+                  # After uploading a fix, we usually go back to checking logs
+                  state = STATE_CHECKING_LOGS_RUN # Correct transition after upload fix
+
              except Exception as e:
                   history = add_bot_message(history, f"❌ Error generating debug code: {e}. Click 'reset'.")
                   # Yield error message and reset state on failure
@@ -1079,28 +1004,39 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
     # Define the output for updating the send button interactivity
     send_button_update_output = [send_btn]
 
+    # Lambda to pass only the required 4 state inputs to check_send_button_ready,
+    # ignoring the first argument (the changed value) passed by state.change
+    lambda_check_button_from_state_change = lambda changed_value, s1, s2, s3, s4: check_send_button_ready(s1, s2, s3, s4)
+
+    # Lambda to pass only the required 4 state inputs to check_send_button_ready,
+    # ignoring the previous step's output passed by .then
+    lambda_check_button_from_then = lambda prev_output, s1, s2, s3, s4: check_send_button_ready(s1, s2, s3, s4)
+
 
     # Trigger check_send_button_ready whenever any prerequisite state changes
-    # Use the specific change wrapper which expects (changed_value, *input_values)
+    # Use the specific lambda which expects (changed_value, *input_values)
     hf_profile.change(
-        wrapper_check_button_change,
+        lambda_check_button_from_state_change,
         inputs=send_button_interactive_binding_inputs, # Pass all 4 prerequisite states
         outputs=send_button_update_output, # Update only the send button
     )
     hf_token.change(
-        wrapper_check_button_change,
+        lambda_check_button_from_state_change,
         inputs=send_button_interactive_binding_inputs,
         outputs=send_button_update_output,
     )
     # When gemini_api_key_state changes (updated by gemini_input.change), check button readiness
+    # The .then() chain attached to gemini_input.change updates the state *first*, then triggers this change handler.
+    # This change handler receives (new_state_value, *inputs_values).
     gemini_api_key_state.change(
-        wrapper_check_button_change,
+        lambda_check_button_from_state_change,
         inputs=send_button_interactive_binding_inputs,
         outputs=send_button_update_output,
     )
     # When gemini_model_state changes (updated by model_selector.change), check button readiness
+    # This change handler receives (new_state_value, *inputs_values).
     gemini_model_state.change(
-        wrapper_check_button_change,
+        lambda_check_button_from_state_change,
         inputs=send_button_interactive_binding_inputs,
         outputs=send_button_update_output,
     )
@@ -1108,12 +1044,13 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
 
     # 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], # Pass the LoginButton itself to get its output
+         # Lambda takes the LoginButton output (profile, token tuple) which is 2 args: (profile, token)
+         lambda profile, token: (profile, token),
+         inputs=[login_btn], # Pass the LoginButton itself to get its output (its output is a tuple of profile, token)
          outputs=[hf_profile, hf_token] # Update state variables
     )
 
-    # Handle Gemini Key Input change: Update key state -> Configure Gemini status -> Update send button state
+    # Handle Gemini Key Input change: Update key state -> Configure Gemini status
     gemini_input.change(
         # Lambda receives the new value of gemini_input (1 arg) because inputs=None (implied)
         lambda new_key_value: new_key_value,
@@ -1121,14 +1058,20 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
         outputs=[gemini_api_key_state] # This output becomes the implicit first arg for the next .then() in this chain
     ).then(
         # Configure Gemini using the updated state variables
-        # Use the then_inputs wrapper which expects (prev_output, api_key_val, model_name_val)
-        wrapper_configure_gemini_then,
+        # Lambda receives (prev_output, api_key_val, model_name_val) where prev_output is the new key value
+        # It needs to pass api_key_val and model_name_val to configure_gemini.
+        # Note: In this specific chain, prev_output IS the new key value, so we pass args[0] and args[2].
+        # This is fragile! A better approach is to rely *only* on explicit inputs in .then.
+        # Let's use the values from the *states* directly in the .then inputs.
+        lambda prev_output, api_key_val_from_state, model_name_val_from_state: configure_gemini(api_key_val_from_state, model_name_val_from_state),
         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()
+        outputs=[gemini_status] # Update Gemini status display.
     )
-    # The .then chain continues from the outputs of the configure_gemini call, handled by gemini_api_key_state.change handler above
+    # The .then chain continues from the outputs of the configure_gemini call, but no further .then is attached here.
+    # The gemini_api_key_state.change handler (defined above) will pick up the state change.
+
 
-    # Handle Gemini Model Selector change: Update model state -> Update description -> Configure Gemini status -> Update send button state
+    # Handle Gemini Model Selector change: Update model state -> Update description -> Configure Gemini status
     model_selector.change(
         # Lambda receives the new value of model_selector (1 arg)
         lambda new_model_name: new_model_name,
@@ -1136,16 +1079,19 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
         outputs=[gemini_model_state] # This output becomes the implicit first arg for the next .then()
     ).then(
         # Update the model description display
-        # Use the then_inputs wrapper which expects (prev_output, model_name_val)
-        wrapper_get_model_description_then,
+        # Lambda receives (prev_output, model_name_val) where prev_output is the new model name
+        # It needs to pass model_name_val to get_model_description.
+        # Again, fragile. Rely on explicit inputs.
+        lambda prev_output, model_name_val_from_state: get_model_description(model_name_val_from_state),
         inputs=[gemini_model_state], # Get the new state value
-        outputs=[model_description_text] # Update description UI. This output becomes implicit first arg for next .then()
+        outputs=[model_description_text] # Update description UI.
     ).then(
         # Configure Gemini using the updated state variables
-        # Use the then_inputs wrapper which expects (prev_output, api_key_val, model_name_val)
-        wrapper_configure_gemini_then,
+        # Lambda receives (prev_output, api_key_val, model_name_val) where prev_output is the description text
+        # It needs to pass api_key_val and model_name_val to configure_gemini.
+        lambda prev_output, api_key_val_from_state, model_name_val_from_state: configure_gemini(api_key_val_from_state, model_name_val_from_state),
         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()
+        outputs=[gemini_status] # Update Gemini status display.
     )
     # The .then chain continues from the outputs of the configure_gemini call, handled by gemini_model_state.change handler above
 
@@ -1166,7 +1112,6 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
 
     # Link Repo ID State variable change to UI status display
     # Lambda receives the new state value (1 arg) because inputs=None
-    # The warning about receiving 0 args persists, likely ignorable for this lambda
     repo_id.change(lambda new_repo_id_value: new_repo_id_value if new_repo_id_value else "None", inputs=None, outputs=repo_id_text)
 
 
@@ -1178,7 +1123,7 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
     # This call is direct, not in a .then() chain, so it does NOT receive a prev_output arg.
     # It receives args only from the inputs list.
     send_btn.click(
-        ai_workflow_chat, # The generator function to run (signature handles potential extra args, just in case)
+        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
@@ -1208,32 +1153,36 @@ 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 expects 1 arg (profile) or None. It receives 1 from load. Correct.
-        show_profile,
-        inputs=None,
+        # show_profile receives no implicit args from load when inputs=None is used for load itself
+        # (If inputs was not None for load, it would receive those input values first).
+        # Let's use inputs=None for load for simplicity. show_profile expects 1 arg (profile).
+        # How does Gradio handle this for load? The load *function* takes no inputs, but the *event* passes the initial state values.
+        # Let's add a lambda wrapper to be safe.
+        lambda *args: show_profile(args[0] if args else None), # Expects 0 or 1 args, needs 1 for show_profile
+        inputs=[hf_profile], # Pass the initial profile state value
         outputs=login_status # Updates UI. This output becomes the implicit first arg for the next .then()
     ).then(
         # Action 2: Configure Gemini using initial state
-        # Use the then_inputs wrapper which expects (prev_output, api_key_val, model_name_val)
-        wrapper_configure_gemini_then,
+        # Lambda receives (prev_output, api_key_val, model_name_val)
+        lambda prev_output, api_key_val_from_state, model_name_val_from_state: configure_gemini(api_key_val_from_state, model_name_val_from_state),
         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
-        # Use the then_inputs wrapper which expects (prev_output, *prereq_state_values)
-        wrapper_check_button_then,
+        # Lambda receives (prev_output, *prereq_state_values)
+        lambda prev_output, s1, s2, s3, s4: check_send_button_ready(s1, s2, s3, s4),
         inputs=send_button_interactive_binding_inputs, # Pass all 4 prerequisite states
         outputs=send_button_update_output, # Update the send button. This output becomes implicit first arg for next .then()
     ).then(
         # Action 4: Update the model description text based on the default selected model
-        # Use the then_inputs wrapper which expects (prev_output, model_name_val)
-        wrapper_get_model_description_then,
+        # Lambda receives (prev_output, model_name_val)
+        lambda prev_output, model_name_val_from_state: get_model_description(model_name_val_from_state),
         inputs=[gemini_model_state], # Get the default model name from state
         outputs=[model_description_text] # Update description UI. This output becomes implicit first arg for next .then()
     ).then(
         # Action 5: Add the initial welcome message to the chat history
-        # Use the prev_output wrapper which expects (prev_output,)
-        wrapper_greet_then,
+        # Lambda receives (prev_output)
+        lambda prev_output: greet(),
         inputs=None, # Greet takes no explicit inputs
         outputs=chatbot # Updates the chatbot display
     )