Update app.py

app.py

@@ -229,48 +229,51 @@ 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
-# MODIFIED to return gr.update
-# FIX: Added *args, **kwargs to accept any extra arguments passed by Gradio chaining
-def check_send_button_ready(profile: gr.OAuthProfile | None, token: gr.OAuthToken | None, api_key: str | None, model_name: str | None, *args, **kwargs) -> gr.update:
+# MODIFIED: Signature takes exactly 4 inputs, removed *args, **kwargs
+# MODIFIED: Return type hint changed to gr.Button.update
+# MODIFIED: Internal logic uses bool() check for simplicity
+def check_send_button_ready(hf_profile: gr.OAuthProfile | None, hf_token: gr.OAuthToken | None, gemini_key: str | None, gemini_model: str | None) -> gr.Button.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 ---")
-    print(f"  Received profile type: {type(profile)}, is None: {profile is None}")
-    print(f"  Received token type: {type(token)}, is None: {token is None}")
-    # For api_key, print part of the key if not None for verification, be careful with full key
-    # Also check for empty string for printing
-    api_key_display = api_key[:5] if isinstance(api_key, str) and api_key else ('Empty String' if isinstance(api_key, str) and api_key == "" else 'None')
-    print(f"  Received api_key: Type={type(api_key)}, Value={api_key_display}")
-    print(f"  Received model_name: Type={type(model_name)}, Value={model_name}")
+    print(f"  Received hf_profile: Type={type(hf_profile)}, Value={'present' if hf_profile else 'None'}")
+    print(f"  Received hf_token: Type={type(hf_token)}, Value={'present' if hf_token else 'None'}")
+    # For api_key, print part of the key if not None/empty for verification
+    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}")
     # --- END ENHANCED DEBUGGING LOGS ---
 
-    is_logged_in    = profile is not None and token is not None
-    # Gemini is ready if api_key is a non-empty string AND model_name is set
-    is_gemini_ready = isinstance(api_key, str) and api_key != "" and model_name is not None
+    is_logged_in    = hf_profile is not None and hf_token is not None
+    # Use bool() check for simplicity - handles None and "" correctly
+    is_gemini_ready = bool(gemini_key) and bool(gemini_model)
 
     # --- CONTINUED DEBUGGING LOGS ---
-    print(f"  HF check: {profile is not None} and {token is not None} = {is_logged_in}")
-    print(f"  Gemini check: {isinstance(api_key, str)} and {api_key != ''} and {model_name is not None} = {is_gemini_ready}")
-    # --- END CONTINUED DEBUGGING LOGS ---
+    print(f"  HF check: ({hf_profile is not None} and {hf_token is not None}) = {is_logged_in}")
+    print(f"  Gemini check: ({bool(gemini_key)} and {bool(gemini_model)}) = {is_gemini_ready}")
+    print("--- END CONTINUED DEBUGGING LOGS ---")
 
     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}")
     print("--- check_send_button_ready END ---\n")
 
