refactor(swarm): move router DTOs into decnet/web/db/models.py
_schemas.py was a local exception to the codebase convention. The rest of the app keeps all API request/response DTOs in decnet/web/db/models.py alongside UserResponse, DeployIniRequest, etc. — the swarm endpoints now follow the same convention (SwarmEnrollRequest, SwarmHostView, etc). Deletes decnet/web/router/swarm/_schemas.py.
This commit is contained in:
@@ -10,10 +10,10 @@ from decnet.logging import get_logger
|
||||
from decnet.swarm.client import AgentClient
|
||||
from decnet.web.db.repository import BaseRepository
|
||||
from decnet.web.dependencies import get_repo
|
||||
from decnet.web.router.swarm._schemas import (
|
||||
DeployResponse,
|
||||
HostResult,
|
||||
TeardownRequest,
|
||||
from decnet.web.db.models import (
|
||||
SwarmDeployResponse,
|
||||
SwarmHostResult,
|
||||
SwarmTeardownRequest,
|
||||
)
|
||||
|
||||
log = get_logger("swarm.teardown")
|
||||
@@ -21,11 +21,11 @@ log = get_logger("swarm.teardown")
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post("/teardown", response_model=DeployResponse, tags=["Swarm Deployments"])
|
||||
@router.post("/teardown", response_model=SwarmDeployResponse, tags=["Swarm Deployments"])
|
||||
async def api_teardown_swarm(
|
||||
req: TeardownRequest,
|
||||
req: SwarmTeardownRequest,
|
||||
repo: BaseRepository = Depends(get_repo),
|
||||
) -> DeployResponse:
|
||||
) -> SwarmDeployResponse:
|
||||
if req.host_uuid is not None:
|
||||
row = await repo.get_swarm_host_by_uuid(req.host_uuid)
|
||||
if row is None:
|
||||
@@ -34,18 +34,18 @@ async def api_teardown_swarm(
|
||||
else:
|
||||
targets = await repo.list_swarm_hosts()
|
||||
|
||||
async def _call(host: dict[str, Any]) -> HostResult:
|
||||
async def _call(host: dict[str, Any]) -> SwarmHostResult:
|
||||
try:
|
||||
async with AgentClient(host=host) as agent:
|
||||
body = await agent.teardown(req.decky_id)
|
||||
if req.decky_id is None:
|
||||
await repo.delete_decky_shards_for_host(host["uuid"])
|
||||
return HostResult(host_uuid=host["uuid"], host_name=host["name"], ok=True, detail=body)
|
||||
return SwarmHostResult(host_uuid=host["uuid"], host_name=host["name"], ok=True, detail=body)
|
||||
except Exception as exc:
|
||||
log.exception("swarm.teardown failed host=%s", host["name"])
|
||||
return HostResult(
|
||||
return SwarmHostResult(
|
||||
host_uuid=host["uuid"], host_name=host["name"], ok=False, detail=str(exc)
|
||||
)
|
||||
|
||||
results = await asyncio.gather(*(_call(h) for h in targets))
|
||||
return DeployResponse(results=list(results))
|
||||
return SwarmDeployResponse(results=list(results))
|
||||
|
||||
Reference in New Issue
Block a user