Update app.py

app.py

@@ -7,9 +7,9 @@ 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 & HF SPACE HELPERS ——
+# — HF LOGIN CALLBACKS — #
 
-def show_profile(profile: gr.OAuthProfile | None) -> str:
+def show_profile(profile):
     return f"✅ Logged in as **{profile.username}**" if profile else "*Not logged in.*"
 
 def list_private_models(profile, oauth_token):
@@ -21,9 +21,7 @@ def list_private_models(profile, oauth_token):
     ]
     return "No models found." if not models else "Models:\n\n" + "\n - ".join(models)
 
-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))
+# — HF SPACE HELPERS — #
 
 def create_space(repo_name, sdk, profile, oauth_token):
     if not (profile and oauth_token):
@@ -33,18 +31,22 @@ def create_space(repo_name, sdk, profile, 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_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 upload_file_to_space(file, path, 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, repo_id, token=oauth_token.token, repo_type="space")
+    return f"✅ Uploaded `{path}`"
 
-def fetch_logs(repo_id, level, profile, oauth_token):
+def fetch_logs(repo_id, profile, oauth_token, level):
     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())
+    # get 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 = []
@@ -59,10 +61,9 @@ def fetch_logs(repo_id, level, profile, oauth_token):
 def list_files(repo_id, profile, oauth_token):
     if not (profile and oauth_token and repo_id):
         return "⚠️ Log in & create a Space first."
-    files = list_repo_files(repo_id, token=oauth_token.token, repo_type="space")
-    return "\n".join(files)
+    return "\n".join(list_repo_files(repo_id, token=oauth_token.token, repo_type="space"))
 
