WEBDIENSTE/openswarm
1
0
Fork 0
mirror of https://github.com/openswarm-ai/openswarm.git synced 2026-09-26 03:24:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

[aidan] feat/task-scheduling: add hourly and minute (15-min minimum) schedule intervals (#93)

Browse Source
This commit is contained in:
Aidan
2026-06-16 23:50:52 -07:00
committed by GitHub
parent 11bbabd0ed
commit e84eceee5b
11 changed files with 173 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/app/pages/Workflows/ScheduleFacet.tsx
+52 -5
View File
@@ -58,6 +58,18 @@ function previewNextRun(sched: ScheduleConfig): Date | null {
if (!Number.isNaN(ends.getTime()) && ends.getTime() <= now.getTime()) return null;
}
if (sched.max_runs != null && sched.runs_count >= sched.max_runs) return null;
if (sched.repeat_unit === 'minute') {
const step = Math.max(15, sched.repeat_every);
let c = new Date(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), now.getMinutes(), 0, 0);
while (c <= now) c = new Date(c.getTime() + step * 60000);
return c;
}
if (sched.repeat_unit === 'hour') {
const step = Math.max(1, sched.repeat_every);
let c = new Date(now.getFullYear(), now.getMonth(), now.getDate(), now.getHours(), sched.minute, 0, 0);
while (c <= now) c = new Date(c.getTime() + step * 3600000);
return c;
}
let candidate = new Date(now.getFullYear(), now.getMonth(), now.getDate(), sched.hour, sched.minute, 0, 0);
if (candidate <= now) candidate = new Date(candidate.getTime() + 86400000);
if (sched.repeat_unit === 'day') {
@@ -192,7 +204,7 @@ export default function ScheduleFacet({ draft, setDraft }: { draft: Workflow; se
</Box>
{s.enabled && (
<AppOpenStatusBadge info={appOpen} hour={s.hour} minute={s.minute} onFix={fixAppOpen} />
<AppOpenStatusBadge info={appOpen} hour={s.hour} minute={s.minute} frequent={s.repeat_unit === 'minute' || s.repeat_unit === 'hour'} onFix={fixAppOpen} />
)}
{/* Section: When should this workflow run? */}
@@ -205,14 +217,29 @@ export default function ScheduleFacet({ draft, setDraft }: { draft: Workflow; se
<InputBase
type="number"
value={s.repeat_every}
onChange={(e) => setSched({ repeat_every: Math.max(1, Number(e.target.value) || 1) })}
onChange={(e) => {
// Per-unit bounds mirror the backend: minute 15..1440 (24h),
// every other unit 1..365.
const min = s.repeat_unit === 'minute' ? 15 : 1;
const max = s.repeat_unit === 'minute' ? 1440 : 365;
setSched({ repeat_every: Math.min(max, Math.max(min, Number(e.target.value) || min)) });
}}
sx={{ width: 56, fontSize: INPUT_FS, border: `1px solid ${c.border.subtle}`, borderRadius: `${c.radius.md}px`, px: 0.75, py: 0.4 }}
/>
<Select
size="small"
value={s.repeat_unit}
onChange={(e) => setSched({ repeat_unit: e.target.value as ScheduleConfig['repeat_unit'] })}
onChange={(e) => {
const unit = e.target.value as ScheduleConfig['repeat_unit'];
// 15 is the floor for the minute unit; bump repeat_every up
// when switching in so the input never shows an invalid value.
const patch: Partial<ScheduleConfig> = { repeat_unit: unit };
if (unit === 'minute' && s.repeat_every < 15) patch.repeat_every = 15;
setSched(patch);
}}
sx={{ fontSize: LABEL_FS, '& .MuiSelect-select': { py: 0.5 } }}>
<MenuItem value="minute">minute</MenuItem>
<MenuItem value="hour">hour</MenuItem>
<MenuItem value="day">day</MenuItem>
<MenuItem value="week">week</MenuItem>
<MenuItem value="month">month</MenuItem>
@@ -233,6 +260,25 @@ export default function ScheduleFacet({ draft, setDraft }: { draft: Workflow; se
})}
</Box>
)}
{/* minute-unit schedules have no anchor time; hour-unit schedules
only need the minute offset; the rest pick a full clock time. */}
{s.repeat_unit === 'hour' && (
<Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5, flexWrap: 'wrap' }}>
<Typography sx={{ fontSize: LABEL_FS, color: c.text.secondary, minWidth: 96 }}>At</Typography>
<Typography sx={{ fontSize: INPUT_FS, color: c.text.muted }}>:</Typography>
<Select
size="small"
value={s.minute}
onChange={(e) => setSched({ minute: Number(e.target.value) })}
sx={{ fontSize: LABEL_FS, '& .MuiSelect-select': { py: 0.4 } }}>
{[0, 15, 30, 45].map((m) => (
<MenuItem key={m} value={m}>{String(m).padStart(2, '0')}</MenuItem>
))}
</Select>
<Typography sx={{ fontSize: HINT_FS, color: c.text.muted }}>past the hour</Typography>
</Box>
)}
{(s.repeat_unit === 'day' || s.repeat_unit === 'week' || s.repeat_unit === 'month') && (
<Box sx={{ display: 'flex', alignItems: 'center', gap: 0.5, flexWrap: 'wrap' }}>
<Typography sx={{ fontSize: LABEL_FS, color: c.text.secondary, minWidth: 96 }}>At</Typography>
<Select
@@ -274,6 +320,7 @@ export default function ScheduleFacet({ draft, setDraft }: { draft: Workflow; se
</Select>
<Typography sx={{ fontSize: HINT_FS, color: c.text.ghost, ml: 0.5 }}>{friendlyTzLabel(s.timezone)}</Typography>
</Box>
)}
{nextPreview && s.enabled && (
<Typography sx={{ fontSize: HINT_FS, color: c.accent.primary, pl: 12, fontWeight: 500 }}>
Next run: {formatNextRun(nextPreview)}
@@ -391,7 +438,7 @@ export default function ScheduleFacet({ draft, setDraft }: { draft: Workflow; se
);
}
function AppOpenStatusBadge({ info, hour, minute, onFix }: { info: AppOpenInfo; hour: number; minute: number; onFix: () => void }) {
function AppOpenStatusBadge({ info, hour, minute, frequent, onFix }: { info: AppOpenInfo; hour: number; minute: number; frequent: boolean; onFix: () => void }) {
const c = useClaudeTokens();
const good = info.alwaysOn;
const fmt = formatTime(hour, minute);
@@ -404,7 +451,7 @@ function AppOpenStatusBadge({ info, hour, minute, onFix }: { info: AppOpenInfo;
}}>
<Box sx={{ width: 8, height: 8, borderRadius: '50%', bgcolor: good ? c.status.success : (c.status.warning || c.text.muted) }} />
<Typography sx={{ flex: 1, fontSize: HINT_FS, color: c.text.primary }}>
{good ? 'Will run even if you close OpenSwarm.' : `OpenSwarm must be open at ${fmt} for this to run.`}
{good ? 'Will run even if you close OpenSwarm.' : (frequent ? 'OpenSwarm must be open for this to run.' : `OpenSwarm must be open at ${fmt} for this to run.`)}
</Typography>
{!good && (
<Tooltip title="One click: start OpenSwarm automatically when you log in, and keep a small icon in your menubar so it stays running when you close the window. You can undo both later in Settings.">
frontend/src/app/pages/Workflows/WorkflowCardSubviews.tsx
+2
View File
@@ -263,6 +263,8 @@ function describeSchedule(workflow: Workflow): string {
const h12 = ((s.hour + 11) % 12) + 1;
const ampm = s.hour < 12 ? 'am' : 'pm';
const time = s.minute === 0 ? `${h12}${ampm}` : `${h12}:${String(s.minute).padStart(2, '0')}${ampm}`;
if (s.repeat_unit === 'minute') return `Every ${s.repeat_every} minutes`;
if (s.repeat_unit === 'hour') return s.repeat_every === 1 ? `Hourly at :${String(s.minute).padStart(2, '0')}` : `Every ${s.repeat_every} hours`;
if (s.repeat_unit === 'day') return s.repeat_every === 1 ? `Daily at ${time}` : `Every ${s.repeat_every} days at ${time}`;
if (s.repeat_unit === 'month') return s.repeat_every === 1 ? `Monthly at ${time}` : `Every ${s.repeat_every} months at ${time}`;
if (s.on_days.length === 5 && [1,2,3,4,5].every((d) => s.on_days.includes(d))) return `Weekdays at ${time}`;
frontend/src/app/pages/Workflows/scheduleDetect.ts
+19 -1
View File
@@ -36,9 +36,12 @@ export function detectSchedule(text: string): DetectedSchedule | null {
const isWeekdays = /\b(weekdays?|each weekday|every weekday|mon(?:day)?\s*(?:to|-|through|–)\s*fri(?:day)?)\b/.test(t);
const isWeekly = /\b(every week|weekly|each week|once a week)\b/.test(t);
const isMonthly = /\b(every month|monthly|each month|once a month)\b/.test(t);
const hourlyMatch = t.match(/\bevery\s+(\d{1,2})\s+hours?\b/);
const isHourly = /\b(every hour|hourly|each hour|once an hour)\b/.test(t) || !!hourlyMatch;
const minutesMatch = t.match(/\bevery\s+(\d{1,3})\s+min(?:ute)?s?\b/);
const dayMatches = Array.from(t.matchAll(DAY_RE)).map((m) => DAY_MAP[m[1].toLowerCase().slice(0, 3)]);
const hasExplicitDays = dayMatches.length > 0;
if (!isDaily && !isWeekdays && !isWeekly && !isMonthly && !hasExplicitDays) return null;
if (!isDaily && !isWeekdays && !isWeekly && !isMonthly && !hasExplicitDays && !isHourly && !minutesMatch) return null;
// Extract hour:minute.
let hour = 9;
@@ -65,6 +68,21 @@ export function detectSchedule(text: string): DetectedSchedule | null {
}
const base = defaultSchedule();
// Sub-day cadences are the most specific; match them before daily/weekly.
if (minutesMatch) {
const every = Math.max(15, parseInt(minutesMatch[1], 10) || 15);
return {
schedule: { ...base, enabled: true, repeat_unit: 'minute', repeat_every: every },
presetLabel: `Every ${every} minutes`,
};
}
if (isHourly) {
const every = Math.max(1, hourlyMatch ? parseInt(hourlyMatch[1], 10) || 1 : 1);
return {
schedule: { ...base, enabled: true, repeat_unit: 'hour', repeat_every: every, minute },
presetLabel: every === 1 ? 'Every hour' : `Every ${every} hours`,
};
}
if (isMonthly) {
return {
schedule: { ...base, enabled: true, repeat_unit: 'month', repeat_every: 1, hour, minute },
frontend/src/app/pages/Workflows/scheduleUtils.ts
+27
View File
@@ -43,6 +43,13 @@ export function formatHourLabel(hour: number): string {
export function describeSchedule(sched: ScheduleConfig): string {
if (!sched.enabled) return 'Not scheduled';
const time = formatTime(sched.hour, sched.minute);
if (sched.repeat_unit === 'minute') {
return `Every ${sched.repeat_every} minutes`;
}
if (sched.repeat_unit === 'hour') {
const at = sched.minute === 0 ? '' : ` at :${String(sched.minute).padStart(2, '0')}`;
return sched.repeat_every === 1 ? `Every hour${at}` : `Every ${sched.repeat_every} hours${at}`;
}
if (sched.repeat_unit === 'day') {
return sched.repeat_every === 1 ? `Every day at ${time}` : `Every ${sched.repeat_every} days at ${time}`;
}
@@ -128,6 +135,26 @@ export function fireTimesWithin(workflow: Workflow, from: Date, to: Date, cap =
const cursor = new Date(from);
cursor.setHours(0, 0, 0, 0);
if (sched.repeat_unit === 'minute') {
const step = Math.max(15, sched.repeat_every);
const d = new Date(from);
d.setSeconds(0, 0);
for (; d <= to && out.length < effectiveCap; d.setTime(d.getTime() + step * 60000)) {
if (d >= from) out.push(new Date(d));
}
return out;
}
if (sched.repeat_unit === 'hour') {
const step = Math.max(1, sched.repeat_every);
const d = new Date(from);
d.setMinutes(sched.minute, 0, 0);
for (; d <= to && out.length < effectiveCap; d.setTime(d.getTime() + step * 3600000)) {
if (d >= from) out.push(new Date(d));
}
return out;
}
if (sched.repeat_unit === 'day') {
const step = Math.max(1, sched.repeat_every);
for (let i = 0; i < 366 && out.length < effectiveCap; i += step) {
frontend/src/app/pages/Workflows/workflowVisuals.tsx
+2
View File
@@ -84,6 +84,8 @@ export function StatusDot({ status }: { status: LastRunStatus | null | undefined
function scheduleShort(sched: ScheduleConfig): string {
if (!sched.enabled) return 'Not scheduled';
const time = formatTime(sched.hour, sched.minute);
if (sched.repeat_unit === 'minute') return `Every ${sched.repeat_every}m`;
if (sched.repeat_unit === 'hour') return sched.repeat_every === 1 ? 'Hourly' : `Every ${sched.repeat_every}h`;
if (sched.repeat_unit === 'day') {
return sched.repeat_every === 1 ? `Daily ${time}` : `Every ${sched.repeat_every}d ${time}`;
}
frontend/src/shared/state/workflowsSlice.ts
+1 -1
View File
@@ -14,7 +14,7 @@ export interface PermissionTier {
export interface ScheduleConfig {
enabled: boolean;
repeat_every: number;
repeat_unit: 'day' | 'week' | 'month';
repeat_unit: 'minute' | 'hour' | 'day' | 'week' | 'month';
on_days: number[];
hour: number;
minute: number;