add logging in ui WIP

Author: elikoga

controller/thymis_controller/crud/logs.py

@@ -1,7 +1,7 @@
 import uuid
 from datetime import datetime
 
-from sqlalchemy import nullslast
+from sqlalchemy import nullslast, or_
 from sqlalchemy.dialects.sqlite import insert as sqlite_insert
 from sqlalchemy.orm import Session
 from thymis_controller import db_models
@@ -62,3 +62,29 @@ def create(
     )
     session.execute(stmt)
     session.commit()
+
+
+def get_logs(
+    session: Session,
+    deployment_info: db_models.DeploymentInfo,
+    from_datetime: datetime = None,
+    to_datetime: datetime = None,
+    limit: int = 100,
+    offset: int = 0,
+):
+    # where ID equals or ssh public key equals
+
+    stmt = session.query(db_models.LogEntry)
+    stmt = stmt.filter(
+        or_(
+            db_models.LogEntry.deployment_info_id == deployment_info.id,
+            db_models.LogEntry.ssh_public_key == deployment_info.ssh_public_key,
+        )
+    )
+    if from_datetime is not None:
+        stmt = stmt.filter(db_models.LogEntry.timestamp >= from_datetime)
+    if to_datetime is not None:
+        stmt = stmt.filter(db_models.LogEntry.timestamp <= to_datetime)
+    stmt = stmt.order_by(nullslast(db_models.LogEntry.timestamp.desc()))
+    stmt = stmt.limit(limit).offset(offset)
+    return stmt.all()

controller/thymis_controller/routers/api.py

