diff --git a/Borealis.ps1 b/Borealis.ps1 index 80cd930..67642cf 100644 --- a/Borealis.ps1 +++ b/Borealis.ps1 @@ -563,8 +563,9 @@ switch ($choice) { Remove-Item $dataDestination -Recurse -Force -ErrorAction SilentlyContinue New-Item -Path $dataDestination -ItemType Directory -Force | Out-Null Copy-Item "$dataSource\Server\Python_API_Endpoints" $dataDestination -Recurse - Copy-Item "$dataSource\Server\Sounds" $dataDestination -Recurse - Copy-Item "$dataSource\Server\server.py" $dataDestination + Copy-Item "$dataSource\Server\Sounds" $dataDestination -Recurse + Copy-Item "$dataSource\Server\server.py" $dataDestination + Copy-Item "$dataSource\Server\job_scheduler.py" $dataDestination } . "$venvFolder\Scripts\Activate" } diff --git a/Data/Server/WebUI/src/Scheduling/Create_Job.jsx b/Data/Server/WebUI/src/Scheduling/Create_Job.jsx index b3055b7..b72c899 100644 --- a/Data/Server/WebUI/src/Scheduling/Create_Job.jsx +++ b/Data/Server/WebUI/src/Scheduling/Create_Job.jsx @@ -21,7 +21,8 @@ import { TableHead, TableRow, TableCell, - TableBody + TableBody, + TableSortLabel } from "@mui/material"; import { Add as AddIcon, Delete as DeleteIcon } from "@mui/icons-material"; import { SimpleTreeView, TreeItem } from "@mui/x-tree-view"; @@ -159,7 +160,7 @@ export default function CreateJob({ onCancel, onCreated, initialJob = null }) { ]); // {type:'script'|'workflow', path, name, description} const [targets, setTargets] = useState([]); // array of hostnames const [scheduleType, setScheduleType] = useState("immediately"); - const [startDateTime, setStartDateTime] = useState(() => dayjs().add(5, "minute")); + const [startDateTime, setStartDateTime] = useState(() => dayjs().add(5, "minute").second(0)); const [stopAfterEnabled, setStopAfterEnabled] = useState(false); const [expiration, setExpiration] = useState("no_expire"); const [execContext, setExecContext] = useState("system"); @@ -188,6 +189,158 @@ export default function CreateJob({ onCancel, onCreated, initialJob = null }) { const [confirmOpen, setConfirmOpen] = useState(false); const editing = !!(initialJob && initialJob.id); + // --- Job History (only when editing) --- + const [historyRows, setHistoryRows] = useState([]); + const [historyOrderBy, setHistoryOrderBy] = useState("started_ts"); + const [historyOrder, setHistoryOrder] = useState("desc"); + + const fmtTs = useCallback((ts) => { + if (!ts) return ''; + try { + const d = new Date(Number(ts) * 1000); + return d.toLocaleString(undefined, { year:'numeric', month:'2-digit', day:'2-digit', hour:'numeric', minute:'2-digit' }); + } catch { return ''; } + }, []); + + const loadHistory = useCallback(async () => { + if (!editing) return; + try { + const [runsResp, jobResp, devResp] = await Promise.all([ + fetch(`/api/scheduled_jobs/${initialJob.id}/runs?days=30`), + fetch(`/api/scheduled_jobs/${initialJob.id}`), + fetch(`/api/scheduled_jobs/${initialJob.id}/devices`) + ]); + const runs = await runsResp.json(); + const job = await jobResp.json(); + const dev = await devResp.json(); + if (!runsResp.ok) throw new Error(runs.error || `HTTP ${runsResp.status}`); + if (!jobResp.ok) throw new Error(job.error || `HTTP ${jobResp.status}`); + if (!devResp.ok) throw new Error(dev.error || `HTTP ${devResp.status}`); + setHistoryRows(Array.isArray(runs.runs) ? runs.runs : []); + setJobSummary(job.job || {}); + setDeviceRows(Array.isArray(dev.devices) ? dev.devices : []); + } catch { + setHistoryRows([]); + setJobSummary({}); + setDeviceRows([]); + } + }, [editing, initialJob?.id]); + + useEffect(() => { + if (!editing) return; + let t; + (async () => { try { await loadHistory(); } catch {} })(); + t = setInterval(loadHistory, 10000); + return () => { if (t) clearInterval(t); }; + }, [editing, loadHistory]); + + const resultChip = (status) => { + const map = { + Success: { bg: '#00d18c', fg: '#000' }, + Running: { bg: '#58a6ff', fg: '#000' }, + Scheduled: { bg: '#999999', fg: '#fff' }, + Expired: { bg: '#777777', fg: '#fff' }, + Failed: { bg: '#ff4f4f', fg: '#fff' }, + Warning: { bg: '#ff8c00', fg: '#000' } + }; + const c = map[status] || { bg: '#aaa', fg: '#000' }; + return ( + + {status || ''} + + ); + }; + + const sortedHistory = useMemo(() => { + const dir = historyOrder === 'asc' ? 1 : -1; + const key = historyOrderBy; + return [...historyRows].sort((a, b) => { + const A = a?.[key]; + const B = b?.[key]; + if (key === 'started_ts' || key === 'finished_ts' || key === 'scheduled_ts') { + return ((A || 0) - (B || 0)) * dir; + } + return String(A ?? '').localeCompare(String(B ?? '')) * dir; + }); + }, [historyRows, historyOrderBy, historyOrder]); + + const handleHistorySort = (col) => { + if (historyOrderBy === col) setHistoryOrder(historyOrder === 'asc' ? 'desc' : 'asc'); + else { setHistoryOrderBy(col); setHistoryOrder('asc'); } + }; + + const renderHistory = () => ( + + + + + + handleHistorySort('scheduled_ts')}> + Scheduled + + + + handleHistorySort('started_ts')}> + Started + + + + handleHistorySort('finished_ts')}> + Finished + + + Status + + + + {sortedHistory.map((r) => ( + + {fmtTs(r.scheduled_ts)} + {fmtTs(r.started_ts)} + {fmtTs(r.finished_ts)} + {resultChip(r.status)} + + ))} + {sortedHistory.length === 0 && ( + + No runs in the last 30 days. + + )} + +
+ + ); + + // --- Job Progress (summary) --- + const [jobSummary, setJobSummary] = useState({}); + const sumCounts = (o, k) => Number((o?.result_counts||{})[k] || 0); + const counts = jobSummary?.result_counts || {}; + + const ProgressSummary = () => ( + + Job Progress + + {[ + ['pending','Pending','#999999'], + ['running','Running','#58a6ff'], + ['success','Success','#00d18c'], + ['failed','Failed','#ff4f4f'], + ['expired','Expired','#777777'], + ['timed_out','Timed Out','#b36ae2'] + ].map(([key,label,color]) => ( + + + {label}: {Number((counts||{})[key] || 0)} + + ))} + + + ); + + // --- Devices breakdown --- + const [deviceRows, setDeviceRows] = useState([]); + const deviceSorted = useMemo(() => deviceRows, [deviceRows]); + useEffect(() => { if (initialJob && initialJob.id) { setJobName(initialJob.name || ""); @@ -195,7 +348,7 @@ export default function CreateJob({ onCancel, onCreated, initialJob = null }) { setComponents(comps.length ? comps : [{ type: "script", path: "demo/component", name: "Demonstration Component", description: "placeholder" }]); setTargets(Array.isArray(initialJob.targets) ? initialJob.targets : []); setScheduleType(initialJob.schedule_type || initialJob.schedule?.type || "immediately"); - setStartDateTime(initialJob.start_ts ? dayjs(Number(initialJob.start_ts) * 1000) : (initialJob.schedule?.start ? dayjs(initialJob.schedule.start) : dayjs().add(5, "minute"))); + setStartDateTime(initialJob.start_ts ? dayjs(Number(initialJob.start_ts) * 1000).second(0) : (initialJob.schedule?.start ? dayjs(initialJob.schedule.start).second(0) : dayjs().add(5, "minute").second(0))); setStopAfterEnabled(Boolean(initialJob.duration_stop_enabled)); setExpiration(initialJob.expiration || "no_expire"); setExecContext(initialJob.execution_context || "system"); @@ -269,7 +422,7 @@ export default function CreateJob({ onCancel, onCreated, initialJob = null }) { name: jobName, components, targets, - schedule: { type: scheduleType, start: scheduleType !== "immediately" ? (startDateTime?.toISOString?.() || startDateTime) : null }, + schedule: { type: scheduleType, start: scheduleType !== "immediately" ? (() => { try { const d = startDateTime?.toDate?.() || new Date(startDateTime); d.setSeconds(0,0); return d.toISOString(); } catch { return startDateTime; } })() : null }, duration: { stopAfterEnabled, expiration }, execution_context: execContext }; @@ -288,13 +441,17 @@ export default function CreateJob({ onCancel, onCreated, initialJob = null }) { } }; - const tabDefs = useMemo(() => ([ - { key: "name", label: "Job Name" }, - { key: "components", label: "Scripts/Workflows" }, - { key: "targets", label: "Targets" }, - { key: "schedule", label: "Schedule" }, - { key: "context", label: "Execution Context" } - ]), []); + const tabDefs = useMemo(() => { + const base = [ + { key: "name", label: "Job Name" }, + { key: "components", label: "Scripts/Workflows" }, + { key: "targets", label: "Targets" }, + { key: "schedule", label: "Schedule" }, + { key: "context", label: "Execution Context" } + ]; + if (editing) base.push({ key: 'history', label: 'Job History' }); + return base; + }, [editing]); return ( @@ -441,7 +598,9 @@ export default function CreateJob({ onCancel, onCreated, initialJob = null }) { setStartDateTime(val)} + onChange={(val) => setStartDateTime(val?.second ? val.second(0) : val)} + views={['year','month','day','hours','minutes']} + format="YYYY-MM-DD hh:mm A" slotProps={{ textField: { size: "small" } }} /> @@ -481,6 +640,70 @@ export default function CreateJob({ onCancel, onCreated, initialJob = null }) { )} + + {/* Job History tab (only when editing) */} + {editing && tab === tabDefs.findIndex(t => t.key === 'history') && ( + + + Job History + + + Showing the last 30 days of runs. + + + + + + + Devices + + + + Hostname + Status + Site + Ran On + Job Status + StdOut / StdErr + + + + {deviceSorted.map((d, i) => ( + + {d.hostname} + + + {d.online ? 'Online' : 'Offline'} + + {d.site || ''} + {fmtTs(d.ran_on)} + {resultChip(d.job_status)} + + + {d.has_stdout ? : null} + {d.has_stderr ? : null} + + + + ))} + {deviceSorted.length === 0 && ( + + No targets found for this job. + + )} + +
+ + + + {renderHistory()} + + + )} {/* Bottom actions removed per design; actions live next to tabs. */} diff --git a/Data/Server/WebUI/src/Scheduling/Scheduled_Jobs_List.jsx b/Data/Server/WebUI/src/Scheduling/Scheduled_Jobs_List.jsx index 0145147..b4321a0 100644 --- a/Data/Server/WebUI/src/Scheduling/Scheduled_Jobs_List.jsx +++ b/Data/Server/WebUI/src/Scheduling/Scheduled_Jobs_List.jsx @@ -42,17 +42,22 @@ export default function ScheduledJobsList({ onCreateJob, onEditJob, refreshToken const occurrence = (j.schedule_type || 'immediately').replace(/^./, (c) => c.toUpperCase()); const fmt = (ts) => { if (!ts) return ''; - try { const d = new Date(Number(ts) * 1000); return d.toLocaleString(); } catch { return ''; } + try { + const d = new Date(Number(ts) * 1000); + return d.toLocaleString(undefined, { year:'numeric', month:'2-digit', day:'2-digit', hour:'numeric', minute:'2-digit' }); + } catch { return ''; } }; + const result = j.last_status || (j.next_run_ts ? 'Scheduled' : ''); return { id: j.id, name: j.name, scriptWorkflow: compName, target: targetText, occurrence, - lastRun: '', - nextRun: fmt(j.start_ts), - result: 'Success', + lastRun: fmt(j.last_run_ts), + nextRun: fmt(j.next_run_ts || j.start_ts), + result, + resultsCounts: j.result_counts || { pending: (Array.isArray(j.targets)?j.targets.length:0) }, enabled: !!j.enabled, raw: j }; @@ -64,8 +69,13 @@ export default function ScheduledJobsList({ onCreateJob, onEditJob, refreshToken } }; - React.useEffect(() => { loadJobs(); }, []); - React.useEffect(() => { loadJobs(); }, [refreshToken]); + // Initial load and polling each 5 seconds for live status updates + React.useEffect(() => { + let timer; + (async () => { try { await loadJobs(); } catch {} })(); + timer = setInterval(loadJobs, 5000); + return () => { if (timer) clearInterval(timer); }; + }, [refreshToken]); const handleSort = (col) => { if (orderBy === col) setOrder(order === "asc" ? "desc" : "asc"); @@ -84,8 +94,48 @@ export default function ScheduledJobsList({ onCreateJob, onEditJob, refreshToken }); }, [rows, orderBy, order]); - const resultColor = (r) => - r === "Success" ? "#00d18c" : r === "Warning" ? "#ff8c00" : "#ff4f4f"; + const resultColor = (r) => { + if (r === 'Success') return '#00d18c'; + if (r === 'Running') return '#58a6ff'; + if (r === 'Scheduled') return '#999999'; + if (r === 'Expired') return '#777777'; + if (r === 'Timed Out') return '#b36ae2'; + if (r === 'Warning') return '#ff8c00'; + if (r === 'Failed') return '#ff4f4f'; + return '#aaaaaa'; + }; + + const ResultsBar = ({ counts }) => { + const total = Math.max(1, Number(counts?.total_targets || 0)); + const seg = (n) => `${Math.round(((n||0)/total)*100)}%`; + const styleSeg = (bg, w) => ({ display: 'inline-block', height: 8, background: bg, width: w }); + const s = counts || {}; + const sections = [ + { key: 'success', color: '#00d18c' }, + { key: 'running', color: '#58a6ff' }, + { key: 'failed', color: '#ff4f4f' }, + { key: 'timed_out', color: '#b36ae2' }, + { key: 'expired', color: '#777777' }, + { key: 'pending', color: '#999999' } + ]; + return ( +
+
+ {sections.map(({key,color}) => (s[key] ? : null))} +
+
+ {['success','running','failed','timed_out','expired','pending'] + .filter(k => s[k]) + .map((k,i) => ( + + x.key===k).color, marginRight: 6 }} /> + {s[k]} {k.replace('_',' ').replace(/^./, c=>c.toUpperCase())} + + ))} +
+
+ ); + }; return ( @@ -125,12 +175,13 @@ export default function ScheduledJobsList({ onCreateJob, onEditJob, refreshToken ["occurrence", "Schedule Occurrence"], ["lastRun", "Last Run"], ["nextRun", "Next Run"], - ["result", "Result"], - ["enabled", "Enabled"], - ["edit", "Edit Job"] + ["result", "Result"], + ["results", "Results"], + ["enabled", "Enabled"], + ["edit", "Edit Job"] ].map(([key, label]) => ( - {key !== "edit" ? ( + {key !== "edit" && key !== "results" ? ( {r.result} + + + int: + return int(time.time()) + + +def _parse_ts(val: Any) -> Optional[int]: + """Best effort to parse ISO-ish datetime string or numeric seconds to epoch seconds.""" + if val is None: + return None + if isinstance(val, (int, float)): + return int(val) + try: + from datetime import datetime + s = str(val).strip().replace("Z", "+00:00") + dt = datetime.fromisoformat(s) + return int(dt.timestamp()) + except Exception: + return None + + +def _parse_expiration(s: Optional[str]) -> Optional[int]: + """Parse expiration shorthand to seconds. + Examples: '30m' -> 1800, '1h' -> 3600, '2d' -> 172800. + Returns None for 'no_expire' or invalid input. + """ + if not s or s == "no_expire": + return None + try: + s = s.strip().lower() + unit = s[-1] + value = int(s[:-1]) + if unit == 'm': + return value * 60 + if unit == 'h': + return value * 3600 + if unit == 'd': + return value * 86400 + # Fallback: treat as minutes if only a number + return int(s) * 60 + except Exception: + return None + + +def _floor_minute(ts: int) -> int: + ts = int(ts or 0) + return ts - (ts % 60) + + +def _now_minute() -> int: + return _floor_minute(_now_ts()) + + +def _add_months(dt_tuple: Tuple[int, int, int, int, int, int], months: int = 1) -> int: + """Advance a date by N months and return epoch seconds. + dt_tuple = (year, month, day, hour, minute, second) + Handles month-end clamping. + """ + from calendar import monthrange + from datetime import datetime + + y, m, d, hh, mm, ss = dt_tuple + m2 = m + months + y += (m2 - 1) // 12 + m2 = ((m2 - 1) % 12) + 1 + # Clamp day to last day of new month + last_day = monthrange(y, m2)[1] + d = min(d, last_day) + try: + return int(datetime(y, m2, d, hh, mm, ss).timestamp()) + except Exception: + # Fallback to first of month if something odd + return int(datetime(y, m2, 1, hh, mm, ss).timestamp()) + + +def _add_years(dt_tuple: Tuple[int, int, int, int, int, int], years: int = 1) -> int: + from datetime import datetime + y, m, d, hh, mm, ss = dt_tuple + y += years + # Handle Feb 29 -> Feb 28 if needed + try: + return int(datetime(y, m, d, hh, mm, ss).timestamp()) + except Exception: + # clamp day to 28 + d2 = 28 if (m == 2 and d > 28) else 1 + return int(datetime(y, m, d2, hh, mm, ss).timestamp()) + + +def _to_dt_tuple(ts: int) -> Tuple[int, int, int, int, int, int]: + from datetime import datetime + dt = datetime.utcfromtimestamp(int(ts)) + return (dt.year, dt.month, dt.day, dt.hour, dt.minute, dt.second) + + +class JobScheduler: + def __init__(self, app, socketio, db_path: str): + self.app = app + self.socketio = socketio + self.db_path = db_path + self._running = False + # Simulated run duration to hold jobs in "Running" before Success + self.SIMULATED_RUN_SECONDS = int(os.environ.get("BOREALIS_SIM_RUN_SECONDS", "30")) + # Retention for run history (days) + self.RETENTION_DAYS = int(os.environ.get("BOREALIS_JOB_HISTORY_DAYS", "30")) + # Callback to retrieve current set of online hostnames + self._online_lookup: Optional[Callable[[], List[str]]] = None + + # Ensure run-history table exists + self._init_tables() + + # Bind routes + self._register_routes() + + # ---------- DB helpers ---------- + def _conn(self): + return sqlite3.connect(self.db_path) + + def _init_tables(self): + conn = self._conn() + cur = conn.cursor() + # Runs table captures each firing + cur.execute( + """ + CREATE TABLE IF NOT EXISTS scheduled_job_runs ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + job_id INTEGER NOT NULL, + scheduled_ts INTEGER, + started_ts INTEGER, + finished_ts INTEGER, + status TEXT, + error TEXT, + created_at INTEGER, + updated_at INTEGER, + FOREIGN KEY(job_id) REFERENCES scheduled_jobs(id) ON DELETE CASCADE + ) + """ + ) + # Add per-target column if missing + try: + cur.execute("PRAGMA table_info(scheduled_job_runs)") + cols = {row[1] for row in cur.fetchall()} + if 'target_hostname' not in cols: + cur.execute("ALTER TABLE scheduled_job_runs ADD COLUMN target_hostname TEXT") + except Exception: + pass + # Helpful index for lookups + try: + cur.execute("CREATE INDEX IF NOT EXISTS idx_runs_job_sched_target ON scheduled_job_runs(job_id, scheduled_ts, target_hostname)") + except Exception: + pass + conn.commit() + conn.close() + + # ---------- Scheduling core ---------- + def _get_last_run(self, job_id: int) -> Optional[Dict[str, Any]]: + conn = self._conn() + cur = conn.cursor() + cur.execute( + "SELECT id, scheduled_ts, started_ts, finished_ts, status FROM scheduled_job_runs WHERE job_id=? ORDER BY COALESCE(started_ts, scheduled_ts, 0) DESC, id DESC LIMIT 1", + (job_id,) + ) + row = cur.fetchone() + conn.close() + if not row: + return None + return { + "id": row[0], + "scheduled_ts": row[1], + "started_ts": row[2], + "finished_ts": row[3], + "status": row[4] or "", + } + + def _compute_next_run(self, schedule_type: str, start_ts: Optional[int], last_run_ts: Optional[int], now_ts: int) -> Optional[int]: + st = (schedule_type or "immediately").strip().lower() + start_ts = _floor_minute(start_ts) if start_ts else None + last_run_ts = _floor_minute(last_run_ts) if last_run_ts else None + now_ts = _floor_minute(now_ts) + if st == "immediately": + # Run once asap if never ran + return None if last_run_ts else now_ts + if st == "once": + if not start_ts: + return None + # If never ran and time in future/now + if not last_run_ts: + return start_ts + return None + if not start_ts: + return None + + # For recurring types, base off start_ts and last_run_ts + last = last_run_ts if last_run_ts else None + if st == "daily": + period = 86400 + candidate = last + period if last else start_ts + while candidate is not None and candidate <= now_ts - 1: + candidate += period + return candidate + if st == "weekly": + period = 7 * 86400 + candidate = last + period if last else start_ts + while candidate is not None and candidate <= now_ts - 1: + candidate += period + return candidate + if st == "monthly": + base = _to_dt_tuple(last) if last else _to_dt_tuple(start_ts) + candidate = _add_months(base, 1 if last else 0) + while candidate <= now_ts - 1: + base = _to_dt_tuple(candidate) + candidate = _add_months(base, 1) + return candidate + if st == "yearly": + base = _to_dt_tuple(last) if last else _to_dt_tuple(start_ts) + candidate = _add_years(base, 1 if last else 0) + while candidate <= now_ts - 1: + base = _to_dt_tuple(candidate) + candidate = _add_years(base, 1) + return candidate + return None + + def _should_expire(self, started_ts: Optional[int], expiration: Optional[str], now_ts: int) -> bool: + if not started_ts: + return False + seconds = _parse_expiration(expiration) + if not seconds: + return False + return (started_ts + seconds) <= now_ts + + def _tick_once(self): + """Evaluate all enabled scheduled jobs and trigger those due. + Placeholder execution: mark Running then Success immediately. + """ + now = _now_ts() + conn = self._conn() + cur = conn.cursor() + # First, mark any stale Running runs that exceeded job expiration as Timed Out + try: + cur.execute( + """ + SELECT r.id, r.started_ts, j.expiration + FROM scheduled_job_runs r + JOIN scheduled_jobs j ON j.id = r.job_id + WHERE r.status = 'Running' + """ + ) + rows = cur.fetchall() + for rid, started_ts, expiration in rows: + if self._should_expire(started_ts, expiration, now): + try: + c2 = conn.cursor() + c2.execute( + "UPDATE scheduled_job_runs SET status='Timed Out', updated_at=? WHERE id=?", + (now, rid), + ) + conn.commit() + except Exception: + pass + except Exception: + pass + + # Next, finalize any Running runs that have passed the simulated duration + try: + cur.execute( + "SELECT id, started_ts FROM scheduled_job_runs WHERE status='Running'" + ) + rows = cur.fetchall() + for rid, started_ts in rows: + if started_ts and (int(started_ts) + self.SIMULATED_RUN_SECONDS) <= now: + try: + c2 = conn.cursor() + c2.execute( + "UPDATE scheduled_job_runs SET finished_ts=?, status='Success', updated_at=? WHERE id=?", + (now, now, rid), + ) + conn.commit() + except Exception: + pass + except Exception: + pass + + # Finally, rotate history older than the retention window + try: + cutoff = now - (self.RETENTION_DAYS * 86400) + cur.execute( + "DELETE FROM scheduled_job_runs WHERE COALESCE(finished_ts, started_ts, scheduled_ts, 0) < ?", + (cutoff,) + ) + conn.commit() + except Exception: + pass + try: + cur.execute( + "SELECT id, schedule_type, start_ts, enabled, expiration, targets_json, created_at FROM scheduled_jobs WHERE enabled=1 ORDER BY id ASC" + ) + jobs = cur.fetchall() + except Exception: + jobs = [] + conn.close() + + # Online hostnames snapshot for this tick + online = set() + try: + if callable(self._online_lookup): + online = set(self._online_lookup() or []) + except Exception: + online = set() + + five_min = 300 + now_min = _now_minute() + + for (job_id, schedule_type, start_ts, enabled, expiration, targets_json, created_at) in jobs: + try: + # Targets list for this job + try: + targets = json.loads(targets_json or "[]") + except Exception: + targets = [] + targets = [str(t) for t in targets if isinstance(t, (str, int))] + total_targets = len(targets) + + exp_seconds = _parse_expiration(expiration) + + # Determine current occurrence to work on + occ = None + try: + conn2 = self._conn() + c2 = conn2.cursor() + c2.execute("SELECT MAX(scheduled_ts) FROM scheduled_job_runs WHERE job_id=?", (job_id,)) + occ_from_runs = c2.fetchone()[0] + conn2.close() + except Exception: + occ_from_runs = None + + if occ_from_runs: + occ = int(occ_from_runs) + # Check if occurrence is complete (terminal status per target) + try: + conn2 = self._conn() + c2 = conn2.cursor() + c2.execute( + "SELECT COUNT(DISTINCT target_hostname) FROM scheduled_job_runs WHERE job_id=? AND scheduled_ts=? AND status IN ('Success','Expired','Timed Out')", + (job_id, occ) + ) + done_count = int(c2.fetchone()[0] or 0) + conn2.close() + except Exception: + done_count = 0 + + if total_targets > 0 and done_count >= total_targets: + # Move to next occurrence if due in window + nxt = self._compute_next_run(schedule_type, start_ts, occ, now_min) + if nxt is not None and now_min >= nxt and (now_min - nxt) <= five_min: + occ = nxt + else: + # Nothing to do this tick for this job + continue + else: + # Continue working on this occurrence regardless of the 5-minute window until expiration + pass + else: + # No occurrence yet; derive initial occurrence + if (schedule_type or '').lower() == 'immediately': + occ = _floor_minute(created_at or now_min) + else: + st_min = _floor_minute(start_ts) if start_ts else None + if st_min is None: + # Try compute_next_run to derive first planned occurrence + occ = self._compute_next_run(schedule_type, start_ts, None, now_min) + else: + occ = st_min + if occ is None: + continue + # For first occurrence, require it be within the 5-minute window to trigger + if not (now_min >= occ and (now_min - occ) <= five_min): + continue + + # For each target, if no run exists for this occurrence, either start it (if online) or keep waiting/expire + for host in targets: + # Skip if a run already exists for this job/host/occurrence + try: + conn2 = self._conn() + c2 = conn2.cursor() + c2.execute( + "SELECT id, status, started_ts FROM scheduled_job_runs WHERE job_id=? AND target_hostname=? AND scheduled_ts=? ORDER BY id DESC LIMIT 1", + (job_id, host, occ) + ) + row = c2.fetchone() + except Exception: + row = None + if row: + # Existing record — if Running, timeout handled earlier; skip + conn2.close() + continue + + # Start if online; otherwise, wait until expiration + if host in online: + try: + ts_now = _now_ts() + c2.execute( + "INSERT INTO scheduled_job_runs (job_id, target_hostname, scheduled_ts, started_ts, status, created_at, updated_at) VALUES (?,?,?,?,?,?,?)", + (job_id, host, occ, ts_now, "Running", ts_now, ts_now), + ) + conn2.commit() + except Exception: + pass + finally: + conn2.close() + else: + # If expired window is configured and has passed, mark this host as Expired + if exp_seconds is not None and (occ + exp_seconds) <= now: + try: + ts_now = _now_ts() + c2.execute( + "INSERT INTO scheduled_job_runs (job_id, target_hostname, scheduled_ts, finished_ts, status, error, created_at, updated_at) VALUES (?,?,?,?,?,?,?,?)", + (job_id, host, occ, ts_now, "Expired", "Device offline", ts_now, ts_now), + ) + conn2.commit() + except Exception: + pass + finally: + conn2.close() + else: + # keep waiting; no record created yet + try: + conn2.close() + except Exception: + pass + except Exception: + # Keep loop resilient + continue + + def start(self): + if self._running: + return + self._running = True + + def _loop(): + # cooperative loop aligned to minutes + while self._running: + try: + self._tick_once() + except Exception: + pass + # Sleep until next minute boundary + delay = 60 - (_now_ts() % 60) + try: + import eventlet + eventlet.sleep(delay) + except Exception: + time.sleep(delay) + + # Use SocketIO helper so it integrates with eventlet + try: + self.socketio.start_background_task(_loop) + except Exception: + # Fallback to thread + import threading + threading.Thread(target=_loop, daemon=True).start() + + # ---------- Route registration ---------- + def _register_routes(self): + app = self.app + + # Utility: job row + def _job_row_to_dict(r) -> Dict[str, Any]: + base = { + "id": r[0], + "name": r[1], + "components": json.loads(r[2] or "[]"), + "targets": json.loads(r[3] or "[]"), + "schedule_type": r[4] or "immediately", + "start_ts": r[5], + "duration_stop_enabled": bool(r[6] or 0), + "expiration": r[7] or "no_expire", + "execution_context": r[8] or "system", + "enabled": bool(r[9] or 0), + "created_at": r[10] or 0, + "updated_at": r[11] or 0, + } + # Attach computed status summary for latest occurrence + try: + conn = self._conn() + c = conn.cursor() + c.execute("SELECT MAX(scheduled_ts) FROM scheduled_job_runs WHERE job_id=?", (base["id"],)) + max_occ = c.fetchone()[0] + summary_status = None + last_run_ts = None + result_counts = { + "pending": 0, + "running": 0, + "success": 0, + "failed": 0, + "expired": 0, + "timed_out": 0, + "total_targets": len(base.get("targets") or []), + } + if max_occ: + # Summarize statuses for this occurrence + c.execute( + "SELECT status, COUNT(*) FROM scheduled_job_runs WHERE job_id=? AND scheduled_ts=? GROUP BY status", + (base["id"], max_occ) + ) + counts = {row[0] or "": int(row[1] or 0) for row in c.fetchall()} + result_counts["running"] = counts.get("Running", 0) + result_counts["success"] = counts.get("Success", 0) + result_counts["failed"] = counts.get("Failed", 0) + result_counts["expired"] = counts.get("Expired", 0) + result_counts["timed_out"] = counts.get("Timed Out", 0) + computed = result_counts["running"] + result_counts["success"] + result_counts["failed"] + result_counts["expired"] + result_counts["timed_out"] + pend = (result_counts["total_targets"] or 0) - computed + result_counts["pending"] = pend if pend > 0 else 0 + # Priority: Running > Timed Out > Expired > Success + if counts.get("Running"): + summary_status = "Running" + elif counts.get("Timed Out"): + summary_status = "Timed Out" + elif counts.get("Expired"): + summary_status = "Expired" + elif counts.get("Success"): + summary_status = "Success" + last_run_ts = int(max_occ) + conn.close() + except Exception: + summary_status = None + last_run_ts = None + result_counts = { + "pending": len(base.get("targets") or []), + "running": 0, + "success": 0, + "failed": 0, + "expired": 0, + "timed_out": 0, + "total_targets": len(base.get("targets") or []), + } + base["last_run_ts"] = last_run_ts + base["last_status"] = summary_status or ("Scheduled" if base.get("start_ts") else "") + base["latest_occurrence"] = last_run_ts + base["result_counts"] = result_counts + try: + base["next_run_ts"] = self._compute_next_run( + base["schedule_type"], base.get("start_ts"), base.get("last_run_ts"), _now_ts() + ) + except Exception: + base["next_run_ts"] = None + return base + + @app.route("/api/scheduled_jobs", methods=["GET"]) + def api_scheduled_jobs_list(): + try: + conn = self._conn() + cur = conn.cursor() + cur.execute( + """ + SELECT id, name, components_json, targets_json, schedule_type, start_ts, + duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at + FROM scheduled_jobs + ORDER BY created_at DESC + """ + ) + rows = [ _job_row_to_dict(r) for r in cur.fetchall() ] + conn.close() + return json.dumps({"jobs": rows}), 200, {"Content-Type": "application/json"} + except Exception as e: + return json.dumps({"error": str(e)}), 500, {"Content-Type": "application/json"} + + @app.route("/api/scheduled_jobs", methods=["POST"]) + def api_scheduled_jobs_create(): + data = self._json_body() + name = (data.get("name") or "").strip() + components = data.get("components") or [] + targets = data.get("targets") or [] + schedule_type = (data.get("schedule", {}).get("type") or data.get("schedule_type") or "immediately").strip().lower() + start = data.get("schedule", {}).get("start") or data.get("start") or None + start_ts = _parse_ts(start) if start else None + duration_stop_enabled = int(bool((data.get("duration") or {}).get("stopAfterEnabled") or data.get("duration_stop_enabled"))) + expiration = (data.get("duration") or {}).get("expiration") or data.get("expiration") or "no_expire" + execution_context = (data.get("execution_context") or "system").strip().lower() + enabled = int(bool(data.get("enabled", True))) + if not name or not components or not targets: + return json.dumps({"error": "name, components, targets required"}), 400, {"Content-Type": "application/json"} + now = _now_ts() + try: + conn = self._conn() + cur = conn.cursor() + cur.execute( + """ + INSERT INTO scheduled_jobs + (name, components_json, targets_json, schedule_type, start_ts, duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at) + VALUES (?,?,?,?,?,?,?,?,?,?,?) + """, + ( + name, + json.dumps(components), + json.dumps(targets), + schedule_type, + start_ts, + duration_stop_enabled, + expiration, + execution_context, + enabled, + now, + now, + ), + ) + job_id = cur.lastrowid + conn.commit() + cur.execute( + """ + SELECT id, name, components_json, targets_json, schedule_type, start_ts, + duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at + FROM scheduled_jobs WHERE id=? + """, + (job_id,), + ) + row = cur.fetchone() + conn.close() + return json.dumps({"job": _job_row_to_dict(row)}), 200, {"Content-Type": "application/json"} + except Exception as e: + return json.dumps({"error": str(e)}), 500, {"Content-Type": "application/json"} + + @app.route("/api/scheduled_jobs/", methods=["GET"]) + def api_scheduled_jobs_get(job_id: int): + try: + conn = self._conn() + cur = conn.cursor() + cur.execute( + """ + SELECT id, name, components_json, targets_json, schedule_type, start_ts, + duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at + FROM scheduled_jobs WHERE id=? + """, + (job_id,), + ) + row = cur.fetchone() + conn.close() + if not row: + return json.dumps({"error": "not found"}), 404, {"Content-Type": "application/json"} + return json.dumps({"job": _job_row_to_dict(row)}), 200, {"Content-Type": "application/json"} + except Exception as e: + return json.dumps({"error": str(e)}), 500, {"Content-Type": "application/json"} + + @app.route("/api/scheduled_jobs/", methods=["PUT"]) + def api_scheduled_jobs_update(job_id: int): + data = self._json_body() + fields: Dict[str, Any] = {} + if "name" in data: + fields["name"] = (data.get("name") or "").strip() + if "components" in data: + fields["components_json"] = json.dumps(data.get("components") or []) + if "targets" in data: + fields["targets_json"] = json.dumps(data.get("targets") or []) + if "schedule" in data or "schedule_type" in data: + schedule_type = (data.get("schedule", {}).get("type") or data.get("schedule_type") or "immediately").strip().lower() + fields["schedule_type"] = schedule_type + start = data.get("schedule", {}).get("start") or data.get("start") or None + fields["start_ts"] = _parse_ts(start) if start else None + if "duration" in data or "duration_stop_enabled" in data: + fields["duration_stop_enabled"] = int(bool((data.get("duration") or {}).get("stopAfterEnabled") or data.get("duration_stop_enabled"))) + if "expiration" in data or (data.get("duration") and "expiration" in data.get("duration")): + fields["expiration"] = (data.get("duration") or {}).get("expiration") or data.get("expiration") or "no_expire" + if "execution_context" in data: + fields["execution_context"] = (data.get("execution_context") or "system").strip().lower() + if "enabled" in data: + fields["enabled"] = int(bool(data.get("enabled"))) + if not fields: + return json.dumps({"error": "no fields to update"}), 400, {"Content-Type": "application/json"} + try: + conn = self._conn() + cur = conn.cursor() + sets = ", ".join([f"{k}=?" for k in fields.keys()]) + params = list(fields.values()) + [_now_ts(), job_id] + cur.execute(f"UPDATE scheduled_jobs SET {sets}, updated_at=? WHERE id=?", params) + if cur.rowcount == 0: + conn.close() + return json.dumps({"error": "not found"}), 404, {"Content-Type": "application/json"} + conn.commit() + cur.execute( + """ + SELECT id, name, components_json, targets_json, schedule_type, start_ts, + duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at + FROM scheduled_jobs WHERE id=? + """, + (job_id,), + ) + row = cur.fetchone() + conn.close() + return json.dumps({"job": _job_row_to_dict(row)}), 200, {"Content-Type": "application/json"} + except Exception as e: + return json.dumps({"error": str(e)}), 500, {"Content-Type": "application/json"} + + @app.route("/api/scheduled_jobs//toggle", methods=["POST"]) + def api_scheduled_jobs_toggle(job_id: int): + data = self._json_body() + enabled = int(bool(data.get("enabled", True))) + try: + conn = self._conn() + cur = conn.cursor() + cur.execute("UPDATE scheduled_jobs SET enabled=?, updated_at=? WHERE id=?", (enabled, _now_ts(), job_id)) + if cur.rowcount == 0: + conn.close() + return json.dumps({"error": "not found"}), 404, {"Content-Type": "application/json"} + conn.commit() + cur.execute( + "SELECT id, name, components_json, targets_json, schedule_type, start_ts, duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at FROM scheduled_jobs WHERE id=?", + (job_id,), + ) + row = cur.fetchone() + conn.close() + return json.dumps({"job": _job_row_to_dict(row)}), 200, {"Content-Type": "application/json"} + except Exception as e: + return json.dumps({"error": str(e)}), 500, {"Content-Type": "application/json"} + + @app.route("/api/scheduled_jobs/", methods=["DELETE"]) + def api_scheduled_jobs_delete(job_id: int): + try: + conn = self._conn() + cur = conn.cursor() + cur.execute("DELETE FROM scheduled_jobs WHERE id=?", (job_id,)) + deleted = cur.rowcount + conn.commit() + conn.close() + if deleted == 0: + return json.dumps({"error": "not found"}), 404, {"Content-Type": "application/json"} + return json.dumps({"status": "ok"}), 200, {"Content-Type": "application/json"} + except Exception as e: + return json.dumps({"error": str(e)}), 500, {"Content-Type": "application/json"} + + @app.route("/api/scheduled_jobs//runs", methods=["GET"]) + def api_scheduled_job_runs(job_id: int): + try: + from flask import request + days = request.args.get('days', default=str(self.RETENTION_DAYS)) + try: + days = max(1, int(days)) + except Exception: + days = self.RETENTION_DAYS + cutoff = _now_ts() - (days * 86400) + + conn = self._conn() + cur = conn.cursor() + cur.execute( + """ + SELECT id, scheduled_ts, started_ts, finished_ts, status, error + FROM scheduled_job_runs + WHERE job_id=? AND COALESCE(finished_ts, started_ts, scheduled_ts, 0) >= ? + ORDER BY COALESCE(started_ts, scheduled_ts, 0) DESC, id DESC + LIMIT 500 + """, + (job_id, cutoff) + ) + rows = cur.fetchall() + conn.close() + runs = [ + { + "id": r[0], + "scheduled_ts": r[1], + "started_ts": r[2], + "finished_ts": r[3], + "status": r[4] or "", + "error": r[5] or "", + } + for r in rows + ] + return json.dumps({"runs": runs}), 200, {"Content-Type": "application/json"} + except Exception as e: + return json.dumps({"error": str(e)}), 500, {"Content-Type": "application/json"} + + @app.route("/api/scheduled_jobs//devices", methods=["GET"]) + def api_scheduled_job_devices(job_id: int): + """Return per-target status for the latest occurrence (or specified via ?occurrence=epoch).""" + try: + from flask import request + occurrence = request.args.get('occurrence') + occ = int(occurrence) if occurrence else None + + conn = self._conn() + cur = conn.cursor() + cur.execute( + "SELECT targets_json FROM scheduled_jobs WHERE id=?", + (job_id,) + ) + row = cur.fetchone() + if not row: + conn.close() + return json.dumps({"error": "not found"}), 404, {"Content-Type": "application/json"} + try: + targets = json.loads(row[0] or "[]") + except Exception: + targets = [] + targets = [str(t) for t in targets if isinstance(t, (str, int))] + + # Determine occurrence if not provided + if occ is None: + cur.execute("SELECT MAX(scheduled_ts) FROM scheduled_job_runs WHERE job_id=?", (job_id,)) + occ_row = cur.fetchone() + occ = int(occ_row[0]) if occ_row and occ_row[0] else None + + # Sites lookup + site_by_host: Dict[str, str] = {} + try: + cur.execute( + "SELECT device_hostname, sites.name FROM device_sites JOIN sites ON sites.id = device_sites.site_id" + ) + for h, n in cur.fetchall(): + site_by_host[str(h)] = n or "" + except Exception: + pass + + # Status per target for occurrence + run_by_host: Dict[str, Dict[str, Any]] = {} + if occ is not None: + try: + cur.execute( + "SELECT target_hostname, status, started_ts, finished_ts FROM scheduled_job_runs WHERE job_id=? AND scheduled_ts=? ORDER BY id DESC", + (job_id, occ) + ) + rows = cur.fetchall() + for h, st, st_ts, fin_ts in rows: + h = str(h) + if h not in run_by_host: + run_by_host[h] = { + "status": st or "", + "started_ts": st_ts, + "finished_ts": fin_ts, + } + except Exception: + pass + + conn.close() + + # Online snapshot + online = set() + try: + if callable(self._online_lookup): + online = set(self._online_lookup() or []) + except Exception: + online = set() + + out = [] + for host in targets: + rec = run_by_host.get(str(host), {}) + job_status = rec.get("status") or "Pending" + ran_on = rec.get("started_ts") or rec.get("finished_ts") + out.append({ + "hostname": str(host), + "online": str(host) in online, + "site": site_by_host.get(str(host), ""), + "ran_on": ran_on, + "job_status": job_status, + "has_stdout": False, + "has_stderr": False, + }) + + return json.dumps({"occurrence": occ, "devices": out}), 200, {"Content-Type": "application/json"} + except Exception as e: + return json.dumps({"error": str(e)}), 500, {"Content-Type": "application/json"} + + @app.route("/api/scheduled_jobs//runs", methods=["DELETE"]) + def api_scheduled_job_runs_clear(job_id: int): + try: + conn = self._conn() + cur = conn.cursor() + cur.execute("DELETE FROM scheduled_job_runs WHERE job_id=?", (job_id,)) + conn.commit() + conn.close() + return json.dumps({"status": "ok"}), 200, {"Content-Type": "application/json"} + except Exception as e: + return json.dumps({"error": str(e)}), 500, {"Content-Type": "application/json"} + + # ---------- Request helpers ---------- + def _json_body(self) -> Dict[str, Any]: + try: + from flask import request + return request.get_json(silent=True) or {} + except Exception: + return {} + + +def register(app, socketio, db_path: str) -> JobScheduler: + """Factory to create and return a JobScheduler instance.""" + return JobScheduler(app, socketio, db_path) + + +def set_online_lookup(scheduler: JobScheduler, fn: Callable[[], List[str]]): + scheduler._online_lookup = fn diff --git a/Data/Server/server.py b/Data/Server/server.py index c638098..50daa6b 100644 --- a/Data/Server/server.py +++ b/Data/Server/server.py @@ -20,6 +20,8 @@ import io # Borealis Python API Endpoints from Python_API_Endpoints.ocr_engines import run_ocr_on_base64 from Python_API_Endpoints.script_engines import run_powershell_script +from job_scheduler import register as register_job_scheduler +from job_scheduler import set_online_lookup as scheduler_set_online_lookup # --------------------------------------------- # Flask + WebSocket Server Configuration @@ -1039,6 +1041,29 @@ def ensure_default_admin(): ensure_default_admin() +# --------------------------------------------- +# Scheduler Registration +# --------------------------------------------- +job_scheduler = register_job_scheduler(app, socketio, DB_PATH) +job_scheduler.start() + +# Provide scheduler with online device lookup based on registered agents +def _online_hostnames_snapshot(): + # Consider agent online if we saw collector activity within last 5 minutes + try: + now = time.time() + out = [] + for rec in (registered_agents or {}).values(): + host = rec.get('hostname') + last = float(rec.get('collector_active_ts') or 0) + if host and (now - last) <= 300: + out.append(str(host)) + return out + except Exception: + return [] + +scheduler_set_online_lookup(job_scheduler, _online_hostnames_snapshot) + # --------------------------------------------- # Sites API # --------------------------------------------- @@ -1485,236 +1510,10 @@ def get_agents(): return jsonify(out) -# --------------------------------------------- -# Scheduled Jobs API (basic CRUD/persistence only) -# --------------------------------------------- - -def _job_row_to_dict(r): - return { - "id": r[0], - "name": r[1], - "components": json.loads(r[2] or "[]"), - "targets": json.loads(r[3] or "[]"), - "schedule_type": r[4] or "immediately", - "start_ts": r[5], - "duration_stop_enabled": bool(r[6] or 0), - "expiration": r[7] or "no_expire", - "execution_context": r[8] or "system", - "enabled": bool(r[9] or 0), - "created_at": r[10] or 0, - "updated_at": r[11] or 0, - } +"""Scheduled Jobs API moved to Data/Server/job_scheduler.py""" -@app.route("/api/scheduled_jobs", methods=["GET"]) # list -def api_scheduled_jobs_list(): - try: - conn = _db_conn() - cur = conn.cursor() - cur.execute( - """ - SELECT id, name, components_json, targets_json, schedule_type, start_ts, - duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at - FROM scheduled_jobs - ORDER BY created_at DESC - """ - ) - rows = [ _job_row_to_dict(r) for r in cur.fetchall() ] - conn.close() - return jsonify({"jobs": rows}) - except Exception as e: - return jsonify({"error": str(e)}), 500 - - -@app.route("/api/scheduled_jobs", methods=["POST"]) # create -def api_scheduled_jobs_create(): - data = request.get_json(silent=True) or {} - name = (data.get("name") or "").strip() - components = data.get("components") or [] - targets = data.get("targets") or [] - schedule_type = (data.get("schedule", {}).get("type") or data.get("schedule_type") or "immediately").strip().lower() - start = data.get("schedule", {}).get("start") or data.get("start") or None - try: - start_ts = int(dayjs_to_ts(start)) if start else None - except Exception: - start_ts = None - duration_stop_enabled = int(bool((data.get("duration") or {}).get("stopAfterEnabled") or data.get("duration_stop_enabled"))) - expiration = (data.get("duration") or {}).get("expiration") or data.get("expiration") or "no_expire" - execution_context = (data.get("execution_context") or "system").strip().lower() - enabled = int(bool(data.get("enabled", True))) - if not name or not components or not targets: - return jsonify({"error": "name, components, targets required"}), 400 - now = _now_ts() - try: - conn = _db_conn() - cur = conn.cursor() - cur.execute( - """ - INSERT INTO scheduled_jobs - (name, components_json, targets_json, schedule_type, start_ts, duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at) - VALUES (?,?,?,?,?,?,?,?,?,?,?) - """, - ( - name, - json.dumps(components), - json.dumps(targets), - schedule_type, - start_ts, - duration_stop_enabled, - expiration, - execution_context, - enabled, - now, - now, - ), - ) - job_id = cur.lastrowid - conn.commit() - cur.execute( - """ - SELECT id, name, components_json, targets_json, schedule_type, start_ts, - duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at - FROM scheduled_jobs WHERE id=? - """, - (job_id,), - ) - row = cur.fetchone() - conn.close() - return jsonify({"job": _job_row_to_dict(row)}) - except Exception as e: - return jsonify({"error": str(e)}), 500 - - -@app.route("/api/scheduled_jobs/", methods=["GET"]) # get -def api_scheduled_jobs_get(job_id: int): - try: - conn = _db_conn() - cur = conn.cursor() - cur.execute( - """ - SELECT id, name, components_json, targets_json, schedule_type, start_ts, - duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at - FROM scheduled_jobs WHERE id=? - """, - (job_id,), - ) - row = cur.fetchone() - conn.close() - if not row: - return jsonify({"error": "not found"}), 404 - return jsonify({"job": _job_row_to_dict(row)}) - except Exception as e: - return jsonify({"error": str(e)}), 500 - - -@app.route("/api/scheduled_jobs/", methods=["PUT"]) # update -def api_scheduled_jobs_update(job_id: int): - data = request.get_json(silent=True) or {} - fields = {} - if "name" in data: - fields["name"] = (data.get("name") or "").strip() - if "components" in data: - fields["components_json"] = json.dumps(data.get("components") or []) - if "targets" in data: - fields["targets_json"] = json.dumps(data.get("targets") or []) - if "schedule" in data or "schedule_type" in data: - schedule_type = (data.get("schedule", {}).get("type") or data.get("schedule_type") or "immediately").strip().lower() - fields["schedule_type"] = schedule_type - start = data.get("schedule", {}).get("start") or data.get("start") or None - try: - fields["start_ts"] = int(dayjs_to_ts(start)) if start else None - except Exception: - fields["start_ts"] = None - if "duration" in data or "duration_stop_enabled" in data: - fields["duration_stop_enabled"] = int(bool((data.get("duration") or {}).get("stopAfterEnabled") or data.get("duration_stop_enabled"))) - if "expiration" in data or (data.get("duration") and "expiration" in data.get("duration")): - fields["expiration"] = (data.get("duration") or {}).get("expiration") or data.get("expiration") or "no_expire" - if "execution_context" in data: - fields["execution_context"] = (data.get("execution_context") or "system").strip().lower() - if "enabled" in data: - fields["enabled"] = int(bool(data.get("enabled"))) - if not fields: - return jsonify({"error": "no fields to update"}), 400 - try: - conn = _db_conn() - cur = conn.cursor() - sets = ", ".join([f"{k}=?" for k in fields.keys()]) - params = list(fields.values()) + [_now_ts(), job_id] - cur.execute(f"UPDATE scheduled_jobs SET {sets}, updated_at=? WHERE id=?", params) - if cur.rowcount == 0: - conn.close() - return jsonify({"error": "not found"}), 404 - conn.commit() - cur.execute( - """ - SELECT id, name, components_json, targets_json, schedule_type, start_ts, - duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at - FROM scheduled_jobs WHERE id=? - """, - (job_id,), - ) - row = cur.fetchone() - conn.close() - return jsonify({"job": _job_row_to_dict(row)}) - except Exception as e: - return jsonify({"error": str(e)}), 500 - - -@app.route("/api/scheduled_jobs//toggle", methods=["POST"]) # toggle enabled -def api_scheduled_jobs_toggle(job_id: int): - data = request.get_json(silent=True) or {} - enabled = int(bool(data.get("enabled", True))) - try: - conn = _db_conn() - cur = conn.cursor() - cur.execute("UPDATE scheduled_jobs SET enabled=?, updated_at=? WHERE id=?", (enabled, _now_ts(), job_id)) - if cur.rowcount == 0: - conn.close() - return jsonify({"error": "not found"}), 404 - conn.commit() - cur.execute( - "SELECT id, name, components_json, targets_json, schedule_type, start_ts, duration_stop_enabled, expiration, execution_context, enabled, created_at, updated_at FROM scheduled_jobs WHERE id=?", - (job_id,), - ) - row = cur.fetchone() - conn.close() - return jsonify({"job": _job_row_to_dict(row)}) - except Exception as e: - return jsonify({"error": str(e)}), 500 - - -@app.route("/api/scheduled_jobs/", methods=["DELETE"]) # delete -def api_scheduled_jobs_delete(job_id: int): - try: - conn = _db_conn() - cur = conn.cursor() - cur.execute("DELETE FROM scheduled_jobs WHERE id=?", (job_id,)) - deleted = cur.rowcount - conn.commit() - conn.close() - if deleted == 0: - return jsonify({"error": "not found"}), 404 - return jsonify({"status": "ok"}) - except Exception as e: - return jsonify({"error": str(e)}), 500 - - -def dayjs_to_ts(val): - """Convert various ISO-ish datetime strings to epoch seconds.""" - if val is None: - return None - if isinstance(val, (int, float)): - # assume seconds - return int(val) - try: - # Val may be ISO string; let Python parse - from datetime import datetime - # Ensure Z stripped or present - s = str(val).replace("Z", "+00:00") - dt = datetime.fromisoformat(s) - return int(dt.timestamp()) - except Exception: - return None +## dayjs_to_ts removed; scheduling parsing now lives in job_scheduler @app.route("/api/agent/details", methods=["POST"])