Update app.py

app.py

@@ -183,8 +183,8 @@ def ai_workflow_chat(
     app_description_state: str | None,
     repo_name_state: str | None,
     generated_code_state: str | None,
-    *args, # Catch extra positional arguments
-    **kwargs # Catch extra keyword arguments
+    *args,
+    **kwargs
 ) -> tuple[
     list[dict],
     str | None,
@@ -224,15 +224,15 @@ def ai_workflow_chat(
         # --- State Machine Logic ---
 
         if state == STATE_IDLE:
-            # Check prerequisites first within the state logic as well
+            # Check prerequisites within the state logic as well
             if not (hf_profile and hf_token):
                 history = add_bot_message(history, "Workflow paused: Please log in to Hugging Face first.")
                 yield history, repo_id, state, updated_preview, updated_run, updated_build, attempts, app_desc, repo_name, generated_code
-                return # Stop workflow until login
+                return
             if not (gemini_api_key and gemini_model):
                  history = add_bot_message(history, "Workflow paused: Please enter your API key and select a Gemini model.")
                  yield history, repo_id, state, updated_preview, updated_run, updated_build, attempts, app_desc, repo_name, generated_code
-                 return # Stop workflow until API key/model set
+                 return
 
             # Look for commands
             reset_match = "reset" in message.lower()
@@ -378,7 +378,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
 
             reqs_content = "\n".join(reqs_list) + "\n"
 
-            history = add_bot_message(history, "✅ `requirements.txt` generated. Click 'Send' to generate README.")
+            history = add_bot_message(history, "✅ `requirements.txt` generated. Click 'Send' to upload.")
             state = STATE_UPLOADING_REQUIREMENTS
             generated_code = reqs_content
             yield history, repo_id, state, updated_preview, updated_run, updated_build, attempts, app_desc, repo_name, generated_code
@@ -527,7 +527,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
              if not fixed_code_to_upload:
                   history = add_bot_message(history, "Internal error: No fixed code available to upload. Resetting.")
                   yield history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0, None, None, None
-                  return
+                 return
 
              history = add_bot_message(history, "☁️ Uploading fixed `app.py`...")
              yield history, repo_id, state, updated_preview, updated_run, updated_build, attempts, app_desc, repo_name, generated_code
@@ -583,15 +583,11 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             ai_builder_tab.load(show_profile, outputs=login_status)
             # Update status on login click
             login_btn.click(show_profile, outputs=login_status)
-            # Store profile and token in state on login click
-            login_btn.click(lambda x: x, inputs=[login_btn], outputs=[hf_profile, hf_token])
 
             gr.Markdown("## Google AI Studio API Key")
             gemini_input  = gr.Textbox(label="API Key", type="password", interactive=True)
             gemini_status = gr.Markdown("")
 
-            gemini_input.change(lambda k: k, inputs=gemini_input, outputs=gemini_key)
-
             gr.Markdown("## Gemini Model")
             model_selector = gr.Radio(
                 choices=[
@@ -603,24 +599,13 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
                 label="Select model",
                 interactive=True
             )
-            model_selector.change(lambda m: m, inputs=model_selector, outputs=gemini_model)
 
-            # Configure Gemini status on load and when key/model changes
+            # Configure Gemini status on load
             ai_builder_tab.load(
                 configure_gemini,
                 inputs=[gemini_key, gemini_model],
                 outputs=[gemini_status]
             )
-            gemini_key.change(
-                configure_gemini,
-                inputs=[gemini_key, gemini_model],
-                outputs=[gemini_status]
-            )
-            gemini_model.change(
-                configure_gemini,
-                inputs=[gemini_key, gemini_model],
-                outputs=[gemini_status]
-            )
 
             gr.Markdown("## Space SDK")
             sdk_selector = gr.Radio(choices=["gradio","streamlit"], value="gradio", label="Template SDK", interactive=True)
@@ -630,8 +615,7 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             status_text = gr.Textbox(label="Current State", value=STATE_IDLE, interactive=False)
             repo_id_text = gr.Textbox(label="Current Space ID", value="None", interactive=False)
 
-            # --- Added Debugging Indicator ---
-            gr.Markdown("## Prerequisite Status")
+            # --- Debugging Indicator ---
             prereq_status = gr.Markdown("Checking...")
 
 
@@ -662,45 +646,71 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
                 status_str = ""
                 if is_logged_in and is_gemini_ready:
                     status_str = "✅ Ready to send commands."
-                elif not is_logged_in:
-                    status_str = "⚠️ Please log in to Hugging Face."
-                elif not is_gemini_ready:
-                     if not key: status_str += "⚠️ Gemini API key not set. "
-                     if not model: status_str += "⚠️ Gemini model not selected."
-                     status_str = status_str.strip()
+                else: # Consolidated status checks
+                     status_parts = []
+                     if not is_logged_in:
+                         status_parts.append("⚠️ Not logged in to Hugging Face.")
+                     if not key:
+                         status_parts.append("⚠️ Gemini API key not set.")
+                     if not model:
+                          status_parts.append("⚠️ Gemini model not selected.")
+                     status_str = " ".join(status_parts)
+                     if not status_str: # Should be ready if status_parts is empty
+                          status_str = "✅ Ready to send commands."
 
 
                 return gr.update(interactive=is_logged_in and is_gemini_ready), status_str
 
+            # --- Implement Chained Events ---
 
-            # Bind update_send_button_state to the *change* of the relevant state variables
-            # This ensures it's called with the correct 4 state values plus any extras
-            hf_profile.change(
-                 update_send_button_state,
-                 inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-                 outputs=[send_btn, prereq_status] # Update button and status indicator
-            )
-            hf_token.change(
+            # 1. Login Button: Update profile/token state, THEN update send button state
+            login_btn.click(
+                 lambda x: (x[0], x[1]), # Extract profile and token from LoginButton output
+                 inputs=[login_btn],
+                 outputs=[hf_profile, hf_token]
+            ).then( # Chain the next action after state is updated
                  update_send_button_state,
                  inputs=[hf_profile, hf_token, gemini_key, gemini_model],
                  outputs=[send_btn, prereq_status]
             )
-            gemini_key.change(
-                 update_send_button_state,
-                 inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-                 outputs=[send_btn, prereq_status]
+
+
+            # 2. Gemini Key Input: Update key state, THEN configure Gemini, THEN update send button state
+            gemini_input.change(
+                lambda k: k, # Update gemini_key state
+                inputs=[gemini_input],
+                outputs=[gemini_key]
+            ).then( # Chain configure_gemini after key is updated
+                configure_gemini,
+                inputs=[gemini_key, gemini_model],
+                outputs=[gemini_status]
+            ).then( # Chain update_send_button_state after config status is updated
+                update_send_button_state,
+                inputs=[hf_profile, hf_token, gemini_key, gemini_model],
+                outputs=[send_btn, prereq_status]
             )
-            gemini_model.change(
-                 update_send_button_state,
-                 inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-                 outputs=[send_btn, prereq_status]
+
+
+            # 3. Gemini Model Selector: Update model state, THEN configure Gemini, THEN update send button state
+            model_selector.change(
+                lambda m: m, # Update gemini_model state
+                inputs=[model_selector],
+                outputs=[gemini_model]
+            ).then( # Chain configure_gemini after model is updated
+                configure_gemini,
+                inputs=[gemini_key, gemini_model],
+                outputs=[gemini_status]
+            ).then( # Chain update_send_button_state after config status is updated
+                update_send_button_state,
+                inputs=[hf_profile, hf_token, gemini_key, gemini_model],
+                outputs=[send_btn, prereq_status]
             )
 
-            # Keep the initial load trigger as well
+            # 4. Initial Load: Update send button state based on initial (or cached) state
             ai_builder_tab.load(
                 update_send_button_state,
                 inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-                outputs=[send_btn, prereq_status] # Update button and status indicator
+                outputs=[send_btn, prereq_status]
             )