Update app.py

app.py

@@ -5,12 +5,13 @@ from typing import Dict, Any, Optional, List
 
 from fastapi import FastAPI, HTTPException
 from pydantic import BaseModel, Field
+from starlette.routing import Mount
 
 from mcp.server.fastmcp import FastMCP, Context
 
 
 # ============================================================
-# In-memory command queue (local dev)
+# In-memory queue
 # ============================================================
 commands: Dict[str, Dict[str, Any]] = {}
 queue: List[str] = []
@@ -23,12 +24,12 @@ def now_iso() -> str:
 
 async def enqueue(command: str, args: Optional[Dict[str, Any]] = None, source: str = "mcp") -> Dict[str, Any]:
     cmd_id = str(uuid4())
-    record = {
+    rec = {
         "id": cmd_id,
         "command": command,
         "args": args or {},
         "source": source,
-        "status": "queued",      # queued | running | done | failed
+        "status": "queued",  # queued | running | done | failed
         "result": None,
         "error": None,
         "created_at": now_iso(),
@@ -36,49 +37,45 @@ async def enqueue(command: str, args: Optional[Dict[str, Any]] = None, source: s
         "claimed_by": None,
     }
     async with queue_lock:
-        commands[cmd_id] = record
+        commands[cmd_id] = rec
         queue.append(cmd_id)
-    return record
+    return rec
 
 
 # ============================================================
-# MCP server (SSE transport)
+# MCP server (Streamable HTTP) — better for ChatGPT connector
 # ============================================================
 mcp = FastMCP(
-    "Create3 Local Bridge (SSE)",
-    instructions=(
-        "Tools queue robot commands for a local Create 3 runner. "
-        "This MCP server does not control the robot directly."
-    ),
+    "Create3 Robot Bridge",
+    instructions="Queues robot commands for a local Create 3 runner.",
+    stateless_http=True,   # good for hosted environments
+    json_response=False,   # keep MCP transport behavior, not plain JSON API
 )
 
-# --- Exactly 3 tools ---
-
+# Exactly 3 tools
 @mcp.tool()
 async def dock(ctx: Context) -> dict:
-    """Dock the Create 3."""
+    """Queue a dock command for Create 3."""
     rec = await enqueue("dock", {}, source="mcp")
     return {"ok": True, "queued": rec}
 
-
 @mcp.tool()
 async def undock(ctx: Context) -> dict:
-    """Undock the Create 3."""
+    """Queue an undock command for Create 3."""
     rec = await enqueue("undock", {}, source="mcp")
     return {"ok": True, "queued": rec}
 
-
 @mcp.tool()
 async def move_cm(cm: float, ctx: Context) -> dict:
-    """Move forward (negative cm moves backward)."""
+    """Queue a move command in centimeters (negative moves backward)."""
     rec = await enqueue("move_cm", {"cm": cm}, source="mcp")
     return {"ok": True, "queued": rec}
 
 
 # ============================================================
-# FastAPI app + queue endpoints for local robot runner
+# FastAPI app + queue endpoints for local Create 3 client
 # ============================================================
-app = FastAPI(title="Create3 MCP SSE + Queue (Local)", version="1.0.0")
+app = FastAPI(title="Create3 MCP + Queue", version="1.0.0")
 
 
 class StatusUpdate(BaseModel):
@@ -92,8 +89,9 @@ class StatusUpdate(BaseModel):
 async def root():
     return {
         "ok": True,
-        "mcp_sse_endpoint": "/sse",
-        "note": "Point your MCP connector to http://localhost:8000/sse",
+        "mcp_endpoint": "/mcp",
+        "health": "/health",
+        "note": "Use the ChatGPT MCP connector URL ending in /mcp",
         "time": now_iso(),
     }
 
@@ -111,31 +109,22 @@ async def health():
 
 @app.get("/commands")
 async def list_commands(limit: int = 50):
-    items = sorted(
-        commands.values(),
-        key=lambda x: x["updated_at"],
-        reverse=True
-    )[: max(1, min(limit, 200))]
+    items = sorted(commands.values(), key=lambda x: x["updated_at"], reverse=True)[: max(1, min(limit, 200))]
     return {"ok": True, "items": items}
 
 
 @app.post("/commands/next")
 async def claim_next_command(robot_id: str):
-    """Robot runner polls this to claim the next queued command."""
     async with queue_lock:
         while queue:
             cmd_id = queue.pop(0)
             cmd = commands.get(cmd_id)
-            if not cmd:
+            if not cmd or cmd["status"] != "queued":
                 continue
-            if cmd["status"] != "queued":
-                continue
-
             cmd["status"] = "running"
             cmd["claimed_by"] = robot_id
             cmd["updated_at"] = now_iso()
             return {"ok": True, "item": cmd}
-
     return {"ok": True, "item": None}
 
 
@@ -144,7 +133,6 @@ async def update_status(command_id: str, update: StatusUpdate):
     cmd = commands.get(command_id)
     if not cmd:
         raise HTTPException(status_code=404, detail="Command not found")
-
     cmd["status"] = update.status
     cmd["result"] = update.result
     cmd["error"] = update.error
@@ -154,7 +142,5 @@ async def update_status(command_id: str, update: StatusUpdate):
     return {"ok": True}
 
 
-# ============================================================
-# Mount MCP SSE app at /sse
-# ============================================================
-app.mount("/sse", mcp.sse_app())
+# Mount MCP at /mcp (Streamable HTTP transport)
+app.router.routes.append(Mount("/mcp", app=mcp.streamable_http_app()))