Update app.py

app.py

@@ -110,7 +110,9 @@ def get_container_logs(repo_id, profile, token):
         return "⚠️ Please log in and create a Space first."
     return _fetch_space_logs_level(repo_id, "run")
 
-# — GEMINI FUNCTION DECLARATIONS —
+
+# — FUNCTION DECLARATIONS & TOOL — 
+# Build a single Tool containing all function declarations.
 
 func_decls = [
     types.FunctionDeclaration(
@@ -120,9 +122,9 @@ func_decls = [
             "type": "object",
             "properties": {
                 "repo_name": {"type": "string"},
-                "sdk":       {"type": "string", "enum": ["gradio", "streamlit"]},
+                "sdk":       {"type": "string", "enum": ["gradio", "streamlit"]}
             },
-            "required": ["repo_name", "sdk"],
+            "required": ["repo_name", "sdk"]
         }
     ),
     types.FunctionDeclaration(
@@ -131,10 +133,10 @@ func_decls = [
         parameters={
             "type": "object",
             "properties": {
-                "path":    {"type": "string", "description": "File path in the space"},
-                "content": {"type": "string", "description": "Full text content"},
+                "path":    {"type": "string"},
+                "content": {"type": "string"}
             },
-            "required": ["path", "content"],
+            "required": ["path", "content"]
         }
     ),
     types.FunctionDeclaration(
@@ -143,7 +145,7 @@ func_decls = [
         parameters={
             "type": "object",
             "properties": {"repo_id": {"type": "string"}},
-            "required": ["repo_id"],
+            "required": ["repo_id"]
         }
     ),
     types.FunctionDeclaration(
@@ -152,156 +154,132 @@ func_decls = [
         parameters={
             "type": "object",
             "properties": {"repo_id": {"type": "string"}},
-            "required": ["repo_id"],
+            "required": ["repo_id"]
         }
     ),
     types.FunctionDeclaration(
         name="get_run_logs",
-        description="Fetch container (run) logs",
+        description="Fetch container logs",
         parameters={
             "type": "object",
             "properties": {"repo_id": {"type": "string"}},
-            "required": ["repo_id"],
+            "required": ["repo_id"]
         }
     ),
 ]
+tool = types.Tool(function_declarations=func_decls)
+
+
+# — CHAT HANDLER — 
+
+def execute_function_by_name(name, args, profile, token, session):
+    """Dispatch to the right function and return a raw dict result."""
+    if name == "create_space":
+        rid, log, iframe = create_space(
+            args["repo_name"], session["sdk"], profile, token
+        )
+        session["repo_id"] = rid
+        return {"log": log, "iframe": iframe}
+    if name == "write_file":
+        status = write_file(
+            args["path"], args["content"],
+            session["repo_id"], profile, token
+        )
+        return {"status": status}
+    if name == "list_files":
+        fl = list_repo_files(
+            session["repo_id"], token=token.token, repo_type="space"
+        )
+        return {"files": "\n".join(fl)}
+    if name == "get_build_logs":
+        return {"log": get_build_logs(
+            session["repo_id"], profile, token
+        )}
+    if name == "get_run_logs":
+        return {"log": get_container_logs(
+            session["repo_id"], profile, token
+        )}
+    return {"error": f"Unknown function {name}"}
 
-# — CHAT HANDLER —
 
 def process_message(
     profile, token, user_msg,
     gemini_key, sidebar_repo, sidebar_sdk,
     chat_history, session
 ):
-    # Initialize Gemini chat
+    # Initialize 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 admin. You can create spaces, "
-                "write files, list files, and fetch logs."
+        # Pass the Tool object, not a list of dicts
+        model = client.chats.create(
+            model="gemini-2.0-flash",
+            config=types.GenerateContentConfig(
+                system_instruction=(
+                    "You are a HF Spaces admin. You can create spaces, "
+                    "write files, list files, and fetch logs."
+                ),
+                temperature=0,
+                tools=[tool],
             ),
-            temperature=0,
-            tools=func_decls,                  # ← pass declarations directly
         )
-        session["chat"]     = client.chats.create(
-            model="gemini-2.0-flash", config=cfg
-        )
-        session["repo_id"]  = None
-        session["messages"]= []
+        session.update({
+            "chat": model,
+            "repo_id": None,
+            "sdk": sidebar_sdk,
+            "messages": []
+        })
+
+    # Remember current SDK choice
+    session["sdk"] = sidebar_sdk
 
-    # Handle “call it XYZ” before other logic
+    # Pre-chat “call it X” handler
     if session["repo_id"] is None:
-        m = re.search(r"call (?:it )?([A-Za-z0-9_-]+)", user_msg, re.IGNORECASE)
+        m = re.search(r"call (?:it )?([A-Za-z0-9_-]+)", user_msg)
         if m:
-            name = m.group(1)
-            rid, log, iframe = create_space(
-                name, sidebar_sdk, profile, token
-            )
-            session.update({
-                "repo_id": rid,
-                "iframe": iframe,
-                "log": log,
-                "files": ""
-            })
-            session["messages"].append({
-                "role":"assistant",
-                "content":f"✅ Created Space `{name}`. {log}"
-            })
-            return session["messages"], iframe, log, "", session
-
-    # Record user message
-    session["messages"].append({"role":"user","content":user_msg})
-
-    # Send to Gemini
-    resp = session["chat"].send_message(user_msg)
-    part = resp.candidates[0].content.parts[0]
-
-    result = {}
-    if part.function_call:
-        args = part.function_call.args
-        if isinstance(args, str):
-            args = json.loads(args)
-        fn = part.function_call.name
-
-        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}
-
-        elif fn == "write_file":
-            status = write_file(
-                args["path"], args["content"],
-                session["repo_id"], profile, token
-            )
-            result = {"status": status}
-
-        elif fn == "list_files":
-            fl = list_repo_files(
-                session["repo_id"],
-                token=token.token,
-                repo_type="space"
-            )
-            result = {"files": "\n".join(fl)}
-
-        elif fn == "get_build_logs":
-            result = {"log": get_build_logs(
-                session["repo_id"], profile, token
-            )}
-
-        elif fn == "get_run_logs":
-            result = {"log": get_container_logs(
-                session["repo_id"], profile, token
-            )}
-
-        # Send back the *dict* directly (no json.dumps)
-        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
-
-    else:
-        assistant_text = part.text
-
-    # Record assistant
-    session["messages"].append({
-        "role":"assistant","content":assistant_text
-    })
-
-    # Update panels
-    for k in ("iframe","log","files"):
-        if k in result:
-            session[k] = result[k]
-
-    return (
-        session["messages"],
-        session.get("iframe",""),
-        session.get("log",""),
-        session.get("files",""),
-        session
-    )
-
-# — SYNC MANUAL CHANGES —
+            args = {"repo_name": m.group(1), "sdk": sidebar_sdk}
+            result = execute_function_by_name("create_space", args, profile, token, session)
+            session["messages"].append({"role": "assistant", "content": result["log"]})
+            return session["messages"], result.get("iframe", ""), result["log"], "", session
+
+    # Append user message
+    session["messages"].append({"role": "user", "content": user_msg})
+    response = session["chat"].send_message(user_msg)
+
+    # Handle function-calling loop
+    while True:
+        part = response.candidates[0].content.parts[0]
+        if not part.function_call:
+            break  # no more tools needed
+        fname = part.function_call.name
+        fargs = part.function_call.args or {}
+        # Run the tool
+        result = execute_function_by_name(fname, fargs, profile, token, session)
+        # Send function result back to model
+        resp_part = types.Part.from_function_response(name=fname, response=result)
+        response = session["chat"].send_message(types.Content(role="user", parts=[resp_part]))
+
+    # Final assistant text
+    assistant_text = response.text
+    session["messages"].append({"role": "assistant", "content": assistant_text})
+
+    # Update UI panels
+    iframe = session.get("iframe", "")
+    log    = session.get("log", "")
+    files  = session.get("files", "")
+    return session["messages"], iframe, log, files, session
+
+
+# — MANUAL SYNC — 
 
 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
-    fl = list_repo_files(
-        session["repo_id"], token=token.token, repo_type="space"
-    )
-    session["files"] = "\n".join(fl)
-    session["log"]   = "🔄 Manual changes synced."
-    return session["iframe"], session["log"], session["files"], session
+        return "", "⚠️ Cannot sync manual changes.", "", session
+    files = list_repo_files(session["repo_id"], token=token.token, repo_type="space")
+    log   = "🔄 Manual changes synced."
+    return session.get("iframe",""), log, "\n".join(files), session
+
 
-# — BUILD THE UI —
+# — GRADIO UI — 
 
 with gr.Blocks(css="""
 #sidebar { background:#f2f2f2; padding:1rem; border-right:1px solid #ccc; }
@@ -324,12 +302,12 @@ with gr.Blocks(css="""
                              [profile_state, token_state], [models_md])
 
         gemini_key   = gr.Textbox(label="Gemini API Key", type="password")
-        sidebar_repo = gr.Textbox(label="Space name", placeholder="my-space")
+        sidebar_repo = gr.Textbox(label="Space name", placeholder="blurrtest")
         sidebar_sdk  = gr.Radio(["gradio","streamlit"],
                                 value="gradio", label="SDK")
 
         gr.Markdown("---")
-        confirm_btn  = gr.Button("🔄 Confirm Manual Changes")
+        confirm_btn  = gr.Button("🔄 Sync Manual Changes")
 
     # Main area
     with gr.Column(elem_id="main", scale=3):
@@ -338,17 +316,16 @@ with gr.Blocks(css="""
             with gr.TabItem("💬 Chat"):
                 chatbox    = gr.Chatbot(type="messages")
                 user_input = gr.Textbox(show_label=False,
-                                        placeholder="Ask the LLM…")
+                                        placeholder="Generate code…")
                 send_btn   = gr.Button("Send")
             with gr.TabItem("🛠️ Manual"):
-                gr.Markdown("#### Create a Space")
-                repo_m     = gr.Textbox(label="Name")
+                gr.Markdown("#### Create / Rename Space")
+                repo_m     = gr.Textbox(label="Name", value="")
                 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)
+                log_c      = gr.Textbox(label="Log", interactive=False, lines=2)
                 preview    = gr.HTML("<p>No Space yet.</p>")
 
                 create_btn.click(create_space,
@@ -359,7 +336,7 @@ with gr.Blocks(css="""
                 path        = gr.Textbox(label="Path", value="app.py")
                 file_u      = gr.File()
                 upload_btn  = gr.Button("Upload File")
-                log_u       = gr.Textbox(label="Log",
+                log_u       = gr.Textbox(label="Upload Log",
                                           interactive=False, lines=2)
 
                 upload_btn.click(upload_file_to_space,
@@ -397,4 +374,4 @@ with gr.Blocks(css="""
                       [iframe_out, log_out, files_out, state])
 
 if __name__ == "__main__":
-    demo.launch(share=True)
+    demo.launch()