yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'integrate webserver into cli' (#161) from Mic92-mic92 into main

Browse Source
This commit is contained in:
clan-bot
2023-08-24 09:32:26 +00:00
parent 7f6f147d84 745368242d
commit 55ed397d21
6 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/clan-cli/clan_cli/webui/app.py Normal file
View File

@@ -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)

0
pkgs/clan-cli/clan_cli/webui/routers/__init__.py Normal file
View File

8
pkgs/clan-cli/clan_cli/webui/routers/health.py Normal file
View File

@@ -0,0 +1,8 @@
from fastapi import APIRouter
router = APIRouter()
@router.get("/health")
async def health() -> str:
return "OK"

9
pkgs/clan-cli/clan_cli/webui/routers/root.py Normal file
View File

@@ -0,0 +1,9 @@
from fastapi import APIRouter, Response
router = APIRouter()
@router.get("/")
async def root() -> Response:
body = "<html><body><h1>Welcome</h1></body></html>"
return Response(content=body, media_type="text/html")

11
pkgs/clan-cli/clan_cli/webui/server.py
View File

@@ -4,18 +4,9 @@ import urllib.request
import webbrowser import webbrowser
from threading import Thread from threading import Thread
from fastapi import FastAPI
# XXX: can we dynamically load this using nix develop? # XXX: can we dynamically load this using nix develop?
from uvicorn import run from uvicorn import run
app = FastAPI()
@app.get("/health")
async def read_root() -> str:
return "OK"
def defer_open_browser(base_url: str) -> None: def defer_open_browser(base_url: str) -> None:
for i in range(5): 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}",) target=defer_open_browser, args=(f"http://[{args.host}]:{args.port}",)
).start() ).start()
run( run(
"clan_cli.webui.server:app", "clan_cli.webui.app:app",
host=args.host, host=args.host,
port=args.port, port=args.port,
log_level=args.log_level, log_level=args.log_level,

2
scripts/pre-commit
View File

@@ -46,7 +46,7 @@ git stash push --quiet --keep-index --message "treefmt pre-commit"
trap restore_stash EXIT trap restore_stash EXIT
# Run treefmt on the files in the index and record the result. # 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 # Check if there is a diff
git diff --name-only --exit-code git diff --name-only --exit-code