-    return gr.update(interactive=is_ready)
+    # Use gr.Button.update for clearer intent, although gr.update works
+    return gr.Button.update(interactive=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.
 # 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
 def ai_workflow_chat(
     message: str,
     history: list[dict],
     hf_profile: gr.OAuthProfile | None,
     hf_token:   gr.OAuthToken   | None,
-    # Pass gemini_api_key and gemini_model as inputs - these come from the State variables
-    gemini_api_key: str         | None,
-    gemini_model:   str         | None,
+    # Input parameters corresponding to the State variables read by .click
+    gemini_api_key_state: str | None,
+    gemini_model_state:   str | None,
     repo_id_state:  str | None,
     workflow_state: str,
     space_sdk:      str,
@@ -298,8 +301,8 @@ def ai_workflow_chat(
     str | None,       # 8: Updated repo name (for repo_name_state state)
     str | None,       # 9: Updated generated code (for generated_code_state state)
     bool,             # 10: Updated use_grounding_state (for use_grounding_state state)
-    str | None,       # 11: Explicitly yield gemini_api_key State
-    str | None,       # 12: Explicitly yield gemini_model State
+    str | None,       # 11: Explicitly yield gemini_api_key_state
+    str | None,       # 12: Explicitly yield gemini_model_state
 ]:
     """
     Generator function to handle the AI workflow state machine.
@@ -313,6 +316,10 @@ def ai_workflow_chat(
     repo_name = repo_name_state
     generated_code = generated_code_state
     use_grounding = use_grounding_state # Unpack grounding state
+    # Use the input parameters for Gemini key/model directly in the generator
+    current_gemini_key = gemini_api_key_state
+    current_gemini_model = gemini_model_state
+
 
     # Keep copies of potentially updated UI elements passed as inputs to update them later
     # These are the *current values* of the UI components as of the button click
@@ -330,10 +337,10 @@ def ai_workflow_chat(
     # Yield immediately to update the chat UI with the user's message
     # This provides immediate feedback to the user while the AI processes
     # Ensure all state variables and UI outputs are yielded back in the correct order
-    # Include gemini_api_key and gemini_model in the yield tuple
+    # Include gemini_api_key_state and gemini_model_state in the yield tuple
     yield (history, repo_id, state, updated_preview, updated_run, updated_build,
            attempts, app_desc, repo_name, generated_code, use_grounding,
-           gemini_api_key, gemini_model) # Explicitly pass back current state values
+           current_gemini_key, current_gemini_model) # Explicitly pass back current state values
 
     try:
         # --- State Machine Logic based on the current 'state' variable ---
@@ -344,15 +351,16 @@ def ai_workflow_chat(
             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,
-                   gemini_api_key, gemini_model) # Explicitly pass back current state values
+                   current_gemini_key, current_gemini_model) # Explicitly pass back current state values
             return # Stop workflow execution for this click
 
         # Check if API key is non-empty string and model is set
-        if not (isinstance(gemini_api_key, str) and gemini_api_key != "" and gemini_model):
+        # Use the local variables derived from state inputs
+        if not (isinstance(current_gemini_key, str) and current_gemini_key != "" and current_gemini_model):
              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,
-                    gemini_api_key, gemini_model) # Explicitly pass back current state values
+                    current_gemini_key, current_gemini_model) # Explicitly pass back current state values
              return # Stop workflow execution for this click
 
 
@@ -371,8 +379,8 @@ def ai_workflow_chat(
                 # Also reset UI outputs to their initial state
                 # gemini_key and gemini_model are passed back with their *current* (likely valid) state
                 yield (history, None, STATE_IDLE, "<p>No Space created yet.</p>", "", "", 0,
-                       None, None, None, False,
-                       gemini_api_key, gemini_model) # Reset use_grounding to default False, other states to None/default
+                       None, None, None, False, # Reset use_grounding to default False, other states to None/default
+                       current_gemini_key, current_gemini_model) # Explicitly pass back current state values
                 # No return needed after yield in this generator pattern; execution for this click ends here.
 
             elif generate_match:
@@ -387,7 +395,7 @@ def ai_workflow_chat(
                 # Yield updated history and state variables (pass UI outputs through)
                 yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                        attempts, app_desc, repo_name, generated_code, use_grounding,
-                       gemini_api_key, gemini_model)
+                       current_gemini_key, current_gemini_model)
                 # No return needed
 
             elif create_match:
@@ -399,7 +407,7 @@ def ai_workflow_chat(
                  # Yield updated history and state variables (pass UI outputs through)
                  yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                         attempts, app_desc, repo_name, generated_code, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
                  # No return needed
 
             elif "create" in message.lower() and not repo_id:
@@ -409,7 +417,7 @@ def ai_workflow_chat(
                 # Yield updated history and state (pass UI outputs through)
                 yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                        attempts, app_desc, repo_name, generated_code, use_grounding,
-                       gemini_api_key, gemini_model)
+                       current_gemini_key, current_gemini_model)
                 # No return needed
 
             else:
@@ -418,7 +426,7 @@ def ai_workflow_chat(
                 # Yield updated history and current state (pass UI outputs through)
                 yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                        attempts, app_desc, repo_name, generated_code, use_grounding,
-                       gemini_api_key, gemini_model)
+                       current_gemini_key, current_gemini_model)
                 # No return needed
 
 
@@ -432,7 +440,7 @@ def ai_workflow_chat(
                  # Stay in AWAITING_REPO_NAME state and yield message (pass UI outputs through)
                  yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                         attempts, app_desc, repo_name, generated_code, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
                  # No return needed
 
              else:
@@ -443,7 +451,7 @@ def ai_workflow_chat(
                  # The next click will proceed from the STATE_CREATING_SPACE block.
                  yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                         attempts, app_desc, repo_name, generated_code, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
                  # No return needed
 
         # Note: Each 'elif' block below represents a distinct step in the workflow triggered
@@ -456,7 +464,7 @@ def ai_workflow_chat(
                  # Reset relevant states and UI outputs on critical error
                  yield (history, None, STATE_IDLE, "<p>Error creating space.</p>", "", "", 0,
                        None, None, None, use_grounding,
-                       gemini_api_key, gemini_model) # Pass grounding state through
+                       current_gemini_key, current_gemini_model) # Pass grounding state through
                  # No return needed
 
              else:
@@ -470,7 +478,7 @@ def ai_workflow_chat(
                      # Yield updated state variables and history, and the new iframe HTML
                      yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                             attempts, app_desc, repo_name, generated_code, use_grounding,
-                            gemini_api_key, gemini_model) # Pass logs and grounding through
+                            current_gemini_key, current_gemini_model) # Pass logs and grounding through
                      # No return needed
 
                  except Exception as e:
@@ -478,7 +486,7 @@ def ai_workflow_chat(
                      # Yield error message and reset state on failure
                      yield (history, None, STATE_IDLE, "<p>Error creating space.</p>", "", "", 0,
                            None, None, None, use_grounding,
-                           gemini_api_key, gemini_model) # Pass logs and grounding through
+                           current_gemini_key, current_gemini_model) # Pass logs and grounding through
                      # No return needed
 
 
@@ -499,11 +507,11 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                  # Yield to show message before the potentially time-consuming API call
                  yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                         attempts, app_desc, repo_name, generated_code, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
 
                  # Perform the Gemini API call to generate code, optionally using grounding
-                 # Use the gemini_api_key and gemini_model inputs directly (which come from state)
-                 code = call_gemini(prompt, gemini_api_key, gemini_model, use_grounding=use_grounding)
+                 # Use the current_gemini_key and current_gemini_model derived from state inputs
+                 code = call_gemini(prompt, current_gemini_key, current_gemini_model, use_grounding=use_grounding)
                  code = code.strip()
                  # Clean up common markdown code block formatting if present
                  if code.startswith("```python"):
@@ -522,7 +530,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                  # 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,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
                  # No return needed
 
              except Exception as e:
@@ -530,7 +538,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                  # Yield error message and reset state on failure
                  yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                        None, None, None, use_grounding,
-                       gemini_api_key, gemini_model)
+                       current_gemini_key, current_gemini_model)
                  # No return needed
 
 
@@ -541,7 +549,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                   history = add_bot_message(history, "Internal error: No code to upload. Resetting.")
                   yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                         None, None, None, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
                   # No return needed
 
              else:
@@ -549,7 +557,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                  # Yield to show message before the upload action (pass UI outputs and states through)
                  yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                         attempts, app_desc, repo_name, generated_code, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
 
                  try:
                      # Perform the file upload action
@@ -560,7 +568,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                      # 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,
-                            gemini_api_key, gemini_model)
+                            current_gemini_key, current_gemini_model)
                      # No return needed
 
                  except Exception as e:
@@ -568,7 +576,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                      # Yield error message and reset state on failure
                      yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                            None, None, None, use_grounding,
-                           gemini_api_key, gemini_model)
+                           current_gemini_key, current_gemini_model)
                      # No return needed
 
 
@@ -577,7 +585,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
              # Yield to show message before generating requirements (pass UI outputs and states through)
              yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                     attempts, app_desc, repo_name, generated_code, use_grounding,
-                    gemini_api_key, gemini_model)
+                    current_gemini_key, current_gemini_model)
 
              # Logic to determine required packages based on SDK and keywords in the app description
              reqs_list = ["gradio"] if space_sdk == "gradio" else ["streamlit"]
@@ -620,7 +628,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
              # 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,
-                    gemini_api_key, gemini_model)
+                    current_gemini_key, current_gemini_model)
                      # No return needed
 
 
@@ -631,7 +639,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                  history = add_bot_message(history, "Internal error: No requirements content to upload. Resetting.")
                  yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                         None, None, None, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
                  # No return needed
 
             else:
@@ -639,7 +647,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                  # Yield message before upload (pass UI outputs and states through)
                  yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                         attempts, app_desc, repo_name, generated_code, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
 
                  try:
                      # Perform requirements file upload
@@ -650,7 +658,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                      # 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,
-                            gemini_api_key, gemini_model)
+                            current_gemini_key, current_gemini_model)
                      # No return needed
 
                  except Exception as e:
@@ -658,7 +666,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
                      # Yield error message and reset state on failure
                      yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                            None, None, None, use_grounding,
-                           gemini_api_key, gemini_model)
+                           current_gemini_key, current_gemini_model)
                      # No return needed
 
         elif state == STATE_GENERATING_README:
@@ -666,7 +674,7 @@ Return **only** the python code block for `app.py`. Do not include any extra tex
             # Yield message before generating README (pass UI outputs and states through)
             yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                    attempts, app_desc, repo_name, generated_code, use_grounding,
-                   gemini_api_key, gemini_model)
+                   current_gemini_key, current_gemini_model)
 
             # Generate simple README content with Space metadata header
             readme_title = repo_name if repo_name else "My Awesome Space"
@@ -695,7 +703,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
             # 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,
-                   gemini_api_key, gemini_model)
+                   current_gemini_key, current_gemini_model)
             # No return needed
 
 
@@ -706,7 +714,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                  history = add_bot_message(history, "Internal error: No README content to upload. Resetting.")
                  yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                         None, None, None, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
                  # No return needed
 
             else:
@@ -714,7 +722,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                  # Yield message before upload (pass UI outputs and states through)
                  yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                         attempts, app_desc, repo_name, generated_code, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
 
                  try:
                      # Perform README file upload
@@ -725,7 +733,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                      # 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,
-                            gemini_api_key, gemini_model)
+                            current_gemini_key, current_gemini_model)
                      # No return needed
 
                  except Exception as e:
@@ -733,7 +741,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                      # Yield error message and reset state on failure
                      yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                            None, None, None, use_grounding,
-                           gemini_api_key, gemini_model)
+                           current_gemini_key, current_gemini_model)
                      # No return needed
 
         elif state == STATE_CHECKING_LOGS_BUILD:
@@ -741,7 +749,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
              # Yield message before fetching logs (which includes a delay) (pass UI outputs and states through)
              yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                     attempts, app_desc, repo_name, generated_code, use_grounding,
-                    gemini_api_key, gemini_model)
+                    current_gemini_key, current_gemini_model)
 
              # Fetch build logs from HF Space
              build_logs_text = get_build_logs_action(repo_id, hf_profile, hf_token)
@@ -754,7 +762,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                   # Yield updated state, logs, and variables
                   yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                          attempts, app_desc, repo_name, generated_code, use_grounding,
-                         gemini_api_key, gemini_model)
+                         current_gemini_key, current_gemini_model)
                   # No return needed
 
              else:
@@ -763,7 +771,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                   # Yield updated state, logs, and variables
                   yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                          attempts, app_desc, repo_name, generated_code, use_grounding,
-                         gemini_api_key, gemini_model)
+                         current_gemini_key, current_gemini_model)
                   # No return needed
 
 
@@ -772,7 +780,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
              # Yield message before fetching logs (includes a delay) (pass UI outputs and states through)
              yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                     attempts, app_desc, repo_name, generated_code, use_grounding,
-                    gemini_api_key, gemini_model)
+                    current_gemini_key, current_gemini_model)
 
              # Fetch container logs from HF Space
              container_logs_text = get_container_logs_action(repo_id, hf_profile, hf_token)
@@ -786,7 +794,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                   # Yield updated state, logs, attempts, and variables
                   yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                          attempts, app_desc, repo_name, generated_code, use_grounding,
-                         gemini_api_key, gemini_model)
+                         current_gemini_key, current_gemini_model)
                   # No return needed
 
              elif ("error" in updated_run.lower() or "exception" in updated_run.lower()) and attempts >= MAX_DEBUG_ATTEMPTS:
@@ -796,7 +804,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                   # Yield updated state, logs, attempts, and variables
                   yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                          attempts, app_desc, repo_name, generated_code, use_grounding,
-                         gemini_api_key, gemini_model)
+                         current_gemini_key, current_gemini_model)
                   # No return needed
 
              else:
@@ -806,7 +814,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
                   # Yield updated state, logs, attempts, and variables
                   yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                          attempts, app_desc, repo_name, generated_code, use_grounding,
-                         gemini_api_key, gemini_model)
+                         current_gemini_key, current_gemini_model)
                   # No return needed
 
 
@@ -817,7 +825,7 @@ This Space was automatically generated by an AI workflow using Google Gemini and
              # Yield message before Gemini API call (pass UI outputs and states through)
              yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                     attempts, app_desc, repo_name, generated_code, use_grounding,
-                    gemini_api_key, gemini_model)
+                    current_gemini_key, current_gemini_model)
 
              # Construct prompt for Gemini including the container logs
              debug_prompt = f"""
@@ -834,8 +842,8 @@ Return **only** the python code block for app.py. Do not include any extra text,
                   # Call Gemini to generate the corrected code, optionally using grounding
                   # Note: Grounding might be less effective for debugging based *only* on logs,
                   # but we include the option as requested.
-                  # Use the gemini_api_key and gemini_model inputs directly (which come from state)
-                  fix_code = call_gemini(debug_prompt, gemini_api_key, gemini_model, use_grounding=use_grounding)
+                  # Use the current_gemini_key and current_gemini_model derived from state inputs
+                  fix_code = call_gemini(debug_prompt, current_gemini_key, current_gemini_model, use_grounding=use_grounding)
                   fix_code = fix_code.strip()
                   # Clean up potential markdown formatting
                   if fix_code.startswith("```python"):
@@ -854,7 +862,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
                   # Yield updated state, code, and variables (pass UI outputs and states through)
                   yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                          attempts, app_desc, repo_name, generated_code, use_grounding,
-                         gemini_api_key, gemini_model)
+                         current_gemini_key, current_gemini_model)
                   # No return needed
 
              except Exception as e:
