Update app.py

app.py

@@ -30,6 +30,22 @@ def fetch_logs(repo_id: str, level: str):
                     continue
     return "\n".join(lines)
 
+# — UTILS —
+
+def normalize_history(history):
+    """
+    Take Chatbot 'messages' history (list of ChatMessage or dict)
+    and return list of dicts: {'role': ..., 'content': ...}
+    """
+    out = []
+    for msg in history:
+        if isinstance(msg, dict):
+            out.append({"role": msg["role"], "content": msg["content"]})
+        else:
+            # ChatMessage namedtuple
+            out.append({"role": msg.role, "content": msg.content})
+    return out
+
 # — CORE LOOP: send prompt & (iteratively) deploy —
 
 def handle_user_message(
@@ -38,11 +54,13 @@ def handle_user_message(
     sdk_choice: str,
     gemini_api_key, grounding_enabled
 ):
-    # Ensure we actually have a profile & token
+    # must be logged in
     if hf_profile is None or hf_token is None:
-        return history + [("assistant", "⚠️ Please log in first.")], "", "", "<p>No Space yet.</p>"
+        return history + [{"role":"assistant","content":"⚠️ Please log in first."}], "", "", "<p>No Space yet.</p>"
 
     genai_client = genai.Client(api_key=gemini_api_key)
+
+    # build system + user chat
     chat = [{
         "role":"system",
         "content":(
@@ -51,19 +69,19 @@ def handle_user_message(
             "If errors appear, fix them and return the full updated code."
         )
     }]
-    for role, msg in history:
-        chat.append({"role": role, "content": msg})
+    chat += normalize_history(history)
 
     filename = "app.py" if sdk_choice=="gradio" else "streamlit_app.py"
     build_logs = run_logs = ""
 
     for _ in range(5):
-        # build tool list for grounding
+        # setup tools for grounding
         tools = []
         if grounding_enabled:
             tools.append(Tool(google_search=GoogleSearch()))
         config = GenerateContentConfig(tools=tools, response_modalities=["TEXT"])
 
+        # call Gemini
         resp = genai_client.models.generate_content(
             model="gemini-2.5-flash-preview-04-17",
             contents=[c["content"] for c in chat],
@@ -92,12 +110,15 @@ def handle_user_message(
             repo_type="space"
         )
 
+        # fetch logs
         build_logs = fetch_logs(repo_id, "build")
         run_logs   = fetch_logs(repo_id, "run")
 
+        # done if no errors
         if "ERROR" not in build_logs.upper() and "ERROR" not in run_logs.upper():
             break
 
+        # else feed back
         chat.append({
             "role":"user",
             "content":(
@@ -108,9 +129,13 @@ def handle_user_message(
         })
         time.sleep(2)
 
-    new_history = [(h["role"], h["content"]) for h in chat if h["role"]!="system"]
-    iframe = f'<iframe src="https://huggingface.co/spaces/{repo_id}" width="100%" height="500px"></iframe>'
-    return new_history, build_logs, run_logs, iframe
+    # prepare return: a list of dicts for Chatbot(type="messages")
+    return (
+        [{"role":m["role"], "content":m["content"]} for m in chat if m["role"]!="system"],
+        build_logs,
+        run_logs,
+        f'<iframe src="https://huggingface.co/spaces/{repo_id}" width="100%" height="500px"></iframe>'
+    )
 
 # — GRADIO UI — 
 
@@ -118,27 +143,31 @@ with gr.Blocks(title="HF Space Auto‑Builder (Gradio & Streamlit)") as demo:
     with gr.Row():
         with gr.Column(scale=1):
             gr.Markdown("### Sidebar")
-            # hidden state holders for OAuthProfile and OAuthToken
+
             profile_state = gr.State()
             token_state   = gr.State()
 
             login_btn    = gr.LoginButton("huggingface", size="sm")
             login_status = gr.Markdown("*Not logged in.*")
 
-            # capture profile & token into state
+            # capture the profile/token from the LoginButton
             login_btn.click(
-                lambda profile, oauth_token: (profile, oauth_token),
+                fn=lambda profile, oauth_token: (profile, oauth_token),
+                inputs=None,
                 outputs=[profile_state, token_state]
             )
-            # update status text
+            # update the status text once those states are set
             login_btn.click(
-                lambda profile, oauth_token: f"Logged in as **{profile.username}**"
-                  if profile else "*Not logged in.*",
+                fn=lambda profile, oauth_token: f"Logged in as **{profile.username}**"
+                      if profile else "*Not logged in.*",
+                inputs=[profile_state, token_state],
                 outputs=login_status
             )
 
             sdk_choice = gr.Radio(
-                ["gradio","streamlit"], value="gradio", label="SDK Template"
+                ["gradio","streamlit"],
+                value="gradio",
+                label="SDK Template"
             )
             api_key   = gr.Textbox(label="Gemini API Key", type="password")
             grounding = gr.Checkbox(label="Enable grounding", value=False)