Upload Dockerfile with huggingface_hub

Dockerfile

@@ -1,108 +1,112 @@
-# Marimo Zero - Hugging Face Spaces Dockerfile
-# Optimized for HF Spaces deployment
+# Marimo Zero - Agent Zero + Marimo + OmniRoute
+# Clean minimal setup
 
-FROM python:3.11-slim
+FROM agent0ai/agent-zero:latest
 
-# 1. System Dependencies
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    curl git bash jq procps net-tools nodejs npm ca-certificates nginx \
+USER root
+
+# 1. Install dependencies
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    curl jq python3-pip \
     && rm -rf /var/lib/apt/lists/*
 
-# 2. Install Python Dependencies
-RUN pip install --no-cache-dir \
-    marimo \
-    huggingface_hub \
-    tomli \
-    tomli-w \
-    fastapi \
-    uvicorn \
-    requests
-
-# 3. Install ZeroClaw (Agent Zero)
-RUN curl -fsSL "https://github.com/zeroclaw-labs/zeroclaw/releases/latest/download/zeroclaw-x86_64-unknown-linux-gnu.tar.gz" \
-    -o zeroclaw.tar.gz && \
-    tar -xzf zeroclaw.tar.gz && \
-    mv zeroclaw /usr/local/bin/zeroclaw && \
-    chmod +x /usr/local/bin/zeroclaw && \
-    rm zeroclaw.tar.gz
-
-# 4. Install OmniRoute
+RUN pip install --no-cache-dir marimo fastapi uvicorn requests
+
+# 2. Install OmniRoute
 RUN npm install -g omniroute
 
-# 5. Setup Workspace
+# 3. Setup directories
 WORKDIR /app
-RUN mkdir -p /app/workspace /app/.zeroclaw /app/.omniroute /var/log/marimo-zero && \
-    chmod -R 777 /app/workspace /app/.zeroclaw /app/.omniroute /var/log/marimo-zero
-
-# 6. Copy Config Files
-COPY config.toml /app/.zeroclaw/config.toml
-COPY omniroute-accounts.json /app/.omniroute/accounts.json
-
-# 7. Copy Marimo Notebook
-COPY marimo_sandbox.py /app/marimo_sandbox.py
+RUN mkdir -p /app/marimo /app/workspace /app/.omniroute && chmod -R 777 /app
 
-# 8. Copy Static UI
-RUN mkdir -p /app/static
-COPY static/index.html /app/static/index.html
-COPY nginx.conf /etc/nginx/nginx.conf
+# 4. Copy Marimo notebook
+COPY marimo_sandbox.py /app/marimo/marimo_sandbox.py
 
-# 9. Copy Proxy Server
-COPY proxy_server.py /app/proxy_server.py
-
-# 10. Create Entrypoint Script Inline (avoids file copy issues)
-RUN cat > /app/entrypoint.sh << 'ENTRYPOINT_EOF'
+# 5. Create startup script
+RUN cat > /app/start.sh << 'EOF'
 #!/bin/bash
 set -e
-echo "Starting Marimo Zero for Hugging Face Spaces..."
+
+echo "🚀 Starting Marimo Zero..."
+
+# Parse API_KEYS_JSON
 if [ -n "$API_KEYS_JSON" ]; then
-    echo "Parsing API keys from JSON..."
+    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')
-    export NVIDIA_API_KEY=$(echo $API_KEYS_JSON | jq -r '.nvidia // empty')
-    export GROQ_API_KEY=$(echo $API_KEYS_JSON | jq -r '.groq // empty')
-    export GOOGLE_API_KEY=$(echo $API_KEYS_JSON | jq -r '.google // empty')
-    echo "API keys loaded from API_KEYS_JSON"
-else
-    echo "WARNING: API_KEYS_JSON not set!"
 fi
-echo "Starting OmniRoute on port $OMNIROUTE_PORT..."
-cat > /app/.omniroute/accounts.json << 'ACCOUNTS_EOF'
-{
-  "accounts": [
-    {"name": "openai", "provider": "openai", "api_key": "${OPENAI_API_KEY:-dummy}", "default": true}
-  ]
-}
-ACCOUNTS_EOF
-omniroute start --port $OMNIROUTE_PORT --accounts /app/.omniroute/accounts.json &
-sleep 3
-echo "Starting Agent Zero on port 80..."
-zeroclaw gateway --port 80 --config /app/.zeroclaw/config.toml &
-sleep 5
-echo "Starting Marimo on port $MARIMO_PORT..."
-marimo run /app/marimo_sandbox.py --host 127.0.0.1 --port $MARIMO_PORT --headless &
-sleep 3
-echo "Starting proxy server on port 7860..."
-python3 /app/proxy_server.py &
+
+# Start OmniRoute
+echo "📡 Starting OmniRoute..."
+cat > /app/.omniroute/accounts.json << ACCOUNTS
+{"accounts": [{"name": "openai", "provider": "openai", "api_key": "${OPENAI_API_KEY:-dummy}", "default": true}]}
+ACCOUNTS
+omniroute start --port 20128 --accounts /app/.omniroute/accounts.json &
 sleep 2
-echo "Marimo Zero Ready!"
+
+# Start Marimo
+echo "📓 Starting Marimo..."
+marimo run /app/marimo/marimo_sandbox.py --host 0.0.0.0 --port 8081 --headless &
+sleep 3
+
+# Start proxy (Agent Zero on 80, Marimo on 8081, all on 7860)
+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():
+    from fastapi.responses import RedirectResponse
+    return RedirectResponse(url="/marimo/")
+
+@app.api_route("/marimo/{path:path}", methods=["GET","POST","PUT","DELETE","PATCH"])
+async def marimo_proxy(request: Request, path: str):
+    url = f"http://localhost:8081/{path}"
+    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))
+
+@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!"
+echo "   Agent Zero: http://localhost:7860"
+echo "   Marimo: http://localhost:7860/marimo/"
 wait
-ENTRYPOINT_EOF
+EOF
 
-RUN chmod +x /app/entrypoint.sh
+RUN chmod +x /app/start.sh
 
-# 11. HF Spaces Environment
-ENV PORT=7860
-ENV MARIMO_PORT=8080
-ENV OMNIROUTE_PORT=20128
-ENV WORKSPACE=/app/workspace
-ENV HOME=/app
+# 6. Environment
 ENV HF_SPACE=true
+ENV WORKSPACE=/app/workspace
 
-# 12. Expose single port
+# 7. Port
 EXPOSE 7860
 
 HEALTHCHECK --interval=30s --timeout=10s --start-period=40s --retries=3 \
     CMD curl -f http://localhost:7860/health || exit 1
 
-ENTRYPOINT ["/app/entrypoint.sh"]
+ENTRYPOINT ["/app/start.sh"]