Update app.py

app.py

@@ -1,4 +1,4 @@
-import os, json, requests
+import os, json
 import gradio as gr
 from huggingface_hub import (
     create_repo, list_models, upload_file, constants
@@ -7,57 +7,46 @@ from huggingface_hub.utils import build_hf_headers, get_session, hf_raise_for_st
 from google import genai
 from google.genai import types
 
-# — USER INFO & MODEL LISTING — (unchanged)
-def show_profile(profile: gr.OAuthProfile | None) -> str:
-    if profile is None:
-        return "*Not logged in.*"
-    return f"✅ Logged in as **{profile.username}**"
+# — USER INFO & MODEL LISTING —
 
-def list_private_models(profile: gr.OAuthProfile | None,
-                        oauth_token: gr.OAuthToken | None) -> str:
-    if profile is None or oauth_token is None:
+def show_profile(profile):
+    return f"✅ Logged in as **{profile.username}**" if profile else "*Not logged in.*"
+
+def list_private_models(profile, token):
+    if not (profile and token):
         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)
+        for m in list_models(author=profile.username, token=token.token)
     ]
     return "No models found." if not models else "Models:\n\n" + "\n - ".join(models)
 
-# — BUTTON‑ENABLING HELPERS — (unchanged)
-def enable_create(profile: gr.OAuthProfile | None,
-                  oauth_token: gr.OAuthToken | None):
-    return gr.update(interactive=profile is not None)
-
-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 — (unchanged)
-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:
+# — BUTTON‑ENABLING HELPERS —
+
+def enable_create(profile, token):
+    return gr.update(interactive=bool(profile and token))
+
+def enable_repo_actions(repo_id, profile, token):
+    return gr.update(interactive=bool(repo_id and profile and token))
+
+# — CORE ACTIONS —
+
+def create_space(repo_name, sdk, profile, token):
+    if not (profile and token):
         return "", "⚠️ Please log in first.", "<p>No Space created yet.</p>"
