Update app.py

app.py

@@ -55,7 +55,7 @@ def create_space_action(repo_name: str, sdk: str, profile: gr.OAuthProfile, toke
             space_sdk=sdk
         )
         url    = f"https://huggingface.co/spaces/{repo_id}"
-        iframe = f'<iframe src="{url}" width="100%" height="500px"></iframe>' # Fixed closing tag
+        iframe = f'<iframe src="{url}" width="100%" height="500px"></iframe>'
         return repo_id, iframe
     except Exception as e:
         raise RuntimeError(f"Failed to create Space `{repo_id}`: {e}")
@@ -140,20 +140,25 @@ def get_container_logs_action(repo_id, profile, token):
 def configure_gemini(api_key: str | None, model_name: str | None) -> str:
     """Configures the Gemini API and checks if the model is accessible."""
     if not api_key:
+        # Keep the message about key not set
         return "⚠️ Gemini API key is not set."
     if not model_name:
+        # Keep the message about model not selected
         return "⚠️ Please select a Gemini model."
     try:
         genai.configure(api_key=api_key)
         # Attempt a simple call to verify credentials and model availability
         # This will raise an exception if the key is invalid or model not found
         genai.GenerativeModel(model_name).generate_content("ping", stream=False)
+        # This message indicates the API call *for configuration check* was successful
         return f"✅ Gemini configured successfully with **{model_name}**."
     except Exception as e:
+        # This message indicates the API call *for configuration check* failed
         return f"❌ Error configuring Gemini: {e}"
 
 def call_gemini(prompt: str, api_key: str, model_name: str, use_grounding: bool = False) -> str:
     """Calls the Gemini API with a given prompt, optionally using grounding."""
+    # This check is crucial - it will raise an error *before* the API call if prereqs aren't met
     if not api_key or not model_name:
         raise ValueError("Gemini API key or model not set.")
     try:
@@ -217,47 +222,7 @@ def add_bot_message(history: list[dict], bot_message: str) -> list[dict]:
     history.append({"role": "assistant", "content": bot_message})
     return history
 
-# Helper function to control send button interactivity and prerequisite status text
-# This function is triggered by changes in login status and Gemini configuration
-# Defined OUTSIDE the gr.Blocks context
-def update_send_button_state(
-    profile: gr.OAuthProfile | None,
-    token: gr.OAuthToken | None,
-    key: str | None,
-    model: str | None,
-    # Absorb potential extra args Gradio passes to event handlers
-    *args,
-    **kwargs
-):
-    """Determines if the send button should be active and updates status text."""
-    # Add debug prints to see what values this function is getting
-    print(f"update_send_button_state - profile: {profile is not None}, token: {token is not None}, key: {key is not None}, model: {model is not None}")
-    is_logged_in    = profile is not None and token is not None
-    is_gemini_ready = key     is not None and model is not None # Check if key and model are set
-
-    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.")
-
-    is_ready = is_logged_in and is_gemini_ready
-
-    if is_ready:
-        status_str = "✅ Ready to send commands."
-    else:
-         status_str = " ".join(status_parts)
-         # Fallback, should not be needed if not is_ready, but good practice
-         if not status_str:
-              status_str = "Checking prerequisites..."
-
-    # gr.update is used to dynamically change a component's properties
-    return gr.update(interactive=is_ready), status_str
-
 # Add an initial welcome message to the chatbot (defined outside Blocks to be called by load chain)
-# Defined OUTSIDE the gr.Blocks context
 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."}]
 
@@ -346,7 +311,8 @@ def ai_workflow_chat(
                 return # Exit the generator for this click
 
             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.")
+                 # 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: Please enter your API key and select a Gemini model.")
                  # Yield updated history and current state, then exit for this click
                  yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                         attempts, app_desc, repo_name, generated_code, use_grounding)
@@ -559,8 +525,9 @@ 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"]
-             if gemini_api_key and gemini_model: # Only add if Gemini is actually configured
-                  reqs_list.extend(essential_libs)
+             # 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)
 
              # Add common libraries if description suggests they might be needed
              if app_desc:
@@ -939,9 +906,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)
 
-            # Define prereq_status before it's used in handlers that update it
-            prereq_status = gr.Markdown("Checking prerequisites...")
-
 
         # Main content area column
         with gr.Column(scale=3):
@@ -960,37 +924,46 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
 
             # --- Define Event Handlers and Chains AFTER all components are defined ---
 
-            # Handle login button click
+            # Helper function to update send button interactivity based on prereqs
+            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)
+
+
+            # Handle login button click: Update profile/token state -> Update send button interactivity
             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 these State variables
-            ).then( # Chain the next action after state is updated
-                 # Pass all relevant state variables to re-evaluate prerequisites
-                 update_send_button_state,
+                 outputs=[hf_profile, hf_token] # Update HF State variables
+            ).then(
+                 update_send_button_interactivity,
                  inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-                 outputs=[send_btn, prereq_status] # Update button interactivity and status text
+                 outputs=[send_btn] # Update button interactivity
             )
 
-            # Handle Gemini Key Input change: update key state -> configure Gemini -> update send button
+            # Handle Gemini Key Input change: Update key state -> Configure Gemini status -> Update send 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(
-                # Pass all relevant state variables to re-evaluate prerequisites
-                update_send_button_state, inputs=[hf_profile, hf_token, gemini_key, gemini_model], outputs=[send_btn, prereq_status] # Update button/prereq status
+                update_send_button_interactivity,
+                inputs=[hf_profile, hf_token, gemini_key, gemini_model],
+                outputs=[send_btn] # Update button interactivity
             )
 
-            # Handle Gemini Model Selector change: update model state -> configure Gemini -> update send button
+            # Handle Gemini Model Selector change: Update model state -> Configure Gemini status -> Update send 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(
-                # Pass all relevant state variables to re-evaluate prerequisites
-                update_send_button_state, inputs=[hf_profile, hf_token, gemini_key, gemini_model], outputs=[send_btn, prereq_status] # Update button/prereq status
+                update_send_button_interactivity,
+                inputs=[hf_profile, hf_token, gemini_key, gemini_model],
+                outputs=[send_btn] # Update button interactivity
             )
 
             # Handle Grounding checkbox change: update grounding state
@@ -1012,9 +985,10 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
 
             # 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
             send_btn.click(
                 ai_workflow_chat, # The generator function to run
-                # Inputs are read from UI components AND State variables
                 inputs=[
                     user_input, chatbot, # UI component inputs (message, current chat history)
                     hf_profile, hf_token, # HF State variables
@@ -1026,8 +1000,6 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
                     debug_attempts, app_description, repo_name_state, generated_code_state, # Other State variables
                     use_grounding_state # Add the new grounding state input
                 ],
-                # Outputs update UI components AND State variables.
-                # The order MUST match the tuple yielded by the generator function.
                 outputs=[
                     chatbot, # Update Chatbot with new messages
                     repo_id, workflow, # Update workflow State variables
@@ -1043,7 +1015,7 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             )
 
 
-    # --- Initial Load Event Chain (Defined INSIDE gr.Blocks, AFTER components) ---
+    # --- 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
@@ -1057,11 +1029,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 state and prerequisite status based on initial states
+        # Action 3: Update the 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_state,
+        update_send_button_interactivity, # Use the dedicated helper
         inputs=[hf_profile, hf_token, gemini_key, gemini_model],
-        outputs=[send_btn, prereq_status] # Update button interactivity and status text
+        outputs=[send_btn] # Update button interactivity
     ).then(
         # Action 4: Add the initial welcome message to the chatbot
         greet,