diff --git a/tools/web_monitor/dashboard/__init__.py b/tools/web_monitor/dashboard/__init__.py index 45e5d2ec..8c8f10d8 100644 --- a/tools/web_monitor/dashboard/__init__.py +++ b/tools/web_monitor/dashboard/__init__.py @@ -17,7 +17,6 @@ def index(request: Request): @router.get("/dashboard") def dashboard(request: Request): - return templates.TemplateResponse("index.html", { - "request": request, - "cur_miners": get_current_miner_list() - }) + return templates.TemplateResponse( + "index.html", {"request": request, "cur_miners": get_current_miner_list()} + ) diff --git a/tools/web_testbench/app.py b/tools/web_testbench/app.py index 8da41300..25168c8f 100644 --- a/tools/web_testbench/app.py +++ b/tools/web_testbench/app.py @@ -1,9 +1,7 @@ from fastapi import FastAPI, WebSocket, Request from fastapi.websockets import WebSocketDisconnect -from fastapi.staticfiles import StaticFiles -from fastapi.responses import HTMLResponse -import websockets.exceptions import asyncio +from fastapi.staticfiles import StaticFiles import uvicorn import os diff --git a/tools/web_testbench/public/create_layout.js b/tools/web_testbench/public/create_layout.js index 25a2c911..1ce12b86 100644 --- a/tools/web_testbench/public/create_layout.js +++ b/tools/web_testbench/public/create_layout.js @@ -257,4 +257,5 @@ export function generate_layout(miners) { generate_graphs(miner, hr_canvas, temp_canvas, fan_1_canvas, fan_2_canvas); } }); +<<<<<<< HEAD }