Update app.py

app.py

@@ -50,10 +50,8 @@ def write_file(path, content, repo_id, profile, token):
         return "⚠️ Please log in first."
     if not repo_id:
         return "⚠️ Please create a Space first."
-    # Write locally
     with open(path, "w") as f:
         f.write(content)
-    # Upload
     upload_file(path, path, repo_id,
                 token=token.token, repo_type="space")
     return f"✅ Wrote and uploaded `{path}`"
@@ -66,8 +64,10 @@ def list_files(repo_id, profile, token):
 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."
-    r = get_session().get(f"{constants.ENDPOINT}/api/spaces/{repo_id}/jwt",
-                          headers=build_hf_headers())
+    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/build"
@@ -83,8 +83,10 @@ def get_build_logs(repo_id, profile, token):
 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."
-    r = get_session().get(f"{constants.ENDPOINT}/api/spaces/{repo_id}/jwt",
-                          headers=build_hf_headers())
+    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/run"
@@ -153,15 +155,14 @@ func_decls = [
 def process_message(profile, token, user_msg,
                     gemini_key, sidebar_repo, sidebar_sdk,
                     chat_history, session):
-    # 1) Initialize chat
+    # Initialize the chat once
     if session.get("chat") is None:
         client = genai.Client(api_key=gemini_key)
         cfg = types.GenerateContentConfig(
             system_instruction=(
-                "You are a HF Spaces developer assistant. On request, "
-                "1) call create_space(name, sdk),  2) call write_file for app.py, "
-                "requirements.txt, README.md in that order, then 3) optionally list or fetch logs. "
-                "You MUST use function calls for every action, and never return code inline."
+                "You are a HF Spaces developer assistant. When asked to build a new Space, "
+                "first call create_space(name,sdk), then call write_file for app.py, requirements.txt "
+                "and README.md in that order. You must use function calls—never emit raw code."
             ),
             temperature=0,
             tools=[ types.Tool(function_declarations=func_decls) ],
@@ -169,31 +170,28 @@ def process_message(profile, token, user_msg,
                 function_calling_config=types.FunctionCallingConfig(mode="ANY")
             )
         )
-        session["chat"]     = client.chats.create(model="gemini-2.0-flash", config=cfg)
-        session["repo_id"]  = None
-        session["messages"]= []
+        session["chat"] = client.chats.create(model="gemini-2.0-flash", config=cfg)
+        session["repo_id"] = None
+        session["messages"] = []
 
-    # 1.5) Auto‐create space if user says “call it NAME”
+    # Auto‐create on “call it NAME”
     if session["repo_id"] is None:
         m = re.search(r"call (?:it )?([A-Za-z0-9_-]+)", user_msg, re.IGNORECASE)
         if m:
             name = m.group(1)
             rid, log, iframe = create_space(name, sidebar_sdk, profile, token)
-            session["repo_id"] = rid
-            session["iframe"]  = iframe
-            session["log"]     = log
-            session["files"]   = ""
+            session["repo_id"], session["iframe"], session["log"], session["files"] = rid, iframe, log, ""
             session["messages"].append({"role":"assistant","content":log})
             return session["messages"], iframe, log, "", session
 
-    # 2) Record user
+    # Record the user message
     session["messages"].append({"role":"user","content":user_msg})
 
-    # 3) Send to Gemini
+    # Send to Gemini
     resp = session["chat"].send_message(user_msg)
     part = resp.candidates[0].content.parts[0]
 
-    # 4) Handle function_call
+    # Prepare to call back
     args = part.function_call.args
     if isinstance(args, str):
         args = json.loads(args)
@@ -202,8 +200,7 @@ def process_message(profile, token, user_msg,
 
     if fn == "create_space":
         rid, log, iframe = create_space(args["repo_name"], args["sdk"], profile, token)
-        session["repo_id"] = rid
-        result = {"log":log, "iframe":iframe}
+        session["repo_id"], result = rid, {"log":log, "iframe":iframe}
 
     elif fn == "write_file":
         status = write_file(args["path"], args["content"], session["repo_id"], profile, token)
@@ -221,25 +218,22 @@ def process_message(profile, token, user_msg,
     else:
         result = {"log":f"⚠️ Unknown function {fn}"}
 
-    # 5) Return function result as dict (not JSON string)
-    session["chat"].send_message(
-        types.Content(
-            role="function",
-            parts=[ types.Part(
-                function_call=part.function_call,
-                function_response=result
-            )]
-        )
-    )
-    assistant_text = session["chat"].get_history()[-1].parts[0].text
+    # **Key fix:** use Part.from_function_response
+    func_call = part.function_call
+    resp_parts = [
+        types.Part(function_call=func_call),
+        types.Part.from_function_response(name=func_call.name, response=result)
+    ]
+    session["chat"].send_message(types.Content(role="function", parts=resp_parts))
 
-    # 6) Record assistant
+    # Fetch the assistant’s final text
+    assistant_text = session["chat"].get_history()[-1].parts[0].text
     session["messages"].append({"role":"assistant","content":assistant_text})
 
-    # 7) Update panels
-    if "iframe" in result: session["iframe"] = result["iframe"]
-    if "log"    in result: session["log"]    = result["log"]
-    if "files"  in result: session["files"]  = result["files"]
+    # Update panels
+    for k in ("iframe","log","files"):
+        if k in result:
+            session[k] = result[k]
 
     return (
         session["messages"],
@@ -249,17 +243,16 @@ def process_message(profile, token, user_msg,
         session
     )
 
-# — SYNC MANUAL —
+# — SYNC MANUAL CHANGES —
 
 def sync_manual(profile, token, session):
     if not (profile and token and session.get("repo_id")):
-        return session.get("iframe",""), "⚠️ Cannot sync.", session.get("files",""), session
+        return session.get("iframe",""), "⚠️ Cannot sync manual changes.", session.get("files",""), session
     fl = list_repo_files(session["repo_id"], token=token.token, repo_type="space")
-    session["files"] = "\n".join(fl)
-    session["log"]   = "🔄 Manual changes synced."
+    session["files"], session["log"] = "\n".join(fl), "🔄 Manual changes synced."
     return session["iframe"], session["log"], session["files"], session
 
-# — UI —
+# — BUILD THE UI —
 
 with gr.Blocks(css="""
 #sidebar { background:#f2f2f2; padding:1rem; border-right:1px solid #ccc; }
@@ -267,12 +260,12 @@ with gr.Blocks(css="""
 """) as demo:
 
     with gr.Row():
+        # Sidebar
         with gr.Column(elem_id="sidebar", scale=1):
             gr.Markdown("### 🔑 HF Login & Config")
-            login_btn     = gr.LoginButton(variant="huggingface", size="sm")
+            login_btn = gr.LoginButton(variant="huggingface", size="sm")
             profile_state = gr.State(None)
-            token_state   = gr.State(None)
-
+            token_state = gr.State(None)
             login_btn.click(None, [], [profile_state, token_state])
 
             status_md = gr.Markdown("*Not logged in.*")
@@ -283,40 +276,42 @@ with gr.Blocks(css="""
                                  [profile_state, token_state],
                                  [models_md])
 
-            gemini_key   = gr.Textbox(label="Gemini API Key", type="password")
+            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")
+            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
         with gr.Column(elem_id="main", scale=3):
             tabs = gr.Tabs()
             with tabs:
                 with gr.TabItem("💬 Chat"):
-                    chatbox    = gr.Chatbot(type="messages")
+                    chatbox = gr.Chatbot(type="messages")
                     user_input = gr.Textbox(show_label=False, placeholder="Ask the LLM…")
-                    send_btn   = gr.Button("Send")
+                    send_btn = gr.Button("Send")
                 with gr.TabItem("🛠️ Manual"):
                     gr.Markdown("#### Manual Controls")
-                    # (repeat manual create/upload/logs UI as before)
+                    # …repeat your manual-create/upload/logs UI here…
 
             gr.Markdown("---")
             iframe_out = gr.HTML(label="🖼️ Preview")
-            log_out    = gr.Textbox(label="📋 Latest Log", lines=4)
-            files_out  = gr.Textbox(label="📚 Files", 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=[
-                       profile_state, token_state, user_input,
-                       gemini_key, sidebar_repo, sidebar_sdk,
-                       chatbox, state
-                   ],
-                   outputs=[chatbox, iframe_out, log_out, files_out, state])
-
-    confirm_btn.click(sync_manual,
-                      inputs=[profile_state, token_state, state],
-                      outputs=[iframe_out, log_out, files_out, state])
+    send_btn.click(
+        process_message,
+        inputs=[profile_state, token_state, user_input,
+                gemini_key, sidebar_repo, sidebar_sdk,
+                chatbox, state],
+        outputs=[chatbox, iframe_out, log_out, files_out, state]
+    )
+    confirm_btn.click(
+        sync_manual,
+        inputs=[profile_state, token_state, state],
+        outputs=[iframe_out, log_out, files_out, state]
+    )
 
 if __name__ == "__main__":
     demo.launch()