Update hfmaker.py

hfmaker.py

@@ -1,173 +1,228 @@
 import gradio as gr
-import json, time
-from huggingface_hub import create_repo, upload_file, constants
+import requests
+import json
+from huggingface_hub import (
+    create_repo,
+    list_models,
+    upload_file,
+    constants,
+)
 from huggingface_hub.utils import build_hf_headers, get_session, hf_raise_for_status
-from google import genai  # Gemini Python SDK
-from google.genai.types import Tool, GenerateContentConfig, GoogleSearch
 
-# — USER INFO & MODEL LISTING (from your reference) —
+# — USER INFO & MODEL LISTING —
 
 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 list_private_models(
+    profile: gr.OAuthProfile | None,
+    oauth_token: gr.OAuthToken | None
+) -> str:
+    if profile is None or oauth_token is None:
+        return "Please log in to see your models."
+    models = [
+        f"{m.id} ({'private' if m.private else 'public'})"
+        for m in list_models(author=profile.username, token=oauth_token.token)
+    ]
+    return "No models found." if not models else "Models:\n\n" + "\n - ".join(models)
 
-def _get_space_jwt(repo_id: str):
-    url = f"{constants.ENDPOINT}/api/spaces/{repo_id}/jwt"
-    r = get_session().get(url, headers=build_hf_headers())
-    hf_raise_for_status(r)
-    return r.json()["token"]
+# — BUTTON‑ENABLING HELPERS —
+
+def enable_create(
+    profile: gr.OAuthProfile | None,
+    oauth_token: gr.OAuthToken | None
+):
+    return gr.update(interactive=profile is not None)
 
-def fetch_logs(repo_id: str, level: str):
-    jwt = _get_space_jwt(repo_id)
+def enable_repo_actions(
+    repo_id: str,
+    profile: gr.OAuthProfile | None,
+    oauth_token: gr.OAuthToken | None
+):
+    return gr.update(interactive=bool(repo_id and profile and oauth_token))
+
+# — CORE ACTIONS —
+
+def create_space(
+    repo_name: str,
+    sdk: str,
+    profile: gr.OAuthProfile | None,
+    oauth_token: gr.OAuthToken | None
+) -> tuple[str, str, str]:
+    if not profile or not oauth_token:
+        return "", "⚠️ Please log in first.", "<p>No Space created yet.</p>"
+    repo_id = f"{profile.username}/{repo_name}"
+    create_repo(
+        repo_id=repo_id,
+        token=oauth_token.token,
+        exist_ok=True,
+        repo_type="space",
+        space_sdk=sdk
+    )
+    url    = f"https://huggingface.co/spaces/{repo_id}"
+    logmsg = f"✅ Space ready: {url} (SDK: {sdk})"
+    iframe = f'<iframe src="{url}" width="100%" height="500px"></iframe>'
+    return repo_id, logmsg, iframe
+
+def upload_file_to_space(
+    file,
+    path_in_repo: str,
+    repo_id: str,
+    profile: gr.OAuthProfile | None,
+    oauth_token: gr.OAuthToken | None
+) -> str:
+    if not profile or not oauth_token:
+        return "⚠️ Please log in first."
+    if not repo_id:
+        return "⚠️ Please create a Space first."
+    if not file:
+        return "⚠️ No file selected."
+    upload_file(
+        path_or_fileobj=file.name,
+        path_in_repo=path_in_repo,
+        repo_id=repo_id,
+        token=oauth_token.token,
+        repo_type="space"
+    )
+    return f"✅ Uploaded {path_in_repo} to {repo_id}"
+
+def _fetch_space_logs_level(repo_id: str, level: str) -> str:
+    # 1) Get SSE JWT
+    jwt_url = f"{constants.ENDPOINT}/api/spaces/{repo_id}/jwt"
+    r = get_session().get(jwt_url, headers=build_hf_headers())
+    hf_raise_for_status(r)
+    jwt = r.json()["token"]
+    # 2) Stream logs
     logs_url = f"https://api.hf.space/v1/{repo_id}/logs/{level}"
     lines = []
     with get_session().get(logs_url, headers=build_hf_headers(token=jwt), stream=True) as resp:
         hf_raise_for_status(resp)
         for raw in resp.iter_lines():