-    repo_id = f"{profile.username}/{repo_name}"
+    rid = f"{profile.username}/{repo_name}"
     create_repo(
-        repo_id=repo_id,
-        token=oauth_token.token,
+        repo_id=rid,
+        token=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="400px"></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:
+    url = f"https://huggingface.co/spaces/{rid}"
+    return rid, f"✅ Space ready: {url}", f'<iframe src="{url}" width="100%" height="400px"></iframe>'
+
+def upload_file_to_space(file, path, repo_id, profile, token):
+    if not (profile and token):
         return "⚠️ Please log in first."
     if not repo_id:
         return "⚠️ Please create a Space first."
@@ -65,52 +54,45 @@ def upload_file_to_space(file, path_in_repo: str, repo_id: str,
         return "⚠️ No file selected."
     upload_file(
         path_or_fileobj=file.name,
-        path_in_repo=path_in_repo,
+        path_in_repo=path,
         repo_id=repo_id,
-        token=oauth_token.token,
+        token=token.token,
         repo_type="space"
     )
-    return f"✅ Uploaded `{path_in_repo}` to `{repo_id}`"
+    return f"✅ Uploaded `{path}` to `{repo_id}`"
 
-def _fetch_space_logs_level(repo_id: str, level: str) -> str:
+def _fetch_space_logs_level(repo_id, level):
     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"]
-    logs_url = f"https://api.hf.space/v1/{repo_id}/logs/{level}"
+    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:
+    with get_session().get(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: "):
-                ev = json.loads(raw[len(b"data: "):].decode())
-                ts, txt = ev.get("timestamp", ""), ev.get("data", "")
-                lines.append(f"[{ts}] {txt}")
+                ev = json.loads(raw[6:].decode())
+                lines.append(f"[{ev.get('timestamp','')}] {ev.get('data','')}")
     return "\n".join(lines)
 
-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):
+def get_build_logs(repo_id, profile, token):
+    if not (profile and token and repo_id):
         return "⚠️ Please log in and create a Space first."
     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):
+def get_container_logs(repo_id, profile, token):
+    if not (profile and token and repo_id):
         return "⚠️ Please log in and create a Space first."
     return _fetch_space_logs_level(repo_id, "run")
 
 
-# — GEMINI FUNCTION DECLARATIONS — 
+# — GEMINI FUNCTION DECLARATIONS —
+
 func_decls = [
     {
-      "name": "create_space",
-      "description": "Create or get a Hugging Face Space",
-      "parameters": {
+      "name":"create_space","description":"Create or get a Hugging Face Space",
+      "parameters":{
         "type":"object",
         "properties":{
           "repo_name":{"type":"string"},
@@ -120,8 +102,7 @@ func_decls = [
       }
     },
     {
-      "name":"list_files",
-      "description":"List files in the Space",
+      "name":"list_files","description":"List files in the Space",
       "parameters":{
         "type":"object",
         "properties":{"repo_id":{"type":"string"}},
@@ -129,8 +110,7 @@ func_decls = [
       }
     },
     {
-      "name":"get_build_logs",
-      "description":"Fetch the build logs",
+      "name":"get_build_logs","description":"Fetch build logs",
       "parameters":{
         "type":"object",
         "properties":{"repo_id":{"type":"string"}},
@@ -138,8 +118,7 @@ func_decls = [
       }
     },
     {
-      "name":"get_run_logs",
-      "description":"Fetch the run logs",
+      "name":"get_run_logs","description":"Fetch run logs",
       "parameters":{
         "type":"object",
         "properties":{"repo_id":{"type":"string"}},
@@ -148,17 +127,17 @@ func_decls = [
     },
 ]
 
-# — CHAT HANDLER — 
-def process_message(profile, oauth_token, user_msg,
-                    gemini_key, repo_name, sdk,
+# — CHAT HANDLER —
+
+def process_message(profile, token, user_msg,
+                    gemini_key, sidebar_repo, sidebar_sdk,
                     chat_history, session):
-    # initialize chat on first call
     if session.get("chat") is None:
         client = genai.Client(api_key=gemini_key)
         cfg = types.GenerateContentConfig(
             system_instruction=(
                 "You are a HF Spaces admin. "
-                "Use functions to create spaces, list files, or fetch logs."
+                "Use functions to create spaces, list files, and fetch logs."
             ),
             temperature=0,
             tools=[ types.Tool(function_declarations=func_decls) ]
@@ -175,29 +154,24 @@ def process_message(profile, oauth_token, user_msg,
     if part.function_call:
         name = part.function_call.name
         args = json.loads(part.function_call.args)
-        if name == "create_space":
+        if name=="create_space":
             rid, log, iframe = create_space(
-                args["repo_name"], args["sdk"], profile, oauth_token
+                args["repo_name"], args["sdk"], profile, token
             )
             session["repo_id"] = rid
             result = {"log": log, "iframe": iframe}
-        elif name == "list_files":
+        elif name=="list_files":
             files = list_repo_files(
-                session["repo_id"], token=oauth_token.token, repo_type="space"
+                session["repo_id"], token=token.token, repo_type="space"
             )
             result = {"files": "\n".join(files)}
-        elif name == "get_build_logs":
-            result = {
-                "log": get_build_logs(session["repo_id"], profile, oauth_token)
-            }
-        elif name == "get_run_logs":
-            result = {
-                "log": get_container_logs(session["repo_id"], profile, oauth_token)
-            }
+        elif name=="get_build_logs":
+            result = {"log": get_build_logs(session["repo_id"], profile, token)}
+        elif name=="get_run_logs":
+            result = {"log": get_container_logs(session["repo_id"], profile, token)}
         else:
             result = {"log": f"⚠️ Unknown function {name}"}
 
-        # feed function result back into the chat
         chat.send_message(
             types.Content(
                 role="function",
@@ -223,15 +197,14 @@ def process_message(profile, oauth_token, user_msg,
             session.get("files",""),
             session)
 
-# — SYNC MANUAL CHANGES — 
-def sync_manual(profile, oauth_token, session):
-    if not (profile and oauth_token and session.get("repo_id")):
+def sync_manual(profile, token, session):
+    if not (profile and token and session.get("repo_id")):
         return (session.get("iframe",""),
                 "⚠️ Cannot sync manual changes.",
                 session.get("files",""),
                 session)
     files = list_repo_files(
-        session["repo_id"], token=oauth_token.token, repo_type="space"
+        session["repo_id"], token=token.token, repo_type="space"
     )
     session["files"] = "\n".join(files)
     session["log"]   = "🔄 Manual changes synced."
@@ -240,116 +213,112 @@ def sync_manual(profile, oauth_token, session):
             session["files"],
             session)
 
+def capture_login(profile, oauth_token):
+    return profile, oauth_token
+
+
+# — BUILD THE UI —
 
-# — BUILD THE UI — 
 with gr.Blocks(css="""
-#sidebar { background:#fafafa; padding:1em; border-right:1px solid #ddd; }
-#main    { padding:1em; }
+#sidebar {background:#f0f0f0;padding:1rem;border-right:1px solid #ccc;}
+#main    {padding:1rem;}
 """) as demo:
 
     with gr.Row():
-        # ◀ Sidebar
+        # Sidebar
         with gr.Column(elem_id="sidebar", scale=1):
             gr.Markdown("### 🔑 HF Login & Config")
-            hf_login     = gr.LoginButton(variant="huggingface", size="sm")
-            status_md    = gr.Markdown("*Not logged in.*")
-            models_md    = gr.Markdown()
-
-            # login callbacks
-            hf_login.click(show_profile,
-                           inputs=[hf_login], outputs=[status_md])
-            hf_login.click(list_private_models,
-                           inputs=[hf_login, hf_login], outputs=[models_md])
-
-            gemini_key   = gr.Textbox(label="Gemini API Key",
-                                      type="password")
-            sidebar_repo = gr.Textbox(label="Space name",
-                                      placeholder="e.g. my-space")
+            login_btn     = gr.LoginButton(variant="huggingface", size="sm")
+            profile_state = gr.State()
+            token_state   = gr.State()
+
+            login_btn.click(capture_login,
+                            inputs=[login_btn],
+                            outputs=[profile_state, token_state])
+
+            status_md = gr.Markdown("*Not logged in.*")
+            profile_state.change(show_profile,
+                                 inputs=[profile_state],
+                                 outputs=[status_md])
+
+            models_md = gr.Markdown()
+            profile_state.change(list_private_models,
+                                 inputs=[profile_state, token_state],
+                                 outputs=[models_md])
+
+            gemini_key   = gr.Textbox(label="Gemini API Key", type="password")
+            sidebar_repo = gr.Textbox(label="Space name", placeholder="my-space")
             sidebar_sdk  = gr.Radio(["gradio","streamlit"],
                                     value="gradio", label="SDK")
 
             gr.Markdown("---")
-            confirm_btn  = gr.Button("🔄 Confirm Manual Changes")
+            confirm_btn = gr.Button("🔄 Confirm Manual Changes")
 
-        # ▶ Main area: Chat & Manual Controls
+        # Main area
         with gr.Column(elem_id="main", scale=3):
             tabs = gr.Tabs()
             with tabs:
                 with gr.TabItem("💬 Chat"):
-                    chatbox   = gr.Chatbot(type="messages")
-                    user_input= gr.Textbox(show_label=False,
-                                           placeholder="Ask the LLM…")
-                    send_btn  = gr.Button("Send")
+                    chatbox    = gr.Chatbot(type="pairs")
+                    user_input = gr.Textbox(show_label=False,
+                                            placeholder="Ask the LLM…")
+                    send_btn   = gr.Button("Send")
                 with gr.TabItem("🛠️ Manual"):
                     gr.Markdown("#### Create a Space")
-                    repo_m = gr.Textbox(label="Name")
-                    sdk_m  = gr.Radio(["gradio","streamlit"],
-                                      value="gradio", label="SDK")
-                    create_btn = gr.Button("Create Space",
-                                           interactive=False)
+                    repo_m   = gr.Textbox(label="Name")
+                    sdk_m    = gr.Radio(["gradio","streamlit"],
+                                        value="gradio", label="SDK")
+                    create_btn = gr.Button("Create Space")
                     sess_id    = gr.Textbox(visible=False)
                     log_c      = gr.Textbox(label="Log",
-                                           interactive=False, lines=2)
-                    iframe_m   = gr.HTML("<p>No Space yet.</p>")
+                                            interactive=False, lines=2)
+                    preview    = gr.HTML("<p>No Space yet.</p>")
 
-                    hf_login.click(enable_create,
-                                   inputs=[hf_login, hf_login],
-                                   outputs=[create_btn])
                     create_btn.click(create_space,
                                      inputs=[repo_m, sdk_m,
-                                             hf_login, hf_login],
-                                     outputs=[sess_id, log_c,
-                                              iframe_m])
+                                             profile_state, token_state],
+                                     outputs=[sess_id, log_c, preview])
 
                     gr.Markdown("#### Upload File")
-                    path    = gr.Textbox(label="Path in Repo",
-                                         value="app.py")
-                    file_u  = gr.File()
-                    up_btn  = gr.Button("Upload File",
-                                        interactive=False)
-                    log_u   = gr.Textbox(label="Log",
-                                         interactive=False, lines=2)
-
-                    hf_login.click(enable_repo_actions,
-                                   inputs=[sess_id, hf_login, hf_login],
-                                   outputs=[up_btn])
+                    path_in_repo = gr.Textbox(label="Path in Repo",
+                                              value="app.py")
+                    file_uploader = gr.File()
+                    up_btn       = gr.Button("Upload File")
+                    log_u        = gr.Textbox(label="Log",
+                                              interactive=False, lines=2)
+
                     up_btn.click(upload_file_to_space,
-                                 inputs=[file_u, path, sess_id,
-                                         hf_login, hf_login],
+                                 inputs=[file_uploader, path_in_repo,
+                                         sess_id,
+                                         profile_state, token_state],
                                  outputs=[log_u])
 
                     gr.Markdown("#### Fetch Logs")
-                    build_btn = gr.Button("Build Logs",
-                                          interactive=False)
-                    run_btn   = gr.Button("Run Logs",
-                                          interactive=False)
-                    log_b     = gr.Textbox(label="Build",
-                                           interactive=False, lines=5)
-                    log_r     = gr.Textbox(label="Run",
-                                           interactive=False, lines=5)
-
-                    hf_login.click(enable_repo_actions,
-                                   inputs=[sess_id, hf_login, hf_login],
-                                   outputs=[build_btn, run_btn])
-                    build_btn.click(get_build_logs,
-                                    inputs=[sess_id,
-                                            hf_login, hf_login],
-                                    outputs=[log_b])
-                    run_btn.click(get_container_logs,
-                                  inputs=[sess_id,
-                                          hf_login, hf_login],
-                                  outputs=[log_r])
-
-            # persistent bottom panels
+                    b_btn = gr.Button("Build Logs")
+                    r_btn = gr.Button("Run Logs")
+                    log_b = gr.Textbox(label="Build",
+                                       interactive=False, lines=5)
+                    log_r = gr.Textbox(label="Run",
+                                       interactive=False, lines=5)
+
+                    b_btn.click(get_build_logs,
+                                inputs=[sess_id,
+                                        profile_state, token_state],
+                                outputs=[log_b])
+                    r_btn.click(get_container_logs,
+                                inputs=[sess_id,
+                                        profile_state, token_state],
+                                outputs=[log_r])
+
+            # Persistent panels
             gr.Markdown("---")
             iframe_out = gr.HTML(label="🖼️ Preview")
-            log_out    = gr.Textbox(label="📋 Latest Log",
-                                    lines=4)
+            log_out    = gr.Textbox(label="📋 Latest Log", lines=4)
             files_out  = gr.Textbox(label="📚 Files", lines=4)
 
     state = gr.State({})
     send_btn.click(process_message,
-                   inputs=[hf_login, hf_login,
+                   inputs=[profile_state, token_state,
                            user_input, gemini_key,
                            sidebar_repo, sidebar_sdk,
                            chatbox, state],
@@ -357,9 +326,8 @@ with gr.Blocks(css="""
                             log_out, files_out, state])
 
     confirm_btn.click(sync_manual,
-                      inputs=[hf_login, hf_login, state],
-                      outputs=[iframe_out, log_out,
-                               files_out, state])
+                      inputs=[profile_state, token_state, state],
+                      outputs=[iframe_out, log_out, files_out, state])
 
 if __name__ == "__main__":
     demo.launch()