Update app.py

app.py

@@ -394,9 +394,14 @@ def orchestrate_development(client, project_state, config, oauth_token_token):
         current_task = project_state['current_task']
 
         # Add current task to history for UI visibility (if not already added by previous step)
-        if not project_state['chat_history'] or project_state['chat_history'][-1].get('content', '').strip() != f"➡️ Task: {current_task}".strip():
+        # Avoid adding duplicate "➡️ Task" messages immediately
+        if not project_state['chat_history'] or (
+             project_state['chat_history'][-1].get('content', '').strip().replace('➡️ Task: ', '') != current_task.strip().replace('➡️ Task: ', '')
+             or not project_state['chat_history'][-1].get('content', '').startswith('➡️ Task:')
+             ):
              project_state['chat_history'].append({"role": "assistant", "content": f"➡️ Task: {current_task}"})
 
+
         step_successful = True # Flag to track if the current step completed without error
 
         if current_task == 'PLANNING':
@@ -404,24 +409,32 @@ def orchestrate_development(client, project_state, config, oauth_token_token):
             if step_successful:
                  # Add plan to chat history for user (done inside run_planner now?) - moved to run_planner
                  project_state['current_task'] = 'CODING - Initial Implementation' # Move to coding after planning
+                 # Add plan to chat history if it wasn't added by run_planner (depends on its implementation)
+                 if project_state['plan'] and not any("**Plan:**" in msg['content'] for msg in project_state['chat_history']):
+                     project_state['chat_history'].append({"role": "assistant", "content": f"**Plan:**\n{project_state['plan']}"})
+
             else:
                  project_state['current_task'] = 'FAILED' # Planning failed
 
 
         elif current_task.startswith('CODING'):
-            # Ensure the main app file exists before coding if it's the first coding step (or first after syntax error)
-            if project_state['attempt_count'] == 0 or 'Syntax Errors' in project_state.get('feedback', ''):
-                 if project_state['main_app_file'] not in project_state['files']:
-                     project_state['files'][project_state['main_app_file']] = f"# Initial {project_state['sdk_choice']} app file\n" # Start with a basic stub
-                     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"
-                     # Also ensure requirements.txt and README are stubbed if they don't exist
-                     if 'requirements.txt' not in project_state['files']:
-                          project_state['files']['requirements.txt'] = "pandas\n" + ("streamlit\n" if project_state['sdk_choice']=="streamlit" else "gradio\n") + "google-generativeai\nhuggingface-hub\n"
-                     if 'README.md' not in project_state['files']:
-                         readme_content = f"""---
+            # Ensure minimum files exist before asking CodeGen to code
+            # This happens once at the start of the first coding task
+            if project_state['attempt_count'] == 0 and project_state['current_task'] == 'CODING - Initial Implementation':
+                # Add initial stub files if they don't exist
+                if project_state['main_app_file'] not in project_state['files']:
+                    project_state['files'][project_state['main_app_file']] = f"# Initial {project_state['sdk_choice']} app file\n" # Start with a basic stub
+                    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"
+
+                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"
+                     project_state['files']['requirements.txt'] = req_content
+
+                if 'README.md' not in project_state['files']:
+                    readme_content = f"""---
 title: {project_state['repo_id']}
 emoji: 🐢
 sdk: {project_state['sdk_choice']}