@@ -862,7 +870,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
                   # Yield error message and reset state on failure
                   yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                          None, None, None, use_grounding,
-                         gemini_api_key, gemini_model)
+                         current_gemini_key, current_gemini_model)
                   # No return needed
 
         elif state == STATE_UPLOADING_FIXED_APP_PY:
@@ -872,7 +880,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
                   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, use_grounding,
-                        gemini_api_key, gemini_model)
+                        current_gemini_key, current_gemini_model)
                   # No return needed
 
              else:
@@ -880,7 +888,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
                   # Yield message before upload (pass UI outputs and states through)
                   yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                          attempts, app_desc, repo_name, generated_code, use_grounding,
-                         gemini_api_key, gemini_model)
+                         current_gemini_key, current_gemini_model)
 
                   try:
                       # Perform the upload of the fixed app.py
@@ -891,7 +899,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
                       # Yield updated state, code, and variables (pass UI outputs and states through)
                       yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                              attempts, app_desc, repo_name, generated_code, use_grounding,
-                             gemini_api_key, gemini_model)
+                             current_gemini_key, current_gemini_model)
                       # No return needed
 
                   except Exception as e:
@@ -899,7 +907,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
                       # Yield error message and reset state on failure
                       yield (history, None, STATE_IDLE, updated_preview, updated_run, updated_build, 0,
                             None, None, None, use_grounding,
-                            gemini_api_key, gemini_model)
+                            current_gemini_key, current_gemini_model)
                       # No return needed
 
         elif state == STATE_COMPLETE:
