Update app.py

app.py

@@ -1,28 +1,19 @@
 import os, json
 import gradio as gr
 from huggingface_hub import (
-    create_repo,
-    list_models,
-    upload_file,
-    list_repo_files,
-    constants,
+    create_repo, list_models, upload_file, list_repo_files, constants
 )
 from huggingface_hub.utils import build_hf_headers, get_session, hf_raise_for_status
 from google import genai
 from google.genai import types
 
-# — USER INFO & MODEL LISTING (UNCHANGED) —
+# — USER INFO & HF SPACE HELPERS ——
 
 def show_profile(profile: gr.OAuthProfile | None) -> str:
-    if profile is None:
-        return "*Not logged in.*"
-    return f"✅ Logged in as **{profile.username}**"
+    return f"✅ Logged in as **{profile.username}**" if profile else "*Not logged in.*"
 
-def list_private_models(
-    profile: gr.OAuthProfile | None,
-    oauth_token: gr.OAuthToken | None
-) -> str:
-    if profile is None or oauth_token is None:
+def list_private_models(profile, oauth_token):
+    if not (profile and oauth_token):
         return "Please log in to see your models."
     models = [
         f"{m.id} ({'private' if m.private else 'public'})"
@@ -30,121 +21,63 @@ def list_private_models(
     ]
     return "No models found." if not models else "Models:\n\n" + "\n - ".join(models)
 
-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
-):
+def enable_create(profile, oauth_token): return gr.update(interactive=bool(profile and oauth_token))
+def enable_repo_actions(repo_id, profile, oauth_token): 
     return gr.update(interactive=bool(repo_id and profile and oauth_token))
 
-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:
-    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}"
+def create_space(repo_name, sdk, profile, oauth_token):
+    if not (profile and oauth_token):
+        return "", "⚠️ Please log in first.", "<p>No Space.</p>"
+    rid = f"{profile.username}/{repo_name}"
+    create_repo(rid, token=oauth_token.token, exist_ok=True, repo_type="space", space_sdk=sdk)
+    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_in_repo, repo_id, profile, oauth_token):
+    if not (profile and oauth_token): return "⚠️ Please log in first."
+    if not repo_id: return "⚠️ Create a Space first."
+    if not file: return "⚠️ No file selected."
+    upload_file(file.name, path_in_repo, repo_id, token=oauth_token.token, repo_type="space")
+    return f"✅ Uploaded `{path_in_repo}`"
+
+def fetch_logs(repo_id, level, profile, oauth_token):
+    if not (profile and oauth_token and repo_id):
+        return "⚠️ Log in & create a Space first."
+    # SSE JWT
+    r = get_session().get(f"{constants.ENDPOINT}/api/spaces/{repo_id}/jwt", headers=build_hf_headers())
+    hf_raise_for_status(r); jwt = r.json()["token"]
+    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 not raw.startswith(b"data: "):
-                continue
-            payload = raw[len(b"data: "):]
-            try:
-                event = json.loads(payload.decode())
-            except:
-                continue
-            ts  = event.get("timestamp", "")
-            txt = event.get("data", "")
-            lines.append(f"[{ts}] {txt}")
+            if raw.startswith(b"data: "):
+                ev = json.loads(raw[6:])
+                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):
-        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:
+def list_files(repo_id, profile, oauth_token):
     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")
+        return "⚠️ Log in & create a Space first."
+    files = list_repo_files(repo_id, token=oauth_token.token, repo_type="space")
+    return "\n".join(files)
 
