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

Updated to main branch. Removed cluttering asyncio and httpx log messages

Browse Source
This commit is contained in:
Qubasa
2023-10-27 23:36:45 +02:00
parent 97a20053e7
commit e389c7cfe7
12 changed files with 113 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/clan-cli/clan_cli/webui/routers/clan_modules.py
View File

@@ -4,8 +4,9 @@ import logging
from fastapi import APIRouter, HTTPException
from clan_cli.clan_modules import get_clan_module_names
from clan_cli.types import FlakeName
from ..schemas import (
from ..api_outputs import (
ClanModulesResponse,
)
@@ -13,9 +14,9 @@ log = logging.getLogger(__name__)
router = APIRouter()
@router.get("/api/clan_modules")
async def list_clan_modules() -> ClanModulesResponse:
module_names, error = get_clan_module_names()
@router.get("/api/{flake_name}clan_modules")
async def list_clan_modules(flake_name: FlakeName) -> ClanModulesResponse:
module_names, error = get_clan_module_names(flake_name)
if error is not None:
raise HTTPException(status_code=400, detail=error)
return ClanModulesResponse(clan_modules=module_names)

22
pkgs/clan-cli/clan_cli/webui/routers/machines.py
View File

@@ -41,8 +41,7 @@ async def list_machines(flake_name: FlakeName) -> MachinesResponse:
async def create_machine(
flake_name: FlakeName, machine: Annotated[MachineCreate, Body()]
) -> MachineResponse:
out = await _create_machine(flake_name, machine.name)
log.debug(out)
await _create_machine(flake_name, machine.name)
return MachineResponse(machine=Machine(name=machine.name, status=Status.UNKNOWN))
@@ -72,26 +71,29 @@ async def get_machine_schema(flake_name: FlakeName, name: str) -> SchemaResponse
return SchemaResponse(schema=schema)
@router.put("/api/machines/{name}/schema")
@router.put("/api/{flake_name}/machines/{name}/schema")
async def set_machine_schema(
name: str, config: Annotated[dict, Body()]
flake_name: FlakeName, name: str, config: Annotated[dict, Body()]
) -> SchemaResponse:
schema = schema_for_machine(name, config)
schema = schema_for_machine(flake_name, name, config)
return SchemaResponse(schema=schema)
@router.get("/api/machines/{name}/verify")
async def get_verify_machine_config(name: str) -> VerifyMachineResponse:
error = verify_machine_config(name)
@router.get("/api/{flake_name}/machines/{name}/verify")
async def get_verify_machine_config(
flake_name: FlakeName, name: str
) -> VerifyMachineResponse:
error = verify_machine_config(flake_name, name)
success = error is None
return VerifyMachineResponse(success=success, error=error)
@router.put("/api/machines/{name}/verify")
@router.put("/api/{flake_name}/machines/{name}/verify")
async def put_verify_machine_config(
flake_name: FlakeName,
name: str,
config: Annotated[dict, Body()],
) -> VerifyMachineResponse:
error = verify_machine_config(name, config)
error = verify_machine_config(flake_name, name, config)
success = error is None
return VerifyMachineResponse(success=success, error=error)