Update app.py

app.py

@@ -39,13 +39,9 @@ def get_sdk_version(sdk_choice: str) -> str:
 
 def extract_code(text: str) -> str:
     """
-    Extract the last 
-…
- block. If none, return whole text.
+    Extract the last ```…``` block. If none, return whole text.
     """
-    blocks = re.findall(r"
-(?:\w*\n)?([\s\S]*?)
-", text)
+    blocks = re.findall(r"```(?:\w*\n)?([\s\S]*?)```", text)
     return blocks[-1].strip() if blocks else text.strip()
 
 # — HF SPACE LOGGING — 
@@ -73,7 +69,7 @@ def fetch_logs(repo_id: str, level: str) -> str:
                     continue
     return "\n".join(lines)
 
-# — CORE LOOP — 
+# — CORE LOOP (generator) — 
 
 def handle_user_message(
     history,
@@ -84,17 +80,22 @@ def handle_user_message(
     profile: gr.OAuthProfile | None,
     oauth_token: gr.OAuthToken | None
 ):
+    # 1) 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>"
-        )
+        yield history + [{"role":"assistant","content":"⚠️ Please log in first."}], "", "", "<p>No Space yet.</p>"
+        return
+
+    username    = profile.username
+    repo_name   = f"{username}-{space_suffix}"
+    repo_id     = f"{username}/{repo_name}"
+    preview_url = f"https://{username}-{space_suffix}.hf.space"
+    iframe_html = (
+        f'<iframe src="{preview_url}" '
+        f'width="100%" height="500px" frameborder="0"></iframe>'
+    )
 
-    username = profile.username
-    repo_name = f"{username}-{space_suffix}"
-    repo_id   = f"{username}/{repo_name}"
+    # 2) Initial “in progress” update
+    yield history + [{"role":"assistant","content":"🚀 Generating and deploying your Space..."}], "Fetching logs…", "Fetching logs…", iframe_html
 
     client = genai.Client(api_key=gemini_api_key)
     system_msg = {
@@ -106,30 +107,26 @@ def handle_user_message(
     }
     chat = [system_msg] + history
 
-    code_fn   = "app.py" if sdk_choice=="gradio" else "streamlit_app.py"
+    code_fn   = "app.py" if sdk_choice == "gradio" else "streamlit_app.py"
     readme_fn = "README.md"
     reqs_fn   = "requirements.txt"
 
-    # Try up to 5 times to generate & push working code
+    # 3) Build & retry loop
     for _ in range(5):
         tools = [Tool(google_search=GoogleSearch())] if grounding_enabled else []
         cfg   = GenerateContentConfig(tools=tools, response_modalities=["TEXT"])
-
-        resp = client.models.generate_content(
+        resp  = client.models.generate_content(
             model="gemini-2.5-flash-preview-04-17",
             contents=[m["content"] for m in chat],
             config=cfg
         )
 
-        raw_code = resp.text
-        code = extract_code(raw_code)
+        code = extract_code(resp.text)
         chat.append({"role":"assistant","content":code})
 
-        # Write code file
+        # Write files
         with open(code_fn, "w") as f:
             f.write(code)
-
-        # Write README with dynamic SDK version
         sdk_version = get_sdk_version(sdk_choice)
         readme = f"""---
 title: Wuhp Auto Space
@@ -146,10 +143,8 @@ Check out the configuration reference at https://huggingface.co/docs/hub/spaces-
 """
         with open(readme_fn, "w") as f:
             f.write(readme)
-
-        # Write requirements
         base_reqs = "pandas\n"
-        extra     = "streamlit\n" if sdk_choice=="streamlit" else "gradio\n"
+        extra     = "streamlit\n" if sdk_choice == "streamlit" else "gradio\n"
         with open(reqs_fn, "w") as f:
             f.write(base_reqs + extra)
 
@@ -170,33 +165,29 @@ Check out the configuration reference at https://huggingface.co/docs/hub/spaces-
                 repo_type="space"
             )
 
-        # If build succeeds without errors, break; otherwise feed logs back to LLM
-        build = fetch_logs(repo_id, "build")
-        run   = fetch_logs(repo_id, "run")
-        if "ERROR" not in build.upper() and "ERROR" not in run.upper():
+        # Fetch logs
+        build_logs = fetch_logs(repo_id, "build")
+        run_logs   = fetch_logs(repo_id, "run")
+
+        # Stream update
+        msgs = [{"role":m["role"], "content":m["content"]} for m in chat if m["role"] != "system"]
+        yield msgs, build_logs, run_logs, iframe_html
+
+        # Stop if successful
+        if "ERROR" not in build_logs.upper() and "ERROR" not in run_logs.upper():
             break
 
+        # Otherwise feed logs back for retry
         chat.append({
-            "role":"user",
-            "content":(
-                f"Build logs:\n{build}\n\n"
-                f"Run logs:\n{run}\n\n"
+            "role": "user",
+            "content": (
+                f"Build logs:\n{build_logs}\n\n"
+                f"Run logs:\n{run_logs}\n\n"
                 "Please fix the code."
             )
         })
         time.sleep(2)
 
-    # Prepare messages + immediate iframe preview
-    messages = [{"role":m["role"],"content":m["content"]} for m in chat if m["role"]!="system"]
-    preview_url = f"https://huggingface.co/spaces/{repo_id}"
-    iframe = (
-        f'<iframe src="{preview_url}" '
-        f'width="100%" height="500px" frameborder="0"></iframe>'
-    )
-
-    placeholder = "✅ Space created! Click “Refresh Logs” to pull build/run logs."
-    return messages, placeholder, placeholder, iframe
-
 # — REFRESH LOGS — 
 
 def refresh_logs(
@@ -212,45 +203,49 @@ def refresh_logs(
 # — BUILD THE UI — 
 
 with gr.Blocks(title="HF Space Auto‑Builder") as demo:
-    gr.Markdown("## Sign in + Auto‑Build Spaces\n\n"
-                "1. Sign in  2. Enter your prompt  3. Watch code, README, requirements, logs, and preview\n\n---")
-
-    # LOGIN controls
-    login_btn = gr.LoginButton(variant="huggingface", size="lg")
-    status_md = gr.Markdown("*Not logged in.*")
-    models_md = gr.Markdown()
-    demo.load(show_profile,        inputs=None, outputs=status_md)
-    demo.load(list_private_models, inputs=None, outputs=models_md)
+    gr.Markdown(
+        "## Sign in + Auto‑Build Spaces\n\n"
+        "1. Sign in  2. Enter your prompt  3. Watch code, README, requirements, logs, and preview\n\n---"
+    )
+
+    # LOGIN controls (captures profile & token)
+    login_btn  = gr.LoginButton(variant="huggingface", size="lg")
+    status_md  = gr.Markdown("*Not logged in.*")
+    models_md  = gr.Markdown()
+    demo.load(show_profile,        inputs=None,           outputs=status_md)
+    demo.load(list_private_models, inputs=None,           outputs=models_md)
     login_btn.click(show_profile,        inputs=None, outputs=status_md)
     login_btn.click(list_private_models, inputs=None, outputs=models_md)
 
     # SETTINGS
-    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)
-    space_suffix= gr.Textbox(label="Space suffix", value="auto-space",
-                             info="E.g. 'auto-space', 'auto-space2', etc.")
+    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)
+    space_suffix = gr.Textbox(label="Space suffix", value="auto-space",
+                              info="E.g. 'auto-space', 'auto-space2', etc.")
 
     # CHAT + OUTPUTS
-    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>")
-
+    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>")
+
+    # Hook up generator (profile & token pulled from login_btn)
     send_btn.click(
         fn=handle_user_message,
-        inputs=[chatbot, sdk_choice, api_key, grounding, space_suffix],
-        outputs=[chatbot, build_box, run_box, preview]
+        inputs=[chatbot, sdk_choice, api_key, grounding, space_suffix, login_btn],
+        outputs=[chatbot, build_box, run_box, preview],
+        queue=True
     )
 
-    # Manual log refresh
+    # Optional manual refresh
     refresh_btn = gr.Button("Refresh Logs")
     refresh_btn.click(
         fn=refresh_logs,
-        inputs=[space_suffix],
+        inputs=[space_suffix, login_btn],
         outputs=[build_box, run_box]
     )
 
-    demo.launch(server_name="0.0.0.0", server_port=7860)
+    demo.launch(server_name="0.0.0.0", server_port=7860)