-
-# — GEMINI FUNCTION DECLARATIONS — 
+# — GEMINI FUNCTION DECLS ——
 
 func_decls = [
     {
-      "name": "create_space",
-      "description": "Create or get a Hugging Face Space",
-      "parameters": {
-        "type": "object",
-        "properties": {
-          "repo_name": {"type":"string"},
-          "sdk":       {"type":"string","enum":["gradio","streamlit"]},
+      "name":"create_space","description":"Create/get a HF Space",
+      "parameters":{
+        "type":"object",
+        "properties":{
+          "repo_name":{"type":"string"},
+          "sdk":{"type":"string","enum":["gradio","streamlit"]}
         },
-        "required": ["repo_name","sdk"]
+        "required":["repo_name","sdk"]
       }
     },
     {
-      "name":"list_files",
-      "description":"List files in the Space",
+      "name":"list_files","description":"List files in Space",
       "parameters":{
         "type":"object",
         "properties":{"repo_id":{"type":"string"}},
@@ -152,8 +85,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"}},
@@ -161,8 +93,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"}},
@@ -171,23 +102,14 @@ func_decls = [
     },
 ]
 
-# — CHAT HANDLER — 
+# — CHAT HANDLER ——
 
-def process_message(
-    user_msg: str,
-    profile: gr.OAuthProfile | None,
-    oauth_token: gr.OAuthToken | None,
-    gemini_key: str,
-    repo_name: str,
-    sdk: str,
-    chat_history,
-    session
-):
-    # init
+def process_message(profile, oauth_token, user_msg, gemini_key, repo_name, sdk, chat_history, session):
+    # init chat
     if session.get("chat") is None:
         client = genai.Client(api_key=gemini_key)
         cfg = types.GenerateContentConfig(
-            system_instruction="You are an admin for HF Spaces: use functions to create spaces, list files, and fetch logs.",
+            system_instruction="You are an admin for HF Spaces: create spaces, list files, and fetch logs.",
             temperature=0,
             tools=[ types.Tool(function_declarations=func_decls) ]
         )
@@ -195,7 +117,7 @@ def process_message(
         session["repo_id"] = None
 
     chat = session["chat"]
-    chat_history = chat_history + [(user_msg, None)]
+    chat_history.append((user_msg, None))
     resp = chat.send_message(user_msg)
     part = resp.candidates[0].content.parts[0]
 
@@ -204,17 +126,16 @@ def process_message(
         args = json.loads(part.function_call.args)
         if name=="create_space":
             rid, log, iframe = create_space(args["repo_name"], args["sdk"], profile, oauth_token)
-            session["repo_id"] = rid
-            result = {"repo_id":rid,"log":log,"iframe":iframe}
+            session["repo_id"], result = rid, {"log":log,"iframe":iframe}
         elif name=="list_files":
-            files = list_repo_files(session["repo_id"], token=oauth_token.token, repo_type="space") if session["repo_id"] else []
+            files = list_repo_files(session["repo_id"], token=oauth_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)}
+            result = {"log":fetch_logs(session["repo_id"], "build", profile, oauth_token)}
         elif name=="get_run_logs":
-            result = {"log":get_container_logs(session["repo_id"], profile, oauth_token)}
+            result = {"log":fetch_logs(session["repo_id"], "run", profile, oauth_token)}
         else:
-            result = {"log":f"⚠️ Unknown function {name}"}
+            result = {"log":f"⚠️ Unknown fn {name}"}
 
         chat.send_message(
             types.Content(
@@ -226,98 +147,102 @@ def process_message(
     else:
         final = part.text
 
-    # panels
-    iframe = session.get("iframe", "")
-    log    = session.get("log", "")
-    files  = session.get("files", "")
-
-    if part.function_call:
-        session["iframe"] = result.get("iframe", iframe)
-        session["log"]    = result.get("log",    log)
-        session["files"]  = result.get("files",  files)
-
+    # update panels
+    session["iframe"] = session.get("iframe", "") if not result.get("iframe") else result["iframe"]
+    session["log"]    = session.get("log", "")    if not result.get("log")    else result["log"]
+    session["files"]  = session.get("files", "")  if not result.get("files")   else result["files"]
     chat_history[-1] = (user_msg, final)
     return chat_history, session["iframe"], session["log"], session["files"], session
 
-# — BUILD THE UI — 
-
-with gr.Blocks(title="HF Spaces + Gemini Chat") as demo:
+def sync_manual(profile, oauth_token, session):
+    # after manual tweaks, refresh file list in panels & LLM memory
+    if not (profile and oauth_token and session.get("repo_id")):
+        return session.get("iframe",""), "⚠️ Cannot sync.", session.get("files",""), session
+    files = list_repo_files(session["repo_id"], token=oauth_token.token, repo_type="space")
+    session["files"] = "\n".join(files)
+    session["log"]   = "🔄 Manual changes synced."
+    return session["iframe"], session["log"], session["files"], session
+
+# — BUILD UI ——
+
+with gr.Blocks(title="HF Spaces + Gemini Chat", css="""
+#sidebar {background:#f7f7f7;padding:10px;border-right:1px solid #ddd;}
+#main {padding:10px;}
+""") as demo:
     with gr.Row():
-        # ◀ Sidebar: login + chat config
-        with gr.Column(scale=1):
-            gr.Markdown("## 🔑 Sign in & Chat Config")
-            login_btn   = gr.LoginButton(variant="huggingface", size="sm")
-            status_md   = gr.Markdown("*Not logged in.*")
-            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)
-
-            gemini_key  = gr.Textbox(label="Gemini API Key", type="password")
-            repo_name   = gr.Textbox(label="Space name", placeholder="e.g. my-space")
-            sdk_choice  = gr.Radio(["gradio","streamlit"], value="gradio", label="SDK")
-        # ▶ Main: chat + panels + manual controls
-        with gr.Column(scale=3):
-            gr.Markdown("## 💬 Chat to manage your Space")
-            chatbox   = gr.Chatbot(type="messages")
-            user_in   = gr.Textbox(show_label=False, placeholder="e.g. Create Space")
-            send_btn  = gr.Button("Send")
-
+        with gr.Column(elem_id="sidebar", scale=1):
+            gr.Markdown("### 🔑 Login & Config")
+            login = gr.LoginButton(variant="huggingface", size="sm")
+            status = gr.Markdown("*Not logged in.*")
+            models = gr.Markdown()
+            demo.load(show_profile,   inputs=None, outputs=status)
+            login.click(show_profile, inputs=None, outputs=status)
+            demo.load(list_private_models, inputs=None, outputs=models)
+            login.click(list_private_models, inputs=None, outputs=models)
+
+            gemini_key = gr.Textbox(label="Gemini API Key", type="password")
+            repo_name  = gr.Textbox(label="Space name", placeholder="e.g. my-space")
+            sdk_choice = gr.Radio(["gradio","streamlit"], value="gradio", label="SDK")
+
+            gr.Markdown("---")
+            sync_btn = gr.Button("✅ Confirm Manual Changes")
+            sync_btn.click(sync_manual, inputs=[status, login, gr.State({})], 
+                            outputs=[gr.HTML(), gr.Textbox(), gr.Textbox(), gr.State({})])
+
+        with gr.Column(elem_id="main", scale=3):
+            tabs = gr.Tabs()
+            with tabs:
+                with gr.TabItem("💬 Chat"):
+                    chatbox = gr.Chatbot(type="messages", label="Chat")
+                    user_in = gr.Textbox(show_label=False, placeholder="Ask LLM…")
+                    send    = 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  = gr.Button("Create", interactive=False)
+                    sess    = gr.Textbox(visible=False)
+                    log_c   = gr.Textbox(label="Log", interactive=False, lines=2)
+                    preview = gr.HTML("<p>No Space yet</p>")
+
+                    demo.load(enable_create, inputs=None, outputs=create)
+                    login.click(enable_create, inputs=None, outputs=create)
+                    create.click(create_space, 
+                                 inputs=[repo_m, sdk_m, status, login], 
+                                 outputs=[sess, 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", interactive=False)
+                    log_u   = gr.Textbox(label="Log", interactive=False, lines=2)
+
+                    demo.load(enable_repo_actions, inputs=[sess, status, login], outputs=up_btn)
+                    up_btn.click(upload_file_to_space,
+                                 inputs=[file_u, path, sess, status, login],
+                                 outputs=log_u)
+
+                    gr.Markdown("#### Fetch Logs")
+                    b_btn   = gr.Button("Build Logs", interactive=False)
+                    r_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)
+
+                    for b in (b_btn, r_btn):
+                        demo.load(enable_repo_actions, inputs=[sess, status, login], outputs=b)
+                    b_btn.click(fetch_logs, inputs=[sess, gr.State(), gr.State(), "build"], outputs=log_b)
+                    r_btn.click(fetch_logs, inputs=[sess, gr.State(), gr.State(), "run"],   outputs=log_r)
+
+            # always-visible panels
+            gr.Markdown("---")
             iframe_out = gr.HTML(label="🖼️ Preview")
-            log_out    = gr.Textbox(label="📋 Latest Log", lines=8)
-            files_out  = gr.Textbox(label="📚 Files in Space", lines=4)
-
-            gr.Markdown("---\n## 🛠️ Manual Controls")
-            # CREATE SPACE
-            repo_name_m  = gr.Textbox(label="New Space name", placeholder="my-space")
-            sdk_selector = gr.Radio(["gradio","streamlit"], value="gradio", label="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_m    = 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_m, sdk_selector],
-                outputs=[session_id, create_logs, preview_m]
-            )
-
-            # UPLOAD FILE
-            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])
-            upload_btn.click(
-                fn=upload_file_to_space,
-                inputs=[file_uploader, path_in_repo, session_id],
-                outputs=[upload_logs]
-            )
-
-            # FETCH LOGS
-            build_btn     = gr.Button("Get Build Logs", interactive=False)
-            run_btn       = gr.Button("Get Container Logs", interactive=False)
-            build_logs_md = gr.Textbox(label="Build Logs", interactive=False, lines=10)
-            run_logs_md   = gr.Textbox(label="Container Logs", interactive=False, lines=10)
-
-            for b in (build_btn, run_btn):
-                demo.load(enable_repo_actions, inputs=[session_id], outputs=[b])
-                login_btn.click(enable_repo_actions, inputs=[session_id], outputs=[b])
-
-            build_btn.click(fn=get_build_logs,      inputs=[session_id], outputs=[build_logs_md])
-            run_btn.click(  fn=get_container_logs,  inputs=[session_id], outputs=[run_logs_md])
+            log_out    = gr.Textbox(label="📋 Latest Log", lines=4)
+            files_out  = gr.Textbox(label="📚 Files", lines=4)
 
     state = gr.State({})
-    send_btn.click(
-        fn=process_message,
-        inputs=[user_in, status_md, login_btn, gemini_key, repo_name, sdk_choice, chatbox, state],
-        outputs=[chatbox, iframe_out, log_out, files_out, state]
-    )
+    send.click(process_message,
+               inputs=[status, login, user_in, gemini_key, repo_name, sdk_choice, chatbox, state],
+               outputs=[chatbox, iframe_out, log_out, files_out, state])
 
 if __name__ == "__main__":
     demo.launch()