@@ -907,7 +915,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
              # Subsequent clicks just add user messages; we simply yield the current state.
              yield (history, repo_id, state, updated_preview, updated_run, updated_build,
                     attempts, app_desc, repo_name, generated_code, use_grounding,
-                    gemini_api_key, gemini_model)
+                    current_gemini_key, current_gemini_model)
              # No return needed
 
 
@@ -919,7 +927,7 @@ Return **only** the python code block for app.py. Do not include any extra text,
         # 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,
-               gemini_api_key, gemini_model) # Include use_grounding and Gemini states
+               current_gemini_key, current_gemini_model) # Include use_grounding and Gemini states
         # No return needed after yield
 
 
@@ -930,9 +938,11 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
     # Define these first as they might be used in default values for components
     hf_profile   = gr.State(None)
     hf_token     = gr.State(None)
-    # CHANGED: Initialize gemini_key state to empty string, not from env var
-    gemini_key   = gr.State("")  # start with no key
-    gemini_model = gr.State("gemini-1.5-flash") # Default selected model
+    # RENAMED: Initialize gemini_api_key_state to empty string
+    gemini_api_key_state   = gr.State("")  # start with no key
+    # RENAMED: Initialize gemini_model_state
+    gemini_model_state     = gr.State("gemini-1.5-flash") # Default selected model
+
     repo_id      = gr.State(None) # Stores the ID of the created Space
     workflow     = gr.State(STATE_IDLE) # Stores the current state of the AI workflow
     sdk_state    = gr.State("gradio") # Stores the selected Space SDK (Gradio or Streamlit)