@@ -5,6 +5,7 @@
 from thymis_controller.routers import (
     api_action,
     api_deployment_info,
+    api_logging,
     api_secrets,
     api_state,
     api_statistics,
@@ -25,3 +26,5 @@
 router.include_router(api_deployment_info.router)
 router.include_router(api_ui_sockets.router)
 router.include_router(api_statistics.router)
+router.include_router(api_statistics.router, prefix="/statistics", tags=["statistics"])
+router.include_router(api_logging.router)

controller/thymis_controller/routers/api_logging.py

@@ -0,0 +1,45 @@
+import datetime
+import uuid
+
+from fastapi import APIRouter, Response, WebSocket
+from thymis_controller import db_models
+from thymis_controller.crud.logs import get_logs
+from thymis_controller.dependencies import (
+    DBSessionAD,
+    EngineAD,
+    NetworkRelayAD,
+    ProjectAD,
+    TaskControllerAD,
+)
+from thymis_controller.routers.frontend import is_running_in_playwright
+from thymis_controller.task.subscribe_ui import TaskWebsocketSubscriber
+
+router = APIRouter()
+
+
+@router.get("/logs/{deployment_info_id}")
+def get_tasks(
+    session: DBSessionAD,
+    deployment_info_id: uuid.UUID,
+    from_datetime: str = None,
+    to_datetime: str = None,
+    limit: int = 100,
+    offset: int = 0,
+):
+    deployment_info = (
+        session.query(db_models.DeploymentInfo)
+        .filter(db_models.DeploymentInfo.id == deployment_info_id)
+        .first()
+    )
+    if deployment_info is None:
+        return Response(status_code=404)
+
+    logs = get_logs(
+        session,
+        deployment_info=deployment_info,
+        from_datetime=datetime.datetime.fromisoformat(from_datetime),
+        to_datetime=datetime.datetime.fromisoformat(to_datetime),
+        limit=limit,
+        offset=offset,
+    )
+    return logs

frontend/src/lib/logs.ts

@@ -0,0 +1,23 @@
+export const getLogs = async (
+	fetch: typeof window.fetch = window.fetch,
+	deploymentId: string,
+	to: Date,
+	from: Date,
+	limit: number,
+	offset: number
+) => {
+	const response = await fetch(
+		`/api/logs/${deploymentId}?from_datetime=${from.toISOString()}&to_datetime=${to.toISOString()}&limit=${limit}&offset=${offset}`,
+		{
+			method: 'GET',
+			headers: {
+				'Content-Type': 'application/json'
+			}
+		}
+	);
+	if (!response.ok) {
+		throw new Error(`Failed to fetch logs: ${response.statusText}`);
+	}
+	const logs = await response.json();
+	return logs;
+};

frontend/src/locales/en.json

@@ -86,7 +86,8 @@
 			"last-seen": "Last seen",
 			"no-hardware-ids": "No hardware ids detected",
 			"unknown-device-type": "Unknown device type",
-			"never-seen": "Never"
+			"never-seen": "Never",
+			"actions": "Actions"
 		},
 		"hardware-keys": {
 			"pi-serial-number": "Pi Serial Number"

frontend/src/routes/(authenticated)/deployment_info/[id]/logs/+page.svelte

@@ -0,0 +1,7 @@
+<script lang="ts">
+	import type { PageData } from './$types';
+
+	let { data }: { data: PageData } = $props();
+</script>
+
+{JSON.stringify(data.logs)}

frontend/src/routes/(authenticated)/deployment_info/[id]/logs/+page.ts

@@ -0,0 +1,28 @@
+import type { PageLoad } from './$types';
+import { getLogs } from '$lib/logs';
+import { error } from '@sveltejs/kit';
+
+export const load = (async ({ params, fetch, url }) => {
+	try {
+		const fromDateTime = url.searchParams.get('fromDateTime');
+		const toDateTime = url.searchParams.get('toDateTime');
+		// default to is now
+		// default from is to-1h
+		const to = toDateTime ? new Date(toDateTime) : new Date();
+		const from = fromDateTime ? new Date(fromDateTime) : new Date(to.getTime() - 60 * 60 * 1000);
+		// default to 1000
+		const limit = url.searchParams.get('limit')
+			? parseInt(url.searchParams.get('limit') ?? '1000')
+			: 1000;
+		// default to 0
+		const offset = url.searchParams.get('offset')
+			? parseInt(url.searchParams.get('offset') ?? '0')
+			: 0;
+		const logs = await getLogs(fetch, params.id, to, from, limit, offset);
+		return {
+			logs
+		};
+	} catch (e) {
+		error(404, 'Task not found');
+	}
+}) satisfies PageLoad;

frontend/src/routes/(authenticated)/devices/+page.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
 	import { t } from 'svelte-i18n';
 	import type { PageData } from './$types';
-	import { Table, TableBodyCell, TableHead, TableHeadCell, Toggle } from 'flowbite-svelte';
+	import { Button, Table, TableBodyCell, TableHead, TableHeadCell, Toggle } from 'flowbite-svelte';
 	import { getDeviceTypesMap, getDeviceType } from '$lib/config/configUtils';
 	import PageHead from '$lib/components/layout/PageHead.svelte';
 	import RenderTimeAgo from '$lib/components/RenderTimeAgo.svelte';
@@ -53,6 +53,7 @@
 		<TableHeadCell padding="p-2">{$t('hardware-devices.table.device-type')}</TableHeadCell>
 		<TableHeadCell padding="p-2">{$t('hardware-devices.table.hardware-ids')}</TableHeadCell>
 		<TableHeadCell padding="p-2">{$t('hardware-devices.table.connected')}</TableHeadCell>
+		<TableHeadCell padding="p-2">{$t('hardware-devices.table.actions')}</TableHeadCell>
 	</TableHead>
 	<tbody>
 		{#each data.deploymentInfos as deploymentInfo (deploymentInfo.id)}
@@ -118,6 +119,14 @@
 							{/if}
 						{/if}
 					</TableBodyCell>
+					<TableBodyCell tdClass="p-2">
+						<!-- View Logs button -->
+						<a href={`/deployment_info/${deploymentInfo.id}/logs`}>
+							<Button>
+								{$t('hardware-devices.table.view-logs')}
+							</Button>
+						</a>
+					</TableBodyCell>
 				</tr>
 			{/if}
 		{/each}