diff --git a/dockerfile b/dockerfile new file mode 100644 index 0000000..a36dff2 --- /dev/null +++ b/dockerfile @@ -0,0 +1,19 @@ +# Dockerfile +FROM python:3.11-slim + +WORKDIR /app + +# Install required packages +RUN apt-get update && apt-get install -y \ + iproute2 \ + can-utils \ + libpython3-dev \ + && rm -rf /var/lib/apt/lists/* + +# Copy all application files +COPY . . + +# Install Python dependencies +RUN pip install --no-cache-dir -r requirements.txt + +CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] diff --git a/main.py b/main.py index 54e0bb1..8e63595 100644 --- a/main.py +++ b/main.py @@ -2,6 +2,9 @@ from fastapi import FastAPI, HTTPException, Query from fastapi.staticfiles import StaticFiles from fastapi.responses import HTMLResponse import logging +import os +from fastapi import Request, APIRouter +import subprocess import platform if platform.system() in ['Darwin']: # macOS or Windows from MockCAN import CANBackend @@ -9,13 +12,36 @@ else : from classCAN import CANBackend # Your real backend app = FastAPI() +router = APIRouter() + logging.basicConfig(level=logging.INFO) can_backend = CANBackend() + # Serve static files (HTML, JS, CSS) app.mount("/static", StaticFiles(directory="static"), name="static") +@router.post("/webhook") +async def github_webhook(request: Request): + payload = await request.json() + print("[WEBHOOK] Received webhook:", payload.get("head_commit", {}).get("message")) + + try: + # Call the update script on the HOST using host bash + subprocess.run( + ["/usr/bin/bash", "-c", "bash /home/hmi/Desktop/HMI/update_hmi.sh"], + check=True, + capture_output=True, + text=True + ) + return {"status": "Update triggered"} + except subprocess.CalledProcessError as e: + print(f"[WEBHOOK] Update failed:\n{e.stderr}") + return {"status": "Update failed", "error": str(e)} + + + @app.post("/connect_toggle") def connect_toggle(): """Toggle CAN connection.""" @@ -26,7 +52,7 @@ def connect_toggle(): else: success = can_backend.connect( node_id=0x02, - eds_path=r"/eds_file/processBoard_0.eds" + eds_path = os.path.join(os.path.dirname(__file__), "eds_file", "processBoard_0.eds") ) if not success: raise HTTPException(status_code=500, detail="Connection failed.") @@ -41,7 +67,6 @@ def send_command(state: str, pu_number: int, ploop_setpoint: float = Query(...)) return {"status": "success", "command": state.upper(), "pu": pu_number, "ploop_setpoint": ploop_setpoint} except Exception as e: raise HTTPException(status_code=500, detail=str(e)) - @app.get("/monitor") def get_monitor_data(): # TODO : agree on the structure @@ -136,6 +161,8 @@ async def read_monitor_page(): return HTMLResponse(content=file.read(), status_code=200) +app.include_router(router) + if __name__ == "__main__": import uvicorn uvicorn.run( diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..cfc7728 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,4 @@ +fastapi +uvicorn[standard] +python-can +canopen diff --git a/update_hmi.sh b/update_hmi.sh new file mode 100644 index 0000000..d1506cb --- /dev/null +++ b/update_hmi.sh @@ -0,0 +1,12 @@ +#!/bin/bash +set -e + +echo "[UPDATE] Pulling latest code..." +cd /home/hmi/Desktop/HMI || exit 1 +git reset --hard HEAD +git pull origin main + +echo "[RESTART] Restarting HMI service..." +sudo /bin/systemctl restart hmi.service + +echo "[DONE] HMI updated."