@@ -943,6 +953,16 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
     # New State variable for grounding checkbox
     use_grounding_state = gr.State(False)
 
+    # 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
+    ]
+
+
     with gr.Row():
         # Sidebar column for inputs and status displays
         with gr.Column(scale=1, min_width=300):
@@ -1013,8 +1033,6 @@ 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
-            send_button_interactive_binding_inputs = [hf_profile, hf_token, gemini_key, gemini_model]
 
             # Handle login button click: Update profile/token state -> Check prereqs and update button interactivity
             # LoginButton outputs a tuple (OAuthProfile, OAuthToken) on success
@@ -1025,34 +1043,44 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             ).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,
-                 outputs=[send_btn] # Update button interactivity using gr.update return value
+                 inputs=send_button_interactive_binding_inputs, # Use the explicit list with renamed states
+                 outputs=[send_btn] # Update button interactivity using gr.Button.update return value
             )
 
             # 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
             gemini_input.change(
-                lambda k: k, inputs=[gemini_input], outputs=[gemini_key] # Update gemini_key state with textbox value
+                lambda k: k,
+                inputs=[gemini_input],
+                outputs=[gemini_api_key_state] # Update RENAMED gemini_api_key_state with textbox value
             ).then(
-                configure_gemini, inputs=[gemini_key, gemini_model], outputs=[gemini_status] # Update Gemini status based on new key
+                # 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,
-                outputs=[send_btn] # Update button interactivity using gr.update return value
+                inputs=send_button_interactive_binding_inputs, # Use the explicit list with renamed states
+                outputs=[send_btn] # Update button interactivity using gr.Button.update return value
             )
 
             # 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
             model_selector.change(
-                lambda m: m, inputs=[model_selector], outputs=[gemini_model] # Update gemini_model state with selected model
+                lambda m: m,
+                inputs=[model_selector],
+                outputs=[gemini_model_state] # Update RENAMED gemini_model_state with selected model
             ).then(
-                configure_gemini, inputs=[gemini_key, gemini_model], outputs=[gemini_status] # Update Gemini status based on new model
+                # 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,
-                outputs=[send_btn] # Update button interactivity using gr.update return value
+                inputs=send_button_interactive_binding_inputs, # Use the explicit list with renamed states
+                outputs=[send_btn] # Update button interactivity using gr.Button.update return value
             )
 
             # Handle Grounding checkbox change: update grounding state
