diff --git a/pkgs/clan-cli/clan_cli/webui/app.py b/pkgs/clan-cli/clan_cli/webui/app.py new file mode 100644 index 000000000..52de7cc1b --- /dev/null +++ b/pkgs/clan-cli/clan_cli/webui/app.py @@ -0,0 +1,7 @@ +from fastapi import FastAPI + +from .routers import health, root + +app = FastAPI() +app.include_router(health.router) +app.include_router(root.router) diff --git a/pkgs/clan-cli/clan_cli/webui/routers/__init__.py b/pkgs/clan-cli/clan_cli/webui/routers/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/pkgs/clan-cli/clan_cli/webui/routers/health.py b/pkgs/clan-cli/clan_cli/webui/routers/health.py new file mode 100644 index 000000000..d734e121e --- /dev/null +++ b/pkgs/clan-cli/clan_cli/webui/routers/health.py @@ -0,0 +1,8 @@ +from fastapi import APIRouter + +router = APIRouter() + + +@router.get("/health") +async def health() -> str: + return "OK" diff --git a/pkgs/clan-cli/clan_cli/webui/routers/root.py b/pkgs/clan-cli/clan_cli/webui/routers/root.py new file mode 100644 index 000000000..752b6e726 --- /dev/null +++ b/pkgs/clan-cli/clan_cli/webui/routers/root.py @@ -0,0 +1,9 @@ +from fastapi import APIRouter, Response + +router = APIRouter() + + +@router.get("/") +async def root() -> Response: + body = "

Welcome

" + return Response(content=body, media_type="text/html") diff --git a/pkgs/clan-cli/clan_cli/webui/server.py b/pkgs/clan-cli/clan_cli/webui/server.py index 7205496bc..cbea5a215 100644 --- a/pkgs/clan-cli/clan_cli/webui/server.py +++ b/pkgs/clan-cli/clan_cli/webui/server.py @@ -4,18 +4,9 @@ import urllib.request import webbrowser from threading import Thread -from fastapi import FastAPI - # XXX: can we dynamically load this using nix develop? from uvicorn import run -app = FastAPI() - - -@app.get("/health") -async def read_root() -> str: - return "OK" - def defer_open_browser(base_url: str) -> None: for i in range(5): @@ -33,7 +24,7 @@ def start_server(args: argparse.Namespace) -> None: target=defer_open_browser, args=(f"http://[{args.host}]:{args.port}",) ).start() run( - "clan_cli.webui.server:app", + "clan_cli.webui.app:app", host=args.host, port=args.port, log_level=args.log_level, diff --git a/scripts/pre-commit b/scripts/pre-commit index 61b1010ea..5760641b8 100755 --- a/scripts/pre-commit +++ b/scripts/pre-commit @@ -46,7 +46,7 @@ git stash push --quiet --keep-index --message "treefmt pre-commit" trap restore_stash EXIT # Run treefmt on the files in the index and record the result. -nix fmt -- --no-cache --quiet "${commit_files[@]}" +nix fmt -- --no-cache "${commit_files[@]}" # Check if there is a diff git diff --name-only --exit-code