diff --git a/pkgs/clan-cli/clan_cli/flakes/create.py b/pkgs/clan-cli/clan_cli/flakes/create.py index b4d642310..1f56f4f49 100644 --- a/pkgs/clan-cli/clan_cli/flakes/create.py +++ b/pkgs/clan-cli/clan_cli/flakes/create.py @@ -3,20 +3,14 @@ import argparse from pathlib import Path from typing import Dict -from pydantic import AnyUrl -from pydantic.tools import parse_obj_as - from ..async_cmd import CmdOut, run, runforcli from ..errors import ClanError from ..nix import nix_command, nix_shell -DEFAULT_URL: AnyUrl = parse_obj_as( - AnyUrl, - "git+https://git.clan.lol/clan/clan-core?new-clan", -) +DEFAULT_URL: str = "git+https://git.clan.lol/clan/clan-core?new-clan" -async def create_flake(directory: Path, url: AnyUrl) -> Dict[str, CmdOut]: +async def create_flake(directory: Path, url: str) -> Dict[str, CmdOut]: if not directory.exists(): directory.mkdir() else: diff --git a/pkgs/clan-cli/clan_cli/nix.py b/pkgs/clan-cli/clan_cli/nix.py index 56e2964a6..e2d7c6a14 100644 --- a/pkgs/clan-cli/clan_cli/nix.py +++ b/pkgs/clan-cli/clan_cli/nix.py @@ -5,8 +5,6 @@ import tempfile from pathlib import Path from typing import Any -from pydantic import AnyUrl - from .dirs import nixpkgs_flake, nixpkgs_source @@ -14,7 +12,7 @@ def nix_command(flags: list[str]) -> list[str]: return ["nix", "--extra-experimental-features", "nix-command flakes"] + flags -def nix_flake_show(flake_url: AnyUrl | Path) -> list[str]: +def nix_flake_show(flake_url: str | Path) -> list[str]: return nix_command( [ "flake", diff --git a/pkgs/clan-cli/clan_cli/types.py b/pkgs/clan-cli/clan_cli/types.py deleted file mode 100644 index 9f4f04df7..000000000 --- a/pkgs/clan-cli/clan_cli/types.py +++ /dev/null @@ -1,9 +0,0 @@ -import logging -from pathlib import Path -from typing import Union - -from pydantic import AnyUrl - -log = logging.getLogger(__name__) - -FlakeUrl = Union[AnyUrl, Path] diff --git a/pkgs/clan-cli/clan_cli/vms/inspect.py b/pkgs/clan-cli/clan_cli/vms/inspect.py index fa32439db..09a1bf968 100644 --- a/pkgs/clan-cli/clan_cli/vms/inspect.py +++ b/pkgs/clan-cli/clan_cli/vms/inspect.py @@ -1,16 +1,16 @@ import argparse import asyncio import json +from dataclasses import dataclass from pathlib import Path -from pydantic import AnyUrl, BaseModel - from ..async_cmd import run from ..nix import nix_config, nix_eval -class VmConfig(BaseModel): - flake_url: AnyUrl | Path +@dataclass +class VmConfig: + flake_url: str | Path flake_attr: str cores: int @@ -18,7 +18,7 @@ class VmConfig(BaseModel): graphics: bool -async def inspect_vm(flake_url: AnyUrl | Path, flake_attr: str) -> VmConfig: +async def inspect_vm(flake_url: str | Path, flake_attr: str) -> VmConfig: config = nix_config() system = config["system"] diff --git a/pkgs/clan-cli/clan_cli/webui/api_inputs.py b/pkgs/clan-cli/clan_cli/webui/api_inputs.py index ba17360e4..b08f125cf 100644 --- a/pkgs/clan-cli/clan_cli/webui/api_inputs.py +++ b/pkgs/clan-cli/clan_cli/webui/api_inputs.py @@ -1,6 +1,6 @@ import logging -from pydantic import AnyUrl, BaseModel, Extra +from pydantic import AnyUrl, BaseModel, Extra, parse_obj_as from ..flakes.create import DEFAULT_URL @@ -8,7 +8,7 @@ log = logging.getLogger(__name__) class FlakeCreateInput(BaseModel): - url: AnyUrl = DEFAULT_URL + url: AnyUrl = parse_obj_as(AnyUrl, DEFAULT_URL) class MachineConfig(BaseModel): diff --git a/pkgs/clan-cli/clan_cli/webui/api_outputs.py b/pkgs/clan-cli/clan_cli/webui/api_outputs.py index 7f6270d22..a73e1cee9 100644 --- a/pkgs/clan-cli/clan_cli/webui/api_outputs.py +++ b/pkgs/clan-cli/clan_cli/webui/api_outputs.py @@ -5,7 +5,6 @@ from pydantic import BaseModel, Extra, Field from ..async_cmd import CmdOut from ..task_manager import TaskStatus -from ..vms.inspect import VmConfig class Status(Enum): @@ -62,10 +61,6 @@ class FlakeAttrResponse(BaseModel): flake_attrs: list[str] -class VmInspectResponse(BaseModel): - config: VmConfig - - class FlakeAction(BaseModel): id: str uri: str diff --git a/pkgs/clan-cli/clan_cli/webui/app.py b/pkgs/clan-cli/clan_cli/webui/app.py index 3cf6d9b0f..d6d10ff6f 100644 --- a/pkgs/clan-cli/clan_cli/webui/app.py +++ b/pkgs/clan-cli/clan_cli/webui/app.py @@ -7,7 +7,7 @@ from fastapi.staticfiles import StaticFiles from .assets import asset_path from .error_handlers import clan_error_handler -from .routers import clan_modules, flake, health, machines, root, vms +from .routers import clan_modules, flake, health, machines, root from .settings import settings from .tags import tags_metadata @@ -31,7 +31,6 @@ def setup_app() -> FastAPI: app.include_router(flake.router) app.include_router(health.router) app.include_router(machines.router) - app.include_router(vms.router) # Needs to be last in register. Because of wildcard route app.include_router(root.router) diff --git a/pkgs/clan-cli/clan_cli/webui/routers/vms.py b/pkgs/clan-cli/clan_cli/webui/routers/vms.py deleted file mode 100644 index d1a655e42..000000000 --- a/pkgs/clan-cli/clan_cli/webui/routers/vms.py +++ /dev/null @@ -1,68 +0,0 @@ -import logging -from pathlib import Path -from typing import Annotated, Iterator -from uuid import UUID - -from fastapi import APIRouter, Body, status -from fastapi.exceptions import HTTPException -from fastapi.responses import StreamingResponse -from pydantic import AnyUrl - -from clan_cli.webui.routers.flake import get_attrs - -from ...task_manager import get_task -from ...vms import create, inspect -from ..api_outputs import ( - VmConfig, - VmCreateResponse, - VmInspectResponse, - VmStatusResponse, -) -from ..tags import Tags - -log = logging.getLogger(__name__) -router = APIRouter() - - -# TODO: Check for directory traversal -@router.post("/api/vms/inspect", tags=[Tags.vm]) -async def inspect_vm( - flake_url: Annotated[AnyUrl | Path, Body()], flake_attr: Annotated[str, Body()] -) -> VmInspectResponse: - config = await inspect.inspect_vm(flake_url, flake_attr) - return VmInspectResponse(config=config) - - -@router.get("/api/vms/{uuid}/status", tags=[Tags.vm]) -async def get_vm_status(uuid: UUID) -> VmStatusResponse: - task = get_task(uuid) - log.debug(msg=f"error: {task.error}, task.status: {task.status}") - error = str(task.error) if task.error is not None else None - return VmStatusResponse(status=task.status, error=error) - - -@router.get("/api/vms/{uuid}/logs", tags=[Tags.vm]) -async def get_vm_logs(uuid: UUID) -> StreamingResponse: - # Generator function that yields log lines as they are available - def stream_logs() -> Iterator[str]: - task = get_task(uuid) - - yield from task.log_lines() - - return StreamingResponse( - content=stream_logs(), - media_type="text/plain", - ) - - -# TODO: Check for directory traversal -@router.post("/api/vms/create", tags=[Tags.vm]) -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( - status_code=status.HTTP_400_BAD_REQUEST, - detail=f"Provided attribute '{vm.flake_attr}' does not exist.", - ) - task = create.create_vm(vm) - return VmCreateResponse(uuid=str(task.uuid)) diff --git a/pkgs/clan-cli/tests/test_vms_api.py b/pkgs/clan-cli/tests/test_vms_api.py deleted file mode 100644 index aeee77068..000000000 --- a/pkgs/clan-cli/tests/test_vms_api.py +++ /dev/null @@ -1,32 +0,0 @@ -import pytest -from api import TestClient -from fixtures_flakes import FlakeForTest - - -@pytest.mark.impure -def test_inspect(api: TestClient, test_flake_with_core: FlakeForTest) -> None: - response = api.post( - "/api/vms/inspect", - json=dict(flake_url=str(test_flake_with_core.path), flake_attr="vm1"), - ) - - # print(f"SLEEPING FOR EVER: {99999}", file=sys.stderr) - # time.sleep(99999) - - assert response.status_code == 200, f"Failed to inspect vm: {response.text}" - config = response.json()["config"] - assert config.get("flake_attr") == "vm1" - assert config.get("cores") == 1 - assert config.get("memory_size") == 1024 - assert config.get("graphics") is False - - -def test_incorrect_uuid(api: TestClient) -> None: - uuid_endpoints = [ - "/api/vms/{}/status", - "/api/vms/{}/logs", - ] - - for endpoint in uuid_endpoints: - response = api.get(endpoint.format("1234")) - assert response.status_code == 422, f"Failed to get vm status: {response.text}" diff --git a/pkgs/clan-cli/tests/test_vms_api_create.py b/pkgs/clan-cli/tests/test_vms_api_create.py deleted file mode 100644 index f5b955789..000000000 --- a/pkgs/clan-cli/tests/test_vms_api_create.py +++ /dev/null @@ -1,130 +0,0 @@ -import os -from pathlib import Path -from typing import TYPE_CHECKING, Iterator - -import pytest -from api import TestClient -from cli import Cli -from fixtures_flakes import FlakeForTest, create_flake -from httpx import SyncByteStream -from pydantic import AnyUrl -from root import CLAN_CORE - -if TYPE_CHECKING: - from age_keys import KeyPair - - -@pytest.fixture -def flake_with_vm_with_secrets( - monkeypatch: pytest.MonkeyPatch, temporary_home: Path -) -> Iterator[FlakeForTest]: - yield from create_flake( - monkeypatch, - temporary_home, - "test_flake_with_core_dynamic_machines", - CLAN_CORE, - machines=["vm_with_secrets"], - ) - - -@pytest.fixture -def remote_flake_with_vm_without_secrets( - monkeypatch: pytest.MonkeyPatch, temporary_home: Path -) -> Iterator[FlakeForTest]: - yield from create_flake( - monkeypatch, - temporary_home, - "test_flake_with_core_dynamic_machines", - CLAN_CORE, - machines=["vm_without_secrets"], - remote=True, - ) - - -def generic_create_vm_test(api: TestClient, flake: Path | AnyUrl, vm: str) -> None: - print(f"flake_url: {flake} ") - response = api.post( - "/api/vms/create", - json=dict( - flake_url=str(flake), - flake_attr=vm, - cores=1, - memory_size=1024, - graphics=False, - ), - ) - assert response.status_code == 200, "Failed to create vm" - - uuid = response.json()["uuid"] - assert len(uuid) == 36 - assert uuid.count("-") == 4 - - response = api.get(f"/api/vms/{uuid}/status") - assert response.status_code == 200, "Failed to get vm status" - - response = api.get(f"/api/vms/{uuid}/logs") - print("=========VM LOGS==========") - assert isinstance(response.stream, SyncByteStream) - for line in response.stream: - print(line.decode("utf-8")) - print("=========END LOGS==========") - assert response.status_code == 200, "Failed to get vm logs" - print("Get /api/vms/{uuid}/status") - response = api.get(f"/api/vms/{uuid}/status") - print("Finished Get /api/vms/{uuid}/status") - assert response.status_code == 200, "Failed to get vm status" - data = response.json() - assert ( - data["status"] == "FINISHED" - ), f"Expected to be finished, but got {data['status']} ({data})" - - -@pytest.mark.skipif(not os.path.exists("/dev/kvm"), reason="Requires KVM") -@pytest.mark.impure -def test_create_local( - api: TestClient, - monkeypatch: pytest.MonkeyPatch, - flake_with_vm_with_secrets: FlakeForTest, - age_keys: list["KeyPair"], -) -> None: - monkeypatch.setenv("SOPS_AGE_KEY", age_keys[0].privkey) - cli = Cli() - cmd = [ - "--flake", - str(flake_with_vm_with_secrets.path), - "secrets", - "users", - "add", - "user1", - age_keys[0].pubkey, - ] - cli.run(cmd) - - generic_create_vm_test(api, flake_with_vm_with_secrets.path, "vm_with_secrets") - - -@pytest.mark.skipif(not os.path.exists("/dev/kvm"), reason="Requires KVM") -@pytest.mark.impure -def test_create_remote( - api: TestClient, - monkeypatch: pytest.MonkeyPatch, - remote_flake_with_vm_without_secrets: FlakeForTest, -) -> None: - generic_create_vm_test( - api, remote_flake_with_vm_without_secrets.path, "vm_without_secrets" - ) - - -# TODO: We need a test that creates the same VM twice, and checks that the second time it fails - - -# TODO: Democlan needs a machine called testVM, which is headless and gets executed by this test below -# pytest -n0 -s tests/test_vms_api_create.py::test_create_from_democlan -# @pytest.mark.skipif(not os.path.exists("/dev/kvm"), reason="Requires KVM") -# @pytest.mark.impure -# def test_create_from_democlan( -# api: TestClient, -# test_democlan_url: AnyUrl) -> None: -# generic_create_vm_test( -# api, test_democlan_url, "defaultVM" -# ) diff --git a/pkgs/ui/src/components/hooks/useVms.tsx b/pkgs/ui/src/components/hooks/useVms.tsx index 6eda02897..b4cda9939 100644 --- a/pkgs/ui/src/components/hooks/useVms.tsx +++ b/pkgs/ui/src/components/hooks/useVms.tsx @@ -1,52 +1,17 @@ -import { HTTPValidationError, VmConfig } from "@/api/model"; -import { inspectVm } from "@/api/vm/vm"; +import { HTTPValidationError } from "@/api/model"; import { AxiosError } from "axios"; -import { useEffect, useState } from "react"; -import { toast } from "react-hot-toast"; +import { useState } from "react"; interface UseVmsOptions { url: string; attr: string; } export const useVms = (options: UseVmsOptions) => { - const { url, attr } = options; - const [isLoading, setIsLoading] = useState(true); - const [config, setConfig] = useState(); - const [error, setError] = useState>(); - - useEffect(() => { - const getVmInfo = async (url: string, attr: string) => { - if (url === "" || !url) { - toast.error("Flake url is missing", { id: "missing.flake.url" }); - return undefined; - } - try { - const response = await inspectVm({ - flake_attr: attr, - flake_url: url, - }); - const { - data: { config }, - } = response; - setError(undefined); - return config; - } catch (e) { - const err = e as AxiosError; - setError(err); - toast( - "Could not find default configuration. Please select a machine preset", - ); - return undefined; - } finally { - setIsLoading(false); - } - }; - getVmInfo(url, attr).then((c) => setConfig(c)); - }, [url, attr]); + const [isLoading] = useState(true); + const [error] = useState>(); return { error, isLoading, - config, }; }; diff --git a/pkgs/ui/src/components/join/configureVM.tsx b/pkgs/ui/src/components/join/configureVM.tsx index 27ab0526e..7a66f42c4 100644 --- a/pkgs/ui/src/components/join/configureVM.tsx +++ b/pkgs/ui/src/components/join/configureVM.tsx @@ -1,159 +1,10 @@ -import { useInspectFlakeAttrs } from "@/api/flake/flake"; import { FormValues } from "@/views/joinPrequel"; -import { - Button, - InputAdornment, - LinearProgress, - ListSubheader, - MenuItem, - Select, - Switch, - TextField, -} from "@mui/material"; -import { useEffect } from "react"; -import { Controller, UseFormReturn } from "react-hook-form"; -import { toast } from "react-hot-toast"; -import { FlakeBadge } from "../flakeBadge/flakeBadge"; - -interface VmPropLabelProps { - children: React.ReactNode; -} -const VmPropLabel = (props: VmPropLabelProps) => ( -
- {props.children} -
-); - -interface VmPropContentProps { - children: React.ReactNode; -} -const VmPropContent = (props: VmPropContentProps) => ( -
{props.children}
-); +import { UseFormReturn } from "react-hook-form"; interface VmDetailsProps { formHooks: UseFormReturn; } -type ClanError = { - detail: { - msg: string; - loc: []; - }[]; -}; - export const ConfigureVM = (props: VmDetailsProps) => { - const { formHooks } = props; - const { control, watch, setValue, formState } = formHooks; - - const { isLoading, data, error } = useInspectFlakeAttrs({ - url: watch("flakeUrl"), - }); - - useEffect(() => { - if (!isLoading && data?.data) { - setValue("flake_attr", data.data.flake_attrs[0] || ""); - } - }, [isLoading, setValue, data]); - if (error) { - const msg = - (error?.response?.data as unknown as ClanError)?.detail?.[0]?.msg || - error.message; - - toast.error(msg, { - id: error.name, - }); - return
{msg}
; - } - return ( -
-
- General -
- Flake - - - - Machine - - {!isLoading && ( - ( - - )} - /> - )} - -
- VM -
- CPU Cores - - } - /> - - Graphics - - ( - - )} - /> - - Memory Size - - - ( - MiB - ), - }} - /> - )} - /> - - -
- {formState.isSubmitting && } - -
-
- ); + return
; }; diff --git a/pkgs/ui/src/components/join/confirmVM.tsx b/pkgs/ui/src/components/join/confirmVM.tsx index 7d6180611..3cbc9d463 100644 --- a/pkgs/ui/src/components/join/confirmVM.tsx +++ b/pkgs/ui/src/components/join/confirmVM.tsx @@ -1,11 +1,4 @@ "use client"; -import { useVms } from "@/components/hooks/useVms"; -import { useEffect } from "react"; - -import { FormValues } from "@/views/joinPrequel"; -import { useFormContext } from "react-hook-form"; -import { ConfigureVM } from "./configureVM"; -import { LoadingOverlay } from "./loadingOverlay"; interface ConfirmVMProps { url: string; @@ -14,35 +7,7 @@ interface ConfirmVMProps { } export function ConfirmVM(props: ConfirmVMProps) { - const formHooks = useFormContext(); - - const { setValue, watch } = formHooks; - - const url = watch("flakeUrl"); - const attr = watch("flake_attr"); - - const { config, isLoading } = useVms({ - url, - attr, - }); - - useEffect(() => { - if (config) { - setValue("cores", config?.cores); - setValue("memory_size", config?.memory_size); - setValue("graphics", config?.graphics); - } - }, [config, setValue]); - return ( -
-
- {isLoading && ( - - )} - - -
-
+
); } diff --git a/pkgs/ui/src/components/join/vmBuildLogs.tsx b/pkgs/ui/src/components/join/vmBuildLogs.tsx index f5bab1219..ec8f7bfff 100644 --- a/pkgs/ui/src/components/join/vmBuildLogs.tsx +++ b/pkgs/ui/src/components/join/vmBuildLogs.tsx @@ -1,8 +1,6 @@ "use client"; -import { getGetVmLogsKey } from "@/api/vm/vm"; -import axios from "axios"; -import { Dispatch, SetStateAction, useEffect, useState } from "react"; +import { useState } from "react"; import { Log } from "./log"; interface VmBuildLogsProps { @@ -10,46 +8,9 @@ interface VmBuildLogsProps { handleClose: () => void; } -const streamLogs = async ( - uuid: string, - setter: Dispatch>, - onFinish: () => void, -) => { - const apiPath = getGetVmLogsKey(uuid); - const baseUrl = axios.defaults.baseURL; - - const response = await fetch(`${baseUrl}${apiPath}`); - const reader = response?.body?.getReader(); - if (!reader) { - console.log("could not get reader"); - } - while (true) { - const stream = await reader?.read(); - if (!stream || stream.done) { - console.log("stream done"); - onFinish(); - break; - } - - const text = new TextDecoder().decode(stream.value); - setter((s) => `${s}${text}`); - console.log("Received", stream.value); - console.log("String:", text); - } -}; - export const VmBuildLogs = (props: VmBuildLogsProps) => { - const { vmUuid, handleClose } = props; - const [logs, setLogs] = useState(""); - const [done, setDone] = useState(false); - - // Reset the logs if uuid changes - useEffect(() => { - setLogs(""); - setDone(false); - }, [vmUuid]); - - !done && streamLogs(vmUuid, setLogs, () => setDone(true)); + const { handleClose } = props; + const [logs] = useState(""); return (
diff --git a/pkgs/ui/src/views/joinPrequel.tsx b/pkgs/ui/src/views/joinPrequel.tsx index d845d5f45..c26e70c74 100644 --- a/pkgs/ui/src/views/joinPrequel.tsx +++ b/pkgs/ui/src/views/joinPrequel.tsx @@ -1,18 +1,13 @@ "use client"; import { Button, Typography } from "@mui/material"; import { useSearchParams } from "next/navigation"; -import { Suspense, useState } from "react"; +import { Suspense } from "react"; -import { VmConfig } from "@/api/model"; -import { createVm } from "@/api/vm/vm"; import { Layout } from "@/components/join/layout"; -import { VmBuildLogs } from "@/components/join/vmBuildLogs"; -import { AxiosError } from "axios"; import { FormProvider, useForm } from "react-hook-form"; -import { toast } from "react-hot-toast"; import { JoinForm } from "./joinForm"; -export type FormValues = VmConfig & { +export type FormValues = { flakeUrl: string; dest?: string; }; @@ -27,17 +22,11 @@ export default function JoinPrequel() { defaultValues: { flakeUrl: "", dest: undefined, - cores: 4, - graphics: true, - memory_size: 2048, }, }); const { handleSubmit } = methods; - const [vmUuid, setVmUuid] = useState(null); - const [showLogs, setShowLogs] = useState(false); - return ( - {vmUuid && showLogs ? ( - setShowLogs(false)} /> - ) : ( + {
{ console.log("JOINING"); console.log(values); - try { - const response = await createVm({ - cores: values.cores, - flake_attr: values.flake_attr, - flake_url: values.flakeUrl, - graphics: values.graphics, - memory_size: values.memory_size, - }); - const { uuid } = response?.data || null; - setShowLogs(true); - setVmUuid(() => uuid); - if (response.statusText === "OK") { - toast.success(("Joined @ " + uuid) as string); - } else { - toast.error("Could not join"); - } - } catch (error) { - toast.error(`Error: ${(error as AxiosError).message || ""}`); - } })} className="w-full max-w-2xl justify-self-center" > @@ -85,7 +53,7 @@ export default function JoinPrequel() {
- )} + } );