@@ -1076,13 +1104,15 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
             # 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
+            # MODIFIED: Inputs use renamed gemini state variables
+            # MODIFIED: Outputs include renamed gemini state variables
             send_btn.click(
                 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
-                    # Pass gemini_key and gemini_model as inputs (their state is read here)
-                    gemini_key, gemini_model,
+                    # Pass RENAMED gemini state variables as inputs
+                    gemini_api_key_state, gemini_model_state,
                     repo_id, workflow, sdk_state, # Workflow State variables
                     # UI component inputs whose *current values* are needed by the generator
                     iframe, run_txt, build_txt, # UI component inputs (current values)
@@ -1095,8 +1125,8 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
                     iframe, run_txt, build_txt, # Update UI component outputs
                     debug_attempts, app_description, repo_name_state, generated_code_state, # Update other State variables
                     use_grounding_state, # Update the grounding state output
-                    # ADDED BACK: gemini_key, gemini_model to outputs to ensure state consistency
-                    gemini_key, gemini_model
+                    # Include RENAMED gemini state variables in outputs to ensure consistency
+                    gemini_api_key_state, gemini_model_state
                 ]
             ).success( # Chain a .success() event to run *after* the .click() handler completes without error
                  # Clear the user input textbox after the message is sent and processed
@@ -1115,16 +1145,17 @@ with gr.Blocks(title="AI-Powered HF Space App Builder") as ai_builder_tab:
         outputs=login_status # Update login status markdown
     ).then(
         # Action 2: Configure Gemini using the initial state values.
-        # Since gemini_key state starts as "", this will initially show a "key is not set" message.
+        # Since gemini_api_key_state state starts as "", this will initially show a "key is not set" message.
+        # Use RENAMED state variables as inputs
         configure_gemini,
-        inputs=[gemini_key, gemini_model],
+        inputs=[gemini_api_key_state, gemini_model_state],
         outputs=[gemini_status] # Update Gemini status display
     ).then(
         # Action 3: Check prereqs and update send button interactivity based on initial states.
-        # Since gemini_key state starts as "", button will initially be disabled.
+        # Since gemini_api_key_state state starts as "", button will initially be disabled.
         check_send_button_ready,
-        inputs=send_button_interactive_binding_inputs,
-        outputs=[send_btn] # Update button interactivity using gr.update return value
+        inputs=send_button_interactive_binding_inputs, # Use the explicit list with renamed states
+        outputs=[send_btn] # Update button interactivity using gr.Button.update return value
     ).then(
         # Action 4: Add the initial welcome message to the chatbot
         greet,