Update app.py

app.py

@@ -5,6 +5,13 @@ from huggingface_hub.utils import build_hf_headers, get_session, hf_raise_for_st
 from google import genai  # Gemini Python SDK
 from google.genai.types import Tool, GenerateContentConfig, GoogleSearch
 
+# — USER INFO & MODEL LISTING (from your reference) —
+
+def show_profile(profile: gr.OAuthProfile | None) -> str:
+    if profile is None:
+        return "*Not logged in.*"
+    return f"✅ Logged in as **{profile.username}**"
+
 # — HELPERS FOR HF SPACE LOGS —
 
 def _get_space_jwt(repo_id: str):
@@ -30,37 +37,24 @@ 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(
-    history, 
-    hf_profile, hf_token, 
+    history,              # list of {"role","content"} dicts
     sdk_choice: str,
-    gemini_api_key, grounding_enabled
+    gemini_api_key: str,
+    grounding_enabled: bool,
+    profile: gr.OAuthProfile | None,
+    oauth_token: gr.OAuthToken | None
 ):
-    # must be logged in
-    if hf_profile is None or hf_token is None:
+    # require login
+    if profile is None or oauth_token is None:
         return history + [{"role":"assistant","content":"⚠️ Please log in first."}], "", "", "<p>No Space yet.</p>"
 
+    # initialize Gemini
     genai_client = genai.Client(api_key=gemini_api_key)
 
-    # build system + user chat
+    # build the prompt history (including a system instruction)
     chat = [{
         "role":"system",
         "content":(
@@ -68,36 +62,39 @@ def handle_user_message(
             f"{sdk_choice} SDK. After producing code, wait for logs. "
             "If errors appear, fix them and return the full updated code."
         )
-    }]
-    chat += normalize_history(history)
+    }] + history
 
     filename = "app.py" if sdk_choice=="gradio" else "streamlit_app.py"
     build_logs = run_logs = ""
 
     for _ in range(5):
-        # setup tools for grounding
+        # assemble tools
         tools = []
         if grounding_enabled:
             tools.append(Tool(google_search=GoogleSearch()))
-        config = GenerateContentConfig(tools=tools, response_modalities=["TEXT"])
+
+        config = GenerateContentConfig(
+            tools=tools,
+            response_modalities=["TEXT"],
+        )
 
         # call Gemini
-        resp = genai_client.models.generate_content(
+        response = genai_client.models.generate_content(
             model="gemini-2.5-flash-preview-04-17",
-            contents=[c["content"] for c in chat],
+            contents=[m["content"] for m in chat],
             config=config
         )
-        ai_code = resp.text
+        ai_code = response.text
         chat.append({"role":"assistant", "content": ai_code})
 
         # write & deploy
         with open(filename, "w") as f:
             f.write(ai_code)
 
-        repo_id = f"{hf_profile.username}/{hf_profile.username}-auto-space"
+        repo_id = f"{profile.username}/{profile.username}-auto-space"
         create_repo(
             repo_id=repo_id,
-            token=hf_token.token,
+            token=oauth_token.token,
             exist_ok=True,
             repo_type="space",
             space_sdk=sdk_choice
@@ -106,19 +103,19 @@ def handle_user_message(
             path_or_fileobj=filename,
             path_in_repo=filename,
             repo_id=repo_id,
-            token=hf_token.token,
+            token=oauth_token.token,
             repo_type="space"
         )
 
-        # fetch logs
+        # fetch build & run logs
         build_logs = fetch_logs(repo_id, "build")
         run_logs   = fetch_logs(repo_id, "run")
 
-        # done if no errors
+        # if no errors, stop looping
         if "ERROR" not in build_logs.upper() and "ERROR" not in run_logs.upper():
             break
 
-        # else feed back
+        # otherwise feed logs back to Gemini
         chat.append({
             "role":"user",
             "content":(
@@ -129,67 +126,48 @@ def handle_user_message(
         })
         time.sleep(2)
 
-    # 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>'
-    )
+    # prepare outputs for gr.Chatbot(type="messages")
+    messages = [{"role":m["role"], "content":m["content"]} for m in chat if m["role"]!="system"]
+    iframe   = f'<iframe src="https://huggingface.co/spaces/{repo_id}" width="100%" height="500px"></iframe>'
+    return messages, build_logs, run_logs, iframe
 
-# — GRADIO UI — 
+# — BUILD THE UI —
 
 with gr.Blocks(title="HF Space Auto‑Builder (Gradio & Streamlit)") as demo:
-    with gr.Row():
-        with gr.Column(scale=1):
-            gr.Markdown("### Sidebar")
-
-            profile_state = gr.State()
-            token_state   = gr.State()
-
-            login_btn    = gr.LoginButton("huggingface", size="sm")
-            login_status = gr.Markdown("*Not logged in.*")
-
-            # capture the profile/token from the LoginButton
-            login_btn.click(
-                fn=lambda profile, oauth_token: (profile, oauth_token),
-                inputs=None,
-                outputs=[profile_state, token_state]
-            )
-            # update the status text once those states are set
-            login_btn.click(
-                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"
-            )
-            api_key   = gr.Textbox(label="Gemini API Key", type="password")
-            grounding = gr.Checkbox(label="Enable grounding", value=False)
-
-        with gr.Column(scale=3):
-            chatbot   = gr.Chatbot(type="messages")
-            user_in   = gr.Textbox(placeholder="Your prompt …", label="Prompt")
-            send_btn  = gr.Button("Send")
-
-            build_box = gr.Textbox(label="Build logs", lines=5, interactive=False)
-            run_box   = gr.Textbox(label="Run logs",   lines=5, interactive=False)
-            preview   = gr.HTML("<p>No Space yet.</p>")
-
-            send_btn.click(
-                fn=handle_user_message,
-                inputs=[
-                    chatbot,
-                    profile_state, token_state,
-                    sdk_choice, api_key, grounding
-                ],
-                outputs=[chatbot, build_box, run_box, preview]
-            )
+    gr.Markdown("## Sign in with Hugging Face + Auto‑Build Spaces\n\n"
+                "1. Sign in\n2. Enter your prompt\n3. Watch the code deploy & debug itself\n\n---")
+
+    # — LOGIN —
+    login_btn = gr.LoginButton(variant="huggingface", size="lg")
+    status_md = gr.Markdown("*Not logged in.*")
+    # automatically show profile on load & login
+    demo.load(show_profile,         inputs=None, outputs=status_md)
+    login_btn.click(show_profile,   inputs=None, outputs=status_md)
+
+    # — SIDEBAR CONTROLS —
+    sdk_choice = gr.Radio(
+        choices=["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)
+
+    # — CHAT INTERFACE & OUTPUTS —
+    chatbot   = gr.Chatbot(type="messages")
+    user_in   = gr.Textbox(placeholder="e.g. Generate me a blurtest app…", label="Prompt")
+    send_btn  = gr.Button("Send")
+
+    build_box = gr.Textbox(label="Build logs", lines=5, interactive=False)
+    run_box   = gr.Textbox(label="Run logs",   lines=5, interactive=False)
+    preview   = gr.HTML("<p>No Space yet.</p>")
+
+    # wire up the Send button
+    send_btn.click(
+        fn=handle_user_message,
+        inputs=[chatbot, sdk_choice, api_key, grounding],
+        outputs=[chatbot, build_box, run_box, preview]
+    )
 
 if __name__=="__main__":
     demo.launch()