@@ -438,7 +451,7 @@ This is an auto-generated HF Space.
 **Plan:**
 {project_state['plan']}
 """
-                         project_state['files']['README.md'] = readme_content
+                    project_state['files']['README.md'] = readme_content
 
 
             step_successful = run_codegen(client, project_state, config)
@@ -449,7 +462,7 @@ This is an auto-generated HF Space.
                  # Code-gen failed (syntax error, parsing issue, etc.)
                  # The failure is handled within run_codegen by setting status_message and feedback
                  # We'll try debugging/coding again in the next attempt loop iteration if attempts allow
-                 print("Code-Gen step failed.")
+                 print("Code-Gen step failed. Moving to Debugging.")
                  # attempt_count is incremented AFTER debugging phase analyses results
                  project_state['current_task'] = 'DEBUGGING' # Go to debugging to analyze the failure
 
@@ -490,13 +503,15 @@ This is an auto-generated HF Space.
             # Wait a moment for build to start
             time.sleep(5) # Initial wait
             wait_time = 5
-            max_log_wait = 90 # Maximum total time to wait for logs in this step (increased slightly)
+            max_log_wait = 120 # Maximum total time to wait for logs in this step (increased slightly more)
             elapsed_log_wait = 0
             logs_fetched = False
             iframe_checked = False
 
             project_state['status_message'] = "Fetching logs and checking iframe..."
-            project_state['chat_history'].append({"role": "assistant", "content": project_state['status_message']})
+            # Check if the message is already the last one to avoid spamming
+            if not project_state['chat_history'] or project_state['chat_history'][-1].get('content', '').strip() != project_state['status_message'].strip():
+                 project_state['chat_history'].append({"role": "assistant", "content": project_state['status_message']})
 
 
             while elapsed_log_wait < max_log_wait:
@@ -508,7 +523,8 @@ This is an auto-generated HF Space.
                      logs_fetched = True
 
                      # Only check iframe once logs indicate something might be running, or after a delay
-                     if elapsed_log_wait > 10: # Don't check immediately
+                     # Check iframe more frequently after initial wait
+                     if elapsed_log_wait > 10 or len(run_logs) > 0:
                          project_state['iframe_ok'] = check_iframe(project_state['iframe_url'])
                          iframe_checked = True
                      else:
@@ -518,14 +534,16 @@ This is an auto-generated HF Space.
                      print(f"Log/Iframe check at {elapsed_log_wait}s. Build logs len: {len(build_logs)}, Run logs len: {len(run_logs)}, Iframe OK: {project_state['iframe_ok']}")
 
                      # Conditions to proceed to debugging:
-                     # 1. Iframe is OK (app is running and accessible)
+                     # 1. Iframe is OK (app is running and accessible) - strongest signal
                      # 2. Build logs show errors (need debugging ASAP)
                      # 3. Max wait time is almost reached (proceed with whatever logs we have)
                      # 4. Build logs exist and indicate *some* progress (e.g., contain "Building" or sufficient length)
+                     # 5. Run logs exist (app is at least trying to run)
                      if project_state['iframe_ok'] or \
                         "ERROR" in build_logs.upper() or "FATAL" in build_logs.upper() or \
                         elapsed_log_wait >= max_log_wait - wait_time or \
-                        ("Building" in build_logs or len(build_logs) > 100) and logs_fetched: # Heuristic for build progress
+                        ("Building" in build_logs or len(build_logs) > 100) and logs_fetched or \
+                        len(run_logs) > 0:
                             break # Exit the log fetching wait loop
                      else:
                          print(f"Logs or iframe not ready. Waiting {wait_time}s...")
@@ -541,16 +559,16 @@ This is an auto-generated HF Space.
                       wait_time = min(wait_time * 1.5, 20)
 
 
+            # Update status message after the wait loop
             if logs_fetched or iframe_checked: # Proceed if we got logs OR checked the iframe
                 project_state['status_message'] = "Logs fetched and iframe checked (or timeout reached)."
-                project_state['chat_history'].append({"role": "assistant", "content": project_state['status_message']})
-                project_state['current_task'] = 'DEBUGGING' # Move to debugging to analyze logs
             else:
-                 step_successful = False
-                 project_state['status'] = 'Failed' # Failed to fetch logs/check iframe within timeout after retries
-                 project_state['status_message'] = "ERROR: Failed to fetch logs or check iframe within timeout after multiple retries."
-                 project_state['chat_history'].append({"role": "assistant", "content": project_state['status_message']})
-                 project_state['current_task'] = 'FINISHED' # End process
+                project_state['status_message'] = "Warning: Could not fetch logs or check iframe status within timeout." # Use Warning status message
+                step_successful = False # Indicate that this step didn't fully succeed
+
+
+            project_state['chat_history'].append({"role": "assistant", "content": project_state['status_message']})
+            project_state['current_task'] = 'DEBUGGING' # Always move to debugging after attempting to log/check
 
 
         elif current_task == 'DEBUGGING':
@@ -564,23 +582,17 @@ 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}")
 
 
-                 if "All clear. Project appears complete." in feedback or \
-                    (iframe_ok and error_types == "none" and "ERROR" not in feedback.upper()):
-                     # Debugger says it's clear OR iframe is working AND no errors reported in logs AND no ERROR in feedback
+                 # Decision Logic:
+                 # 1. Success? Debugger says clear AND iframe works AND no/minor errors in logs
+                 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
+
+                 if is_complete:
                      project_state['status'] = 'Complete'
                      project_state['current_task'] = 'FINISHED'
                      project_state['status_message'] = "Debug Agent reports clear. Project appears complete."
@@ -606,7 +618,7 @@ This is an auto-generated HF Space.
 
         elif current_task == 'FINISHED':
             # Exit the main loop
-            pass # Loop condition handles exit
+            break # Loop condition handles exit
 
         else:
             # Unknown task
@@ -622,9 +634,14 @@ This is an auto-generated HF Space.
         # the orchestrator logic above should handle transition to FAILED or DEBUGGING.
         # This check acts as a safeguard.
         if not step_successful and project_state['status'] == 'In Progress':
+             # This case might occur if a sub-function returns False but doesn't set status='Failed'
+             # The logic above *should* set status_message and transition away from the failed task,
+             # but this ensures the overall loop exits if something goes wrong.
+             print(f"Orchestration step '{current_task}' failed, but status is still 'In Progress'. Forcing Failure.")
              project_state['status'] = 'Failed'
-             project_state['status_message'] = project_state.get('status_message', f'An error occurred during task: {current_task}')
-             project_state['current_task'] = 'FINISHED' # End process
+             project_state['status_message'] = project_state.get('status_message', f'An unexpected error caused task failure: {current_task}')
+             project_state['chat_history'].append({"role": "assistant", "content": project_state['status_message']})
+             project_state['current_task'] = 'FINISHED'
 
 
     # --- End of Orchestration Loop ---
@@ -638,6 +655,7 @@ This is an auto-generated HF Space.
 
     # Add final outcome message to history if not already the last message
     final_outcome_message = f"**Project Outcome:** {project_state['status']} - {project_state['status_message']}"
+    # Prevent adding duplicate messages if they were already added inside the loop
     if not project_state['chat_history'] or project_state['chat_history'][-1].get('content', '').strip() != final_outcome_message.strip():
         project_state['chat_history'].append({"role": "assistant", "content": final_outcome_message})
 
@@ -664,8 +682,10 @@ This is an auto-generated HF Space.
 
 # --- MAIN HANDLER (Called by Gradio) ---
 
+# Updated signature to include user_input
 def handle_user_message(
-    history, # This is the list of messages in the Gradio Chatbot
+    history, # This is the list of messages in the Gradio Chatbot (from previous turns)
+    user_input: str, # <--- The *new* text input from the user_in textbox
     sdk_choice: str,
     gemini_api_key: str,
     grounding_enabled: bool,
@@ -674,16 +694,17 @@ def handle_user_message(
     profile: gr.OAuthProfile | None,
     oauth_token: gr.OAuthToken | None # We need the token object
 ):
-    # Append the user's message to the history immediately for display
-    # Gradio's Chatbot usually handles this automatically, but explicitly ensures it's present
-    # before we start the orchestration.
-    # Check if the last message is the current user input to avoid duplication on submit/click
-    if not history or history[-1].get("content") != user_in.value: # Assuming user_in is accessible or passed
-         # This logic is tricky with Gradio's submit button.
-         # The default Chatbot behavior on submit/click is to add the user message.
-         # So, history *should* already contain the new user message.
-         # Let's rely on Gradio's standard behavior.
-         pass
+    # The user_input is already the new prompt.
+    # We need to add it to the history list here at the beginning,
+    # as Gradio's Chatbot expects the handler to return the *updated* history.
+    # 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)
+    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
@@ -695,6 +716,11 @@ def handle_user_message(
          error_history = history + [{"role":"assistant","content":"⚠️ Please provide your Gemini API Key."}]
          return error_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."
+
 
     client = genai.Client(api_key=gemini_api_key)
     repo_id = f"{profile.username}/{profile.username}-auto-space"
@@ -702,14 +728,8 @@ def handle_user_message(
     sdk_version = get_sdk_version(sdk_choice)
     code_fn = "app.py" if sdk_choice == "gradio" else "streamlit_app.py" # Standard main file name convention
 
-    # Get the user's latest prompt from the history
-    # Assume the last message in history is the user's new prompt because Gradio added it
-    user_prompt = history[-1]['content'] if history and history[-1].get("role") == "user" else "No prompt provided."
-
-    if user_prompt == "No prompt provided." or user_prompt.strip() == "":
-        # Handle empty prompt case
-        empty_prompt_history = history + [{"role":"assistant","content":"Please enter requirements for the application."}]
-        return empty_prompt_history, "", "", "<p>Enter requirements.</p>", "Waiting for prompt."
+    # The user's latest prompt is the user_input parameter
+    user_prompt = user_input
 
 
     # Initialize project state for this development session
@@ -762,7 +782,7 @@ with gr.Blocks(title="HF Space Auto‑Builder (Team AI)") as demo:
 
     with gr.Row():
         with gr.Column(scale=1):
-            # --- LOGIN BUTTON / PROFILE & MODEL LISTING (FIXED) ---
+            # --- LOGIN BUTTON / PROFILE & MODEL LISTING ---
             login_btn = gr.LoginButton(variant="huggingface", size="lg")
             status_md = gr.Markdown("*Not logged in.*")
             models_md = gr.Markdown()
@@ -784,7 +804,7 @@ with gr.Blocks(title="HF Space Auto‑Builder (Team AI)") as demo:
                 outputs=models_md,
                 api_name="login_models"
             )
-            # --- END FIX ---
+            # --- END LOGIN FIX ---
 
 
             gr.Markdown("---")
@@ -812,17 +832,37 @@ with gr.Blocks(title="HF Space Auto‑Builder (Team AI)") as demo:
         preview   = gr.HTML("<p>App preview will load here when available.</p>")
 
 
-    # Update the button click handler
-    # It will now return the updated chatbot history, logs, preview, and the project status
-    # Inputs=None allows Gradio to inject profile/token from login_btn
+    # Update the button click handler - ADD user_in to inputs
     send_btn.click(
         fn=handle_user_message,
-        inputs=[chatbot, sdk_choice, api_key, grounding, temp, max_tokens, login_btn, login_btn], # Keep login_btn twice for profile and token objects
+        inputs=[
+            chatbot,        # history (passed automatically by chatbot)
+            user_in,        # <-- user_input (pass the textbox component)
+            sdk_choice,
+            api_key,
+            grounding,
+            temp,
+            max_tokens,
+            login_btn,      # profile (passed automatically by LoginButton)
+            login_btn       # oauth_token (passed automatically by LoginButton)
+        ],
         outputs=[chatbot, build_box, run_box, preview, project_status_md]
     )
+
+    # Update the submit handler - ADD user_in to inputs
     user_in.submit(
         fn=handle_user_message,
-        inputs=[chatbot, sdk_choice, api_key, grounding, temp, max_tokens, login_btn, login_btn], # Keep login_btn twice
+        inputs=[
+            chatbot,        # history
+            user_in,        # <-- user_input
+            sdk_choice,
+            api_key,
+            grounding,
+            temp,
+            max_tokens,
+            login_btn,
+            login_btn
+        ],
         outputs=[chatbot, build_box, run_box, preview, project_status_md]
     )