Fixed MCP URL and cleanup process

app.py

@@ -1,4 +1,7 @@
-from client import demo
+from client import demo, cleanup
 
 if __name__ == "__main__":
-    demo.launch()
+    try:
+        demo.launch()
+    finally:
+        cleanup()

client.py

@@ -1,20 +1,22 @@
 import gradio as gr
+import os
 
 from smolagents import CodeAgent, InferenceClientModel
 from smolagents.mcp_client import MCPClient
 
-try:
-    mcp_client = MCPClient(
-        {
-            "url": "http://localhost:7860/gradio_api/mcp/sse",
-        }
-    )
-    tools = mcp_client.get_tools()
-    model = InferenceClientModel()
-    agent = CodeAgent(tools=[*tools], model=model)
+# Determine if we're running locally or on HF Spaces
+is_spaces = os.environ.get('SPACE_ID') is not None
+
+# Define the MCP URL based on environment
+mcp_url = "/gradio_api/mcp/sse" if is_spaces else "http://localhost:7860/gradio_api/mcp/sse"
+
+# Initialize the client outside the try block, but don't connect yet
+mcp_client = None
 
-    demo = gr.ChatInterface(
-        fn=lambda message, history: str(agent.run(message)),
+def create_demo():
+    # Creating the chatbot interface
+    return gr.ChatInterface(
+        fn=lambda message, history: str(agent.run(message)) if agent else "Agent not connected",
         type="messages",
         examples=["What is the capital of France?"],
         title="Agent with Gradio and MCP",
@@ -23,6 +25,32 @@ try:
         theme="ocean"
     )
 
-    demo.launch()
-finally:
-    mcp_client.close()
+# Initialize the demo outside of the try-except
+demo = None
+
+try:
+    # Create and connect the MCP client
+    mcp_client = MCPClient({"url": mcp_url})
+    tools = mcp_client.get_tools()
+    model = InferenceClientModel()
+    agent = CodeAgent(tools=[*tools], model=model)
+    
+    # Create the chat interface
+    demo = create_demo()
+    
+except Exception as e:
+    # If client connection fails, create a demo that shows the error
+    print(f"Error connecting to MCP server: {e}")
+    agent = None
+    demo = create_demo()
+
+# Only close the client if it was successfully created
+def cleanup():
+    if mcp_client:
+        try:
+            mcp_client.close()
+        except:
+            pass
+
+# In app.py, we only import the demo object, 
+# so we don't need to call launch() here