Update app.py

app.py

@@ -10,8 +10,11 @@ from huggingface_hub import (
 )
 from huggingface_hub.utils import build_hf_headers, get_session, hf_raise_for_status
 from google import genai
+# Import Content specifically if we were using Option B, but sticking to Option A
+# from google.genai.types import Content
 from google.genai.types import Tool, GenerateContentConfig, GoogleSearch
 
+
 # --- USER INFO & MODEL LISTING ---
 
 def show_profile(profile: gr.OAuthProfile | None) -> str:
@@ -176,31 +179,25 @@ SYSTEM_DEBUG = {
 
 def run_agent(client, model_name, system_prompt_template, user_input_state, config):
     """Helper to run a single agent interaction using the project state as input."""
-    # Format the system prompt using state variables if needed
     try:
-        # Use a specific formatting approach that handles missing keys gracefully if needed
-        # For our current prompts, direct f-string formatting with known keys is fine
+        # Format the system prompt using state variables
         system_prompt = system_prompt_template["content"].format(**user_input_state)
     except KeyError as e:
          print(f"Error formatting system prompt: Missing key {e}. Prompt template: {system_prompt_template['content']}")
          return f"ERROR: Internal agent error - Missing key {e} for prompt formatting.", None
 
-    # Prepare the message content. The user_input_state is the core context.
-    # We structure it clearly for the agent to read.
+    # Prepare the message content by formatting the project state
     user_message_content = "Project State:\n" + json.dumps(user_input_state, indent=2)
 
-    messages = [
-        {"role": "user", "content": system_prompt + "\n\n" + user_message_content}
-    ]
+    # *** FIX: Combine system prompt and user state into a single string and pass as a list of strings ***
+    # This matches the format expected by generate_content for simple, non-chat inputs.
+    prompt = system_prompt + "\n\n" + user_message_content
 
     try:
-        # Use a specific, more capable model if needed for complex reasoning, otherwise Flash is fine
-        # model_to_use = "gemini-1.5-flash-latest" # Example of using a different model
-        model_to_use = model_name # Use the one passed in
-
+        # Pass a list containing the single combined prompt string
         response = client.models.generate_content(
             model=model_to_use,
-            contents=messages,
+            contents=[prompt], # <-- Corrected: Pass a list of strings
             config=config
         )
         response.raise_for_status() # Raise an exception for bad status codes
@@ -212,7 +209,8 @@ def run_agent(client, model_name, system_prompt_template, user_input_state, conf
         # print(response_text) # Careful: can be very long
         print("----------------------")
 
-        return response_text.strip(), messages + [{"role": "model", "content": response_text.strip()}] # Return response and the turn
+        # Return just the response text. The calling functions manage the project_state history.
+        return response_text.strip()
 
     except Exception as e:
         print(f"Agent call failed: {e}")
@@ -220,13 +218,19 @@ def run_agent(client, model_name, system_prompt_template, user_input_state, conf
         error_details = str(e)
         if hasattr(e, 'response') and e.response is not None:
              try:
-                 error_details = e.response.text # Get response body for more details
+                 # Check if response has a usable text body or error structure
+                 error_json = e.response.json()
+                 error_details = json.dumps(error_json, indent=2)
              except:
-                 pass # Ignore if cannot get text
+                 try:
+                     error_details = e.response.text # Fallback to raw text
+                 except:
+                      pass # Cannot get response text
 
-        return f"ERROR: Agent failed - {error_details}", None # Indicate failure
+        return f"ERROR: Agent failed - {error_details}" # Indicate failure
 
 # --- AGENT FUNCTIONS (called by Orchestrator) ---
+# These functions now expect only the response text from run_agent
 
 def run_planner(client, project_state, config):
     print("Orchestrator: Running Planner Agent...")
@@ -235,12 +239,11 @@ def run_planner(client, project_state, config):
         "requirements": project_state['requirements'],
         "sdk_choice": project_state['sdk_choice'],
         "main_app_file": project_state['main_app_file'],
-        # Include other relevant state like existing files if refining plan
-        "files": project_state['files']
+        "files": project_state['files'] # Include existing files
     }
-    response_text, _ = run_agent(
+    response_text = run_agent(
         client=client,
-        model_name="gemini-1.5-flash-latest", # Flash is good for this, maybe Pro if planning is complex
+        model_name="gemini-1.5-flash-latest",
         system_prompt_template=SYSTEM_ARCHITECT,
         user_input_state=input_state_for_planner,
         config=config,
@@ -253,6 +256,8 @@ def run_planner(client, project_state, config):
     project_state['plan'] = response_text
     print("Orchestrator: Planner Output Received.")
     project_state['status_message'] = "Planning complete."
+    # Add plan to chat history for user
+    project_state['chat_history'].append({"role": "assistant", "content": f"**Plan:**\n{project_state['plan']}"})
     return True
 
 def run_codegen(client, project_state, config):
@@ -267,9 +272,9 @@ def run_codegen(client, project_state, config):
         "sdk_choice": project_state['sdk_choice'],
         "main_app_file": project_state['main_app_file'] # Ensure it knows the main file convention
     }
-    response_text, _ = run_agent(
+    response_text = run_agent(
         client=client,
-        model_name="gemini-1.5-flash-latest", # Can use Flash, or Pro for more complex coding
+        model_name="gemini-1.5-flash-latest",
         system_prompt_template=SYSTEM_CODEGEN,
         user_input_state=input_state_for_codegen,
         config=config,
@@ -277,30 +282,30 @@ def run_codegen(client, project_state, config):
 
     if response_text.startswith("ERROR:"):
         project_state['status_message'] = response_text
+        # The error message added here will be processed by the debugger
+        # No need to add to chat history here, debugger feedback will summarize
         return False # Indicate failure
 
     # Parse the response text to extract code blocks for potentially multiple files
     files_updated = {}
     # Regex to find blocks like `filename`\n```[language]\ncode...\n```
-    # It captures the filename (group 1) and the code content (group 2)
-    # Added handling for optional language tag after the triple backticks
     blocks = re.findall(r"(`[^`]+`)\s*```(?:\w*\n)?([\s\S]*?)```", response_text)
 
     if not blocks:
          print("Code-Gen Agent did not output any code blocks in expected format.")
-         project_state['status_message'] = "ERROR: Code-Gen Agent failed to output code blocks in `filename`\\n```code``` format."
-         # Add the agent's raw response to chat history for debugging if no blocks found
-         project_state['chat_history'].append({"role": "assistant", "content": f"Code-Gen Agent raw response (no code blocks detected):\n\n{response_text}"})
-
+         parse_error_msg = "ERROR: Code-Gen Agent failed to output code blocks in `filename`\\n```code``` format."
+         project_state['status_message'] = parse_error_msg
+         # Add the agent's raw response to feedback for debugging
+         project_state['feedback'] = project_state['feedback'] + "\n\n" + parse_error_msg + "\nRaw Agent Response (no code blocks detected):\n" + response_text[:1000] + "..." # Add truncated raw response
+         project_state['chat_history'].append({"role": "assistant", "content": parse_error_msg + "\nSee Debug Feedback for raw response."})
          return False # Indicate failure
 
     syntax_errors = []
     for filename_match, code_content in blocks:
         filename = filename_match.strip('`').strip()
         if not filename:
-             print(f"Warning: Found a code block but filename was empty: {code_content[:50]}...")
              syntax_errors.append(f"Code block found with empty filename.")
-             continue
+             continue # Skip this block
 
         files_updated[filename] = code_content.strip() # Store updated code
 
@@ -308,7 +313,7 @@ def run_codegen(client, project_state, config):
         if filename.endswith('.py'):
             try:
                 compile(code_content, filename, "exec")
-                print(f"Syntax check passed for {filename}")
+                # print(f"Syntax check passed for {filename}") # Too verbose
             except SyntaxError as e:
                 syntax_errors.append(f"Syntax Error in {filename}: {e}")
                 print(f"Syntax Error in {filename}: {e}")
@@ -319,13 +324,17 @@ def run_codegen(client, project_state, config):
 
     if not files_updated:
          print("Code-Gen Agent outputted blocks but couldn't parse any valid filenames.")
-         project_state['status_message'] = "ERROR: Code-Gen Agent outputted blocks but couldn't parse any valid filenames."
+         parse_error_msg = "ERROR: Code-Gen Agent outputted blocks but couldn't parse any valid filenames."
+         project_state['status_message'] = parse_error_msg
+         project_state['feedback'] = project_state['feedback'] + "\n\n" + parse_error_msg
+         project_state['chat_history'].append({"role": "assistant", "content": parse_error_msg})
          return False # Indicate failure
 
     if syntax_errors:
         # If syntax errors found, add them to feedback and signal failure for CodeGen step
-        project_state['feedback'] = "Syntax Errors Found:\n" + "\n".join(syntax_errors) + "\n\n" + project_state['feedback'] # Prepend errors
-        project_state['status_message'] = "ERROR: Code-Gen Agent introduced syntax errors. Debugging needed."
+        syntax_error_msg = "ERROR: Code-Gen Agent introduced syntax errors."
+        project_state['feedback'] = syntax_error_msg + "\n" + "\n".join(syntax_errors) + "\n\n" + project_state.get('feedback', '') # Prepend errors
+        project_state['status_message'] = syntax_error_msg + " Debugging needed."
         # Add syntax errors to chat history for user visibility
         project_state['chat_history'].append({"role": "assistant", "content": project_state['status_message']})
         project_state['chat_history'].append({"role": "assistant", "content": "Details:\n" + "\n".join(syntax_errors)})
@@ -335,7 +344,7 @@ def run_codegen(client, project_state, config):
     project_state['files'].update(files_updated) # Update existing files or add new ones
     print(f"Orchestrator: Code-Gen Agent updated files: {list(files_updated.keys())}")
 
-    # Add the generated/updated code content to the status message for visibility in UI
+    # Add the generated/updated code content snippet to the chat history for visibility
     code_summary = "\n".join([f"`{fn}`:\n```python\n{code[:500]}{'...' if len(code) > 500 else ''}\n```" for fn, code in files_updated.items()]) # Show snippet
     project_state['chat_history'].append({"role": "assistant", "content": f"**Code Generated/Updated:**\n\n{code_summary}"})
     project_state['status_message'] = f"Code generated/updated: {list(files_updated.keys())}"
@@ -355,9 +364,9 @@ def run_debugger(client, project_state, config):
         "iframe_status": 'Responding OK' if project_state.get('iframe_ok', False) else 'Not responding or check failed.',
         "error_types_found": classify_errors(project_state['logs'].get('build', '') + '\n' + project_state['logs'].get('run', ''))
     }
-    response_text, _ = run_agent(
+    response_text = run_agent(
         client=client,
-        model_name="gemini-1.5-flash-latest", # Flash is good for analysis
+        model_name="gemini-1.5-flash-latest",
         system_prompt_template=SYSTEM_DEBUG,
         user_input_state=input_state_for_debugger,
         config=config,
@@ -365,19 +374,20 @@ def run_debugger(client, project_state, config):
 
     if response_text.startswith("ERROR:"):
         project_state['status_message'] = response_text
+        # Add the debugger error to feedback for visibility
+        project_state['feedback'] = project_state.get('feedback', '') + "\n\n" + response_text
+        project_state['chat_history'].append({"role": "assistant", "content": response_text}) # Add error to chat
         return False # Indicate failure
 
     project_state['feedback'] = response_text
     print("Orchestrator: Debug Agent Feedback Received.")
     project_state['status_message'] = "Debug feedback generated."
-    # Add debug feedback to chat history (already done in orchestrate_development, but could be here)
+    # Add debug feedback to chat history
+    project_state['chat_history'].append({"role": "assistant", "content": f"**Debug Feedback:**\n{project_state['feedback']}"})
     return True
 
 # --- MAIN ORCHESTRATION LOGIC ---
 
-# We use Python functions to represent the state transitions and agent calls
-# This is more deterministic than using an LLM purely for orchestration.
-
 def orchestrate_development(client, project_state, config, oauth_token_token):
     """Manages the overall development workflow."""
 
@@ -385,6 +395,8 @@ def orchestrate_development(client, project_state, config, oauth_token_token):
     if project_state['current_task'] == 'START':
         project_state['current_task'] = 'PLANNING'
         project_state['status_message'] = "Starting project: Initializing and moving to Planning."
+        # Add initial message to chat history
+        project_state['chat_history'].append({"role": "assistant", "content": "Project initialized. Starting development team."})
 
 
     while project_state['status'] == 'In Progress' and project_state['attempt_count'] < 7:
@@ -392,13 +404,10 @@ def orchestrate_development(client, project_state, config, oauth_token_token):
         print(f"Current Task: {project_state['current_task']}")
         current_task = project_state['current_task']
 
-        # Add current task to history for UI visibility (if not already added by previous step)
-        # 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}"})
+        # Add current task to history for UI visibility
+        task_message = f"➡️ Task: {current_task}"
+        if not project_state['chat_history'] or project_state['chat_history'][-1].get('content', '').strip() != task_message.strip():
+             project_state['chat_history'].append({"role": "assistant", "content": task_message})
 
 
         step_successful = True # Flag to track if the current step completed without error
@@ -406,14 +415,9 @@ def orchestrate_development(client, project_state, config, oauth_token_token):
         if current_task == 'PLANNING':
             step_successful = run_planner(client, project_state, config)
             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
+                 project_state['current_task'] = 'FAILED' # Planning failed, end process
 
 
         elif current_task.startswith('CODING'):
@@ -502,15 +506,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 = 120 # Maximum total time to wait for logs in this step (increased slightly more)
+            max_log_wait = 120 # Maximum total time to wait for logs in this step
             elapsed_log_wait = 0
             logs_fetched = False
             iframe_checked = False
 
-            project_state['status_message'] = "Fetching logs and checking iframe..."
-            # 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']})
+            status_logging_message = "Fetching logs and checking iframe..."
+            if not project_state['chat_history'] or project_state['chat_history'][-1].get('content', '').strip() != status_logging_message.strip():
+                 project_state['chat_history'].append({"role": "assistant", "content": status_logging_message})
+            project_state['status_message'] = status_logging_message
 
 
             while elapsed_log_wait < max_log_wait:
@@ -522,8 +526,7 @@ This is an auto-generated HF Space.
                      logs_fetched = True
 
                      # 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 or len(build_logs) > 100: # Also check if build logs are substantial
+                     if elapsed_log_wait > 10 or len(run_logs) > 0 or len(build_logs) > 100:
                          project_state['iframe_ok'] = check_iframe(project_state['iframe_url'])
                          iframe_checked = True
                      else:
@@ -562,7 +565,7 @@ This is an auto-generated HF Space.
             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)."
             else:
-                project_state['status_message'] = "Warning: Could not fetch logs or check iframe status within timeout." # Use Warning status message
+                project_state['status_message'] = "Warning: Could not fetch logs or check iframe status within timeout."
                 step_successful = False # Indicate that this step didn't fully succeed
 
 
@@ -573,22 +576,13 @@ This is an auto-generated HF Space.
         elif current_task == 'DEBUGGING':
             step_successful = run_debugger(client, project_state, config)
 
-            # Add debug feedback to chat history
-            project_state['chat_history'].append({"role": "assistant", "content": f"**Debug Feedback:**\n{project_state['feedback']}"})
+            # Debug feedback is added to chat history inside run_debugger now
 
 
             if step_successful:
                  # 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', ''))
 
 
@@ -598,7 +592,7 @@ This is an auto-generated HF Space.
                  # Decision Logic:
                  # 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', '')) > 10) # 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)
 
                  if is_complete:
                      project_state['status'] = 'Complete'
@@ -621,7 +615,7 @@ This is an auto-generated HF Space.
                  # Debugger failed (e.g. API error)
                  project_state['status'] = 'Failed'
                  project_state['current_task'] = 'FINISHED'
-                 # status_message already set by run_debugger
+                 # status_message and feedback already set by run_debugger
 
 
         elif current_task == 'FINISHED':
@@ -642,9 +636,6 @@ 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 unexpected error caused task failure: {current_task}')
@@ -656,14 +647,12 @@ This is an auto-generated HF Space.
 
     # Final status message if loop exited without explicit FINISHED state
     if project_state['status'] == 'In Progress':
-         # This shouldn't happen with the current logic, but good practice
          project_state['status'] = 'Failed'
          project_state['status_message'] = project_state.get('status_message', 'Orchestration loop exited unexpectedly.')
 
 
     # 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})
 
@@ -706,17 +695,12 @@ def handle_user_message(
     # 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)
-    # 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})
+         history.append({"role": "user", "content": user_input})
 
 
     if not profile or not oauth_token or not oauth_token.token:
         # Append error message to history for display
-        # 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})
@@ -851,7 +835,7 @@ 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 - REMOVE login_btn from inputs
+    # Update the button click handler - inputs now match the handle_user_message signature (7 inputs)
     # Gradio will auto-inject profile and token based on the function signature
     send_btn.click(
         fn=handle_user_message,
@@ -863,12 +847,13 @@ with gr.Blocks(title="HF Space Auto‑Builder (Team AI)") as demo:
             grounding,
             temp,
             max_tokens,
-            # REMOVED: login_btn, login_btn - Gradio injects profile/token based on signature
+            # profile (auto-injected)
+            # oauth_token (auto-injected)
         ],
         outputs=[chatbot, build_box, run_box, preview, project_status_md]
     )
 
-    # Update the submit handler - REMOVE login_btn from inputs
+    # Update the submit handler - inputs now match the handle_user_message signature (7 inputs)
     user_in.submit(
         fn=handle_user_message,
         inputs=[
@@ -879,7 +864,8 @@ with gr.Blocks(title="HF Space Auto‑Builder (Team AI)") as demo:
             grounding,
             temp,
             max_tokens,
-            # REMOVED: login_btn, login_btn - Gradio injects profile/token based on signature
+             # profile (auto-injected)
+             # oauth_token (auto-injected)
         ],
         outputs=[chatbot, build_box, run_box, preview, project_status_md]
     )