-            if raw.startswith(b"data: "):
-                try:
-                    ev = json.loads(raw[len(b"data: "):].decode())
-                    ts  = ev.get("timestamp","")
-                    txt = ev.get("data","")
-                    lines.append(f"[{ts}] {txt}")
-                except:
-                    continue
+            if not raw.startswith(b"data: "):
+                continue
+            payload = raw[len(b"data: "):]
+            try:
+                event = json.loads(payload.decode())
+            except json.JSONDecodeError:
+                continue
+            ts  = event.get("timestamp", "")
+            txt = event.get("data", "")
+            lines.append(f"[{ts}] {txt}")
     return "\n".join(lines)
 
-# — CORE LOOP: send prompt & (iteratively) deploy —
+def get_build_logs(
+    repo_id: str,
+    profile: gr.OAuthProfile | None,
+    oauth_token: gr.OAuthToken | None
+) -> str:
+    if not (profile and oauth_token and repo_id):
+        return "⚠️ Please log in and create a Space first."
+    return _fetch_space_logs_level(repo_id, "build")
 
-def handle_user_message(
-    history,              # list of {"role","content"} dicts
-    sdk_choice: str,
-    gemini_api_key: str,
-    grounding_enabled: bool,
+def get_container_logs(
+    repo_id: str,
     profile: gr.OAuthProfile | None,
     oauth_token: gr.OAuthToken | 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 the prompt history (including a system instruction)
-    chat = [{
-        "role":"system",
-        "content":(
-            f"You are an AI assistant that writes a HuggingFace Space using the "
-            f"{sdk_choice} SDK. After producing code, wait for logs. "
-            "If errors appear, fix them and return the full updated code."
-        )
-    }] + history
-
-    filename = "app.py" if sdk_choice=="gradio" else "streamlit_app.py"
-    build_logs = run_logs = ""
-
-    for _ in range(5):
-        # assemble tools
-        tools = []
-        if grounding_enabled:
-            tools.append(Tool(google_search=GoogleSearch()))
-
-        config = GenerateContentConfig(
-            tools=tools,
-            response_modalities=["TEXT"],
-        )
-
-        # call Gemini
-        response = genai_client.models.generate_content(
-            model="gemini-2.5-flash-preview-04-17",
-            contents=[m["content"] for m in chat],
-            config=config
-        )
-        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"{profile.username}/{profile.username}-auto-space"
-        create_repo(
-            repo_id=repo_id,
-            token=oauth_token.token,
-            exist_ok=True,
-            repo_type="space",
-            space_sdk=sdk_choice
-        )
-        upload_file(
-            path_or_fileobj=filename,
-            path_in_repo=filename,
-            repo_id=repo_id,
-            token=oauth_token.token,
-            repo_type="space"
-        )
-
-        # fetch build & run logs
-        build_logs = fetch_logs(repo_id, "build")
-        run_logs   = fetch_logs(repo_id, "run")
-
-        # if no errors, stop looping
-        if "ERROR" not in build_logs.upper() and "ERROR" not in run_logs.upper():
-            break
-
-        # otherwise feed logs back to Gemini
-        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."
-            )
-        })
-        time.sleep(2)
-
-    # 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
+) -> str:
+    if not (profile and oauth_token and repo_id):
+        return "⚠️ Please log in and create a Space first."
+    return _fetch_space_logs_level(repo_id, "run")
 
 # — BUILD THE UI —
 
-with gr.Blocks(title="HF Space Auto‑Builder (Gradio & Streamlit)") as demo:
-    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---")
+with gr.Blocks(title="HF OAuth + Space Manager with Logs") as demo:
+    gr.Markdown(
+        "## Sign in with Hugging Face + Manage Your Space\n\n"
+        "1. Sign in\n"
+        "2. Create a Space (Gradio/Streamlit)\n"
+        "3. Upload files to it\n"
+        "4. Fetch build and container logs\n\n"
+        "---"
+    )
 
