Update app.py

app.py

@@ -22,8 +22,6 @@ def show_profile(profile: gr.OAuthProfile | None) -> str:
     """Displays the logged-in Hugging Face profile username."""
     if profile is None:
         return "*Not logged in.*"
-    # More robust check: ensure token is also present for "logged in" status for actions
-    # However, the LoginButton itself updates profile/token state. Let's rely on the State check.
     return f"✅ Logged in as **{profile.username}**"
 
 def list_private_models(
@@ -228,6 +226,16 @@ def add_bot_message(history: list[dict], bot_message: str) -> list[dict]:
 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 check if the send button should be interactive
+# Returns a boolean: True if ready, False otherwise
+def check_send_button_ready(profile: gr.OAuthProfile | None, token: gr.OAuthToken | None, api_key: str | None, model_name: str | None) -> bool:
+    """Checks if HF login and Gemini configuration are complete."""
+    is_logged_in    = profile is not None and token is not None
+    is_gemini_ready = api_key is not None and model_name is not None
+    is_ready = is_logged_in and is_gemini_ready
+    print(f"check_send_button_ready - HF Ready: {is_logged_in}, Gemini Ready: {is_gemini_ready}, Button Ready (boolean): {is_ready}")
+    return is_ready
+
 
 # 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.
@@ -303,25 +311,21 @@ def ai_workflow_chat(
         # --- State Machine Logic based on the current 'state' variable ---
 
         if state == STATE_IDLE:
-            # Check prerequisites before starting any workflow actions
-            # Use the passed-in state variable values for checks
-            # Note: Button interactivity should prevent reaching here if HF login or Gemini isn't ready
-            # But this check is a safeguard.
+            # Check workflow prerequisites before starting any workflow actions
+            # The Send button should already be disabled if these aren't met, but double-check
             if not (hf_profile and hf_token):
-                history = add_bot_message(history, "Workflow paused: Hugging Face login is required.")
-                # Yield updated history and current state, then exit for this click
+                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, use_grounding)
-                return # Exit the generator for this click
+                return
 
             if not (gemini_api_key and gemini_model):
-                 # The button is *enabled* if HF is logged in, but we still need Gemini for the workflow
-                 history = add_bot_message(history, "Workflow cannot start: Google AI Studio / Gemini configuration is required.")
-                 # Yield updated history and current state, then exit for this click
+                 # The button is *enabled* if HF is logged in and Gemini shows configured,
+                 # but we still need the key/model for the workflow itself.
+                 history = add_bot_message(history, "Workflow cannot start: Please ensure your Gemini API key is entered and a model is selected.")
                  yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                         attempts, app_desc, repo_name, generated_code, use_grounding)
-                 return # Exit the generator for this click
-
+                 return
 
             # Look for specific commands in the user's message
             reset_match = "reset" in message.lower()
@@ -530,6 +534,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
              reqs_list = ["gradio"] if space_sdk == "gradio" else ["streamlit"]
              # Add essential libraries regardless of description keywords or grounding
              essential_libs = ["google-generativeai", "huggingface_hub"]
+             # Only add if Gemini is actually needed for the app (determined by description or if key is present)
              # If we are here, key and model are available based on STATE_IDLE checks
              reqs_list.extend(essential_libs)
 
@@ -632,7 +637,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
             history = add_bot_message(history, "✅ `README.md` generated. Click 'Send' to upload.")
             state = STATE_UPLOADING_README # Transition state
             generated_code = readme_content # Store README content
-            # Yield updated state variables and history (pass UI outputs and states through)
+            # Yield updated state variables and history (pass UI outputs and other states through)
             yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                    attempts, app_desc, repo_name, generated_code, use_grounding)
             # No return needed
@@ -659,7 +664,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                      history = add_bot_message(history, "✅ Uploaded `README.md`. All files uploaded. Space is now building. Click 'Send' to check build logs.")
                      state = STATE_CHECKING_LOGS_BUILD # Transition to checking build logs
                      generated_code = None # Clear content after use
-                     # Yield updated state variables and history (pass UI outputs and states through)
+                     # Yield updated state variables and history (pass UI outputs and other states through)
                      yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                             attempts, app_desc, repo_name, generated_code, use_grounding)
                      # No return needed
@@ -910,8 +915,6 @@ 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)
 
-            # Removed prereq_status markdown component
-
 
         # Main content area column
         with gr.Column(scale=3):