-# — GEMINI FUNCTION DECLS ——
+# — GEMINI FUNCTION DECLS — #
 
 func_decls = [
     {
@@ -102,10 +103,10 @@ func_decls = [
     },
 ]
 
-# — CHAT HANDLER ——
+# — CHAT HANDLER — #
 
 def process_message(profile, oauth_token, user_msg, gemini_key, repo_name, sdk, chat_history, session):
-    # init chat
+    # init on first call
     if session.get("chat") is None:
         client = genai.Client(api_key=gemini_key)
         cfg = types.GenerateContentConfig(
@@ -121,26 +122,32 @@ def process_message(profile, oauth_token, user_msg, gemini_key, repo_name, sdk,
     resp = chat.send_message(user_msg)
     part = resp.candidates[0].content.parts[0]
 
+    result = {}
     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)
-            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")
-            result = {"files":"\n".join(files)}
-        elif name=="get_build_logs":
-            result = {"log":fetch_logs(session["repo_id"], "build", profile, oauth_token)}
-        elif name=="get_run_logs":
-            result = {"log":fetch_logs(session["repo_id"], "run", profile, oauth_token)}
+            session["repo_id"] = rid
+            result = {"log": log, "iframe": iframe}
+        elif name == "list_files":
+            files = list_files(session["repo_id"], profile, oauth_token)
+            result = {"files": files}
+        elif name == "get_build_logs":
+            log = fetch_logs(session["repo_id"], profile, oauth_token, "build")
+            result = {"log": log}
+        elif name == "get_run_logs":
+            log = fetch_logs(session["repo_id"], profile, oauth_token, "run")
+            result = {"log": log}
         else:
-            result = {"log":f"⚠️ Unknown fn {name}"}
+            result = {"log": f"⚠️ Unknown function {name}"}
 
+        # feed back into chat
         chat.send_message(
             types.Content(
                 role="function",
-                parts=[ types.Part(function_call=part.function_call, function_response=json.dumps(result)) ]
+                parts=[ types.Part(function_call=part.function_call,
+                                   function_response=json.dumps(result)) ]
             )
         )
         final = chat.get_history()[-1].parts[0].text
@@ -148,67 +155,88 @@ def process_message(profile, oauth_token, user_msg, gemini_key, repo_name, sdk,
         final = part.text
 
     # 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"]
+    if "iframe" in result: session["iframe"] = result["iframe"]
+    if "log"    in result: session["log"]    = result["log"]
+    if "files"  in result: session["files"]  = result["files"]
+
     chat_history[-1] = (user_msg, final)
-    return chat_history, session["iframe"], session["log"], session["files"], session
+    return chat_history, session.get("iframe",""), session.get("log",""), session.get("files",""), session
 
 def sync_manual(profile, oauth_token, session):
-    # after manual tweaks, refresh file list in panels & LLM memory
+    # pull in any manual file changes
     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)
+    files = list_files(session["repo_id"], profile, oauth_token)
+    session["files"] = files
     session["log"]   = "🔄 Manual changes synced."
-    return session["iframe"], session["log"], session["files"], session
+    return session.get("iframe",""), session["log"], session["files"], session
 
-# — BUILD UI ——
+# — LAYOUT — #
 
-with gr.Blocks(title="HF Spaces + Gemini Chat", css="""
-#sidebar {background:#f7f7f7;padding:10px;border-right:1px solid #ddd;}
-#main {padding:10px;}
+with gr.Blocks(css="""
+#sidebar {background:#f7f7f7;padding:1em;border-right:1px solid #ddd;}
+#main    {padding:1em;}
 """) as demo:
+
     with gr.Row():
+        # Sidebar
         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)
+            login_btn     = gr.LoginButton(variant="huggingface", size="sm")
+            profile_state = gr.State(None)
+            token_state   = gr.State(None)
+            # capture login outputs
+            login_btn.click(None, outputs=[profile_state, token_state])
+
+            status_md = gr.Markdown("*Not logged in.*")
+            profile_state.change(show_profile, inputs=[profile_state], outputs=[status_md])
+            login_btn.click(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])
+            login_btn.click(list_private_models,
+                            inputs=[profile_state, token_state],
+                            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")
 
             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({})])
+            sync_btn = gr.Button("🔄 Confirm Manual Changes")
+            sync_out = gr.Markdown()
+            sync_btn.click(sync_manual,
+                           inputs=[profile_state, token_state, gr.State({})],
+                           outputs=[gr.HTML(), sync_out, gr.Textbox(), gr.State({})])
 
+        # Main area
         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…")
+                    chatbox = gr.Chatbot(type="messages")
+                    user_in = gr.Textbox(show_label=False, placeholder="Ask the 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")
+                    sdk_m   = gr.Radio(["gradio","streamlit"], 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], 
+                    profile_state.change(enable_create,
+                                         inputs=[profile_state, token_state],
+                                         outputs=[create])
+                    login_btn.click(enable_create,
+                                    inputs=[profile_state, token_state],
+                                    outputs=[create])
+
+                    create.click(create_space,
+                                 inputs=[repo_m, sdk_m, profile_state, token_state],
                                  outputs=[sess, log_c, preview])
 
                     gr.Markdown("#### Upload File")
@@ -217,23 +245,38 @@ with gr.Blocks(title="HF Spaces + Gemini Chat", css="""
                     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)
+                    profile_state.change(enable_repo_actions,
+                                         inputs=[sess, profile_state, token_state],
+                                         outputs=[up_btn])
+                    login_btn.click(enable_repo_actions,
+                                    inputs=[sess, profile_state, token_state],
+                                    outputs=[up_btn])
+
                     up_btn.click(upload_file_to_space,
-                                 inputs=[file_u, path, sess, status, login],
-                                 outputs=log_u)
+                                 inputs=[file_u, path, sess, profile_state, token_state],
+                                 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)
+                    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)
+
+                    profile_state.change(enable_repo_actions,
+                                         inputs=[sess, profile_state, token_state],
+                                         outputs=[b_btn, r_btn])
+                    login_btn.click(enable_repo_actions,
+                                    inputs=[sess, profile_state, token_state],
+                                    outputs=[b_btn, r_btn])
 
-                    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)
+                    b_btn.click(fetch_logs,
+                                inputs=[sess, profile_state, token_state, gr.State("build")],
+                                outputs=[log_b])
+                    r_btn.click(fetch_logs,
+                                inputs=[sess, profile_state, token_state, gr.State("run")],
+                                outputs=[log_r])
 
-            # always-visible panels
+            # always‑visible panels
             gr.Markdown("---")
             iframe_out = gr.HTML(label="🖼️ Preview")
             log_out    = gr.Textbox(label="📋 Latest Log", lines=4)
@@ -241,7 +284,7 @@ with gr.Blocks(title="HF Spaces + Gemini Chat", css="""
 
     state = gr.State({})
     send.click(process_message,
-               inputs=[status, login, user_in, gemini_key, repo_name, sdk_choice, chatbox, state],
+               inputs=[profile_state, token_state, user_in, gemini_key, repo_name, sdk_choice, chatbox, state],
                outputs=[chatbox, iframe_out, log_out, files_out, state])
 
 if __name__ == "__main__":