-    # — LOGIN —
+    # — LOGIN & MODEL LIST —
     login_btn = gr.LoginButton(variant="huggingface", size="lg")
     status_md = gr.Markdown("*Not logged in.*")
-    # automatically show profile on load & login
+    models_md = gr.Markdown()
     demo.load(show_profile,         inputs=None, outputs=status_md)
     login_btn.click(show_profile,   inputs=None, outputs=status_md)
+    demo.load(list_private_models,  inputs=None, outputs=models_md)
+    login_btn.click(list_private_models,
+                    inputs=None,     outputs=models_md)
 
-    # — SIDEBAR CONTROLS —
-    sdk_choice = gr.Radio(
+    # — CREATE SPACE —
+    repo_name    = gr.Textbox(label="New Space name", placeholder="my-space")
+    sdk_selector = gr.Radio(
         choices=["gradio","streamlit"],
         value="gradio",
-        label="SDK template"
+        label="Space template (SDK)"
+    )
+    create_btn   = gr.Button("Create Space", interactive=False)
+    session_id   = gr.Textbox(visible=False)
+    create_logs  = gr.Textbox(label="Create Logs", interactive=False, lines=3)
+    preview      = gr.HTML("<p>No Space created yet.</p>")
+
+    demo.load(enable_create,        inputs=None,        outputs=[create_btn])
+    login_btn.click(enable_create,  inputs=None,        outputs=[create_btn])
+
+    create_btn.click(
+        fn=create_space,
+        inputs=[repo_name, sdk_selector],
+        outputs=[session_id, create_logs, preview]
+    )
+
+    # — UPLOAD FILES —
+    path_in_repo  = gr.Textbox(label="Path in Space", value="app.py")
+    file_uploader = gr.File(label="Select file")
+    upload_btn    = gr.Button("Upload File", interactive=False)
+    upload_logs   = gr.Textbox(label="Upload Logs", interactive=False, lines=2)
+
+    demo.load(enable_repo_actions,
+              inputs=[session_id],
+              outputs=[upload_btn])
+    login_btn.click(enable_repo_actions,
+                    inputs=[session_id],
+                    outputs=[upload_btn])
+    session_id.change(enable_repo_actions,
+                      inputs=[session_id],
+                      outputs=[upload_btn])
+
+    upload_btn.click(
+        fn=upload_file_to_space,
+        inputs=[file_uploader, path_in_repo, session_id],
+        outputs=[upload_logs]
+    )
+
+    # — FETCH BUILD & CONTAINER LOGS —
+    build_logs_btn     = gr.Button("Get Build Logs", interactive=False)
+    container_logs_btn = gr.Button("Get Container Logs", interactive=False)
+    build_logs_md      = gr.Textbox(label="Build Logs", interactive=False, lines=10)
+    container_logs_md  = gr.Textbox(label="Container Logs", interactive=False, lines=10)
+
+    # enable both log buttons
+    for btn in (build_logs_btn, container_logs_btn):
+        demo.load(enable_repo_actions,
+                  inputs=[session_id],
+                  outputs=[btn])
+        login_btn.click(enable_repo_actions,
+                        inputs=[session_id],
+                        outputs=[btn])
+        session_id.change(enable_repo_actions,
+                          inputs=[session_id],
+                          outputs=[btn])
+
+    build_logs_btn.click(
+        fn=get_build_logs,
+        inputs=[session_id],
+        outputs=[build_logs_md]
     )
-    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]
+    container_logs_btn.click(
+        fn=get_container_logs,
+        inputs=[session_id],
+        outputs=[container_logs_md]
     )
 
-if __name__=="__main__":
-    demo.launch()
+if __name__ == "__main__":
+    demo.launch()