Update app.py

app.py

@@ -22,7 +22,7 @@ def list_private_models(
     ]
     return "No models found." if not models else "Models:\n\n" + "\n - ".join(models)
 
-# — LOG FETCHING —
+# — HELPERS FOR HF SPACE LOGS —
 
 def _get_space_jwt(repo_id: str):
     url = f"{constants.ENDPOINT}/api/spaces/{repo_id}/jwt"
@@ -45,10 +45,10 @@ def fetch_logs(repo_id: str, level: str):
                     continue
     return "\n".join(lines)
 
-# — HANDLERS —
+# — CORE LOOP: ask LLM for JSON, write & deploy —
 
 def handle_user_message(
-    history,               # list of dicts {"role","content"}
+    history,               # list of {"role","content"} dicts
     sdk_choice: str,
     gemini_api_key: str,
     grounding_enabled: bool,
@@ -56,32 +56,36 @@ def handle_user_message(
     oauth_token: gr.OAuthToken | None
 ):
     if not (profile and oauth_token):
-        return history + [{"role":"assistant","content":"⚠️ Please log in first."}], "", "", "<p>No Space yet.</p>", ""
+        return history + [{"role":"assistant","content":"⚠️ Please log in first."}], "", "", "<p>No Space yet.</p>"
 
     client = genai.Client(api_key=gemini_api_key)
-    chat   = [{
+
+    # System prompt: instruct JSON output
+    system_msg = {
         "role":"system",
         "content":(
-            f"You are an AI assistant writing a HuggingFace Space using the "
-            f"{sdk_choice} SDK. After producing code, wait for logs; if errors appear, fix them."
+            "You are an AI assistant that generates all files needed for a HuggingFace Space.\n"
+            "Based on the user's prompt, return a **single JSON object** with keys:\n"
+            "  • repo_name: string – the name of the new Space repo (no username).\n"
+            "  • files: object mapping filenames to file contents (strings).  \n"
+            "    Required files: one code file (preferably app.py; if you choose a different name, update README.md),\n"
+            "    README.md frontmatter (with title, sdk, sdk_version, app_file), and requirements.txt.\n"
+            "Do **NOT** return any explanatory text—only that JSON object.\n"
         )
-    }] + history
-
-    # choose filenames
-    code_fn   = "app.py" if sdk_choice == "gradio" else "streamlit_app.py"
-    readme_fn = "README.md"
-    reqs_fn   = "requirements.txt"
-    repo_id   = f"{profile.username}/{profile.username}-auto-space"
+    }
+    chat = [system_msg] + history
 
+    repo_id = None
     build_logs = run_logs = ""
+
     for _ in range(5):
-        # dynamic sdk_version
+        # dynamic version detection
         if sdk_choice == "gradio":
             import gradio as _gr; sdk_version = _gr.__version__
         else:
             import streamlit as _st; sdk_version = _st.__version__
 
-        # ask Gemini
+        # ask the LLM
         tools = [Tool(google_search=GoogleSearch())] if grounding_enabled else []
         cfg   = GenerateContentConfig(tools=tools, response_modalities=["TEXT"])
         resp  = client.models.generate_content(
@@ -89,60 +93,59 @@ def handle_user_message(
             contents=[m["content"] for m in chat],
             config=cfg
         )
-        code  = resp.text
-        chat.append({"role":"assistant","content":code})
-
-        # write code
-        with open(code_fn, "w") as f:
-            f.write(code)
-
-        # write README.md
-        with open(readme_fn, "w") as f:
-            f.write(f"""---
-title: Wuhp Auto Space
-emoji: 🐢
-colorFrom: red
-colorTo: pink
-sdk: {sdk_choice}
-sdk_version: {sdk_version}
-app_file: {code_fn}
-pinned: false
----
-
-See config reference → https://huggingface.co/docs/hub/spaces-config-reference
-""")
-
-        # write requirements
-        base = "pandas\n"
-        extra = ("streamlit\n" if sdk_choice=="streamlit" else "gradio\n")
-        with open(reqs_fn, "w") as f:
-            f.write(base + extra)
-
-        # deploy
-        create_repo(repo_id=repo_id,
-                    token=oauth_token.token,
-                    exist_ok=True,
-                    repo_type="space",
-                    space_sdk=sdk_choice)
-        for fn in (code_fn, readme_fn, reqs_fn):
-            upload_file(path_or_fileobj=fn,
-                        path_in_repo=fn,
-                        repo_id=repo_id,
-                        token=oauth_token.token,
-                        repo_type="space")
+        ai_text = resp.text
+        chat.append({"role":"assistant","content":ai_text})
+
+        # parse JSON
+        try:
+            spec = json.loads(ai_text)
+            repo_name = spec["repo_name"]
+            files     = spec["files"]
+        except Exception as e:
+            # ask it to re-output valid JSON
+            chat.append({"role":"user","content":
+                         "Your last response wasn't valid JSON. "
+                         "Please reply with exactly the JSON object as specified."})
+            continue
+
+        repo_id = f"{profile.username}/{repo_name}"
+
+        # write & upload each file
+        create_repo(
+            repo_id=repo_id,
+            token=oauth_token.token,
+            exist_ok=True,
+            repo_type="space",
+            space_sdk=sdk_choice
+        )
+        for fn, content in files.items():
+            # fill in sdk_version into README if needed
+            if fn.lower() == "readme.md":
+                content = content.replace("<SDK_VERSION>", sdk_version)
+            with open(fn, "w") as f:
+                f.write(content)
+            upload_file(
+                path_or_fileobj=fn,
+                path_in_repo=fn,
+                repo_id=repo_id,
+                token=oauth_token.token,
+                repo_type="space"
+            )
 
         # fetch logs
         build_logs = fetch_logs(repo_id, "build")
         run_logs   = fetch_logs(repo_id, "run")
+
         if "ERROR" not in build_logs.upper() and "ERROR" not in run_logs.upper():
             break
 
+        # feed errors back
         chat.append({
             "role":"user",
             "content":(
-                f"Build logs:\n{build_logs}\n\n"
-                f"Run logs:\n{run_logs}\n\n"
-                "Please fix the code."
+                f"Deployment produced build logs:\n{build_logs}\n\n"
+                f"and run logs:\n{run_logs}\n\n"
+                "Please fix the code and output a new JSON spec."
             )
         })
         time.sleep(2)
@@ -150,67 +153,38 @@ See config reference → https://huggingface.co/docs/hub/spaces-config-referen
     # prepare outputs
     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, repo_id
-
-def refresh_build_logs(repo_id: str, profile, oauth_token):
-    if not (profile and oauth_token and repo_id):
-        return "⚠️ Please deploy first."
-    return fetch_logs(repo_id, "build")
+    return messages, build_logs, run_logs, iframe
 
-def refresh_run_logs(repo_id: str, profile, oauth_token):
-    if not (profile and oauth_token and repo_id):
-        return "⚠️ Please deploy first."
-    return fetch_logs(repo_id, "run")
+# — BUILD THE UI —
 
-# — UI —
+with gr.Blocks(title="HF Space Auto‑Builder") as demo:
+    gr.Markdown("## Sign in + Auto‑Build Spaces\n\n"
+                "1. Sign in  2. Prompt  3. Deploy & Debug \n\n"
+                "*LLM will generate code, README, requirements, and iterate until successful.*\n\n---")
 
-with gr.Blocks() as demo:
-    gr.Markdown("## HF Space Auto‑Builder\n1. Sign in  2. Prompt  3. Deploy & Debug ►")
-
-    # Login & model list
-    login_btn  = gr.LoginButton("huggingface", size="lg")
-    status_md  = gr.Markdown("*Not logged in.*")
-    models_md  = gr.Markdown()
+    login_btn = gr.LoginButton("huggingface", size="lg")
+    status_md = gr.Markdown("*Not logged in.*")
+    models_md = gr.Markdown()
     demo.load(show_profile,         None, status_md)
     demo.load(list_private_models,  None, models_md)
     login_btn.click(show_profile,        None, status_md)
     login_btn.click(list_private_models, None, models_md)
 
-    # Controls
-    with gr.Row():
-        sdk_choice = gr.Radio(["gradio","streamlit"], "gradio", label="SDK")
-        api_key    = gr.Textbox(label="Gemini API Key", type="password")
-        grounding  = gr.Checkbox(label="Enable grounding")
-
-    # Chat + outputs
-    chatbot    = gr.Chatbot(type="messages")
-    user_in    = gr.Textbox(label="Prompt", placeholder="e.g. CSV inspector…")
-    send_btn   = gr.Button("Send")
-    build_box  = gr.Textbox(label="Build logs", lines=5)
-    run_box    = gr.Textbox(label="Run logs",   lines=5)
-    preview    = gr.HTML("<p>No Space yet.</p>")
-    state_repo = gr.Textbox(visible=False)
+    sdk_choice = gr.Radio(["gradio","streamlit"], "gradio", label="SDK")
+    api_key    = gr.Textbox(label="Gemini API Key", type="password")
+    grounding  = gr.Checkbox(label="Enable grounding")
+
+    chatbot   = gr.Chatbot(type="messages")
+    user_in   = gr.Textbox(label="Prompt", placeholder="e.g. Build a CSV inspector…")
+    send_btn  = gr.Button("Send")
+    build_box = gr.Textbox(label="Build logs", lines=5)
+    run_box   = gr.Textbox(label="Run logs",   lines=5)
+    preview   = gr.HTML("<p>No Space yet.</p>")
 
     send_btn.click(
         fn=handle_user_message,
         inputs=[chatbot, sdk_choice, api_key, grounding],
-        outputs=[chatbot, build_box, run_box, preview, state_repo]
-    )
-
-    # Manual refresh
-    with gr.Row():
-        refresh_build = gr.Button("Refresh Build Logs")
-        refresh_run   = gr.Button("Refresh Run Logs")
-
-    refresh_build.click(
-        fn=refresh_build_logs,
-        inputs=[state_repo],
-        outputs=build_box
-    )
-    refresh_run.click(
-        fn=refresh_run_logs,
-        inputs=[state_repo],
-        outputs=run_box
+        outputs=[chatbot, build_box, run_box, preview]
     )
 
 demo.launch()