Add formatting and type checks

karldns/routers/api.py

@@ -16,8 +16,12 @@ from ..schemas import (
     HostnameCreateResponse,
     HostnameRotateUpdateResponse,
     HostnameStatusResponse,
+    _admin_cleanup_run,
     _admin_hostname,
     _admin_metrics,
+    _admin_record,
+    _admin_scheduled_task,
+    _admin_update_event,
     _create_response,
     _hostname_rotate_update_response,
     _hostname_status,
@@ -62,7 +66,11 @@ async def read_hostname(
     if not account or account["disabled"]:
         raise HTTPException(status_code=404, detail="not found")
     account["management_slug"] = dashboard_secret
-    history = await run_in_threadpool(store.list_update_events_for_hostname, str(account["hostname"]), history_limit) if history_limit else []
+    history = (
+        await run_in_threadpool(store.list_update_events_for_hostname, str(account["hostname"]), history_limit)
+        if history_limit
+        else []
+    )
     return _hostname_status(service, account, history)
 
 
@@ -149,9 +157,9 @@ async def read_admin(
         ),
         metrics=_admin_metrics(metrics),
         hostnames=[_admin_hostname(account) for account in accounts],
-        update_events=events,
-        cleanup_runs=cleanup_runs,
-        scheduled_tasks=scheduled_tasks,
+        update_events=[_admin_update_event(event) for event in events],
+        cleanup_runs=[_admin_cleanup_run(cleanup_run) for cleanup_run in cleanup_runs],
+        scheduled_tasks=[_admin_scheduled_task(task) for task in scheduled_tasks],
         limit=limit,
     )
 
@@ -204,7 +212,13 @@ async def list_admin_events(
     )
     next_before = str(items[-1]["created_at"]) if len(items) == limit and items[-1].get("created_at") else None
     total = await run_in_threadpool(store.count_update_events)
-    return AdminEventsResponse(items=items, limit=limit, offset=offset, next_before=next_before, total=total)
+    return AdminEventsResponse(
+        items=[_admin_update_event(item) for item in items],
+        limit=limit,
+        offset=offset,
+        next_before=next_before,
+        total=total,
+    )
 
 
 @router.get(
@@ -224,4 +238,9 @@ async def list_admin_records(
 ) -> AdminRecordsResponse:
     items = await run_in_threadpool(store.list_records_page, limit, offset)
     total = await run_in_threadpool(store.count_records)
-    return AdminRecordsResponse(items=items, limit=limit, offset=offset, total=total)
+    return AdminRecordsResponse(
+        items=[_admin_record(item) for item in items],
+        limit=limit,
+        offset=offset,
+        total=total,
+    )