Update app.py

app.py

@@ -21,19 +21,18 @@ def list_private_models(
     profile: gr.OAuthProfile | None,
     oauth_token: gr.OAuthToken | None
 ) -> str:
-    if not profile or not oauth_token:
+    # Gradio injects profile and oauth_token automatically when inputs=None
+    # and the function signature has these parameter types.
+    if not profile or not oauth_token or not hasattr(oauth_token, 'token') or not oauth_token.token:
         return "Please log in to see your models."
     try:
-        # Check if the token is valid before listing models
-        if not hasattr(oauth_token, 'token') or not oauth_token.token:
-             return "Invalid or missing access token."
-
         models = [
             f"{m.id} ({'private' if m.private else 'public'})"
             for m in list_models(author=profile.username, token=oauth_token.token)
         ]
         return "No models found." if not models else "Models:\n\n" + "\n - ".join(models)
     except Exception as e:
+        # Catching potential API errors during model listing
         return f"Error listing models: {e}"
 
 
@@ -427,7 +426,7 @@ def orchestrate_development(client, project_state, config, oauth_token_token):
                     if project_state['sdk_choice'] == 'gradio':
                          project_state['files'][project_state['main_app_file']] += "import gradio as gr\n\n# Define a simple interface\n# For example: gr.Interface(...).launch()\n"
                     elif project_state['sdk_choice'] == 'streamlit':
-                          project_state['files'][project_state['main_app_file']] += "import streamlit as st\n\n# Your Streamlit app starts here\n# For example: st.write('Hello, world!')\n"
+                           project_state['files'][project_state['main_app_file']] += "import streamlit as st\n\n# Your Streamlit app starts here\n# For example: st.write('Hello, world!')\n"
 
                 if 'requirements.txt' not in project_state['files']:
                      req_content = "pandas\n" + ("streamlit\n" if project_state['sdk_choice']=="streamlit" else "gradio\n") + "google-generativeai\nhuggingface-hub\n"
@@ -524,7 +523,7 @@ This is an auto-generated HF Space.
 
                      # Only check iframe once logs indicate something might be running, or after a delay
                      # Check iframe more frequently after initial wait
-                     if elapsed_log_wait > 10 or len(run_logs) > 0:
+                     if elapsed_log_wait > 10 or len(run_logs) > 0 or len(build_logs) > 100: # Also check if build logs are substantial
                          project_state['iframe_ok'] = check_iframe(project_state['iframe_url'])
                          iframe_checked = True
                      else:
@@ -582,15 +581,24 @@ This is an auto-generated HF Space.
                  # Analyze feedback to decide next step
                  feedback = project_state['feedback']
                  iframe_ok = project_state.get('iframe_ok', False)
+                 # Re-check logs just before making the decision for freshest info if possible
+                 # This might add latency, skipping for now, rely on logs fetched in LOGGING step
+                 # build_logs = fetch_logs(project_state['repo_id'], "build", oauth_token_token)
+                 # run_logs = fetch_logs(project_state['repo_id'], "run", oauth_token_token)
+                 # error_types = classify_errors(build_logs + '\n' + run_logs)
+                 # project_state['logs']['build'] = build_logs # Update state with freshest logs
+                 # project_state['logs']['run'] = run_logs
+
                  error_types = classify_errors(project_state['logs'].get('build', '') + '\n' + project_state['logs'].get('run', ''))
 
+
                  print(f"Debug Analysis - Feedback: {feedback[:100]}... | Iframe OK: {iframe_ok} | Errors: {error_types}")
 
 
                  # Decision Logic:
-                 # 1. Success? Debugger says clear AND iframe works AND no/minor errors in logs
+                 # 1. Success? Debugger says clear AND iframe works AND no/minor errors in logs AND run logs have some content
                  is_complete = ("All clear. Project appears complete." in feedback) or \
-                                (iframe_ok and error_types == "none" and "ERROR" not in feedback.upper() and len(project_state['logs'].get('run', '')) > 0) # Appears to run and no errors
+                                (iframe_ok and error_types == "none" and "ERROR" not in feedback.upper() and len(project_state['logs'].get('run', '')) > 10) # Appears to run and no errors
 
                  if is_complete:
                      project_state['status'] = 'Complete'
