Skip to content

ServerKit is a lightweight, modern server control panel for managing web applications, databases, and services on your VPS or dedicated server. Built with Python/Flask backend and React frontend.

refactor(models): TimestampMixin + uuid_pk() one-door shapes (plan 77 B1/B3)

Juan Denis4919ff1cfe63
diff --git a/backend/app/models/agent_plugin.py b/backend/app/models/agent_plugin.py
index 8ad55656..3b99b8a7 100644
--- a/backend/app/models/agent_plugin.py
+++ b/backend/app/models/agent_plugin.py
@@ -1,9 +1,10 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
import json
-class AgentPlugin(db.Model):
+class AgentPlugin(TimestampMixin, db.Model):
"""Represents a plugin that can be installed on agents."""
__tablename__ = 'agent_plugins'
@@ -36,8 +37,6 @@ class AgentPlugin(db.Model):
STATUS_DEPRECATED = 'deprecated'
status = db.Column(db.String(32), default=STATUS_AVAILABLE)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Relationships
installations = db.relationship('AgentPluginInstall', backref='plugin', lazy='dynamic')
diff --git a/backend/app/models/ai.py b/backend/app/models/ai.py
index d12569c5..22bca4e0 100644
--- a/backend/app/models/ai.py
+++ b/backend/app/models/ai.py
@@ -19,6 +19,7 @@ import uuid
from datetime import datetime, timedelta
from app import db
+from app.models.mixins import TimestampMixin
def _new_id() -> str:
@@ -26,7 +27,7 @@ def _new_id() -> str:
return uuid.uuid4().hex
-class AiConversation(db.Model):
+class AiConversation(TimestampMixin, db.Model):
"""A single AI chat thread owned by a user."""
__tablename__ = 'ai_conversations'
@@ -40,8 +41,6 @@ class AiConversation(db.Model):
model_name = db.Column(db.String(128)) # 'provider/model' snapshot at creation
export_json = db.Column(db.Text) # Prompture conv.export(strip_images=True)
last_page = db.Column(db.String(256)) # last route the assistant saw (for resume context)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
messages = db.relationship(
'AiMessage', backref='conversation', cascade='all, delete-orphan',
diff --git a/backend/app/models/app_volume.py b/backend/app/models/app_volume.py
index 3feb5c3d..72f725ef 100644
--- a/backend/app/models/app_volume.py
+++ b/backend/app/models/app_volume.py
@@ -1,9 +1,10 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class AppVolume(db.Model):
+class AppVolume(TimestampMixin, db.Model):
"""A first-class, tracked persistent volume attached to an application.
Replaces ad-hoc **relative bind mounts** (``./mysql-data:/var/lib/mysql``)
@@ -30,8 +31,6 @@ class AppVolume(db.Model):
read_only = db.Column(db.Boolean, nullable=False, default=False)
size_bytes = db.Column(db.BigInteger, nullable=True) # denormalized last-measured size
declared_size = db.Column(db.String(40), nullable=True) # operator/manifest-declared size cap, e.g. "10Gi" (plan 35)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Deleting the app removes its volume rows (ORM cascade); the underlying
# Docker volumes are intentionally left on disk so an app delete never nukes
diff --git a/backend/app/models/application.py b/backend/app/models/application.py
index 0c71574d..1755f358 100644
--- a/backend/app/models/application.py
+++ b/backend/app/models/application.py
@@ -7,14 +7,14 @@ from app import db
# FK targets resolvable regardless of import order.
from app.models import project as _project # noqa: F401
from app.models import environment as _environment # noqa: F401
-from app.models.mixins import SoftDeleteMixin
+from app.models.mixins import SoftDeleteMixin, TimestampMixin
from app.utils.ingress import (
default_ingress_plane as _default_ingress_plane,
proxy_eligible as _proxy_eligible,
)
-class Application(SoftDeleteMixin, db.Model):
+class Application(TimestampMixin, SoftDeleteMixin, db.Model):
"""A managed app.
SOFT DELETED (plan 70). `Application.query` therefore returns TOMBSTONES —
@@ -117,8 +117,6 @@ class Application(SoftDeleteMixin, db.Model):
shared_config = db.Column(db.Text, nullable=True) # JSON string for shared resources
# Metadata
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
last_deployed_at = db.Column(db.DateTime, nullable=True)
# Foreign keys
diff --git a/backend/app/models/application_manifest.py b/backend/app/models/application_manifest.py
index 4aff954c..7c8541c1 100644
--- a/backend/app/models/application_manifest.py
+++ b/backend/app/models/application_manifest.py
@@ -10,6 +10,7 @@ import json
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
@@ -20,7 +21,7 @@ STATUS_DRIFTED = 'drifted' # live state diverged from the manifest
STATUS_ERROR = 'error' # last apply / parse failed
-class ApplicationManifest(JsonColumnMixin, db.Model):
+class ApplicationManifest(TimestampMixin, JsonColumnMixin, db.Model):
__tablename__ = 'application_manifests'
id = db.Column(db.Integer, primary_key=True)
@@ -39,8 +40,6 @@ class ApplicationManifest(JsonColumnMixin, db.Model):
status = db.Column(db.String(20), nullable=False, default=STATUS_PENDING, index=True)
last_error = db.Column(db.Text, nullable=True)
applied_at = db.Column(db.DateTime, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
__table_args__ = (
db.UniqueConstraint('project_id', name='uq_application_manifest_project'),
diff --git a/backend/app/models/application_preview.py b/backend/app/models/application_preview.py
index f56754d1..1be63c36 100644
--- a/backend/app/models/application_preview.py
+++ b/backend/app/models/application_preview.py
@@ -12,10 +12,11 @@ Two tables:
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
-class ApplicationPreview(JsonColumnMixin, db.Model):
+class ApplicationPreview(TimestampMixin, JsonColumnMixin, db.Model):
"""A single PR preview environment for an application."""
__tablename__ = 'application_previews'
@@ -46,8 +47,6 @@ class ApplicationPreview(JsonColumnMixin, db.Model):
commit_sha = db.Column(db.String(64), nullable=True)
expires_at = db.Column(db.DateTime, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
deleted_at = db.Column(db.DateTime, nullable=True)
def get_container_ids(self):
@@ -80,7 +79,7 @@ class ApplicationPreview(JsonColumnMixin, db.Model):
return f'<ApplicationPreview app={self.application_id} PR#{self.pr_number} ({self.status})>'
-class ApplicationPreviewSettings(db.Model):
+class ApplicationPreviewSettings(TimestampMixin, db.Model):
"""Per-application PR-preview configuration (opt-in + domain template)."""
__tablename__ = 'application_preview_settings'
@@ -98,8 +97,6 @@ class ApplicationPreviewSettings(db.Model):
# Optional TTL: previews are auto-destroyed this many days after creation.
ttl_days = db.Column(db.Integer, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
return {
diff --git a/backend/app/models/backup_policy.py b/backend/app/models/backup_policy.py
index dddbbca7..7362b55d 100644
--- a/backend/app/models/backup_policy.py
+++ b/backend/app/models/backup_policy.py
@@ -2,6 +2,7 @@ from datetime import datetime
from decimal import Decimal
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
# Every CORE data-protection target the unified policy system can back up (§8).
@@ -27,7 +28,7 @@ def _num(value):
return value
-class BackupPolicy(JsonColumnMixin, db.Model):
+class BackupPolicy(TimestampMixin, JsonColumnMixin, db.Model):
"""Automated backup ("protection") policy for a single target.
A target is a generic application (``target_type='application'``), a
@@ -88,8 +89,6 @@ class BackupPolicy(JsonColumnMixin, db.Model):
last_cost_remote = db.Column(db.Numeric(10, 4), nullable=True)
last_job_id = db.Column(db.String(36), nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
runs = db.relationship(
'BackupRun',
diff --git a/backend/app/models/chat_webhook.py b/backend/app/models/chat_webhook.py
index 115687c9..92716df6 100644
--- a/backend/app/models/chat_webhook.py
+++ b/backend/app/models/chat_webhook.py
@@ -14,11 +14,12 @@ Per kind, ``credentials_json`` holds:
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
from app.utils.crypto import decrypt_secret_safe
-class ChatWebhookConnection(JsonColumnMixin, db.Model):
+class ChatWebhookConnection(TimestampMixin, JsonColumnMixin, db.Model):
__tablename__ = 'chat_webhook_connections'
KINDS = ('discord', 'slack', 'telegram', 'webhook')
@@ -42,8 +43,6 @@ class ChatWebhookConnection(JsonColumnMixin, db.Model):
imported = db.Column(db.Boolean, default=False)
created_by = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
last_tested_at = db.Column(db.DateTime)
last_test_ok = db.Column(db.Boolean)
diff --git a/backend/app/models/cloudflare_tunnel.py b/backend/app/models/cloudflare_tunnel.py
index 68517306..acf082a5 100644
--- a/backend/app/models/cloudflare_tunnel.py
+++ b/backend/app/models/cloudflare_tunnel.py
@@ -1,8 +1,9 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class CloudflareTunnel(db.Model):
+class CloudflareTunnel(TimestampMixin, db.Model):
"""A Cloudflare Tunnel (cloudflared / cfd_tunnel) ServerKit created.
Distinct from the WireGuard remote-access ``Tunnel`` model — this is a
@@ -23,8 +24,6 @@ class CloudflareTunnel(db.Model):
db.Integer, db.ForeignKey('dns_provider_configs.id'), nullable=True)
token_encrypted = db.Column(db.Text) # cloudflared connector token (encrypted)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
# Never serialize the token here — it's revealed only at creation time and
diff --git a/backend/app/models/cloudflare_worker.py b/backend/app/models/cloudflare_worker.py
index 8558edcc..39115543 100644
--- a/backend/app/models/cloudflare_worker.py
+++ b/backend/app/models/cloudflare_worker.py
@@ -1,8 +1,9 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class CloudflareWorker(db.Model):
+class CloudflareWorker(TimestampMixin, db.Model):
"""A Cloudflare Worker (edge script) ServerKit uploaded.
Cloudflare is the source of truth for what's deployed; this table records the
@@ -23,8 +24,6 @@ class CloudflareWorker(db.Model):
source = db.Column(db.Text) # JS module we uploaded
compatibility_date = db.Column(db.String(20))
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self, include_source=False):
d = {
diff --git a/backend/app/models/dashboard.py b/backend/app/models/dashboard.py
index 43d72cec..aca2fc25 100644
--- a/backend/app/models/dashboard.py
+++ b/backend/app/models/dashboard.py
@@ -21,9 +21,10 @@ the geometry fields before storing anything.
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class DashboardBoard(db.Model):
+class DashboardBoard(TimestampMixin, db.Model):
"""One dashboard tab belonging to one user."""
__tablename__ = 'dashboard_boards'
@@ -44,8 +45,6 @@ class DashboardBoard(db.Model):
position = db.Column(db.Integer, nullable=False, default=0)
widgets = db.Column(db.JSON, nullable=False, default=list)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
return {
diff --git a/backend/app/models/db_snapshot.py b/backend/app/models/db_snapshot.py
index ab42149c..f8027688 100644
--- a/backend/app/models/db_snapshot.py
+++ b/backend/app/models/db_snapshot.py
@@ -15,6 +15,7 @@ stable core-managed schema seam, not a reason to keep them in the WP file.
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
import json
@@ -87,7 +88,7 @@ class DatabaseSnapshot(db.Model):
return f'<DatabaseSnapshot {self.id} "{self.name}">'
-class SyncJob(db.Model):
+class SyncJob(TimestampMixin, db.Model):
"""Scheduled database synchronization jobs between WordPress environments."""
__tablename__ = 'sync_jobs'
@@ -117,8 +118,6 @@ class SyncJob(db.Model):
run_count = db.Column(db.Integer, default=0)
# Timestamps
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
return {
diff --git a/backend/app/models/dns_zone.py b/backend/app/models/dns_zone.py
index f2e29aee..098aa5db 100644
--- a/backend/app/models/dns_zone.py
+++ b/backend/app/models/dns_zone.py
@@ -1,9 +1,10 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
import json
-class DNSZone(db.Model):
+class DNSZone(TimestampMixin, db.Model):
"""DNS zone for a domain with provider integration."""
__tablename__ = 'dns_zones'
@@ -22,8 +23,6 @@ class DNSZone(db.Model):
status = db.Column(db.String(32), default='active')
last_sync_at = db.Column(db.DateTime)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
records = db.relationship('DNSRecord', backref='zone', lazy='dynamic', cascade='all, delete-orphan')
@@ -49,7 +48,7 @@ class DNSZone(db.Model):
}
-class DNSRecord(db.Model):
+class DNSRecord(TimestampMixin, db.Model):
"""Individual DNS record within a zone."""
__tablename__ = 'dns_records'
@@ -65,8 +64,6 @@ class DNSRecord(db.Model):
provider_record_id = db.Column(db.String(128))
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
return {
diff --git a/backend/app/models/domain.py b/backend/app/models/domain.py
index 1b9f9444..661d7425 100644
--- a/backend/app/models/domain.py
+++ b/backend/app/models/domain.py
@@ -1,9 +1,9 @@
from datetime import datetime
from app import db
-from app.models.mixins import SoftDeleteMixin
+from app.models.mixins import SoftDeleteMixin, TimestampMixin
-class Domain(SoftDeleteMixin, db.Model):
+class Domain(TimestampMixin, SoftDeleteMixin, db.Model):
__tablename__ = 'domains'
id = db.Column(db.Integer, primary_key=True)
@@ -23,8 +23,6 @@ class Domain(SoftDeleteMixin, db.Model):
ssl_auto_renew = db.Column(db.Boolean, default=True)
# Metadata
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Foreign keys
application_id = db.Column(db.Integer, db.ForeignKey('applications.id'), nullable=False)
diff --git a/backend/app/models/email.py b/backend/app/models/email.py
index 07e57578..0f3248f4 100644
--- a/backend/app/models/email.py
+++ b/backend/app/models/email.py
@@ -1,8 +1,9 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class EmailDomain(db.Model):
+class EmailDomain(TimestampMixin, db.Model):
__tablename__ = 'email_domains'
id = db.Column(db.Integer, primary_key=True)
@@ -22,8 +23,6 @@ class EmailDomain(db.Model):
dns_provider_id = db.Column(db.Integer, db.ForeignKey('dns_provider_configs.id'), nullable=True)
dns_zone_id = db.Column(db.String(255))
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Relationships
accounts = db.relationship('EmailAccount', backref='domain', lazy=True, cascade='all, delete-orphan')
@@ -50,7 +49,7 @@ class EmailDomain(db.Model):
return f'<EmailDomain {self.name}>'
-class EmailAccount(db.Model):
+class EmailAccount(TimestampMixin, db.Model):
__tablename__ = 'email_accounts'
id = db.Column(db.Integer, primary_key=True)
@@ -61,8 +60,6 @@ class EmailAccount(db.Model):
quota_mb = db.Column(db.Integer, default=1024)
quota_used_mb = db.Column(db.Integer, default=0)
is_active = db.Column(db.Boolean, default=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
forwarding_rules = db.relationship('EmailForwardingRule', backref='account', lazy=True, cascade='all, delete-orphan')
diff --git a/backend/app/models/email_bounce.py b/backend/app/models/email_bounce.py
index dfa11b74..4c5bc7a5 100644
--- a/backend/app/models/email_bounce.py
+++ b/backend/app/models/email_bounce.py
@@ -9,9 +9,10 @@ webhook (``POST /api/v1/notifications/inbound/email``).
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class EmailBounceState(db.Model):
+class EmailBounceState(TimestampMixin, db.Model):
__tablename__ = 'email_bounce_state'
KIND_BOUNCE = 'bounce'
@@ -30,8 +31,6 @@ class EmailBounceState(db.Model):
last_reason = db.Column(db.String(500), nullable=True)
last_event_at = db.Column(db.DateTime, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
return {
diff --git a/backend/app/models/email_provider.py b/backend/app/models/email_provider.py
index 60620784..2cb56bfa 100644
--- a/backend/app/models/email_provider.py
+++ b/backend/app/models/email_provider.py
@@ -9,11 +9,12 @@ cloud / registrar providers.
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
from app.utils.crypto import decrypt_secret_safe
-class EmailProviderConnection(JsonColumnMixin, db.Model):
+class EmailProviderConnection(TimestampMixin, JsonColumnMixin, db.Model):
__tablename__ = 'email_provider_connections'
id = db.Column(db.Integer, primary_key=True)
@@ -37,8 +38,6 @@ class EmailProviderConnection(JsonColumnMixin, db.Model):
relay_priority = db.Column(db.Integer, default=0, nullable=False)
created_by = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
last_tested_at = db.Column(db.DateTime)
last_test_ok = db.Column(db.Boolean)
diff --git a/backend/app/models/env_variable.py b/backend/app/models/env_variable.py
index 1ba5f47d..133b2b0b 100644
--- a/backend/app/models/env_variable.py
+++ b/backend/app/models/env_variable.py
@@ -1,5 +1,6 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
from cryptography.fernet import Fernet
import os
@@ -7,7 +8,7 @@ import base64
import hashlib
-class EnvironmentVariable(JsonColumnMixin, db.Model):
+class EnvironmentVariable(TimestampMixin, JsonColumnMixin, db.Model):
"""
Stores environment variables for applications with encrypted values.
Supports versioning for history tracking.
@@ -30,8 +31,6 @@ class EnvironmentVariable(JsonColumnMixin, db.Model):
# {"kind":"service","service":"db","property":"connectionString"}.
value_from = db.Column(db.Text, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
created_by = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=True)
# Unique constraint: one key per application
diff --git a/backend/app/models/event_subscription.py b/backend/app/models/event_subscription.py
index a3ec87e5..76daf1d5 100644
--- a/backend/app/models/event_subscription.py
+++ b/backend/app/models/event_subscription.py
@@ -1,11 +1,12 @@
"""Event subscription and delivery models for webhook system."""
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
import secrets
-class EventSubscription(JsonColumnMixin, db.Model):
+class EventSubscription(TimestampMixin, JsonColumnMixin, db.Model):
"""Webhook subscription for event notifications."""
__tablename__ = 'event_subscriptions'
@@ -19,8 +20,6 @@ class EventSubscription(JsonColumnMixin, db.Model):
headers = db.Column(db.Text, nullable=True) # JSON dict of custom headers
retry_count = db.Column(db.Integer, default=3)
timeout_seconds = db.Column(db.Integer, default=10)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
user = db.relationship('User', foreign_keys=[user_id])
deliveries = db.relationship('EventDelivery', back_populates='subscription',
diff --git a/backend/app/models/exposed_service.py b/backend/app/models/exposed_service.py
index c9950d92..bf9ee309 100644
--- a/backend/app/models/exposed_service.py
+++ b/backend/app/models/exposed_service.py
@@ -1,10 +1,10 @@
-import uuid
from datetime import datetime
from app import db
+from app.models.mixins import uuid_pk, TimestampMixin
-class ExposedService(db.Model):
+class ExposedService(TimestampMixin, db.Model):
"""A service on a private (NAT'd) host published to the public internet
over a WireGuard tunnel (roadmap Phase 2). The edge runs an nginx vhost
for ``hostname`` that proxies to the private peer's WG IP; the private
@@ -13,7 +13,7 @@ class ExposedService(db.Model):
"""
__tablename__ = 'exposed_services'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
tunnel_id = db.Column(db.String(36), db.ForeignKey('tunnels.id'), nullable=False, index=True)
hostname = db.Column(db.String(255), nullable=False) # e.g. jellyfin.example.com
@@ -27,8 +27,6 @@ class ExposedService(db.Model):
status = db.Column(db.String(20), default='pending', index=True) # pending / published / error
last_error = db.Column(db.Text)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
tunnel = db.relationship('Tunnel')
diff --git a/backend/app/models/invitation.py b/backend/app/models/invitation.py
index 3a2a61c7..ee0aeb8d 100644
--- a/backend/app/models/invitation.py
+++ b/backend/app/models/invitation.py
@@ -1,5 +1,4 @@
from datetime import datetime
-from uuid import uuid4
from app import db
from app.models.json_column_mixin import JsonColumnMixin
diff --git a/backend/app/models/linked_panel.py b/backend/app/models/linked_panel.py
index f3f89946..7a6d4215 100644
--- a/backend/app/models/linked_panel.py
+++ b/backend/app/models/linked_panel.py
@@ -14,10 +14,10 @@ Managed/Observed trust levels.
from datetime import datetime
from app import db
-from app.models.mixins import EncryptedSecret
+from app.models.mixins import EncryptedSecret, TimestampMixin
-class LinkedPanelConfig(db.Model):
+class LinkedPanelConfig(TimestampMixin, db.Model):
"""Credentials + addressing for the master panel this panel links to."""
__tablename__ = 'linked_panel_config'
@@ -32,8 +32,6 @@ class LinkedPanelConfig(db.Model):
remote_server_id = db.Column(db.String(36), nullable=False)
remote_server_name = db.Column(db.String(120), nullable=True)
enabled = db.Column(db.Boolean, default=True, nullable=False)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# One crypto path (plan 77 C1). legacy_plaintext: rows written before
# encryption-at-rest read back unchanged until rewritten.
diff --git a/backend/app/models/managed_database_user.py b/backend/app/models/managed_database_user.py
index c16d1c76..11bd4150 100644
--- a/backend/app/models/managed_database_user.py
+++ b/backend/app/models/managed_database_user.py
@@ -1,10 +1,11 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
-class ManagedDatabaseUser(JsonColumnMixin, db.Model):
+class ManagedDatabaseUser(TimestampMixin, JsonColumnMixin, db.Model):
"""A database user/grant ServerKit created on a managed database.
Live engines forget nothing, but ServerKit used to: users created through
@@ -29,8 +30,6 @@ class ManagedDatabaseUser(JsonColumnMixin, db.Model):
grants = db.Column(db.Text, nullable=False, default='["ALL"]')
is_shadow = db.Column(db.Boolean, nullable=False, default=False)
expires_at = db.Column(db.DateTime, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Deleting the managed database removes its user rows (ORM cascade); the
# engine-side users are dropped explicitly by the service, never implicitly.
diff --git a/backend/app/models/managed_dns_record.py b/backend/app/models/managed_dns_record.py
index 7457d4e8..3c5df2ba 100644
--- a/backend/app/models/managed_dns_record.py
+++ b/backend/app/models/managed_dns_record.py
@@ -1,8 +1,9 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class ManagedDnsRecord(db.Model):
+class ManagedDnsRecord(TimestampMixin, db.Model):
"""Ledger of DNS records ServerKit created in an external provider zone.
The single source of truth for "we own this record". It's written whenever the
@@ -28,8 +29,6 @@ class ManagedDnsRecord(db.Model):
source = db.Column(db.String(40)) # zone|ddns|preset|wordpress|email
app_id = db.Column(db.Integer, db.ForeignKey('applications.id'), nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
return {
diff --git a/backend/app/models/metric_alert.py b/backend/app/models/metric_alert.py
index e74b11c1..5b94383f 100644
--- a/backend/app/models/metric_alert.py
+++ b/backend/app/models/metric_alert.py
@@ -1,15 +1,15 @@
"""Models for fleet-wide metric monitoring and alerting."""
-import uuid
from datetime import datetime
from app import db
+from app.models.mixins import uuid_pk, TimestampMixin
-class ServerAlertThreshold(db.Model):
+class ServerAlertThreshold(TimestampMixin, db.Model):
"""Per-server or global alert threshold configuration."""
__tablename__ = 'server_alert_thresholds'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
server_id = db.Column(db.String(36), db.ForeignKey('servers.id'), nullable=True, index=True)
# null = global default
@@ -19,8 +19,6 @@ class ServerAlertThreshold(db.Model):
duration_seconds = db.Column(db.Integer, default=300) # sustained for N seconds
enabled = db.Column(db.Boolean, default=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
server = db.relationship('Server', backref='alert_thresholds')
@@ -42,7 +40,7 @@ class MetricAlert(db.Model):
"""Alert triggered when server metrics exceed thresholds."""
__tablename__ = 'metric_alerts'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
server_id = db.Column(db.String(36), db.ForeignKey('servers.id'), nullable=False, index=True)
metric = db.Column(db.String(20), nullable=False) # cpu, memory, disk
diff --git a/backend/app/models/mixins.py b/backend/app/models/mixins.py
index fe9f7ab5..4b0410ab 100644
--- a/backend/app/models/mixins.py
+++ b/backend/app/models/mixins.py
@@ -27,6 +27,7 @@ just deleted). Those constraints have to become PARTIAL unique indexes with a
See migration 083 for the pattern.
"""
import logging
+import uuid
from datetime import datetime
from app import db
@@ -151,3 +152,47 @@ class EncryptedSecret:
def is_set(self, obj) -> bool:
"""True when ciphertext is stored — the `has_secret` masking flag."""
return bool(getattr(obj, self.column_name))
+
+
+def uuid_pk():
+ """The ONE uuid primary-key shape: String(36), dashed uuid4 text.
+
+ Every uuid-keyed model uses this factory (plan 77 B3) so the format
+ decision is made once — a second format (e.g. 32-char hex) would break
+ FK joins against String(36) columns. The lone pre-existing deviant is
+ ai.py's String(64) hex ids, grandfathered until a data migration.
+
+ class Server(db.Model):
+ id = uuid_pk()
+ """
+ return db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+
+
+class TimestampMixin:
+ """created_at / updated_at in the ONE house shape (plan 77 B1).
+
+ Byte-identical to the hand-written pair::
+
+ created_at = db.Column(db.DateTime, default=datetime.utcnow)
+ updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
+
+ so adoption needs NO schema migration — it only centralizes the
+ ``datetime.utcnow`` default, making the eventual tz-aware migration
+ (utcnow is deprecated on Python 3.13) a one-file edit instead of ~270.
+ Set ``__timestamp_index__ = True`` on the model for the indexed
+ created_at variant. Models with only created_at, or a deviant shape
+ (e.g. sanitization_profile's default-less updated_at), keep their own
+ columns — adding a column via mixin WOULD be a schema change.
+ """
+
+ __timestamp_index__ = False
+
+ @db.declared_attr
+ def created_at(cls): # noqa: N805
+ return db.Column(db.DateTime, default=datetime.utcnow,
+ index=bool(getattr(cls, '__timestamp_index__', False)))
+
+ @db.declared_attr
+ def updated_at(cls): # noqa: N805
+ return db.Column(db.DateTime, default=datetime.utcnow,
+ onupdate=datetime.utcnow)
diff --git a/backend/app/models/notification_preferences.py b/backend/app/models/notification_preferences.py
index 26e81110..ddffb91b 100644
--- a/backend/app/models/notification_preferences.py
+++ b/backend/app/models/notification_preferences.py
@@ -6,11 +6,12 @@ Stores per-user notification preferences for receiving alerts.
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
import json
-class NotificationPreferences(JsonColumnMixin, db.Model):
+class NotificationPreferences(TimestampMixin, JsonColumnMixin, db.Model):
__tablename__ = 'notification_preferences'
id = db.Column(db.Integer, primary_key=True)
@@ -52,8 +53,6 @@ class NotificationPreferences(JsonColumnMixin, db.Model):
quiet_hours_start = db.Column(db.String(5), default='22:00') # HH:MM format
quiet_hours_end = db.Column(db.String(5), default='08:00')
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Relationship
user = db.relationship('User', backref=db.backref('notification_preferences', uselist=False))
diff --git a/backend/app/models/oauth_identity.py b/backend/app/models/oauth_identity.py
index a27bbb7c..f4bc5124 100644
--- a/backend/app/models/oauth_identity.py
+++ b/backend/app/models/oauth_identity.py
@@ -1,8 +1,9 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class OAuthIdentity(db.Model):
+class OAuthIdentity(TimestampMixin, db.Model):
"""Links an external OAuth/SAML identity to a local user."""
__tablename__ = 'oauth_identities'
__table_args__ = (
@@ -18,8 +19,6 @@ class OAuthIdentity(db.Model):
access_token_encrypted = db.Column(db.Text, nullable=True)
refresh_token_encrypted = db.Column(db.Text, nullable=True)
token_expires_at = db.Column(db.DateTime, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
last_login_at = db.Column(db.DateTime, nullable=True)
user = db.relationship('User', backref=db.backref('oauth_identities', lazy='dynamic'))
diff --git a/backend/app/models/pending_agent.py b/backend/app/models/pending_agent.py
index 097e1d1e..3669fcd4 100644
--- a/backend/app/models/pending_agent.py
+++ b/backend/app/models/pending_agent.py
@@ -12,14 +12,13 @@ When an operator submits (code, passphrase) via /pairing/claim, the entry is
matched, real Server credentials are minted, and `claimed_server_id` is set.
"""
-import uuid
import hashlib
from datetime import datetime, timedelta
import bcrypt
from app import db
-from app.models.mixins import EncryptedSecret
+from app.models.mixins import EncryptedSecret, uuid_pk
# Pair code uses Crockford-ish base32 minus ambiguous chars (0/O, 1/I/L)
@@ -34,7 +33,7 @@ class PendingAgent(db.Model):
__tablename__ = 'pending_agents'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
# Opaque token the agent uses to authenticate poll/refresh calls.
# Stored hashed; the agent receives the plaintext value once on enroll.
diff --git a/backend/app/models/plugin_store.py b/backend/app/models/plugin_store.py
index 7890b32e..f011529f 100644
--- a/backend/app/models/plugin_store.py
+++ b/backend/app/models/plugin_store.py
@@ -20,9 +20,10 @@ state, written at runtime by the plugin itself.
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class PluginStore(db.Model):
+class PluginStore(TimestampMixin, db.Model):
"""One key/value pair belonging to one installed plugin."""
__tablename__ = 'plugin_store'
@@ -35,8 +36,6 @@ class PluginStore(db.Model):
key = db.Column(db.String(255), nullable=False)
value = db.Column(db.JSON)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
__table_args__ = (
db.UniqueConstraint('plugin_slug', 'key', name='uq_plugin_store_slug_key'),
diff --git a/backend/app/models/project.py b/backend/app/models/project.py
index d9b9009f..ac0414e5 100644
--- a/backend/app/models/project.py
+++ b/backend/app/models/project.py
@@ -1,9 +1,10 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
import json
-class Project(db.Model):
+class Project(TimestampMixin, db.Model):
"""A Project groups applications under a Workspace.
Hierarchy: Workspace -> Project -> Environment -> Applications.
@@ -20,8 +21,6 @@ class Project(db.Model):
description = db.Column(db.Text, nullable=True)
metadata_json = db.Column(db.Text, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Environments belonging to this project. Deleting a project cascades to its
# environments (apps are detached/blocked separately by the service layer).
diff --git a/backend/app/models/proxy_stack.py b/backend/app/models/proxy_stack.py
index ed5f0ddf..98291aed 100644
--- a/backend/app/models/proxy_stack.py
+++ b/backend/app/models/proxy_stack.py
@@ -7,14 +7,14 @@ Compose stack. This table records that choice + the on-disk compose path and
config snippet for one server. It is intentionally keyed 1:1 on server_id
(unique) — a server runs at most one managed proxy stack at a time.
"""
-import uuid
from datetime import datetime
from app import db
+from app.models.mixins import uuid_pk, TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
-class ProxyStack(JsonColumnMixin, db.Model):
+class ProxyStack(TimestampMixin, JsonColumnMixin, db.Model):
"""One managed reverse-proxy stack per server."""
__tablename__ = 'proxy_stacks'
@@ -24,7 +24,7 @@ class ProxyStack(JsonColumnMixin, db.Model):
PROXY_TRAEFIK = 'traefik'
PROXY_CADDY = 'caddy'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
# 1:1 with a server. Unique so get_or_create never creates duplicates;
# indexed for the per-server lookup the API does on every request.
@@ -51,8 +51,6 @@ class ProxyStack(JsonColumnMixin, db.Model):
last_regenerated_at = db.Column(db.DateTime)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def networks_list(self):
"""Decode the networks JSON column to a list (empty on missing/bad)."""
diff --git a/backend/app/models/registrar_connection.py b/backend/app/models/registrar_connection.py
index 676bec75..acedd85f 100644
--- a/backend/app/models/registrar_connection.py
+++ b/backend/app/models/registrar_connection.py
@@ -1,9 +1,9 @@
from datetime import datetime
from app import db
-from app.models.mixins import EncryptedSecret
+from app.models.mixins import EncryptedSecret, TimestampMixin
-class RegistrarConnection(db.Model):
+class RegistrarConnection(TimestampMixin, db.Model):
"""A connected domain-registrar account (GoDaddy, …) used to read the domain
portfolio: registration status, expiry dates, auto-renew and nameservers.
@@ -24,8 +24,6 @@ class RegistrarConnection(db.Model):
account_label = db.Column(db.String(180), nullable=True) # e.g. domain count / shopper id
config_json = db.Column(db.Text, nullable=True) # provider-specific non-secret extras (e.g. Namecheap username + client_ip)
last_synced_at = db.Column(db.DateTime, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
@property
def config(self):
diff --git a/backend/app/models/saved_view.py b/backend/app/models/saved_view.py
index 1cdaf5e9..e75ea547 100644
--- a/backend/app/models/saved_view.py
+++ b/backend/app/models/saved_view.py
@@ -1,9 +1,9 @@
from datetime import datetime
from app import db
-from app.models.mixins import SoftDeleteMixin
+from app.models.mixins import SoftDeleteMixin, TimestampMixin
-class SavedView(SoftDeleteMixin, db.Model):
+class SavedView(TimestampMixin, SoftDeleteMixin, db.Model):
"""A user's saved table view for a list page (Services, Domains, …).
Captures the page's table state — filter, search, sort levels, hidden
@@ -23,8 +23,6 @@ class SavedView(SoftDeleteMixin, db.Model):
slug = db.Column(db.String(140), nullable=True, index=True)
state = db.Column(db.JSON, nullable=False, default=dict)
is_default = db.Column(db.Boolean, nullable=False, default=False)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# No table-level UNIQUE on (user_id, page, name): a deleted view keeps its
# row, and the constraint would then refuse to let you re-create a view by
diff --git a/backend/app/models/secret_vault.py b/backend/app/models/secret_vault.py
index 627e71ae..f2d6028a 100644
--- a/backend/app/models/secret_vault.py
+++ b/backend/app/models/secret_vault.py
@@ -1,10 +1,11 @@
import json
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.utils.crypto import encrypt_secret, decrypt_secret_safe
-class SecretVault(db.Model):
+class SecretVault(TimestampMixin, db.Model):
"""A named vault for encrypted secrets."""
__tablename__ = 'secret_vaults'
@@ -16,8 +17,6 @@ class SecretVault(db.Model):
# Workspace scoping (#33): a vault belongs to a workspace. Backfilled to the
# Default workspace by migration 021; new rows are stamped on create.
workspace_id = db.Column(db.Integer, db.ForeignKey('workspaces.id'), nullable=True, index=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
secrets = db.relationship('Secret', backref='vault', lazy='dynamic', cascade='all, delete-orphan')
@@ -34,7 +33,7 @@ class SecretVault(db.Model):
}
-class Secret(db.Model):
+class Secret(TimestampMixin, db.Model):
"""An encrypted secret inside a vault."""
__tablename__ = 'secrets'
@@ -44,8 +43,6 @@ class Secret(db.Model):
encrypted_value = db.Column(db.Text, nullable=False)
description = db.Column(db.Text, nullable=True)
expires_at = db.Column(db.DateTime, nullable=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
__table_args__ = (
db.UniqueConstraint('vault_id', 'name', name='uq_secret_vault_name'),
diff --git a/backend/app/models/security_alert.py b/backend/app/models/security_alert.py
index fb9b586f..3defc3b1 100644
--- a/backend/app/models/security_alert.py
+++ b/backend/app/models/security_alert.py
@@ -4,16 +4,16 @@ Security Alert Model for ServerKit.
Stores security alerts from anomaly detection.
"""
-import uuid
from datetime import datetime
from app import db
+from app.models.mixins import uuid_pk
class SecurityAlert(db.Model):
"""Security alerts from anomaly detection"""
__tablename__ = 'security_alerts'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
server_id = db.Column(db.String(36), db.ForeignKey('servers.id'), nullable=True, index=True)
# Alert classification
diff --git a/backend/app/models/server.py b/backend/app/models/server.py
index 6723fa13..4676bba3 100644
--- a/backend/app/models/server.py
+++ b/backend/app/models/server.py
@@ -3,15 +3,15 @@ import secrets
from datetime import datetime
from werkzeug.security import generate_password_hash, check_password_hash
from app import db
-from app.models.mixins import EncryptedSecret
+from app.models.mixins import EncryptedSecret, uuid_pk, TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
-class ServerGroup(db.Model):
+class ServerGroup(TimestampMixin, db.Model):
"""Group servers for organization"""
__tablename__ = 'server_groups'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
name = db.Column(db.String(100), nullable=False)
description = db.Column(db.Text)
color = db.Column(db.String(7), default='#6366f1') # Hex color for UI
@@ -22,8 +22,6 @@ class ServerGroup(db.Model):
auto_upgrade = db.Column(db.Boolean, default=False)
upgrade_channel = db.Column(db.String(20), default='stable') # stable, beta
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Relationships
# Use 'subquery' to eagerly load servers in a single query, avoiding N+1
@@ -52,7 +50,7 @@ class ServerGroup(db.Model):
return f'<ServerGroup {self.name}>'
-class Server(JsonColumnMixin, db.Model):
+class Server(TimestampMixin, JsonColumnMixin, db.Model):
"""Represents a remote server managed by ServerKit"""
__tablename__ = 'servers'
@@ -77,7 +75,7 @@ class Server(JsonColumnMixin, db.Model):
'agent:update',
}
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
# Basic Info
name = db.Column(db.String(100), nullable=False)
@@ -168,8 +166,6 @@ class Server(JsonColumnMixin, db.Model):
capabilities_at = db.Column(db.DateTime) # when the snapshot was last refreshed
# Timestamps
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Relationships
group = db.relationship('ServerGroup', back_populates='servers')
@@ -549,7 +545,7 @@ class ServerCommand(db.Model):
"""Audit log of commands executed on servers"""
__tablename__ = 'server_commands'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
server_id = db.Column(db.String(36), db.ForeignKey('servers.id'), nullable=False, index=True)
user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
@@ -602,7 +598,7 @@ class AgentSession(db.Model):
"""Active agent WebSocket sessions"""
__tablename__ = 'agent_sessions'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
server_id = db.Column(db.String(36), db.ForeignKey('servers.id'), nullable=False, index=True)
session_token = db.Column(db.String(256)) # Current session token
@@ -651,11 +647,11 @@ class AgentSession(db.Model):
}
-class AgentRollout(db.Model):
+class AgentRollout(TimestampMixin, db.Model):
"""Tracks staged rollout progress"""
__tablename__ = 'agent_rollouts'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
version_id = db.Column(db.String(36), db.ForeignKey('agent_versions.id'), nullable=False)
group_id = db.Column(db.String(36), db.ForeignKey('server_groups.id'), nullable=True)
user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
@@ -679,8 +675,6 @@ class AgentRollout(db.Model):
started_at = db.Column(db.DateTime)
completed_at = db.Column(db.DateTime)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
version = db.relationship('AgentVersion')
@@ -707,11 +701,11 @@ class AgentRollout(db.Model):
}
-class AgentVersion(db.Model):
+class AgentVersion(TimestampMixin, db.Model):
"""Available agent versions and compatibility matrix"""
__tablename__ = 'agent_versions'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
version = db.Column(db.String(20), nullable=False, unique=True)
channel = db.Column(db.String(20), default='stable') # stable, beta
@@ -727,8 +721,6 @@ class AgentVersion(db.Model):
# Assets (mapped by platform: linux-amd64, windows-amd64, etc.)
assets = db.Column(db.JSON) # {"linux-amd64": "url", "checksums": "url"}
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
return {
diff --git a/backend/app/models/server_template.py b/backend/app/models/server_template.py
index ad7672dc..89039c26 100644
--- a/backend/app/models/server_template.py
+++ b/backend/app/models/server_template.py
@@ -1,9 +1,10 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
import json
-class ServerTemplate(db.Model):
+class ServerTemplate(TimestampMixin, db.Model):
"""Defines expected state for a server — packages, services, firewall rules, users, files."""
__tablename__ = 'server_templates'
@@ -32,8 +33,6 @@ class ServerTemplate(db.Model):
remediation_approval_required = db.Column(db.Boolean, default=True)
created_by = db.Column(db.Integer, db.ForeignKey('users.id'))
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
assignments = db.relationship('ServerTemplateAssignment', backref='template', lazy='dynamic')
diff --git a/backend/app/models/site_base_domain.py b/backend/app/models/site_base_domain.py
index 1ecee47c..73413cb1 100644
--- a/backend/app/models/site_base_domain.py
+++ b/backend/app/models/site_base_domain.py
@@ -14,9 +14,10 @@ falling back to the ``sites_base_domain`` setting / ``SITES_BASE_DOMAIN`` config
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class SiteBaseDomain(db.Model):
+class SiteBaseDomain(TimestampMixin, db.Model):
__tablename__ = 'site_base_domains'
DNS_MODES = ('wildcard', 'per-site')
@@ -37,8 +38,6 @@ class SiteBaseDomain(db.Model):
db.ForeignKey('dns_provider_configs.id', ondelete='SET NULL'),
nullable=True,
)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
return {
diff --git a/backend/app/models/status_page.py b/backend/app/models/status_page.py
index 1f06cbce..b6a19abf 100644
--- a/backend/app/models/status_page.py
+++ b/backend/app/models/status_page.py
@@ -1,9 +1,10 @@
from datetime import datetime, timedelta
from app import db
+from app.models.mixins import TimestampMixin
import json
-class StatusPage(db.Model):
+class StatusPage(TimestampMixin, db.Model):
"""Public-facing status page configuration."""
__tablename__ = 'status_pages'
@@ -22,8 +23,6 @@ class StatusPage(db.Model):
show_uptime = db.Column(db.Boolean, default=True)
show_history = db.Column(db.Boolean, default=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
components = db.relationship('StatusComponent', backref='status_page', lazy='dynamic',
order_by='StatusComponent.sort_order', cascade='all, delete-orphan')
@@ -190,7 +189,7 @@ class HealthCheck(db.Model):
}
-class StatusIncident(db.Model):
+class StatusIncident(TimestampMixin, db.Model):
"""An incident on the status page."""
__tablename__ = 'status_incidents'
@@ -212,8 +211,6 @@ class StatusIncident(db.Model):
scheduled_end = db.Column(db.DateTime)
resolved_at = db.Column(db.DateTime)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
updates = db.relationship('StatusIncidentUpdate', backref='incident', lazy='dynamic',
order_by='StatusIncidentUpdate.created_at.desc()', cascade='all, delete-orphan')
diff --git a/backend/app/models/theme.py b/backend/app/models/theme.py
index 034e4615..84a6afb8 100644
--- a/backend/app/models/theme.py
+++ b/backend/app/models/theme.py
@@ -12,9 +12,10 @@ values, so themes deliberately bypass the whole extension trust machinery.
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class Theme(db.Model):
+class Theme(TimestampMixin, db.Model):
__tablename__ = 'themes'
id = db.Column(db.Integer, primary_key=True)
@@ -33,8 +34,6 @@ class Theme(db.Model):
preview = db.Column(db.JSON, nullable=True, default=list)
# Where it came from: 'registry' | 'import' | 'studio' | 'bundled'.
source = db.Column(db.String(16), nullable=False, default='import')
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
def to_dict(self):
return {
diff --git a/backend/app/models/tunnel.py b/backend/app/models/tunnel.py
index 4e1fd0b4..17cc4aec 100644
--- a/backend/app/models/tunnel.py
+++ b/backend/app/models/tunnel.py
@@ -1,10 +1,10 @@
-import uuid
from datetime import datetime
from app import db
+from app.models.mixins import uuid_pk, TimestampMixin
-class Tunnel(db.Model):
+class Tunnel(TimestampMixin, db.Model):
"""A WireGuard pairing between two ServerKit agents: a public-IP
"edge" and a NAT'd "private" host. The data plane is kernel WireGuard
running on the agents; this row is the panel's brokered record of it.
@@ -14,7 +14,7 @@ class Tunnel(db.Model):
"""
__tablename__ = 'tunnels'
- id = db.Column(db.String(36), primary_key=True, default=lambda: str(uuid.uuid4()))
+ id = uuid_pk()
name = db.Column(db.String(120))
# Two FKs to servers → relationships must name foreign_keys explicitly.
@@ -36,8 +36,6 @@ class Tunnel(db.Model):
last_handshake_at = db.Column(db.DateTime)
last_error = db.Column(db.Text)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
edge_server = db.relationship('Server', foreign_keys=[edge_server_id])
private_server = db.relationship('Server', foreign_keys=[private_server_id])
diff --git a/backend/app/models/webhook.py b/backend/app/models/webhook.py
index 0bfed416..0121ca2b 100644
--- a/backend/app/models/webhook.py
+++ b/backend/app/models/webhook.py
@@ -1,8 +1,9 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class GitWebhook(db.Model):
+class GitWebhook(TimestampMixin, db.Model):
"""Webhook configuration for syncing external repos with local Gitea."""
__tablename__ = 'git_webhooks'
@@ -40,8 +41,6 @@ class GitWebhook(db.Model):
sync_count = db.Column(db.Integer, default=0)
# Metadata
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Relationships
app = db.relationship('Application', backref=db.backref('webhooks', lazy='dynamic'))
diff --git a/backend/app/models/webhook_gateway.py b/backend/app/models/webhook_gateway.py
index abe3cfe8..7bbafa03 100644
--- a/backend/app/models/webhook_gateway.py
+++ b/backend/app/models/webhook_gateway.py
@@ -4,10 +4,11 @@ import hashlib
import base64
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
from app.models.json_column_mixin import JsonColumnMixin
-class WebhookEndpoint(JsonColumnMixin, db.Model):
+class WebhookEndpoint(TimestampMixin, JsonColumnMixin, db.Model):
"""Inbound webhook endpoint configuration."""
__tablename__ = 'webhook_endpoints'
@@ -22,8 +23,6 @@ class WebhookEndpoint(JsonColumnMixin, db.Model):
created_by = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=True)
# Workspace scoping (#33): backfilled to the Default workspace by migration 021.
workspace_id = db.Column(db.Integer, db.ForeignKey('workspaces.id'), nullable=True, index=True)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
deliveries = db.relationship('WebhookDelivery', backref='endpoint', lazy='dynamic', cascade='all, delete-orphan')
diff --git a/backend/app/models/wordpress_custom_plugin.py b/backend/app/models/wordpress_custom_plugin.py
index 5e54f8e8..779fb286 100644
--- a/backend/app/models/wordpress_custom_plugin.py
+++ b/backend/app/models/wordpress_custom_plugin.py
@@ -11,9 +11,10 @@ A thin global layer on top of the existing per-site WP-CLI plugin management:
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
-class WordPressCustomPlugin(db.Model):
+class WordPressCustomPlugin(TimestampMixin, db.Model):
"""An operator-owned plugin in the global library."""
__tablename__ = 'wordpress_custom_plugins'
@@ -41,8 +42,6 @@ class WordPressCustomPlugin(db.Model):
last_synced_at = db.Column(db.DateTime)
sync_error = db.Column(db.Text)
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
installations = db.relationship(
'WordPressSitePlugin',
diff --git a/backend/app/models/wordpress_site.py b/backend/app/models/wordpress_site.py
index 7bbc5bf4..a8c73e5c 100644
--- a/backend/app/models/wordpress_site.py
+++ b/backend/app/models/wordpress_site.py
@@ -9,6 +9,7 @@ Extended models for WordPress-specific functionality including:
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
import json
# DatabaseSnapshot + SyncJob were relocated to app/models/db_snapshot.py
@@ -19,7 +20,7 @@ import json
from app.models.db_snapshot import DatabaseSnapshot, SyncJob # noqa: F401
-class WordPressSite(db.Model):
+class WordPressSite(TimestampMixin, db.Model):
"""Extended WordPress-specific data linked to Application."""
__tablename__ = 'wordpress_sites'
@@ -97,8 +98,6 @@ class WordPressSite(db.Model):
auto_sync_enabled = db.Column(db.Boolean, default=False)
# Timestamps
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Relationships
application = db.relationship('Application', backref=db.backref('wp_site', uselist=False))
diff --git a/backend/app/models/workflow.py b/backend/app/models/workflow.py
index 33398919..935fcdc6 100644
--- a/backend/app/models/workflow.py
+++ b/backend/app/models/workflow.py
@@ -1,9 +1,10 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
import json
-class Workflow(db.Model):
+class Workflow(TimestampMixin, db.Model):
__tablename__ = 'workflows'
id = db.Column(db.Integer, primary_key=True)
@@ -23,8 +24,6 @@ class Workflow(db.Model):
last_status = db.Column(db.String(20), nullable=True) # success, failed
# Metadata
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
# Foreign keys
user_id = db.Column(db.Integer, db.ForeignKey('users.id'), nullable=False)
diff --git a/backend/app/models/workspace.py b/backend/app/models/workspace.py
index cb7d1487..1d2a0428 100644
--- a/backend/app/models/workspace.py
+++ b/backend/app/models/workspace.py
@@ -1,9 +1,10 @@
from datetime import datetime
from app import db
+from app.models.mixins import TimestampMixin
import json
-class Workspace(db.Model):
+class Workspace(TimestampMixin, db.Model):
"""Isolated container for servers, users, and settings."""
__tablename__ = 'workspaces'
@@ -33,8 +34,6 @@ class Workspace(db.Model):
billing_notes = db.Column(db.Text)
created_by = db.Column(db.Integer, db.ForeignKey('users.id'))
- created_at = db.Column(db.DateTime, default=datetime.utcnow)
- updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
members = db.relationship('WorkspaceMember', backref='workspace', lazy='dynamic')
api_keys = db.relationship('WorkspaceApiKey', backref='workspace', lazy='dynamic')
diff --git a/backend/tests/test_model_shape_mixins.py b/backend/tests/test_model_shape_mixins.py
new file mode 100644
index 00000000..6190c076
--- /dev/null
+++ b/backend/tests/test_model_shape_mixins.py
@@ -0,0 +1,48 @@
+"""Plan 77 B1/B3 — mechanical model shapes come from one definition.
+
+TimestampMixin must be byte-identical to the hand-written column pair it
+replaced (no schema migration on adoption), and uuid_pk() is the one uuid
+primary-key format.
+"""
+import uuid as uuid_mod
+from datetime import datetime
+
+
+def test_timestamp_mixin_matches_house_shape(app):
+ from app.models import Domain # a converted adopter
+ created = Domain.__table__.columns['created_at']
+ updated = Domain.__table__.columns['updated_at']
+ # SQLAlchemy wraps the callable, so compare by name, not identity.
+ assert created.default is not None and created.default.arg.__name__ == 'utcnow'
+ assert created.index is not True # default variant: no index
+ assert updated.default is not None and updated.default.arg.__name__ == 'utcnow'
+ assert updated.onupdate is not None and updated.onupdate.arg.__name__ == 'utcnow'
+
+
+def test_timestamp_mixin_rows_get_defaults(app):
+ from app import db
+ from app.models.server import Server
+ row = Server(name='ts-proof')
+ db.session.add(row)
+ db.session.commit()
+ assert row.created_at is not None
+ assert row.updated_at is not None
+
+
+def test_uuid_pk_generates_dashed_string36(app):
+ from app import db
+ from app.models.server import Server
+ row = Server(name='uuidpk-proof')
+ db.session.add(row)
+ db.session.commit()
+ assert isinstance(row.id, str)
+ assert len(row.id) == 36
+ # round-trips as a dashed uuid4
+ assert str(uuid_mod.UUID(row.id)) == row.id
+
+
+def test_uuid_pk_column_shape(app):
+ from app.models.server import Server
+ col = Server.__table__.columns['id']
+ assert col.primary_key
+ assert col.type.length == 36