Spaces:

TheEdict
/

marimo-zero

Sleeping

App Files Files Community

TheEdict commited on Mar 25

Commit

fd6b4e6

verified ·

1 Parent(s): 845741d

Upload Dockerfile with huggingface_hub

Browse files

Files changed (1) hide show

Dockerfile +42 -40

Dockerfile CHANGED Viewed

@@ -1,4 +1,5 @@
 # Marimo Zero - Agent Zero + Marimo + OmniRoute
 FROM agent0ai/agent-zero:latest
@@ -21,7 +22,7 @@ RUN mkdir -p /app/marimo /app/workspace /app/.omniroute && chmod -R 777 /app
 # 4. Copy Marimo notebook
 COPY marimo_sandbox.py /app/marimo/marimo_sandbox.py
-# 5. Create startup script that ALSO starts base image services
 RUN cat > /app/start.sh << 'EOF'
 #!/bin/bash
 set -e
@@ -32,7 +33,6 @@ echo "🚀 Starting Marimo Zero..."
 if [ -n "$API_KEYS_JSON" ]; then
     echo "📝 Loading API keys..."
     export OPENAI_API_KEY=$(echo $API_KEYS_JSON | jq -r '.openai // empty')
-    export ANTHROPIC_API_KEY=$(echo $API_KEYS_JSON | jq -r '.anthropic // empty')
 fi
 # Start OmniRoute
@@ -43,50 +43,59 @@ ACCOUNTS
 omniroute start --port 20128 --accounts /app/.omniroute/accounts.json &
 sleep 2
-# Start Agent Zero services from base image
-# The base image typically runs a Node.js web UI and Python backend
-echo "🤖 Starting Agent Zero services..."
-# Check for and run the base image entrypoint
-if [ -f /entrypoint.sh ]; then
-    echo "Running base entrypoint..."
-    /entrypoint.sh &
-    sleep 5
-elif [ -f /app/run.py ]; then
-    echo "Running run.py..."
-    python3 /app/run.py &
-    sleep 5
-elif [ -f /app/run_ui.py ]; then
-    echo "Running run_ui.py..."
-    python3 /app/run_ui.py &
-    sleep 5
-elif command -v node &> /dev/null && [ -f /app/server.js ]; then
-    echo "Running Node.js server..."
-    node /app/server.js &
-    sleep 5
-else
-    echo "Looking for Agent Zero services..."
-    find / -name "run*.py" -o -name "server.js" -o -name "main.py" 2>/dev/null | head -5
-fi
 # Start Marimo
 echo "📓 Starting Marimo..."
 marimo run /app/marimo/marimo_sandbox.py --host 0.0.0.0 --port 8081 --headless &
 sleep 3
-# Start proxy
 echo "🔀 Starting proxy..."
 python3 << 'PROXY'
 from fastapi import FastAPI, Request
-from fastapi.responses import StreamingResponse
 import httpx
 app = FastAPI()
 client = httpx.AsyncClient(timeout=120.0)
 @app.get("/health")
 async def health():
-    return {"status": "healthy"}
 @app.get("/marimo")
 async def marimo_redir():
@@ -102,21 +111,14 @@ async def marimo_proxy(request: Request, path: str):
     r = await client.request(request.method, url, headers=h, content=b)
     return StreamingResponse(r.aiter_bytes(), status_code=r.status_code, headers=dict(r.headers))
-@app.api_route("/{path:path}", methods=["GET","POST","PUT","DELETE","PATCH"])
-async def az_proxy(request: Request, path: str):
-    url = f"http://localhost:80/{path}" if path else "http://localhost:80"
-    h = dict(request.headers)
-    h.pop("host", None)
-    b = await request.body() if request.method in ["POST","PUT","PATCH"] else None
-    r = await client.request(request.method, url, headers=h, content=b)
-    return StreamingResponse(r.aiter_bytes(), status_code=r.status_code, headers=dict(r.headers))
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)
 PROXY
 echo "✅ Ready!"
 wait
 EOF

 # Marimo Zero - Agent Zero + Marimo + OmniRoute
+# Simplified: Just run Agent Zero's web server directly
 FROM agent0ai/agent-zero:latest
 # 4. Copy Marimo notebook
 COPY marimo_sandbox.py /app/marimo/marimo_sandbox.py
+# 5. Create startup script
 RUN cat > /app/start.sh << 'EOF'
 #!/bin/bash
 set -e
 if [ -n "$API_KEYS_JSON" ]; then
     echo "📝 Loading API keys..."
     export OPENAI_API_KEY=$(echo $API_KEYS_JSON | jq -r '.openai // empty')
 fi
 # Start OmniRoute
 omniroute start --port 20128 --accounts /app/.omniroute/accounts.json &
 sleep 2
 # Start Marimo
 echo "📓 Starting Marimo..."
 marimo run /app/marimo/marimo_sandbox.py --host 0.0.0.0 --port 8081 --headless &
 sleep 3
+# Start proxy - directly serve Agent Zero static files or proxy
 echo "🔀 Starting proxy..."
 python3 << 'PROXY'
 from fastapi import FastAPI, Request
+from fastapi.responses import StreamingResponse, HTMLResponse
+from fastapi.staticfiles import StaticFiles
 import httpx
+import os
 app = FastAPI()
 client = httpx.AsyncClient(timeout=120.0)
+# Try to find and mount Agent Zero web UI
+AGENT_ZERO_WEB_PATHS = [
+    "/opt/venv-a0/lib/python3.12/site-packages/agent_zero/web",
+    "/app/web",
+    "/usr/share/agent-zero/web",
+    "/var/www/agent-zero",
+]
+web_path = None
+for path in AGENT_ZERO_WEB_PATHS:
+    if os.path.exists(path):
+        web_path = path
+        break
+if web_path:
+    print(f"Serving Agent Zero web UI from: {web_path}")
+    app.mount("/", StaticFiles(directory=web_path, html=True), name="agent_zero")
+else:
+    print("Agent Zero web UI not found, serving simple page")
+    @app.get("/")
+    async def root():
+        return HTMLResponse("""
+        <html>
+        <head><title>Marimo Zero</title></head>
+        <body>
+        <h1>🦀 Marimo Zero</h1>
+        <p>Agent Zero web UI not found in base image.</p>
+        <p><a href="/marimo/">Open Marimo Sandbox</a></p>
+        </body>
+        </html>
+        """)
 @app.get("/health")
 async def health():
+    return {"status": "healthy", "web_path": web_path}
 @app.get("/marimo")
 async def marimo_redir():
     r = await client.request(request.method, url, headers=h, content=b)
     return StreamingResponse(r.aiter_bytes(), status_code=r.status_code, headers=dict(r.headers))
 if __name__ == "__main__":
     import uvicorn
     uvicorn.run(app, host="0.0.0.0", port=7860)
 PROXY
 echo "✅ Ready!"
+echo "   Main: http://localhost:7860"
+echo "   Marimo: http://localhost:7860/marimo/"
 wait
 EOF