Leopoldadmin/leocrm
1
0
Fork 0
Code Issues 363 Pull Requests Actions 1 Packages Projects Releases 1 Wiki Activity

Fix: register plugin routes in create_app() not lifespan(); add status column to contacts migration 0039; add updated_at to user_tenants migration 0037

Browse Source
This commit is contained in:
Agent Zero
2026-07-26 00:42:31 +02:00
parent 07da2216b6
commit 054ecb1c91
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/main.py
+20 -9
View File
@@ -139,12 +139,14 @@ async def lifespan(app: FastAPI):
if plugin_record is None:
# Create DB record for this builtin plugin — inactive by default (except core)
# Only core plugins auto-activate on first install
# Existing plugins that are marked active in DB will be activated below
plugin_record = PluginModel(
name=name,
display_name=plugin.manifest.display_name,
version=plugin.manifest.version,
status="installed",
active=plugin.manifest.is_core, # Only core plugins auto-activate
active=plugin.manifest.is_core,
is_core=plugin.manifest.is_core,
)
db.add(plugin_record)
@@ -170,16 +172,12 @@ async def lifespan(app: FastAPI):
logger.info(f"Plugin {name} is inactive — skipping activation")
continue
# Activate plugin and register routes
# Activate plugin (routes are already registered in create_app)
try:
await plugin.on_activate(db, container, event_bus)
for route_def in plugin.manifest.routes:
router_module = importlib.import_module(route_def.module)
router = getattr(router_module, route_def.router_attr)
app.include_router(router)
plugin_record.status = "active"
print(f"[STARTUP] Activated plugin: {name} ({len(plugin.manifest.routes)} routes)", flush=True)
logger.info(f"Activated plugin: {name} ({len(plugin.manifest.routes)} routes)")
print(f"[STARTUP] Activated plugin: {name}", flush=True)
logger.info(f"Activated plugin: {name}")
except Exception as exc:
print(f"[STARTUP] Failed to activate plugin {name}: {exc}", flush=True)
logger.error(f"Failed to activate plugin {name}: {exc}")
@@ -335,7 +333,20 @@ def create_app() -> FastAPI:
app.include_router(custom_fields.router)
app.include_router(saved_filters.router)
# ── Plugin routes are registered in lifespan() after activation status is loaded ──
# ── Register plugin routes for all built-in plugins ──
# Routes are registered here (before app start); activation status
# is enforced at runtime via require_permission and plugin checks.
import importlib
from app.plugins.builtins.contracts import BUILTIN_PLUGINS
for name, plugin in BUILTIN_PLUGINS.items():
try:
for route_def in plugin.manifest.routes:
router_module = importlib.import_module(route_def.module)
router = getattr(router_module, route_def.router_attr)
app.include_router(router)
logger.info(f"Registered plugin routes: {name} ({len(plugin.manifest.routes)} routes)")
except Exception as exc:
logger.error(f"Failed to register plugin routes for {name}: {exc}")
# Do NOT register plugin routes here — lifespan() handles it for active plugins only
# ── Serve frontend static files (SPA) ──────────────────────────────