Update app.py

app.py

@@ -1,6 +1,13 @@
 import gradio as gr
 import requests
-from huggingface_hub import create_repo, list_models, upload_file
+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
 
 # — USER INFO & MODEL LISTING —
 
@@ -27,7 +34,6 @@ def enable_create(
     profile: gr.OAuthProfile | None,
     oauth_token: gr.OAuthToken | None
 ):
-    # Called with no inputs→Gradio auto‑injects profile & token
     return gr.update(interactive=profile is not None)
 
 def enable_repo_actions(
@@ -35,7 +41,6 @@ def enable_repo_actions(
     profile: gr.OAuthProfile | None,
     oauth_token: gr.OAuthToken | None
 ):
-    # Called with inputs=[session_id]→Gradio injects profile & token
     return gr.update(interactive=bool(repo_id and profile and oauth_token))
 
 # — CORE ACTIONS —
@@ -83,30 +88,57 @@ def upload_file_to_space(
     )
     return f"✅ Uploaded `{path_in_repo}` to `{repo_id}`"
 
-def get_space_logs(
+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 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)
+
+def get_build_logs(
     repo_id: str,
     profile: gr.OAuthProfile | None,
     oauth_token: gr.OAuthToken | None
 ) -> str:
-    if not profile or not oauth_token or not repo_id:
+    if not (profile and oauth_token and repo_id):
         return "⚠️ Please log in and create a Space first."
-    resp = requests.get(
-        f"https://huggingface.co/api/spaces/{repo_id}/logs",
-        headers={"Authorization": f"Bearer {oauth_token.token}"}
-    )
-    if resp.status_code != 200:
-        return f"❌ Failed to fetch logs ({resp.status_code})"
-    return "\n".join(entry.get("text","") for entry in resp.json())
+    return _fetch_space_logs_level(repo_id, "build")
+
+def get_container_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, "run")
 
 # — BUILD THE UI —
 
-with gr.Blocks(title="HF OAuth + Space Manager") as demo:
+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 its logs\n\n"
+        "4. Fetch build and container logs\n\n"
         "---"
     )
 
@@ -132,13 +164,12 @@ with gr.Blocks(title="HF OAuth + Space Manager") as demo:
     create_logs  = gr.Textbox(label="Create Logs", interactive=False, lines=3)
     preview      = gr.HTML("<p>No Space created yet.</p>")
 
-    # enable create_btn once logged in
-    demo.load(enable_create,      inputs=None,           outputs=[create_btn])
-    login_btn.click(enable_create, inputs=None,          outputs=[create_btn])
+    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],  # only non‑OAuth inputs
+        inputs=[repo_name, sdk_selector],
         outputs=[session_id, create_logs, preview]
     )
 
@@ -148,16 +179,15 @@ with gr.Blocks(title="HF OAuth + Space Manager") as demo:
     upload_btn    = gr.Button("Upload File", interactive=False)
     upload_logs   = gr.Textbox(label="Upload Logs", interactive=False, lines=2)
 
-    # enable upload_btn once space exists & logged in
     demo.load(enable_repo_actions,
-              inputs=[session_id],  # only non‑OAuth inputs
+              inputs=[session_id],
               outputs=[upload_btn])
-    session_id.change(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,
@@ -165,24 +195,33 @@ with gr.Blocks(title="HF OAuth + Space Manager") as demo:
         outputs=[upload_logs]
     )
 
-    # — FETCH SPACE LOGS —
-    logs_btn      = gr.Button("Get Space Logs", interactive=False)
-    space_logs_md = gr.Textbox(label="Space Logs", interactive=False, lines=10)
-
-    demo.load(enable_repo_actions,
-              inputs=[session_id],
-              outputs=[logs_btn])
-    session_id.change(enable_repo_actions,
-                      inputs=[session_id],
-                      outputs=[logs_btn])
-    login_btn.click(enable_repo_actions,
-                    inputs=[session_id],
-                    outputs=[logs_btn])
-
-    logs_btn.click(
-        fn=get_space_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]
+    )
+    container_logs_btn.click(
+        fn=get_container_logs,
         inputs=[session_id],
-        outputs=[space_logs_md]
+        outputs=[container_logs_md]
     )
 
 if __name__ == "__main__":