@@ -618,7 +626,7 @@ This is an auto-generated HF Space.
 
         elif current_task == 'FINISHED':
             # Exit the main loop
-            break # Loop condition handles exit
+            pass # Loop condition handles exit
 
         else:
             # Unknown task
@@ -691,8 +699,8 @@ def handle_user_message(
     grounding_enabled: bool,
     temperature: float,
     max_output_tokens: int,
-    profile: gr.OAuthProfile | None,
-    oauth_token: gr.OAuthToken | None # We need the token object
+    profile: gr.OAuthProfile | None, # Gradio auto-injects
+    oauth_token: gr.OAuthToken | None # Gradio auto-injects
 ):
     # The user_input is already the new prompt.
     # We need to add it to the history list here at the beginning,
@@ -700,26 +708,33 @@ def handle_user_message(
     # Check if the last message is *not* a user message or is empty to avoid duplicates
     # (Gradio's default Chatbot adds the user message automatically on submit,
     # but explicit handling here is safer if using user_in separately)
+    # A safer check: If the last message is the exact user_input, assume Gradio added it.
+    # Otherwise, add it.
     if not history or history[-1].get("role") != "user" or history[-1].get("content") != user_input:
         history.append({"role": "user", "content": user_input})
-        # Note: If Gradio Chatbot already adds the message, this might cause duplicates.
-        # In typical chatbot+textbox setup, the textbox value is passed explicitly,
-        # and the handler is responsible for appending it to the history.
+
 
     if not profile or not oauth_token or not oauth_token.token:
         # Append error message to history for display
-        error_history = history + [{"role":"assistant","content":"⚠️ Please log in first via the Hugging Face button."}]
+        # Check if error message is already present to avoid spamming
+        error_msg = "⚠️ Please log in first via the Hugging Face button."
+        if not history or history[-1].get("content") != error_msg:
+            history.append({"role":"assistant","content":error_msg})
         # Return current state, logs etc. + the new history
-        return error_history, "", "", "<p>Please log in.</p>", "Login required."
+        return history, "", "", "<p>Please log in.</p>", "Login required."
 
     if not gemini_api_key:
-         error_history = history + [{"role":"assistant","content":"⚠️ Please provide your Gemini API Key."}]
-         return error_history, "", "", "<p>Please provide API Key.</p>", "API Key required."
+         error_msg = "⚠️ Please provide your Gemini API Key."
+         if not history or history[-1].get("content") != error_msg:
+            history.append({"role":"assistant","content":error_msg})
+         return history, "", "", "<p>Please provide API Key.</p>", "API Key required."
 
     if not user_input or user_input.strip() == "":
         # Handle empty prompt case - the prompt is now the user_input parameter
-        empty_prompt_history = history + [{"role":"assistant","content":"Please enter requirements for the application."}]
-        return empty_prompt_history, "", "", "<p>Enter requirements.</p>", "Waiting for prompt."
+        error_msg = "Please enter requirements for the application."
+        if not history or history[-1].get("content") != error_msg:
+            history.append({"role":"assistant","content":error_msg})
+        return history, "", "", "<p>Enter requirements.</p>", "Waiting for prompt."
 
 
     client = genai.Client(api_key=gemini_api_key)
@@ -788,19 +803,21 @@ with gr.Blocks(title="HF Space Auto‑Builder (Team AI)") as demo:
             models_md = gr.Markdown()
 
             # On app load, show “not logged in” and list public models (or none)
+            # inputs=None tells Gradio to auto-inject LoginButton state if signature matches
             demo.load(show_profile, inputs=None, outputs=status_md, api_name="load_profile")
-            demo.load(list_private_models, inputs=None, outputs=models_md, api_name="load_models") # Inputs=None allows Gradio to inject profile/token (will be None initially)
+            demo.load(list_private_models, inputs=None, outputs=models_md, api_name="load_models")
 
             # When the user actually logs in:
+            # inputs=None tells Gradio to auto-inject LoginButton state
             login_btn.click(
                 fn=show_profile,
-                inputs=None,               # Gradio will inject OAuthProfile
+                inputs=None,
                 outputs=status_md,
                 api_name="login_profile"
             )
             login_btn.click(
                 fn=list_private_models,
-                inputs=None,               # Gradio will inject (OAuthProfile, OAuthToken)
+                inputs=None,
                 outputs=models_md,
                 api_name="login_models"
             )
@@ -825,55 +842,57 @@ with gr.Blocks(title="HF Space Auto‑Builder (Team AI)") as demo:
     with gr.Accordion("Logs", open=False):
         build_box = gr.Textbox(label="Build logs", lines=10, interactive=False, max_lines=20)
         run_box   = gr.Textbox(label="Run logs",   lines=10, interactive=False, max_lines=20)
-        # Need login state for refresh button, inputs=None will inject profile/token
+        # Need login state for refresh button. For a lambda function,
+        # auto-injection doesn't work based on type hints in the same way,
+        # so we explicitly pass the component state.
         refresh_btn = gr.Button("🔄 Refresh Logs Only")
 
     with gr.Accordion("App Preview", open=True):
         preview   = gr.HTML("<p>App preview will load here when available.</p>")
 
 
-    # Update the button click handler - ADD user_in to inputs
+    # Update the button click handler - REMOVE login_btn from inputs
+    # Gradio will auto-inject profile and token based on the function signature
     send_btn.click(
         fn=handle_user_message,
         inputs=[
-            chatbot,        # history (passed automatically by chatbot)
-            user_in,        # <-- user_input (pass the textbox component)
+            chatbot,        # history
+            user_in,        # user_input
             sdk_choice,
             api_key,
             grounding,
             temp,
             max_tokens,
-            login_btn,      # profile (passed automatically by LoginButton)
-            login_btn       # oauth_token (passed automatically by LoginButton)
+            # REMOVED: login_btn, login_btn - Gradio injects profile/token based on signature
         ],
         outputs=[chatbot, build_box, run_box, preview, project_status_md]
     )
 
-    # Update the submit handler - ADD user_in to inputs
+    # Update the submit handler - REMOVE login_btn from inputs
     user_in.submit(
         fn=handle_user_message,
         inputs=[
-            chatbot,        # history
-            user_in,        # <-- user_input
+            chatbot,
+            user_in,
             sdk_choice,
             api_key,
             grounding,
             temp,
             max_tokens,
-            login_btn,
-            login_btn
+            # REMOVED: login_btn, login_btn - Gradio injects profile/token based on signature
         ],
         outputs=[chatbot, build_box, run_box, preview, project_status_md]
     )
 
     # Handler for refreshing logs manually
-    # Inputs=None allows Gradio to inject profile/token from login_btn
+    # For this lambda, we explicitly pass login_btn state as it's not a
+    # function with OAuth type hints for auto-injection.
     refresh_btn.click(
-        fn=lambda profile, token: (
-            fetch_logs(f"{profile.username}/{profile.username}-auto-space", "build", token.token) if profile and token and token.token else "Login required to fetch logs.",
-            fetch_logs(f"{profile.username}/{profile.username}-auto-space", "run", token.token) if profile and token and token.token else "Login required to fetch logs."
+        fn=lambda profile_token_state: ( # Receive the tuple (profile, token) from the login_btn state
+            fetch_logs(f"{profile_token_state[0].username}/{profile_token_state[0].username}-auto-space", "build", profile_token_state[1].token) if profile_token_state and profile_token_state[0] and profile_token_state[1] and profile_token_state[1].token else "Login required to fetch logs.",
+            fetch_logs(f"{profile_token_state[0].username}/{profile_token_state[0].username}-auto-space", "run", profile_token_state[1].token) if profile_token_state and profile_token_state[0] and profile_token_state[1] and profile_token_state[1].token else "Login required to fetch logs."
         ),
-        inputs=[login_btn, login_btn], # Keep login_btn twice for profile and token objects
+        inputs=[login_btn], # Pass the login_btn component state
         outputs=[build_box, run_box]
     )