@@ -919,7 +922,9 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             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
-            send_btn   = gr.Button("Send", interactive=False) # Starts disabled until prereqs are met
+            # Initial interactive state will be handled by the load event chain
+            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
             # These are UI components, NOT State variables
@@ -930,51 +935,44 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
 
             # --- Define Event Handlers and Chains AFTER all components are defined ---
 
-            # Helper function to update send button interactivity based on prereqs
-            # Defined outside Block but used inside event handlers
-            def update_send_button_interactivity(profile, token, api_key, model_name):
-                 is_logged_in    = profile is not None and token is not None
-                 is_gemini_ready = api_key is not None and model_name is not None
-                 is_ready = is_logged_in and is_gemini_ready
-                 print(f"update_send_button_interactivity - HF Ready: {is_logged_in}, Gemini Ready: {is_gemini_ready}, Button Ready: {is_ready}")
-                 return gr.update(interactive=is_ready)
-
+            # Define the inputs used for checking prerequisites
+            send_button_interactive_binding_inputs = [hf_profile, hf_token, gemini_key, gemini_model]
 
-            # Handle login button click: Update profile/token state -> Update send button interactivity
+            # Handle login button click: Update profile/token state -> Check prereqs and update button interactivity
+            # LoginButton outputs a tuple (OAuthProfile, OAuthToken) on success
             login_btn.click(
-                 # The LoginButton outputs a tuple (OAuthProfile, OAuthToken) on success
                  lambda x: (x[0], x[1]),
                  inputs=[login_btn],
                  outputs=[hf_profile, hf_token] # Update HF State variables
-            ).then(
-                 update_send_button_interactivity,
-                 # Pass required state variables to determine interactivity
-                 inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-                 outputs=[send_btn] # Update button interactivity
+            ).then( # Chain the next action after state is updated
+                 # Call the boolean check function and bind its output to the button's interactive property
+                 check_send_button_ready,
+                 inputs=send_button_interactive_binding_inputs,
+                 outputs=[send_btn.interactive] # Update button interactivity directly
             )
 
-            # Handle Gemini Key Input change: Update key state -> Configure Gemini status -> Update send button interactivity
+            # Handle Gemini Key Input change: Update key state -> Configure Gemini status -> Check prereqs and update button interactivity
             gemini_input.change(
                 lambda k: k, inputs=[gemini_input], outputs=[gemini_key] # Update gemini_key state
             ).then(
                 configure_gemini, inputs=[gemini_key, gemini_model], outputs=[gemini_status] # Update Gemini status
             ).then(
-                update_send_button_interactivity,
-                # Pass required state variables to determine interactivity
-                inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-                outputs=[send_btn] # Update button interactivity
+                # Call the boolean check function and bind its output to the button's interactive property
+                check_send_button_ready,
+                inputs=send_button_interactive_binding_inputs,
+                outputs=[send_btn.interactive] # Update button interactivity directly
             )
 
-            # Handle Gemini Model Selector change: Update model state -> Configure Gemini status -> Update send button interactivity
+            # Handle Gemini Model Selector change: Update model state -> Configure Gemini status -> Check prereqs and update button interactivity
             model_selector.change(
                 lambda m: m, inputs=[model_selector], outputs=[gemini_model] # Update gemini_model state
             ).then(
                 configure_gemini, inputs=[gemini_key, gemini_model], outputs=[gemini_status] # Update Gemini status
             ).then(
-                update_send_button_interactivity,
-                # Pass required state variables to determine interactivity
-                inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-                outputs=[send_btn] # Update button interactivity
+                # Call the boolean check function and bind its output to the button's interactive property
+                check_send_button_ready,
+                inputs=send_button_interactive_binding_inputs,
+                outputs=[send_btn.interactive] # Update button interactivity directly
             )
 
             # Handle Grounding checkbox change: update grounding state
@@ -1040,11 +1038,11 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
         inputs=[gemini_key, gemini_model],
         outputs=[gemini_status] # Update Gemini status display
     ).then(
-        # Action 3: Update the send button interactivity based on initial states
+        # Action 3: Check prereqs and update send button interactivity based on initial states
         # This uses the *initial* values of hf_profile, hf_token, gemini_key, and gemini_model states
-        update_send_button_interactivity, # Use the dedicated helper
-        inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-        outputs=[send_btn] # Update button interactivity
+        check_send_button_ready, # Use the simpler boolean helper
+        inputs=send_button_interactive_binding_inputs,
+        outputs=[send_btn.interactive] # Update button interactivity directly
     ).then(
         # Action 4: Add the initial welcome message to the chatbot
         greet,