From cb2815c4d00621f5e5588536c1641699b7c352b6 Mon Sep 17 00:00:00 2001 From: Qubasa Date: Tue, 3 Oct 2023 14:39:29 +0200 Subject: [PATCH] nix fmt --- pkgs/clan-cli/clan_cli/vms/create.py | 1 + pkgs/clan-cli/clan_cli/webui/app.py | 1 - pkgs/clan-cli/clan_cli/webui/assets.py | 10 +++++----- pkgs/clan-cli/clan_cli/webui/routers/root.py | 3 ++- pkgs/clan-cli/clan_cli/webui/routers/vms.py | 10 +++------- pkgs/clan-cli/clan_cli/webui/task_manager.py | 8 ++++---- pkgs/clan-cli/tests/test_flake_api.py | 7 +++---- 7 files changed, 18 insertions(+), 22 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/vms/create.py b/pkgs/clan-cli/clan_cli/vms/create.py index c7b815eb6..d8786e415 100644 --- a/pkgs/clan-cli/clan_cli/vms/create.py +++ b/pkgs/clan-cli/clan_cli/vms/create.py @@ -40,6 +40,7 @@ def create(args: argparse.Namespace) -> None: print(line, end="") print("") + def register_create_parser(parser: argparse.ArgumentParser) -> None: parser.add_argument("machine", type=str) parser.set_defaults(func=create) diff --git a/pkgs/clan-cli/clan_cli/webui/app.py b/pkgs/clan-cli/clan_cli/webui/app.py index 612dd1256..daf415861 100644 --- a/pkgs/clan-cli/clan_cli/webui/app.py +++ b/pkgs/clan-cli/clan_cli/webui/app.py @@ -5,7 +5,6 @@ from fastapi.middleware.cors import CORSMiddleware from fastapi.routing import APIRoute from fastapi.staticfiles import StaticFiles - from .assets import asset_path from .routers import flake, health, machines, root, utils, vms diff --git a/pkgs/clan-cli/clan_cli/webui/assets.py b/pkgs/clan-cli/clan_cli/webui/assets.py index 4c7e1fa1e..4e1de38ec 100644 --- a/pkgs/clan-cli/clan_cli/webui/assets.py +++ b/pkgs/clan-cli/clan_cli/webui/assets.py @@ -1,18 +1,19 @@ import functools -from pathlib import Path import logging +from pathlib import Path log = logging.getLogger(__name__) + def get_hash(string: str) -> str: """ This function takes a string like '/nix/store/kkvk20b8zh8aafdnfjp6dnf062x19732-source' and returns the hash part 'kkvk20b8zh8aafdnfjp6dnf062x19732' after '/nix/store/' and before '-source'. """ # Split the string by '/' and get the last element - last_element = string.split('/')[-1] + last_element = string.split("/")[-1] # Split the last element by '-' and get the first element - hash_part = last_element.split('-')[0] + hash_part = last_element.split("-")[0] # Return the hash part return hash_part @@ -30,10 +31,9 @@ def check_divergence(path: Path) -> None: log.debug(f"Serving webui asset with hash {gh}") - @functools.cache def asset_path() -> Path: path = Path(__file__).parent / "assets" log.debug("Serving assets from: %s", path) check_divergence(path) - return path \ No newline at end of file + return path diff --git a/pkgs/clan-cli/clan_cli/webui/routers/root.py b/pkgs/clan-cli/clan_cli/webui/routers/root.py index 67bc05cbb..b148270c7 100644 --- a/pkgs/clan-cli/clan_cli/webui/routers/root.py +++ b/pkgs/clan-cli/clan_cli/webui/routers/root.py @@ -1,7 +1,8 @@ +import logging import os from mimetypes import guess_type from pathlib import Path -import logging + from fastapi import APIRouter, Response from ..assets import asset_path diff --git a/pkgs/clan-cli/clan_cli/webui/routers/vms.py b/pkgs/clan-cli/clan_cli/webui/routers/vms.py index 29c838f4e..87db98e71 100644 --- a/pkgs/clan-cli/clan_cli/webui/routers/vms.py +++ b/pkgs/clan-cli/clan_cli/webui/routers/vms.py @@ -5,15 +5,13 @@ from pathlib import Path from typing import Annotated, Iterator from uuid import UUID -from fastapi import APIRouter, Body -from fastapi import APIRouter, BackgroundTasks, Body, status +from fastapi import APIRouter, Body, status from fastapi.exceptions import HTTPException from fastapi.responses import StreamingResponse -from ...nix import nix_build, nix_eval, nix_shell from clan_cli.webui.routers.flake import get_attrs -from ...nix import nix_build, nix_eval +from ...nix import nix_build, nix_eval, nix_shell from ..schemas import VmConfig, VmCreateResponse, VmInspectResponse, VmStatusResponse from ..task_manager import BaseTask, CmdState, get_task, register_task from .utils import run_cmd @@ -163,9 +161,7 @@ async def get_vm_logs(uuid: UUID) -> StreamingResponse: @router.post("/api/vms/create") -async def create_vm( - vm: Annotated[VmConfig, Body()] -) -> VmCreateResponse: +async def create_vm(vm: Annotated[VmConfig, Body()]) -> VmCreateResponse: flake_attrs = await get_attrs(vm.flake_url) if vm.flake_attr not in flake_attrs: raise HTTPException( diff --git a/pkgs/clan-cli/clan_cli/webui/task_manager.py b/pkgs/clan-cli/clan_cli/webui/task_manager.py index c08aa8e3f..f73ff61c3 100644 --- a/pkgs/clan-cli/clan_cli/webui/task_manager.py +++ b/pkgs/clan-cli/clan_cli/webui/task_manager.py @@ -54,7 +54,7 @@ class CmdState: line = line.strip("\n") self.stderr.append(line) self.log.debug("stderr: %s", line) - self._output.put(line + '\n') + self._output.put(line + "\n") if self.p.stdout in rlist: assert self.p.stdout is not None @@ -63,7 +63,7 @@ class CmdState: line = line.strip("\n") self.stdout.append(line) self.log.debug("stdout: %s", line) - self._output.put(line + '\n') + self._output.put(line + "\n") if self.p.returncode != 0: raise RuntimeError(f"Failed to run command: {shlex.join(cmd)}") @@ -109,9 +109,9 @@ class BaseTask(threading.Thread): break if proc.done: for line in proc.stderr: - yield line + '\n' + yield line + "\n" for line in proc.stdout: - yield line + '\n' + yield line + "\n" continue while True: out = proc._output diff --git a/pkgs/clan-cli/tests/test_flake_api.py b/pkgs/clan-cli/tests/test_flake_api.py index 82460b0c6..f44a94228 100644 --- a/pkgs/clan-cli/tests/test_flake_api.py +++ b/pkgs/clan-cli/tests/test_flake_api.py @@ -1,6 +1,6 @@ +import json from pathlib import Path -import json -import json + import pytest from api import TestClient @@ -31,7 +31,6 @@ def test_inspect_err(api: TestClient) -> None: assert data.get("detail") - @pytest.mark.impure def test_inspect_flake(api: TestClient, test_flake_with_core: Path) -> None: params = {"url": str(test_flake_with_core)} @@ -49,4 +48,4 @@ def test_inspect_flake(api: TestClient, test_flake_with_core: Path) -> None: assert actions[0].get("id") == "vms/inspect" assert actions[0].get("uri") == "api/vms/inspect" assert actions[1].get("id") == "vms/create" - assert actions[1].get("uri") == "api/vms/create" \ No newline at end of file + assert actions[1].get("uri") == "api/vms/create"