feat: Actions system — scheduled mutations on external services
Full-stack implementation of provider-scoped Actions with extensible executor architecture. First action type: Immich auto_organize (sort assets into albums by person, CLIP search, date range, favorites). Core: - ActionTypeDefinition registry + ActionExecutor ABC with execute/validate/dry-run - ImmichActionExecutor with multi-album support and client-side filtering - ImmichClient write methods: add/remove assets, create album, paginated search Server: - Action, ActionRule, ActionExecution DB models - Full CRUD API + manual execute + dry-run + execution history endpoints - APScheduler integration (interval + cron) for automated execution - Action type discovery API + provider people endpoint Frontend: - Actions page with CRUD, execute/dry-run buttons, inline rule editor - RuleEditor: person/album MultiEntitySelect pickers, criteria config - ExecutionHistory: expandable per-rule result details - MultiEntitySelect reusable component (searchable multi-pick palette) - Notification tracker album picker migrated to MultiEntitySelect - Fixed MdiIcon race condition (icons missing after cache-clearing reload)
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
"""APScheduler-based polling scheduler for trackers."""
|
||||
"""APScheduler-based polling scheduler for trackers and actions."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
@@ -25,6 +25,7 @@ async def start_scheduler() -> None:
|
||||
_LOGGER.info("Scheduler started")
|
||||
|
||||
await _load_tracker_jobs()
|
||||
await _load_action_jobs()
|
||||
|
||||
# Start Telegram bot polling for bots with active command listeners
|
||||
from .telegram_poller import start_command_listener_polling
|
||||
@@ -156,3 +157,123 @@ async def _poll_tracker(tracker_id: int) -> None:
|
||||
await check_tracker(tracker_id)
|
||||
except Exception as e:
|
||||
_LOGGER.error("Error polling tracker %d: %s", tracker_id, e)
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Action scheduling
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
async def _load_action_jobs() -> None:
|
||||
"""Load enabled actions and schedule execution jobs."""
|
||||
from sqlmodel import select
|
||||
from sqlmodel.ext.asyncio.session import AsyncSession
|
||||
from ..database.engine import get_engine
|
||||
from ..database.models import Action
|
||||
|
||||
engine = get_engine()
|
||||
scheduler = get_scheduler()
|
||||
|
||||
async with AsyncSession(engine) as session:
|
||||
result = await session.exec(
|
||||
select(Action).where(Action.enabled == True) # noqa: E712
|
||||
)
|
||||
actions = result.all()
|
||||
|
||||
for action in actions:
|
||||
job_id = f"action_{action.id}"
|
||||
if scheduler.get_job(job_id):
|
||||
continue
|
||||
|
||||
if action.schedule_type == "cron" and action.schedule_cron:
|
||||
try:
|
||||
from apscheduler.triggers.cron import CronTrigger
|
||||
trigger = CronTrigger.from_crontab(action.schedule_cron)
|
||||
scheduler.add_job(
|
||||
_run_action,
|
||||
trigger,
|
||||
id=job_id,
|
||||
args=[action.id],
|
||||
replace_existing=True,
|
||||
)
|
||||
_LOGGER.info(
|
||||
"Scheduled action %d (%s) with cron: %s",
|
||||
action.id, action.name, action.schedule_cron,
|
||||
)
|
||||
continue
|
||||
except Exception as e:
|
||||
_LOGGER.error(
|
||||
"Invalid cron for action %d (%s): %s — falling back to interval",
|
||||
action.id, action.name, e,
|
||||
)
|
||||
|
||||
scheduler.add_job(
|
||||
_run_action,
|
||||
"interval",
|
||||
seconds=action.schedule_interval,
|
||||
id=job_id,
|
||||
args=[action.id],
|
||||
replace_existing=True,
|
||||
)
|
||||
_LOGGER.info(
|
||||
"Scheduled action %d (%s) every %ds",
|
||||
action.id, action.name, action.schedule_interval,
|
||||
)
|
||||
|
||||
|
||||
async def schedule_action(
|
||||
action_id: int,
|
||||
schedule_type: str = "interval",
|
||||
interval: int = 3600,
|
||||
cron_expression: str = "",
|
||||
) -> None:
|
||||
"""Add or update a scheduler job for an action."""
|
||||
scheduler = get_scheduler()
|
||||
job_id = f"action_{action_id}"
|
||||
|
||||
if scheduler.get_job(job_id):
|
||||
scheduler.remove_job(job_id)
|
||||
|
||||
if schedule_type == "cron" and cron_expression:
|
||||
try:
|
||||
from apscheduler.triggers.cron import CronTrigger
|
||||
trigger = CronTrigger.from_crontab(cron_expression)
|
||||
scheduler.add_job(
|
||||
_run_action,
|
||||
trigger,
|
||||
id=job_id,
|
||||
args=[action_id],
|
||||
replace_existing=True,
|
||||
)
|
||||
_LOGGER.info("Scheduled action %d with cron: %s", action_id, cron_expression)
|
||||
return
|
||||
except Exception as e:
|
||||
_LOGGER.error("Invalid cron for action %d: %s — using interval", action_id, e)
|
||||
|
||||
scheduler.add_job(
|
||||
_run_action,
|
||||
"interval",
|
||||
seconds=interval,
|
||||
id=job_id,
|
||||
args=[action_id],
|
||||
replace_existing=True,
|
||||
)
|
||||
_LOGGER.info("Scheduled action %d every %ds", action_id, interval)
|
||||
|
||||
|
||||
async def unschedule_action(action_id: int) -> None:
|
||||
"""Remove a scheduler job for an action."""
|
||||
scheduler = get_scheduler()
|
||||
job_id = f"action_{action_id}"
|
||||
if scheduler.get_job(job_id):
|
||||
scheduler.remove_job(job_id)
|
||||
_LOGGER.info("Unscheduled action %d", action_id)
|
||||
|
||||
|
||||
async def _run_action(action_id: int) -> None:
|
||||
"""Run an action (called by APScheduler)."""
|
||||
from .action_runner import run_action
|
||||
try:
|
||||
await run_action(action_id, trigger="scheduled")
|
||||
except Exception as e:
|
||||
_LOGGER.error("Error running action %d: %s", action_id, e)
|
||||
|
||||
Reference in New Issue
Block a user