fix: align tests with model validation and API error reporting

decnet/web/router/fleet/api_deploy_deckies.py

@@ -3,7 +3,7 @@ import os
 
 from fastapi import APIRouter, Depends, HTTPException
 
-from decnet.config import DEFAULT_MUTATE_INTERVAL, DecnetConfig, _ROOT
+from decnet.config import DEFAULT_MUTATE_INTERVAL, DecnetConfig, _ROOT, log
 from decnet.engine import deploy as _deploy
 from decnet.ini_loader import load_ini_from_string
 from decnet.network import detect_interface, detect_subnet, get_host_ip
@@ -16,15 +16,24 @@ router = APIRouter()
 @router.post(
     "/deckies/deploy",
     tags=["Fleet Management"],
-    responses={401: {"description": "Could not validate credentials"}, 400: {"description": "Validation error or INI parsing failed"}, 500: {"description": "Deployment failed"}}
+    responses={
+        400: {"description": "Bad Request (e.g. malformed JSON)"},
+        401: {"description": "Could not validate credentials"},
+        409: {"description": "Configuration conflict (e.g. invalid IP allocation or network mismatch)"},
+        422: {"description": "Invalid INI config or schema validation error"},
+        500: {"description": "Deployment failed"}
+    }
 )
 async def api_deploy_deckies(req: DeployIniRequest, current_user: str = Depends(get_current_user)) -> dict[str, str]:
     from decnet.fleet import build_deckies_from_ini
 
     try:
         ini = load_ini_from_string(req.ini_content)
-    except Exception as e:
-        raise HTTPException(status_code=400, detail=f"Failed to parse INI: {e}")
+    except ValueError as e:
+        log.debug("deploy: invalid INI structure: %s", e)
+        raise HTTPException(status_code=409, detail=str(e))
+
+    log.debug("deploy: processing configuration for %d deckies", len(ini.deckies))
 
     state_dict = await repo.get_state("deployment")
     ingest_log_file = os.environ.get("DECNET_INGEST_LOG_FILE")
@@ -34,20 +43,25 @@ async def api_deploy_deckies(req: DeployIniRequest, current_user: str = Depends(
         subnet_cidr = ini.subnet or config.subnet
         gateway = ini.gateway or config.gateway
         host_ip = get_host_ip(config.interface)
-        randomize_services = False
         # Always sync config log_file with current API ingestion target
         if ingest_log_file:
             config.log_file = ingest_log_file
     else:
-        # If no state exists, we need to infer network details
-        iface = ini.interface or detect_interface()
-        subnet_cidr, gateway = ini.subnet, ini.gateway
-        if not subnet_cidr or not gateway:
-            detected_subnet, detected_gateway = detect_subnet(iface)
-            subnet_cidr = subnet_cidr or detected_subnet
-            gateway = gateway or detected_gateway
-        host_ip = get_host_ip(iface)
-        randomize_services = False
+        # If no state exists, we need to infer network details from the INI or the host.
+        try:
+            iface = ini.interface or detect_interface()
+            subnet_cidr, gateway = ini.subnet, ini.gateway
+            if not subnet_cidr or not gateway:
+                detected_subnet, detected_gateway = detect_subnet(iface)
+                subnet_cidr = subnet_cidr or detected_subnet
+                gateway = gateway or detected_gateway
+            host_ip = get_host_ip(iface)
+        except RuntimeError as e:
+            raise HTTPException(
+                status_code=409,
+                detail=f"Network configuration conflict: {e}. "
+                       "Add a [general] section with interface=, net=, and gw= to the INI."
+            )
         config = DecnetConfig(
             mode="unihost",
             interface=iface,
@@ -61,10 +75,11 @@ async def api_deploy_deckies(req: DeployIniRequest, current_user: str = Depends(
 
     try:
         new_decky_configs = build_deckies_from_ini(
-            ini, subnet_cidr, gateway, host_ip, randomize_services, cli_mutate_interval=None
+            ini, subnet_cidr, gateway, host_ip, False, cli_mutate_interval=None
         )
     except ValueError as e:
-        raise HTTPException(status_code=400, detail=str(e))
+        log.debug("deploy: build_deckies_from_ini rejected input: %s", e)
+        raise HTTPException(status_code=409, detail=str(e))
 
     # Merge deckies
     existing_deckies_map = {d.name: d for d in config.deckies}

decnet/web/router/fleet/api_mutate_interval.py

@@ -6,19 +6,27 @@ from decnet.web.db.models import MutateIntervalRequest
 
 router = APIRouter()
 
+_UNIT_TO_MINUTES = {"m": 1, "d": 1440, "M": 43200, "y": 525600, "Y": 525600}
+
+
+def _parse_duration(s: str) -> int:
+    """Convert a duration string (e.g. '5d') to minutes."""
+    value, unit = int(s[:-1]), s[-1]
+    return value * _UNIT_TO_MINUTES[unit]
+
 
 @router.put("/deckies/{decky_name}/mutate-interval", tags=["Fleet Management"],
     responses={
-        400: {"description": "No active deployment found"},
+        400: {"description": "Bad Request (e.g. malformed JSON)"},
         401: {"description": "Could not validate credentials"},
-        404: {"description": "Decky not found"},
+        404: {"description": "No active deployment or decky not found"},
         422: {"description": "Validation error"}
     },
 )
 async def api_update_mutate_interval(decky_name: str, req: MutateIntervalRequest, current_user: str = Depends(get_current_user)) -> dict[str, str]:
     state_dict = await repo.get_state("deployment")
     if not state_dict:
-        raise HTTPException(status_code=400, detail="No active deployment")
+        raise HTTPException(status_code=404, detail="No active deployment")
 
     config = DecnetConfig(**state_dict["config"])
     compose_path = state_dict["compose_path"]
@@ -27,7 +35,7 @@ async def api_update_mutate_interval(decky_name: str, req: MutateIntervalRequest
     if not decky:
         raise HTTPException(status_code=404, detail="Decky not found")
 
-    decky.mutate_interval = req.mutate_interval
+    decky.mutate_interval = _parse_duration(req.mutate_interval) if req.mutate_interval else None
 
     await repo.set_state("deployment", {"config": config.model_dump(), "compose_path": compose_path})
     return {"message": "Mutation interval updated"}