mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-22 03:49:18 +02:00
- Fix total print hours calculation in set_total_hours to include all
prints (not just completed), matching get_printer_total_hours behavior - Add option to keep or delete archives when deleting a printer - Custom maintenance types no longer auto-assign to all printers - Add UI to manually assign/remove custom maintenance types per printer - Add backend endpoints for assigning types to printers and removing items - Exclude static/assets from large file pre-commit check
This commit is contained in:
maziggy
+127
-90
@@ -1,9 +1,8 @@
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine, async_sessionmaker
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
||||
from sqlalchemy.orm import DeclarativeBase
|
||||
|
||||
from backend.app.core.config import settings
|
||||
|
||||
|
||||
engine = create_async_engine(
|
||||
settings.database_url,
|
||||
echo=settings.debug,
|
||||
@@ -34,7 +33,22 @@ async def get_db() -> AsyncSession:
|
||||
|
||||
async def init_db():
|
||||
# Import models to register them with SQLAlchemy
|
||||
from backend.app.models import printer, archive, filament, settings, smart_plug, print_queue, notification, maintenance, kprofile_note, notification_template, external_link, project, api_key # noqa: F401
|
||||
from backend.app.models import ( # noqa: F401
|
||||
api_key,
|
||||
archive,
|
||||
external_link,
|
||||
filament,
|
||||
kprofile_note,
|
||||
maintenance,
|
||||
notification,
|
||||
notification_template,
|
||||
print_queue,
|
||||
printer,
|
||||
project,
|
||||
project_bom,
|
||||
settings,
|
||||
smart_plug,
|
||||
)
|
||||
|
||||
async with engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
@@ -52,164 +66,129 @@ async def run_migrations(conn):
|
||||
|
||||
# Migration: Add is_favorite column to print_archives
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE print_archives ADD COLUMN is_favorite BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE print_archives ADD COLUMN is_favorite BOOLEAN DEFAULT 0"))
|
||||
except Exception:
|
||||
# Column already exists
|
||||
pass
|
||||
|
||||
# Migration: Add content_hash column to print_archives for duplicate detection
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE print_archives ADD COLUMN content_hash VARCHAR(64)"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE print_archives ADD COLUMN content_hash VARCHAR(64)"))
|
||||
except Exception:
|
||||
# Column already exists
|
||||
pass
|
||||
|
||||
# Migration: Add auto_off_executed column to smart_plugs
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN auto_off_executed BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN auto_off_executed BOOLEAN DEFAULT 0"))
|
||||
except Exception:
|
||||
# Column already exists
|
||||
pass
|
||||
|
||||
# Migration: Add on_print_stopped column to notification_providers
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE notification_providers ADD COLUMN on_print_stopped BOOLEAN DEFAULT 1"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE notification_providers ADD COLUMN on_print_stopped BOOLEAN DEFAULT 1"))
|
||||
except Exception:
|
||||
# Column already exists
|
||||
pass
|
||||
|
||||
# Migration: Add source_3mf_path column to print_archives
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE print_archives ADD COLUMN source_3mf_path VARCHAR(500)"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE print_archives ADD COLUMN source_3mf_path VARCHAR(500)"))
|
||||
except Exception:
|
||||
# Column already exists
|
||||
pass
|
||||
|
||||
# Migration: Add on_maintenance_due column to notification_providers
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE notification_providers ADD COLUMN on_maintenance_due BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE notification_providers ADD COLUMN on_maintenance_due BOOLEAN DEFAULT 0"))
|
||||
except Exception:
|
||||
# Column already exists
|
||||
pass
|
||||
|
||||
# Migration: Add location column to printers for grouping
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE printers ADD COLUMN location VARCHAR(100)"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE printers ADD COLUMN location VARCHAR(100)"))
|
||||
except Exception:
|
||||
# Column already exists
|
||||
pass
|
||||
|
||||
# Migration: Add interval_type column to maintenance_types
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE maintenance_types ADD COLUMN interval_type VARCHAR(20) DEFAULT 'hours'"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE maintenance_types ADD COLUMN interval_type VARCHAR(20) DEFAULT 'hours'"))
|
||||
except Exception:
|
||||
# Column already exists
|
||||
pass
|
||||
|
||||
# Migration: Add custom_interval_type column to printer_maintenance
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE printer_maintenance ADD COLUMN custom_interval_type VARCHAR(20)"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE printer_maintenance ADD COLUMN custom_interval_type VARCHAR(20)"))
|
||||
except Exception:
|
||||
# Column already exists
|
||||
pass
|
||||
|
||||
# Migration: Add power alert columns to smart_plugs
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN power_alert_enabled BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN power_alert_enabled BOOLEAN DEFAULT 0"))
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN power_alert_high REAL"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN power_alert_high REAL"))
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN power_alert_low REAL"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN power_alert_low REAL"))
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN power_alert_last_triggered DATETIME"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN power_alert_last_triggered DATETIME"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add schedule columns to smart_plugs
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN schedule_enabled BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN schedule_enabled BOOLEAN DEFAULT 0"))
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN schedule_on_time VARCHAR(5)"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN schedule_on_time VARCHAR(5)"))
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN schedule_off_time VARCHAR(5)"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN schedule_off_time VARCHAR(5)"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add daily digest columns to notification_providers
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE notification_providers ADD COLUMN daily_digest_enabled BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE notification_providers ADD COLUMN daily_digest_enabled BOOLEAN DEFAULT 0"))
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE notification_providers ADD COLUMN daily_digest_time VARCHAR(5)"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE notification_providers ADD COLUMN daily_digest_time VARCHAR(5)"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add project_id column to print_archives
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE print_archives ADD COLUMN project_id INTEGER REFERENCES projects(id) ON DELETE SET NULL"
|
||||
))
|
||||
await conn.execute(
|
||||
text("ALTER TABLE print_archives ADD COLUMN project_id INTEGER REFERENCES projects(id) ON DELETE SET NULL")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add project_id column to print_queue
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE print_queue ADD COLUMN project_id INTEGER REFERENCES projects(id) ON DELETE SET NULL"
|
||||
))
|
||||
await conn.execute(
|
||||
text("ALTER TABLE print_queue ADD COLUMN project_id INTEGER REFERENCES projects(id) ON DELETE SET NULL")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Create FTS5 virtual table for archive full-text search
|
||||
try:
|
||||
await conn.execute(text("""
|
||||
await conn.execute(
|
||||
text("""
|
||||
CREATE VIRTUAL TABLE IF NOT EXISTS archive_fts USING fts5(
|
||||
print_name,
|
||||
filename,
|
||||
@@ -220,82 +199,139 @@ async def run_migrations(conn):
|
||||
content='print_archives',
|
||||
content_rowid='id'
|
||||
)
|
||||
"""))
|
||||
""")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Create triggers to keep FTS index in sync
|
||||
try:
|
||||
await conn.execute(text("""
|
||||
await conn.execute(
|
||||
text("""
|
||||
CREATE TRIGGER IF NOT EXISTS archive_fts_insert AFTER INSERT ON print_archives BEGIN
|
||||
INSERT INTO archive_fts(rowid, print_name, filename, tags, notes, designer, filament_type)
|
||||
VALUES (new.id, new.print_name, new.filename, new.tags, new.notes, new.designer, new.filament_type);
|
||||
END
|
||||
"""))
|
||||
""")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
try:
|
||||
await conn.execute(text("""
|
||||
await conn.execute(
|
||||
text("""
|
||||
CREATE TRIGGER IF NOT EXISTS archive_fts_delete AFTER DELETE ON print_archives BEGIN
|
||||
INSERT INTO archive_fts(archive_fts, rowid, print_name, filename, tags, notes, designer, filament_type)
|
||||
VALUES ('delete', old.id, old.print_name, old.filename, old.tags, old.notes, old.designer, old.filament_type);
|
||||
END
|
||||
"""))
|
||||
""")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
try:
|
||||
await conn.execute(text("""
|
||||
await conn.execute(
|
||||
text("""
|
||||
CREATE TRIGGER IF NOT EXISTS archive_fts_update AFTER UPDATE ON print_archives BEGIN
|
||||
INSERT INTO archive_fts(archive_fts, rowid, print_name, filename, tags, notes, designer, filament_type)
|
||||
VALUES ('delete', old.id, old.print_name, old.filename, old.tags, old.notes, old.designer, old.filament_type);
|
||||
INSERT INTO archive_fts(rowid, print_name, filename, tags, notes, designer, filament_type)
|
||||
VALUES (new.id, new.print_name, new.filename, new.tags, new.notes, new.designer, new.filament_type);
|
||||
END
|
||||
"""))
|
||||
""")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add auto_off_pending columns to smart_plugs (for restart recovery)
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN auto_off_pending BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN auto_off_pending BOOLEAN DEFAULT 0"))
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE smart_plugs ADD COLUMN auto_off_pending_since DATETIME"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE smart_plugs ADD COLUMN auto_off_pending_since DATETIME"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add AMS alarm notification columns to notification_providers
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE notification_providers ADD COLUMN on_ams_humidity_high BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(text("ALTER TABLE notification_providers ADD COLUMN on_ams_humidity_high BOOLEAN DEFAULT 0"))
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE notification_providers ADD COLUMN on_ams_temperature_high BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(
|
||||
text("ALTER TABLE notification_providers ADD COLUMN on_ams_temperature_high BOOLEAN DEFAULT 0")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add AMS-HT alarm notification columns to notification_providers
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE notification_providers ADD COLUMN on_ams_ht_humidity_high BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(
|
||||
text("ALTER TABLE notification_providers ADD COLUMN on_ams_ht_humidity_high BOOLEAN DEFAULT 0")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
await conn.execute(text(
|
||||
"ALTER TABLE notification_providers ADD COLUMN on_ams_ht_temperature_high BOOLEAN DEFAULT 0"
|
||||
))
|
||||
await conn.execute(
|
||||
text("ALTER TABLE notification_providers ADD COLUMN on_ams_ht_temperature_high BOOLEAN DEFAULT 0")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add notes column to projects (Phase 2)
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE projects ADD COLUMN notes TEXT"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add attachments column to projects (Phase 3)
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE projects ADD COLUMN attachments JSON"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add tags column to projects (Phase 4)
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE projects ADD COLUMN tags TEXT"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add due_date column to projects (Phase 5)
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE projects ADD COLUMN due_date DATETIME"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add priority column to projects (Phase 5)
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE projects ADD COLUMN priority VARCHAR(20) DEFAULT 'normal'"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add budget column to projects (Phase 6)
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE projects ADD COLUMN budget REAL"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add is_template column to projects (Phase 8)
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE projects ADD COLUMN is_template BOOLEAN DEFAULT 0"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add template_source_id column to projects (Phase 8)
|
||||
try:
|
||||
await conn.execute(text("ALTER TABLE projects ADD COLUMN template_source_id INTEGER"))
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# Migration: Add parent_id column to projects (Phase 10)
|
||||
try:
|
||||
await conn.execute(
|
||||
text("ALTER TABLE projects ADD COLUMN parent_id INTEGER REFERENCES projects(id) ON DELETE SET NULL")
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
@@ -303,7 +339,8 @@ async def run_migrations(conn):
|
||||
async def seed_notification_templates():
|
||||
"""Seed default notification templates if they don't exist."""
|
||||
from sqlalchemy import select
|
||||
from backend.app.models.notification_template import NotificationTemplate, DEFAULT_TEMPLATES
|
||||
|
||||
from backend.app.models.notification_template import DEFAULT_TEMPLATES, NotificationTemplate
|
||||
|
||||
async with async_session() as session:
|
||||
# Check if templates already exist
|
||||
|
||||
Reference in New Issue
Block a user