Last active at timestamp for machines

Author: soundstorm

alembic/versions/0005_machine_last_active.py

@@ -0,0 +1,21 @@
+"""add machines.last_active_at
+
+Revision ID: 0005
+Revises: 0004
+Create Date: 2026-03-24 00:00:00.000000
+"""
+from alembic import op
+import sqlalchemy as sa
+
+revision = "0005"
+down_revision = "0004"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    op.add_column("machines", sa.Column("last_active_at", sa.DateTime(), nullable=True))
+
+
+def downgrade() -> None:
+    op.drop_column("machines", "last_active_at")

app/auth/deps.py

@@ -1,3 +1,5 @@
+from datetime import UTC, datetime
+
 from fastapi import Depends, HTTPException, Request
 from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
 from sqlalchemy.orm import Session
@@ -66,6 +68,9 @@ def get_current_device(
     )
     for m in machine:
         if verify_api_token(token, m.api_token_hash):
+            m.last_active_at = datetime.now(UTC).replace(tzinfo=None)
+            db.commit()
+            db.refresh(m)
             return m
     raise HTTPException(status_code=401, detail="Invalid or revoked API token")
 
@@ -100,6 +105,9 @@ def require_device_or_admin(
         # Try as machine API token first (verify_admin_jwt returns None on non-JWT input)
         for m in db.query(Machine).filter(Machine.active.is_(True)).all():
             if verify_api_token(token, m.api_token_hash):
+                m.last_active_at = datetime.now(UTC).replace(tzinfo=None)
+                db.commit()
+                db.refresh(m)
                 return m
     # Try admin session (cookie or Bearer JWT)
     user = get_session_user(request)

app/models/machine.py

@@ -26,6 +26,7 @@ class Machine(Base):
     created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=lambda: datetime.now(UTC).replace(tzinfo=None))
     created_by: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
     active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
+    last_active_at: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True)
 
     # Relationships
     admin_users: Mapped[list["MachineAdmin"]] = relationship(

app/schemas/machine.py

@@ -26,6 +26,7 @@ class MachineResponse(BaseModel):
     active: bool
     created_at: datetime
     created_by: Optional[str]
+    last_active_at: Optional[datetime] = None
 
     model_config = ConfigDict(from_attributes=True)
 

app/web/locales/de.json

@@ -123,6 +123,7 @@
   "machines.btn_register_token": "Registrieren & Token erhalten",
   "machines.placeholder_name":   "z.B. Lasercutter",
   "machines.placeholder_slug":   "z.B. lasercutter",
+  "machines.col_last_active":    "Letzte Aktivität",
   "machines.col_actions":        "Aktionen",
   "machines.btn_regen_token":    "Token erneuern",
   "machines.regen_title":        "Neuer Token für \"{name}\" — jetzt speichern!",

app/web/locales/en.json

@@ -123,6 +123,7 @@
   "machines.btn_register_token": "Register & Get Token",
   "machines.placeholder_name":   "e.g. Laser Cutter",
   "machines.placeholder_slug":   "e.g. laser-cutter",
+  "machines.col_last_active":    "Last Active",
   "machines.col_actions":        "Actions",
   "machines.btn_regen_token":    "Regen Token",
   "machines.regen_title":        "New token for \"{name}\" — save it now!",

app/web/templates/machines/detail.html

@@ -32,6 +32,8 @@ <h1 class="text-2xl font-bold" x-text="machine.name"></h1>
           <dd x-text="machine.machine_type"></dd>
           <dt class="text-gray-500">{{ _('common.created') }}</dt>
           <dd x-text="fmtDate(machine.created_at)"></dd>
+          <dt class="text-gray-500">{{ _('machines.col_last_active') }}</dt>
+          <dd x-text="machine.last_active_at ? fmtDateTime(machine.last_active_at) : '—'"></dd>
         </dl>
 
         <!-- Admin-only edit form -->

app/web/templates/machines/list.html

@@ -49,15 +49,16 @@ <h1 class="text-2xl font-bold">{{ _('machines.title') }}</h1>
           <th class="px-4 py-3 text-left">{{ _('machines.col_type') }}</th>
           <th class="px-4 py-3 text-center">{{ _('common.status') }}</th>
           <th class="px-4 py-3 text-left">{{ _('common.created') }}</th>
+          <th class="px-4 py-3 text-left">{{ _('machines.col_last_active') }}</th>
           <th class="px-4 py-3 text-right">{{ _('machines.col_actions') }}</th>
         </tr>
       </thead>
       <tbody>
         <template x-if="loading">
-          <tr><td colspan="6" class="px-4 py-8 text-center text-gray-400">Loading…</td></tr>
+          <tr><td colspan="7" class="px-4 py-8 text-center text-gray-400">Loading…</td></tr>
         </template>
         <template x-if="!loading && machines.length === 0">
-          <tr><td colspan="6" class="px-4 py-8 text-center text-gray-400">
+          <tr><td colspan="7" class="px-4 py-8 text-center text-gray-400">
             <span x-show="isAdmin">{{ _('machines.empty') }}</span>
             <span x-show="!isAdmin">{{ _('machines.empty_managed') }}</span>
           </td></tr>
@@ -76,6 +77,8 @@ <h1 class="text-2xl font-bold">{{ _('machines.title') }}</h1>
                     class="text-xs bg-red-100 text-red-600 rounded px-2 py-0.5">{{ _('common.inactive') }}</span>
             </td>
             <td class="px-4 py-2 text-gray-500 text-xs" x-text="fmtDate(m.created_at)"></td>
+            <td class="px-4 py-2 text-gray-500 text-xs"
+                x-text="m.last_active_at ? fmtDateTime(m.last_active_at) : '—'"></td>
             <td class="px-4 py-2 text-right whitespace-nowrap" x-show="isAdmin">
               <button @click="regenToken(m)"
                       class="text-xs text-blue-600 hover:underline mr-3">{{ _('machines.btn_regen_token') }}</button>