feat: add Scheduler provider + multi-provider UX fixes
Scheduler provider: - Virtual provider (no external service) that emits SCHEDULED_MESSAGE events on user-defined intervals or cron expressions - Custom variables stored in tracker filters, flattened into template context - fire_count persists across triggers via tracker state - APScheduler CronTrigger support for cron-mode schedules - Default templates (EN+RU), seeded on startup Multi-provider UX fixes: - Tracking config hides Immich-specific sections (periodic, scheduled, memory, asset display) for non-Immich providers - Command config driven by provider capabilities — hides commands/settings for providers without bot commands - Template config hides empty "Scheduled Messages" group - Test menu on tracker targets is provider-aware (Immich shows all 4 test types, others show only basic) - Removed redundant Test button from tracker card - System-owned tracking configs (user_id=0) seeded for Gitea + Scheduler - Fixed ownership checks to allow system configs in tracker-target links - Capabilities cache shared across template-configs and command-configs - Command tracker bot selector uses EntitySelect instead of raw select - Sample context includes Gitea + Scheduler variables for template preview
This commit is contained in:
@@ -100,4 +100,5 @@ export const previewTargetTypeItems = (): GridItem[] => [
|
|||||||
export const providerTypeItems = (): GridItem[] => [
|
export const providerTypeItems = (): GridItem[] => [
|
||||||
{ value: 'immich', icon: 'mdiCamera', label: t('providers.typeImmich') },
|
{ value: 'immich', icon: 'mdiCamera', label: t('providers.typeImmich') },
|
||||||
{ value: 'gitea', icon: 'mdiGit', label: t('providers.typeGitea') },
|
{ value: 'gitea', icon: 'mdiGit', label: t('providers.typeGitea') },
|
||||||
|
{ value: 'scheduler', icon: 'mdiClockOutline', label: t('providers.typeScheduler') },
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -107,6 +107,7 @@
|
|||||||
"checking": "Checking...",
|
"checking": "Checking...",
|
||||||
"typeImmich": "Immich",
|
"typeImmich": "Immich",
|
||||||
"typeGitea": "Gitea",
|
"typeGitea": "Gitea",
|
||||||
|
"typeScheduler": "Scheduler",
|
||||||
"loadError": "Failed to load providers.",
|
"loadError": "Failed to load providers.",
|
||||||
"externalDomain": "External Domain",
|
"externalDomain": "External Domain",
|
||||||
"optional": "optional",
|
"optional": "optional",
|
||||||
@@ -134,6 +135,14 @@
|
|||||||
"eventTypes": "Event Types",
|
"eventTypes": "Event Types",
|
||||||
"notificationTargets": "Notification Targets",
|
"notificationTargets": "Notification Targets",
|
||||||
"scanInterval": "Scan Interval (seconds)",
|
"scanInterval": "Scan Interval (seconds)",
|
||||||
|
"scheduleType": "Schedule",
|
||||||
|
"intervalMode": "Interval",
|
||||||
|
"cronMode": "Cron expression",
|
||||||
|
"cronExpression": "Cron expression",
|
||||||
|
"cronHint": "Standard 5-field cron: minute hour day month weekday. Example: 0 9 * * 1-5 (weekdays at 9:00)",
|
||||||
|
"customVariables": "Custom Variables",
|
||||||
|
"customVariablesHint": "Define key-value pairs available in templates as {{ key }}.",
|
||||||
|
"addVariable": "Add variable",
|
||||||
"createTracker": "Create Tracker",
|
"createTracker": "Create Tracker",
|
||||||
"noTrackers": "No trackers yet. Add a provider first, then create a tracker.",
|
"noTrackers": "No trackers yet. Add a provider first, then create a tracker.",
|
||||||
"active": "Active",
|
"active": "Active",
|
||||||
@@ -310,6 +319,7 @@
|
|||||||
"rateSearch": "Search cooldown",
|
"rateSearch": "Search cooldown",
|
||||||
"rateFind": "Find cooldown",
|
"rateFind": "Find cooldown",
|
||||||
"rateDefault": "Default cooldown",
|
"rateDefault": "Default cooldown",
|
||||||
|
"noCommandsForProvider": "This provider type does not support bot commands.",
|
||||||
"syncCommands": "Sync with Telegram",
|
"syncCommands": "Sync with Telegram",
|
||||||
"discoverChats": "Discover chats from Telegram",
|
"discoverChats": "Discover chats from Telegram",
|
||||||
"clickToCopy": "Click to copy chat ID",
|
"clickToCopy": "Click to copy chat ID",
|
||||||
@@ -365,6 +375,7 @@
|
|||||||
"prMerged": "PR merged",
|
"prMerged": "PR merged",
|
||||||
"prCommented": "PR commented",
|
"prCommented": "PR commented",
|
||||||
"releasePublished": "Release published",
|
"releasePublished": "Release published",
|
||||||
|
"scheduledMessage": "Scheduled message",
|
||||||
"trackImages": "Track images",
|
"trackImages": "Track images",
|
||||||
"trackVideos": "Track videos",
|
"trackVideos": "Track videos",
|
||||||
"favoritesOnly": "Favorites only",
|
"favoritesOnly": "Favorites only",
|
||||||
|
|||||||
@@ -107,6 +107,7 @@
|
|||||||
"checking": "Проверка...",
|
"checking": "Проверка...",
|
||||||
"typeImmich": "Immich",
|
"typeImmich": "Immich",
|
||||||
"typeGitea": "Gitea",
|
"typeGitea": "Gitea",
|
||||||
|
"typeScheduler": "Планировщик",
|
||||||
"loadError": "Не удалось загрузить провайдеры.",
|
"loadError": "Не удалось загрузить провайдеры.",
|
||||||
"externalDomain": "Внешний домен",
|
"externalDomain": "Внешний домен",
|
||||||
"optional": "необязательно",
|
"optional": "необязательно",
|
||||||
@@ -134,6 +135,14 @@
|
|||||||
"eventTypes": "Типы событий",
|
"eventTypes": "Типы событий",
|
||||||
"notificationTargets": "Получатели уведомлений",
|
"notificationTargets": "Получатели уведомлений",
|
||||||
"scanInterval": "Интервал проверки (секунды)",
|
"scanInterval": "Интервал проверки (секунды)",
|
||||||
|
"scheduleType": "Расписание",
|
||||||
|
"intervalMode": "Интервал",
|
||||||
|
"cronMode": "Cron выражение",
|
||||||
|
"cronExpression": "Cron выражение",
|
||||||
|
"cronHint": "Стандартный 5-полевой cron: минута час день месяц день_недели. Пример: 0 9 * * 1-5 (будни в 9:00)",
|
||||||
|
"customVariables": "Пользовательские переменные",
|
||||||
|
"customVariablesHint": "Определите пары ключ-значение, доступные в шаблонах как {{ ключ }}.",
|
||||||
|
"addVariable": "Добавить переменную",
|
||||||
"createTracker": "Создать трекер",
|
"createTracker": "Создать трекер",
|
||||||
"noTrackers": "Трекеров пока нет. Сначала добавьте провайдер, затем создайте трекер.",
|
"noTrackers": "Трекеров пока нет. Сначала добавьте провайдер, затем создайте трекер.",
|
||||||
"active": "Активен",
|
"active": "Активен",
|
||||||
@@ -310,6 +319,7 @@
|
|||||||
"rateSearch": "Кулдаун поиска",
|
"rateSearch": "Кулдаун поиска",
|
||||||
"rateFind": "Кулдаун поиска файлов",
|
"rateFind": "Кулдаун поиска файлов",
|
||||||
"rateDefault": "Кулдаун по умолчанию",
|
"rateDefault": "Кулдаун по умолчанию",
|
||||||
|
"noCommandsForProvider": "Этот тип провайдера не поддерживает команды бота.",
|
||||||
"syncCommands": "Синхронизировать с Telegram",
|
"syncCommands": "Синхронизировать с Telegram",
|
||||||
"discoverChats": "Обнаружить чаты из Telegram",
|
"discoverChats": "Обнаружить чаты из Telegram",
|
||||||
"clickToCopy": "Нажмите, чтобы скопировать ID чата",
|
"clickToCopy": "Нажмите, чтобы скопировать ID чата",
|
||||||
@@ -365,6 +375,7 @@
|
|||||||
"prMerged": "PR влит",
|
"prMerged": "PR влит",
|
||||||
"prCommented": "Комментарий к PR",
|
"prCommented": "Комментарий к PR",
|
||||||
"releasePublished": "Релиз опубликован",
|
"releasePublished": "Релиз опубликован",
|
||||||
|
"scheduledMessage": "Запланированное сообщение",
|
||||||
"trackImages": "Фото",
|
"trackImages": "Фото",
|
||||||
"trackVideos": "Видео",
|
"trackVideos": "Видео",
|
||||||
"favoritesOnly": "Только избранные",
|
"favoritesOnly": "Только избранные",
|
||||||
|
|||||||
@@ -53,6 +53,23 @@ export const commandTemplateConfigsCache = createEntityCache<CommandTemplateConf
|
|||||||
/** Command trackers — used by Command Trackers page. */
|
/** Command trackers — used by Command Trackers page. */
|
||||||
export const commandTrackersCache = createEntityCache<CommandTracker>('/command-trackers');
|
export const commandTrackersCache = createEntityCache<CommandTracker>('/command-trackers');
|
||||||
|
|
||||||
|
/** Provider capabilities — used by Template Configs, Command Configs. */
|
||||||
|
export const capabilitiesCache = (() => {
|
||||||
|
let data = $state<Record<string, any>>({});
|
||||||
|
let fetchedAt = $state(0);
|
||||||
|
const TTL = 60_000; // 1 minute
|
||||||
|
return {
|
||||||
|
get items() { return data; },
|
||||||
|
async fetch(force = false): Promise<Record<string, any>> {
|
||||||
|
if (!force && Object.keys(data).length > 0 && Date.now() - fetchedAt < TTL) return data;
|
||||||
|
const { api } = await import('$lib/api');
|
||||||
|
data = await api('/providers/capabilities');
|
||||||
|
fetchedAt = Date.now();
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
})();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* All caches keyed by entity type — for search palette and crosslink resolution.
|
* All caches keyed by entity type — for search palette and crosslink resolution.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
import { onMount } from 'svelte';
|
import { onMount } from 'svelte';
|
||||||
import { api } from '$lib/api';
|
import { api } from '$lib/api';
|
||||||
import { t } from '$lib/i18n';
|
import { t } from '$lib/i18n';
|
||||||
import { commandConfigsCache, commandTemplateConfigsCache } from '$lib/stores/caches.svelte';
|
import { commandConfigsCache, commandTemplateConfigsCache, capabilitiesCache } from '$lib/stores/caches.svelte';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import Card from '$lib/components/Card.svelte';
|
import Card from '$lib/components/Card.svelte';
|
||||||
import Loading from '$lib/components/Loading.svelte';
|
import Loading from '$lib/components/Loading.svelte';
|
||||||
@@ -37,22 +37,23 @@
|
|||||||
let submitting = $state(false);
|
let submitting = $state(false);
|
||||||
let confirmDelete = $state<any>(null);
|
let confirmDelete = $state<any>(null);
|
||||||
|
|
||||||
const allCommands = [
|
// Immich command icons — used as fallback when capabilities don't specify icons
|
||||||
{ key: 'help', icon: 'mdiHelpCircle' },
|
const commandIcons: Record<string, string> = {
|
||||||
{ key: 'status', icon: 'mdiChartBox' },
|
help: 'mdiHelpCircle', status: 'mdiChartBox', albums: 'mdiImageMultiple',
|
||||||
{ key: 'albums', icon: 'mdiImageMultiple' },
|
events: 'mdiPulse', summary: 'mdiFileDocumentEdit', latest: 'mdiImagePlus',
|
||||||
{ key: 'events', icon: 'mdiPulse' },
|
memory: 'mdiHistory', random: 'mdiDice3', search: 'mdiMagnify',
|
||||||
{ key: 'summary', icon: 'mdiFileDocumentEdit' },
|
find: 'mdiFileSearch', person: 'mdiAccount', place: 'mdiMapMarker',
|
||||||
{ key: 'latest', icon: 'mdiImagePlus' },
|
favorites: 'mdiStar', people: 'mdiAccountGroup',
|
||||||
{ key: 'memory', icon: 'mdiHistory' },
|
};
|
||||||
{ key: 'random', icon: 'mdiDice3' },
|
|
||||||
{ key: 'search', icon: 'mdiMagnify' },
|
let allCapabilities = $derived(capabilitiesCache.items);
|
||||||
{ key: 'find', icon: 'mdiFileSearch' },
|
let providerCommands = $derived<{key: string, icon: string}[]>(
|
||||||
{ key: 'person', icon: 'mdiAccount' },
|
(allCapabilities[form.provider_type]?.commands || []).map((c: any) => ({
|
||||||
{ key: 'place', icon: 'mdiMapMarker' },
|
key: c.name,
|
||||||
{ key: 'favorites', icon: 'mdiStar' },
|
icon: commandIcons[c.name] || 'mdiConsole',
|
||||||
{ key: 'people', icon: 'mdiAccountGroup' },
|
}))
|
||||||
];
|
);
|
||||||
|
let hasCommands = $derived(providerCommands.length > 0);
|
||||||
|
|
||||||
const defaultForm = () => ({
|
const defaultForm = () => ({
|
||||||
name: '',
|
name: '',
|
||||||
@@ -72,6 +73,7 @@
|
|||||||
await Promise.all([
|
await Promise.all([
|
||||||
commandConfigsCache.fetch(true),
|
commandConfigsCache.fetch(true),
|
||||||
commandTemplateConfigsCache.fetch(),
|
commandTemplateConfigsCache.fetch(),
|
||||||
|
capabilitiesCache.fetch(),
|
||||||
]);
|
]);
|
||||||
} catch (err: any) { error = err.message || t('common.loadError'); snackError(error); }
|
} catch (err: any) { error = err.message || t('common.loadError'); snackError(error); }
|
||||||
finally { loaded = true; highlightFromUrl(); }
|
finally { loaded = true; highlightFromUrl(); }
|
||||||
@@ -170,11 +172,12 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{#if hasCommands}
|
||||||
<!-- Enabled commands -->
|
<!-- Enabled commands -->
|
||||||
<div>
|
<div>
|
||||||
<p class="text-sm font-medium mb-2">{t('commandConfig.enabledCommands')}</p>
|
<p class="text-sm font-medium mb-2">{t('commandConfig.enabledCommands')}</p>
|
||||||
<div class="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-1">
|
<div class="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-1">
|
||||||
{#each allCommands as cmd}
|
{#each providerCommands as cmd}
|
||||||
<label class="flex items-center gap-1.5 text-xs cursor-pointer hover:bg-[var(--color-muted)] px-2 py-1 rounded">
|
<label class="flex items-center gap-1.5 text-xs cursor-pointer hover:bg-[var(--color-muted)] px-2 py-1 rounded">
|
||||||
<input type="checkbox" checked={form.enabled_commands.includes(cmd.key)}
|
<input type="checkbox" checked={form.enabled_commands.includes(cmd.key)}
|
||||||
onchange={() => toggleCmd(cmd.key)} />
|
onchange={() => toggleCmd(cmd.key)} />
|
||||||
@@ -212,6 +215,11 @@
|
|||||||
<input type="number" bind:value={form.rate_limits.default} min="0" max="300"
|
<input type="number" bind:value={form.rate_limits.default} min="0" max="300"
|
||||||
class="w-full px-2 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]" />
|
class="w-full px-2 py-1.5 text-sm border border-[var(--color-border)] rounded-md bg-[var(--color-background)]" />
|
||||||
</div>
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="text-sm text-[var(--color-muted-foreground)] p-3 border border-[var(--color-border)] rounded-md">
|
||||||
|
{t('commandConfig.noCommandsForProvider')}
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<button type="submit" disabled={submitting}
|
<button type="submit" disabled={submitting}
|
||||||
class="px-4 py-2 bg-[var(--color-primary)] text-[var(--color-primary-foreground)] rounded-md text-sm font-medium hover:opacity-90 disabled:opacity-50">
|
class="px-4 py-2 bg-[var(--color-primary)] text-[var(--color-primary-foreground)] rounded-md text-sm font-medium hover:opacity-90 disabled:opacity-50">
|
||||||
|
|||||||
@@ -275,13 +275,9 @@
|
|||||||
|
|
||||||
<!-- Add listener -->
|
<!-- Add listener -->
|
||||||
<div class="flex items-center gap-2 mt-2">
|
<div class="flex items-center gap-2 mt-2">
|
||||||
<select bind:value={newListenerBotId[trk.id]}
|
<div class="flex-1">
|
||||||
class="flex-1 px-2 py-1 text-xs border border-[var(--color-border)] rounded-md bg-[var(--color-background)]">
|
<EntitySelect items={botItems} bind:value={newListenerBotId[trk.id]} placeholder={t('commandTracker.selectBot')} />
|
||||||
<option value={0} disabled selected>{t('commandTracker.selectBot')}</option>
|
</div>
|
||||||
{#each telegramBots as bot}
|
|
||||||
<option value={bot.id}>{bot.name} {bot.bot_username ? `(@${bot.bot_username})` : ''}</option>
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
<button onclick={() => addListener(trk.id)} disabled={!newListenerBotId[trk.id] || addingListener[trk.id]}
|
<button onclick={() => addListener(trk.id)} disabled={!newListenerBotId[trk.id] || addingListener[trk.id]}
|
||||||
class="text-xs px-3 py-1 bg-[var(--color-primary)] text-[var(--color-primary-foreground)] rounded-md hover:opacity-90 disabled:opacity-50">
|
class="text-xs px-3 py-1 bg-[var(--color-primary)] text-[var(--color-primary-foreground)] rounded-md hover:opacity-90 disabled:opacity-50">
|
||||||
{addingListener[trk.id] ? t('common.loading') : t('commandTracker.addListener')}
|
{addingListener[trk.id] ? t('common.loading') : t('commandTracker.addListener')}
|
||||||
|
|||||||
@@ -47,8 +47,12 @@
|
|||||||
const defaultForm = () => ({
|
const defaultForm = () => ({
|
||||||
name: '', icon: '', provider_id: 0, collection_ids: [] as string[],
|
name: '', icon: '', provider_id: 0, collection_ids: [] as string[],
|
||||||
scan_interval: 60, batch_duration: 0,
|
scan_interval: 60, batch_duration: 0,
|
||||||
|
filters: {} as Record<string, any>,
|
||||||
});
|
});
|
||||||
let form = $state(defaultForm());
|
let form = $state(defaultForm());
|
||||||
|
let selectedProviderType = $derived(
|
||||||
|
providers.find(p => p.id === form.provider_id)?.type || ''
|
||||||
|
);
|
||||||
let error = $state('');
|
let error = $state('');
|
||||||
|
|
||||||
// Linked targets management
|
// Linked targets management
|
||||||
@@ -62,12 +66,25 @@
|
|||||||
let testMenuOpen = $state<string | null>(null);
|
let testMenuOpen = $state<string | null>(null);
|
||||||
let testMenuStyle = $state('');
|
let testMenuStyle = $state('');
|
||||||
|
|
||||||
const testTypes = [
|
const immichTestTypes = [
|
||||||
{ key: 'basic', icon: 'mdiSend', labelKey: 'notificationTracker.testBasic' },
|
{ key: 'basic', icon: 'mdiSend', labelKey: 'notificationTracker.testBasic' },
|
||||||
{ key: 'periodic', icon: 'mdiCalendarClock', labelKey: 'notificationTracker.testPeriodic' },
|
{ key: 'periodic', icon: 'mdiCalendarClock', labelKey: 'notificationTracker.testPeriodic' },
|
||||||
{ key: 'scheduled', icon: 'mdiImageMultiple', labelKey: 'notificationTracker.testScheduled' },
|
{ key: 'scheduled', icon: 'mdiImageMultiple', labelKey: 'notificationTracker.testScheduled' },
|
||||||
{ key: 'memory', icon: 'mdiHistory', labelKey: 'notificationTracker.testMemory' },
|
{ key: 'memory', icon: 'mdiHistory', labelKey: 'notificationTracker.testMemory' },
|
||||||
];
|
];
|
||||||
|
const defaultTestTypes = [
|
||||||
|
{ key: 'basic', icon: 'mdiSend', labelKey: 'notificationTracker.testBasic' },
|
||||||
|
];
|
||||||
|
|
||||||
|
let testMenuTrackerId = $state<number | null>(null);
|
||||||
|
let testTypes = $derived(() => {
|
||||||
|
if (!testMenuTrackerId) return defaultTestTypes;
|
||||||
|
const tracker = notificationTrackers.find(t => t.id === testMenuTrackerId);
|
||||||
|
if (!tracker) return defaultTestTypes;
|
||||||
|
const provider = providers.find(p => p.id === tracker.provider_id);
|
||||||
|
if (provider?.type === 'immich') return immichTestTypes;
|
||||||
|
return defaultTestTypes;
|
||||||
|
});
|
||||||
|
|
||||||
onMount(load);
|
onMount(load);
|
||||||
|
|
||||||
@@ -105,6 +122,7 @@
|
|||||||
name: trk.name, icon: trk.icon || '', provider_id: trk.provider_id,
|
name: trk.name, icon: trk.icon || '', provider_id: trk.provider_id,
|
||||||
collection_ids: [...(trk.collection_ids || [])],
|
collection_ids: [...(trk.collection_ids || [])],
|
||||||
scan_interval: trk.scan_interval, batch_duration: trk.batch_duration ?? 0,
|
scan_interval: trk.scan_interval, batch_duration: trk.batch_duration ?? 0,
|
||||||
|
filters: trk.filters || {},
|
||||||
};
|
};
|
||||||
previousCollectionIds = [...(trk.collection_ids || [])];
|
previousCollectionIds = [...(trk.collection_ids || [])];
|
||||||
editing = trk.id; showForm = true;
|
editing = trk.id; showForm = true;
|
||||||
@@ -307,6 +325,7 @@
|
|||||||
const btn = event.currentTarget as HTMLElement;
|
const btn = event.currentTarget as HTMLElement;
|
||||||
const rect = btn.getBoundingClientRect();
|
const rect = btn.getBoundingClientRect();
|
||||||
testMenuStyle = `position:fixed; z-index:9999; top:${rect.bottom + 4}px; right:${window.innerWidth - rect.right}px;`;
|
testMenuStyle = `position:fixed; z-index:9999; top:${rect.bottom + 4}px; right:${window.innerWidth - rect.right}px;`;
|
||||||
|
testMenuTrackerId = notificationTrackers.find(t => t.tracker_targets?.some((x: any) => String(x.id) === String(ttId)))?.id ?? null;
|
||||||
testMenuOpen = testMenuOpen === String(ttId) ? null : String(ttId);
|
testMenuOpen = testMenuOpen === String(ttId) ? null : String(ttId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -339,6 +358,7 @@
|
|||||||
{submitting}
|
{submitting}
|
||||||
{linkCheckLoading}
|
{linkCheckLoading}
|
||||||
{error}
|
{error}
|
||||||
|
providerType={selectedProviderType}
|
||||||
onsave={save}
|
onsave={save}
|
||||||
ontoggleCollection={toggleCollection}
|
ontoggleCollection={toggleCollection}
|
||||||
{formatDate}
|
{formatDate}
|
||||||
@@ -370,7 +390,6 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="flex items-center gap-1 flex-wrap justify-end">
|
<div class="flex items-center gap-1 flex-wrap justify-end">
|
||||||
<IconButton icon="mdiPencil" title={t('common.edit')} onclick={() => edit(tracker)} />
|
<IconButton icon="mdiPencil" title={t('common.edit')} onclick={() => edit(tracker)} />
|
||||||
<IconButton icon="mdiPlay" title={t('common.test')} onclick={async () => { try { await api(`/notification-trackers/${tracker.id}/trigger`, { method: 'POST' }); snackSuccess(t('snack.targetTestSent')); } catch (err) { snackError((err as any).message); } }} />
|
|
||||||
<IconButton icon={tracker.enabled ? 'mdiPause' : 'mdiPlay'} title={tracker.enabled ? t('notificationTracker.pause') : t('notificationTracker.resume')} onclick={() => toggle(tracker)} disabled={toggling[tracker.id]} />
|
<IconButton icon={tracker.enabled ? 'mdiPause' : 'mdiPlay'} title={tracker.enabled ? t('notificationTracker.pause') : t('notificationTracker.resume')} onclick={() => toggle(tracker)} disabled={toggling[tracker.id]} />
|
||||||
<button onclick={() => toggleExpand(tracker.id)}
|
<button onclick={() => toggleExpand(tracker.id)}
|
||||||
class="text-xs text-[var(--color-muted-foreground)] hover:underline px-2 py-1">
|
class="text-xs text-[var(--color-muted-foreground)] hover:underline px-2 py-1">
|
||||||
@@ -411,7 +430,7 @@
|
|||||||
{testMenuOpen}
|
{testMenuOpen}
|
||||||
{testMenuStyle}
|
{testMenuStyle}
|
||||||
{ttTesting}
|
{ttTesting}
|
||||||
{testTypes}
|
testTypes={testTypes()}
|
||||||
ontest={handleTestFromMenu}
|
ontest={handleTestFromMenu}
|
||||||
onclose={() => testMenuOpen = null}
|
onclose={() => testMenuOpen = null}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
collection_ids: string[];
|
collection_ids: string[];
|
||||||
scan_interval: number;
|
scan_interval: number;
|
||||||
batch_duration: number;
|
batch_duration: number;
|
||||||
|
filters: Record<string, any>;
|
||||||
};
|
};
|
||||||
providerItems: { value: number; label: string; icon: string; desc: string }[];
|
providerItems: { value: number; label: string; icon: string; desc: string }[];
|
||||||
collections: any[];
|
collections: any[];
|
||||||
@@ -22,6 +23,7 @@
|
|||||||
submitting: boolean;
|
submitting: boolean;
|
||||||
linkCheckLoading: boolean;
|
linkCheckLoading: boolean;
|
||||||
error: string;
|
error: string;
|
||||||
|
providerType: string;
|
||||||
onsave: (e: SubmitEvent) => void;
|
onsave: (e: SubmitEvent) => void;
|
||||||
ontoggleCollection: (collectionId: string) => void;
|
ontoggleCollection: (collectionId: string) => void;
|
||||||
formatDate: (dateStr: string) => string;
|
formatDate: (dateStr: string) => string;
|
||||||
@@ -36,10 +38,39 @@
|
|||||||
submitting,
|
submitting,
|
||||||
linkCheckLoading,
|
linkCheckLoading,
|
||||||
error,
|
error,
|
||||||
|
providerType = '',
|
||||||
onsave,
|
onsave,
|
||||||
ontoggleCollection,
|
ontoggleCollection,
|
||||||
formatDate,
|
formatDate,
|
||||||
}: Props = $props();
|
}: Props = $props();
|
||||||
|
|
||||||
|
let isScheduler = $derived(providerType === 'scheduler');
|
||||||
|
|
||||||
|
// Custom variable management for scheduler
|
||||||
|
function addVariable() {
|
||||||
|
const vars = { ...(form.filters.custom_variables || {}) };
|
||||||
|
const key = `var_${Object.keys(vars).length + 1}`;
|
||||||
|
vars[key] = '';
|
||||||
|
form.filters = { ...form.filters, custom_variables: vars };
|
||||||
|
}
|
||||||
|
function removeVariable(key: string) {
|
||||||
|
const vars = { ...(form.filters.custom_variables || {}) };
|
||||||
|
delete vars[key];
|
||||||
|
form.filters = { ...form.filters, custom_variables: vars };
|
||||||
|
}
|
||||||
|
function updateVariableKey(oldKey: string, newKey: string) {
|
||||||
|
if (!newKey || newKey === oldKey) return;
|
||||||
|
const vars = { ...(form.filters.custom_variables || {}) };
|
||||||
|
const val = vars[oldKey] ?? '';
|
||||||
|
delete vars[oldKey];
|
||||||
|
vars[newKey] = val;
|
||||||
|
form.filters = { ...form.filters, custom_variables: vars };
|
||||||
|
}
|
||||||
|
function updateVariableValue(key: string, value: string) {
|
||||||
|
const vars = { ...(form.filters.custom_variables || {}) };
|
||||||
|
vars[key] = value;
|
||||||
|
form.filters = { ...form.filters, custom_variables: vars };
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div in:slide={{ duration: 200 }}>
|
<div in:slide={{ duration: 200 }}>
|
||||||
@@ -57,7 +88,7 @@
|
|||||||
<label class="block text-sm font-medium mb-1">{t('notificationTracker.server')}</label>
|
<label class="block text-sm font-medium mb-1">{t('notificationTracker.server')}</label>
|
||||||
<EntitySelect items={providerItems} bind:value={form.provider_id} placeholder={t('notificationTracker.selectServer')} />
|
<EntitySelect items={providerItems} bind:value={form.provider_id} placeholder={t('notificationTracker.selectServer')} />
|
||||||
</div>
|
</div>
|
||||||
{#if collections.length > 0}
|
{#if !isScheduler && collections.length > 0}
|
||||||
<div>
|
<div>
|
||||||
<label class="block text-sm font-medium mb-1">{t('notificationTracker.albums')} ({collections.length})</label>
|
<label class="block text-sm font-medium mb-1">{t('notificationTracker.albums')} ({collections.length})</label>
|
||||||
<input type="text" bind:value={collectionFilter} placeholder="Filter..."
|
<input type="text" bind:value={collectionFilter} placeholder="Filter..."
|
||||||
@@ -77,6 +108,59 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
|
{#if isScheduler}
|
||||||
|
<!-- Schedule type -->
|
||||||
|
<fieldset class="border border-[var(--color-border)] rounded-md p-3">
|
||||||
|
<legend class="text-sm font-medium px-1">{t('notificationTracker.scheduleType')}</legend>
|
||||||
|
<div class="flex gap-4 mt-1">
|
||||||
|
<label class="flex items-center gap-2 text-sm">
|
||||||
|
<input type="radio" name="schedule_type" value="interval"
|
||||||
|
checked={!form.filters.schedule_type || form.filters.schedule_type === 'interval'}
|
||||||
|
onchange={() => form.filters = { ...form.filters, schedule_type: 'interval' }} />
|
||||||
|
{t('notificationTracker.intervalMode')}
|
||||||
|
</label>
|
||||||
|
<label class="flex items-center gap-2 text-sm">
|
||||||
|
<input type="radio" name="schedule_type" value="cron"
|
||||||
|
checked={form.filters.schedule_type === 'cron'}
|
||||||
|
onchange={() => form.filters = { ...form.filters, schedule_type: 'cron' }} />
|
||||||
|
{t('notificationTracker.cronMode')}
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
{#if form.filters.schedule_type === 'cron'}
|
||||||
|
<div class="mt-3">
|
||||||
|
<label for="trk-cron" class="block text-xs mb-1">{t('notificationTracker.cronExpression')}</label>
|
||||||
|
<input id="trk-cron" value={form.filters.cron_expression || ''}
|
||||||
|
oninput={(e) => form.filters = { ...form.filters, cron_expression: (e.target as HTMLInputElement).value }}
|
||||||
|
placeholder="0 9 * * 1-5" class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)] font-mono" />
|
||||||
|
<p class="text-xs text-[var(--color-muted-foreground)] mt-1">{t('notificationTracker.cronHint')}</p>
|
||||||
|
</div>
|
||||||
|
{:else}
|
||||||
|
<div class="mt-3">
|
||||||
|
<label for="trk-interval" class="block text-xs mb-1">{t('notificationTracker.scanInterval')}<Hint text={t('hints.scanInterval')} /></label>
|
||||||
|
<input id="trk-interval" type="number" bind:value={form.scan_interval} min="60" max="86400" class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
|
||||||
|
</div>
|
||||||
|
{/if}
|
||||||
|
</fieldset>
|
||||||
|
|
||||||
|
<!-- Custom variables -->
|
||||||
|
<fieldset class="border border-[var(--color-border)] rounded-md p-3">
|
||||||
|
<legend class="text-sm font-medium px-1">{t('notificationTracker.customVariables')}</legend>
|
||||||
|
<p class="text-xs text-[var(--color-muted-foreground)] mb-2">{t('notificationTracker.customVariablesHint')}</p>
|
||||||
|
{#each Object.entries(form.filters.custom_variables || {}) as [key, value]}
|
||||||
|
<div class="flex gap-2 mb-2 items-center">
|
||||||
|
<input value={key} onblur={(e) => updateVariableKey(key, (e.target as HTMLInputElement).value)}
|
||||||
|
placeholder="key" class="w-1/3 px-2 py-1.5 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)] font-mono" />
|
||||||
|
<input value={value} oninput={(e) => updateVariableValue(key, (e.target as HTMLInputElement).value)}
|
||||||
|
placeholder="value" class="flex-1 px-2 py-1.5 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
|
||||||
|
<button type="button" onclick={() => removeVariable(key)}
|
||||||
|
class="text-[var(--color-error-fg)] hover:opacity-70 text-sm px-1">✕</button>
|
||||||
|
</div>
|
||||||
|
{/each}
|
||||||
|
<button type="button" onclick={addVariable}
|
||||||
|
class="text-xs text-[var(--color-primary)] hover:underline mt-1">+ {t('notificationTracker.addVariable')}</button>
|
||||||
|
</fieldset>
|
||||||
|
{:else}
|
||||||
<div class="grid grid-cols-2 gap-3">
|
<div class="grid grid-cols-2 gap-3">
|
||||||
<div>
|
<div>
|
||||||
<label for="trk-interval" class="block text-sm font-medium mb-1">{t('notificationTracker.scanInterval')}<Hint text={t('hints.scanInterval')} /></label>
|
<label for="trk-interval" class="block text-sm font-medium mb-1">{t('notificationTracker.scanInterval')}<Hint text={t('hints.scanInterval')} /></label>
|
||||||
@@ -87,6 +171,7 @@
|
|||||||
<input id="trk-batch" type="number" bind:value={form.batch_duration} min="0" max="3600" class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
|
<input id="trk-batch" type="number" bind:value={form.batch_duration} min="0" max="3600" class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{/if}
|
||||||
|
|
||||||
<button type="submit" disabled={submitting || linkCheckLoading} class="px-4 py-2 bg-[var(--color-primary)] text-[var(--color-primary-foreground)] rounded-md text-sm font-medium hover:opacity-90 disabled:opacity-50">
|
<button type="submit" disabled={submitting || linkCheckLoading} class="px-4 py-2 bg-[var(--color-primary)] text-[var(--color-primary-foreground)] rounded-md text-sm font-medium hover:opacity-90 disabled:opacity-50">
|
||||||
{#if linkCheckLoading}{t('notificationTracker.checkingLinks')}{:else}{editing ? t('common.save') : t('notificationTracker.createTracker')}{/if}
|
{#if linkCheckLoading}{t('notificationTracker.checkingLinks')}{:else}{editing ? t('common.save') : t('notificationTracker.createTracker')}{/if}
|
||||||
|
|||||||
@@ -140,10 +140,12 @@
|
|||||||
<input id="prv-name" bind:value={form.name} required class="flex-1 px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
|
<input id="prv-name" bind:value={form.name} required class="flex-1 px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{#if form.type !== 'scheduler'}
|
||||||
<div>
|
<div>
|
||||||
<label for="prv-url" class="block text-sm font-medium mb-1">{t('providers.url')}</label>
|
<label for="prv-url" class="block text-sm font-medium mb-1">{t('providers.url')}</label>
|
||||||
<input id="prv-url" bind:value={form.url} required placeholder={form.type === 'gitea' ? 'https://gitea.example.com' : t('providers.urlPlaceholder')} class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
|
<input id="prv-url" bind:value={form.url} required placeholder={form.type === 'gitea' ? 'https://gitea.example.com' : t('providers.urlPlaceholder')} class="w-full px-3 py-2 border border-[var(--color-border)] rounded-md text-sm bg-[var(--color-background)]" />
|
||||||
</div>
|
</div>
|
||||||
|
{/if}
|
||||||
{#if form.type === 'immich'}
|
{#if form.type === 'immich'}
|
||||||
<div>
|
<div>
|
||||||
<label for="prv-key" class="block text-sm font-medium mb-1">{editing ? t('providers.apiKeyKeep') : t('providers.apiKey')}</label>
|
<label for="prv-key" class="block text-sm font-medium mb-1">{editing ? t('providers.apiKeyKeep') : t('providers.apiKey')}</label>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
import { slide } from 'svelte/transition';
|
import { slide } from 'svelte/transition';
|
||||||
import { api } from '$lib/api';
|
import { api } from '$lib/api';
|
||||||
import { t } from '$lib/i18n';
|
import { t } from '$lib/i18n';
|
||||||
import { templateConfigsCache } from '$lib/stores/caches.svelte';
|
import { templateConfigsCache, capabilitiesCache } from '$lib/stores/caches.svelte';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import Card from '$lib/components/Card.svelte';
|
import Card from '$lib/components/Card.svelte';
|
||||||
import Loading from '$lib/components/Loading.svelte';
|
import Loading from '$lib/components/Loading.svelte';
|
||||||
@@ -109,8 +109,8 @@
|
|||||||
let form = $state(defaultForm());
|
let form = $state(defaultForm());
|
||||||
let previewTargetType = $state('telegram');
|
let previewTargetType = $state('telegram');
|
||||||
|
|
||||||
// Provider capabilities: loaded dynamically
|
// Provider capabilities: from shared cache
|
||||||
let allCapabilities = $state<Record<string, any>>({});
|
let allCapabilities = $derived(capabilitiesCache.items);
|
||||||
let providerTypes = $derived(Object.keys(allCapabilities));
|
let providerTypes = $derived(Object.keys(allCapabilities));
|
||||||
|
|
||||||
// Dynamic slot definitions based on selected provider_type
|
// Dynamic slot definitions based on selected provider_type
|
||||||
@@ -137,10 +137,10 @@
|
|||||||
onMount(load);
|
onMount(load);
|
||||||
async function load() {
|
async function load() {
|
||||||
try {
|
try {
|
||||||
[, varsRef, allCapabilities] = await Promise.all([
|
[, varsRef] = await Promise.all([
|
||||||
templateConfigsCache.fetch(true),
|
templateConfigsCache.fetch(true),
|
||||||
api('/template-configs/variables'),
|
api('/template-configs/variables'),
|
||||||
api('/providers/capabilities'),
|
capabilitiesCache.fetch(),
|
||||||
]);
|
]);
|
||||||
} catch (err: any) { error = err.message || t('common.loadError'); snackError(error); }
|
} catch (err: any) { error = err.message || t('common.loadError'); snackError(error); }
|
||||||
finally { loaded = true; highlightFromUrl(); }
|
finally { loaded = true; highlightFromUrl(); }
|
||||||
@@ -284,7 +284,7 @@
|
|||||||
<IconGridSelect items={previewTargetTypeItems()} bind:value={previewTargetType} columns={2} />
|
<IconGridSelect items={previewTargetTypeItems()} bind:value={previewTargetType} columns={2} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#each templateSlots as group}
|
{#each templateSlots.filter(g => g.slots.length > 0) as group}
|
||||||
<fieldset class="border border-[var(--color-border)] rounded-md p-3">
|
<fieldset class="border border-[var(--color-border)] rounded-md p-3">
|
||||||
<legend class="text-sm font-medium px-1">{t(`templateConfig.${group.group}`)}{#if group.group === 'eventMessages'}<Hint text={t('hints.eventMessages')} />{:else if group.group === 'scheduledMessages'}<Hint text={t('hints.scheduledMessages')} />{/if}</legend>
|
<legend class="text-sm font-medium px-1">{t(`templateConfig.${group.group}`)}{#if group.group === 'eventMessages'}<Hint text={t('hints.eventMessages')} />{:else if group.group === 'scheduledMessages'}<Hint text={t('hints.scheduledMessages')} />{/if}</legend>
|
||||||
<div class="space-y-3 mt-2">
|
<div class="space-y-3 mt-2">
|
||||||
|
|||||||
@@ -40,6 +40,8 @@
|
|||||||
scheduled_min_rating: 0, scheduled_order_by: 'random', scheduled_order: 'descending',
|
scheduled_min_rating: 0, scheduled_order_by: 'random', scheduled_order: 'descending',
|
||||||
memory_enabled: false, memory_source: 'albums', memory_times: '09:00', memory_collection_mode: 'combined',
|
memory_enabled: false, memory_source: 'albums', memory_times: '09:00', memory_collection_mode: 'combined',
|
||||||
memory_limit: 10, memory_favorite_only: false, memory_asset_type: 'all', memory_min_rating: 0,
|
memory_limit: 10, memory_favorite_only: false, memory_asset_type: 'all', memory_min_rating: 0,
|
||||||
|
// Scheduler event tracking
|
||||||
|
track_scheduled_message: true,
|
||||||
// Gitea event tracking
|
// Gitea event tracking
|
||||||
track_push: true, track_issue_opened: true, track_issue_closed: true, track_issue_commented: false,
|
track_push: true, track_issue_opened: true, track_issue_closed: true, track_issue_commented: false,
|
||||||
track_pr_opened: true, track_pr_closed: true, track_pr_merged: true, track_pr_commented: false,
|
track_pr_opened: true, track_pr_closed: true, track_pr_merged: true, track_pr_commented: false,
|
||||||
@@ -117,7 +119,11 @@
|
|||||||
<!-- Event tracking -->
|
<!-- Event tracking -->
|
||||||
<fieldset class="border border-[var(--color-border)] rounded-md p-3">
|
<fieldset class="border border-[var(--color-border)] rounded-md p-3">
|
||||||
<legend class="text-sm font-medium px-1">{t('trackingConfig.eventTracking')}</legend>
|
<legend class="text-sm font-medium px-1">{t('trackingConfig.eventTracking')}</legend>
|
||||||
{#if form.provider_type === 'gitea'}
|
{#if form.provider_type === 'scheduler'}
|
||||||
|
<div class="grid grid-cols-2 gap-2 mt-2">
|
||||||
|
<label class="flex items-center gap-2 text-sm"><input type="checkbox" bind:checked={form.track_scheduled_message} /> {t('trackingConfig.scheduledMessage')}</label>
|
||||||
|
</div>
|
||||||
|
{:else if form.provider_type === 'gitea'}
|
||||||
<div class="grid grid-cols-2 gap-2 mt-2">
|
<div class="grid grid-cols-2 gap-2 mt-2">
|
||||||
<label class="flex items-center gap-2 text-sm"><input type="checkbox" bind:checked={form.track_push} /> {t('trackingConfig.push')}</label>
|
<label class="flex items-center gap-2 text-sm"><input type="checkbox" bind:checked={form.track_push} /> {t('trackingConfig.push')}</label>
|
||||||
<label class="flex items-center gap-2 text-sm"><input type="checkbox" bind:checked={form.track_issue_opened} /> {t('trackingConfig.issueOpened')}</label>
|
<label class="flex items-center gap-2 text-sm"><input type="checkbox" bind:checked={form.track_issue_opened} /> {t('trackingConfig.issueOpened')}</label>
|
||||||
@@ -143,7 +149,7 @@
|
|||||||
<label class="flex items-center gap-2 text-sm"><input type="checkbox" bind:checked={form.include_asset_details} /> {t('trackingConfig.includeDetails')}</label>
|
<label class="flex items-center gap-2 text-sm"><input type="checkbox" bind:checked={form.include_asset_details} /> {t('trackingConfig.includeDetails')}</label>
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
{/if}
|
||||||
{#if form.provider_type !== 'gitea'}
|
{#if form.provider_type === 'immich'}
|
||||||
<div class="grid grid-cols-3 gap-3 mt-3">
|
<div class="grid grid-cols-3 gap-3 mt-3">
|
||||||
<div>
|
<div>
|
||||||
<label for="tc-max" class="block text-xs mb-1">{t('trackingConfig.maxAssets')}<Hint text={t('hints.maxAssets')} /></label>
|
<label for="tc-max" class="block text-xs mb-1">{t('trackingConfig.maxAssets')}<Hint text={t('hints.maxAssets')} /></label>
|
||||||
@@ -161,7 +167,7 @@
|
|||||||
{/if}
|
{/if}
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
||||||
{#if form.provider_type !== 'gitea'}
|
{#if form.provider_type === 'immich'}
|
||||||
<!-- Periodic summary -->
|
<!-- Periodic summary -->
|
||||||
<fieldset class="border border-[var(--color-border)] rounded-md p-3">
|
<fieldset class="border border-[var(--color-border)] rounded-md p-3">
|
||||||
<legend class="text-sm font-medium px-1">{t('trackingConfig.periodicSummary')}<Hint text={t('hints.periodicSummary')} /></legend>
|
<legend class="text-sm font-medium px-1">{t('trackingConfig.periodicSummary')}<Hint text={t('hints.periodicSummary')} /></legend>
|
||||||
|
|||||||
@@ -32,6 +32,9 @@ class EventType(str, Enum):
|
|||||||
PR_COMMENTED = "pr_commented"
|
PR_COMMENTED = "pr_commented"
|
||||||
RELEASE_PUBLISHED = "release_published"
|
RELEASE_PUBLISHED = "release_published"
|
||||||
|
|
||||||
|
# Scheduler events
|
||||||
|
SCHEDULED_MESSAGE = "scheduled_message"
|
||||||
|
|
||||||
|
|
||||||
@dataclass
|
@dataclass
|
||||||
class ServiceEvent:
|
class ServiceEvent:
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ class ServiceProviderType(str, Enum):
|
|||||||
|
|
||||||
IMMICH = "immich"
|
IMMICH = "immich"
|
||||||
GITEA = "gitea"
|
GITEA = "gitea"
|
||||||
|
SCHEDULER = "scheduler"
|
||||||
|
|
||||||
|
|
||||||
class ServiceProvider(ABC):
|
class ServiceProvider(ABC):
|
||||||
|
|||||||
@@ -165,6 +165,25 @@ GITEA_CAPABILITIES = ProviderCapabilities(
|
|||||||
commands=[],
|
commands=[],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# Scheduler provider capabilities
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
SCHEDULER_CAPABILITIES = ProviderCapabilities(
|
||||||
|
provider_type="scheduler",
|
||||||
|
display_name="Scheduler",
|
||||||
|
webhook_based=False,
|
||||||
|
supported_filters=[],
|
||||||
|
notification_slots=[
|
||||||
|
{"name": "message_scheduled_message", "description": "Scheduled message"},
|
||||||
|
],
|
||||||
|
command_slots=[],
|
||||||
|
events=[
|
||||||
|
{"name": "scheduled_message", "description": "Scheduled event fired"},
|
||||||
|
],
|
||||||
|
commands=[],
|
||||||
|
)
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Registry
|
# Registry
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -172,6 +191,7 @@ GITEA_CAPABILITIES = ProviderCapabilities(
|
|||||||
_REGISTRY: dict[str, ProviderCapabilities] = {
|
_REGISTRY: dict[str, ProviderCapabilities] = {
|
||||||
"immich": IMMICH_CAPABILITIES,
|
"immich": IMMICH_CAPABILITIES,
|
||||||
"gitea": GITEA_CAPABILITIES,
|
"gitea": GITEA_CAPABILITIES,
|
||||||
|
"scheduler": SCHEDULER_CAPABILITIES,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
"""Scheduler service provider implementation."""
|
||||||
|
|
||||||
|
from notify_bridge_core.providers.base import ServiceProviderType
|
||||||
|
from notify_bridge_core.templates.variables import registry
|
||||||
|
|
||||||
|
from .provider import SchedulerServiceProvider, SCHEDULER_VARIABLES
|
||||||
|
|
||||||
|
# Register Scheduler variables in the global registry
|
||||||
|
registry.register_provider_variables(ServiceProviderType.SCHEDULER, SCHEDULER_VARIABLES)
|
||||||
|
|
||||||
|
__all__ = [
|
||||||
|
"SchedulerServiceProvider",
|
||||||
|
"SCHEDULER_VARIABLES",
|
||||||
|
]
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
"""Scheduler service provider — virtual provider that emits events on a schedule."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from notify_bridge_core.models.events import EventType, ServiceEvent
|
||||||
|
from notify_bridge_core.providers.base import ServiceProvider, ServiceProviderType
|
||||||
|
from notify_bridge_core.templates.variables import TemplateVariableDefinition
|
||||||
|
|
||||||
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
_WEEKDAYS = ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"]
|
||||||
|
|
||||||
|
SCHEDULER_VARIABLES: list[TemplateVariableDefinition] = [
|
||||||
|
TemplateVariableDefinition(
|
||||||
|
name="schedule_name",
|
||||||
|
type="string",
|
||||||
|
description="Name of the scheduled tracker",
|
||||||
|
example="Daily standup reminder",
|
||||||
|
provider_type=ServiceProviderType.SCHEDULER,
|
||||||
|
),
|
||||||
|
TemplateVariableDefinition(
|
||||||
|
name="fire_count",
|
||||||
|
type="int",
|
||||||
|
description="How many times this schedule has fired",
|
||||||
|
example="42",
|
||||||
|
provider_type=ServiceProviderType.SCHEDULER,
|
||||||
|
),
|
||||||
|
TemplateVariableDefinition(
|
||||||
|
name="current_date",
|
||||||
|
type="string",
|
||||||
|
description="Current date (formatted)",
|
||||||
|
example="22.03.2026",
|
||||||
|
provider_type=ServiceProviderType.SCHEDULER,
|
||||||
|
),
|
||||||
|
TemplateVariableDefinition(
|
||||||
|
name="current_time",
|
||||||
|
type="string",
|
||||||
|
description="Current time (formatted)",
|
||||||
|
example="09:00",
|
||||||
|
provider_type=ServiceProviderType.SCHEDULER,
|
||||||
|
),
|
||||||
|
TemplateVariableDefinition(
|
||||||
|
name="current_datetime",
|
||||||
|
type="string",
|
||||||
|
description="Current date and time (formatted)",
|
||||||
|
example="22.03.2026, 09:00 UTC",
|
||||||
|
provider_type=ServiceProviderType.SCHEDULER,
|
||||||
|
),
|
||||||
|
TemplateVariableDefinition(
|
||||||
|
name="weekday",
|
||||||
|
type="string",
|
||||||
|
description="Day of the week",
|
||||||
|
example="Monday",
|
||||||
|
provider_type=ServiceProviderType.SCHEDULER,
|
||||||
|
),
|
||||||
|
TemplateVariableDefinition(
|
||||||
|
name="custom_vars",
|
||||||
|
type="dict",
|
||||||
|
description="User-defined key-value pairs (also available as top-level variables)",
|
||||||
|
example='{"team": "Engineering", "channel": "#general"}',
|
||||||
|
provider_type=ServiceProviderType.SCHEDULER,
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
class SchedulerServiceProvider(ServiceProvider):
|
||||||
|
"""Virtual provider that generates events on a schedule.
|
||||||
|
|
||||||
|
No external service connection. The poll() method creates a
|
||||||
|
SCHEDULED_MESSAGE event with datetime info and custom variables.
|
||||||
|
"""
|
||||||
|
|
||||||
|
provider_type = ServiceProviderType.SCHEDULER
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
name: str = "Scheduler",
|
||||||
|
tracker_name: str = "",
|
||||||
|
custom_variables: dict[str, str] | None = None,
|
||||||
|
date_format: str = "%d.%m.%Y",
|
||||||
|
time_format: str = "%H:%M",
|
||||||
|
datetime_format: str = "%d.%m.%Y, %H:%M UTC",
|
||||||
|
) -> None:
|
||||||
|
self._name = name
|
||||||
|
self._tracker_name = tracker_name
|
||||||
|
self._custom_variables = custom_variables or {}
|
||||||
|
self._date_format = date_format
|
||||||
|
self._time_format = time_format
|
||||||
|
self._datetime_format = datetime_format
|
||||||
|
|
||||||
|
async def connect(self) -> bool:
|
||||||
|
return True # virtual provider — always connected
|
||||||
|
|
||||||
|
async def disconnect(self) -> None:
|
||||||
|
pass
|
||||||
|
|
||||||
|
async def poll(
|
||||||
|
self,
|
||||||
|
collection_ids: list[str],
|
||||||
|
tracker_state: dict[str, Any],
|
||||||
|
) -> tuple[list[ServiceEvent], dict[str, Any]]:
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
|
# State uses {collection_id: {dict}} convention like other providers
|
||||||
|
sched_state = tracker_state.get("scheduler", {})
|
||||||
|
fire_count = sched_state.get("fire_count", 0) + 1
|
||||||
|
|
||||||
|
extra: dict[str, Any] = {
|
||||||
|
"schedule_name": self._tracker_name,
|
||||||
|
"fire_count": fire_count,
|
||||||
|
"current_date": now.strftime(self._date_format),
|
||||||
|
"current_time": now.strftime(self._time_format),
|
||||||
|
"current_datetime": now.strftime(self._datetime_format),
|
||||||
|
"weekday": _WEEKDAYS[now.weekday()],
|
||||||
|
"custom_vars": dict(self._custom_variables),
|
||||||
|
}
|
||||||
|
# Flatten custom variables at top level for easy template access
|
||||||
|
extra.update(self._custom_variables)
|
||||||
|
|
||||||
|
event = ServiceEvent(
|
||||||
|
event_type=EventType.SCHEDULED_MESSAGE,
|
||||||
|
provider_type=ServiceProviderType.SCHEDULER,
|
||||||
|
provider_name=self._name,
|
||||||
|
collection_id="scheduler",
|
||||||
|
collection_name=self._tracker_name,
|
||||||
|
timestamp=now,
|
||||||
|
extra=extra,
|
||||||
|
)
|
||||||
|
|
||||||
|
new_state = {
|
||||||
|
"scheduler": {
|
||||||
|
"name": self._tracker_name,
|
||||||
|
"fire_count": fire_count,
|
||||||
|
"asset_ids": [],
|
||||||
|
"pending_asset_ids": [],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
return [event], new_state
|
||||||
|
|
||||||
|
def get_available_variables(self) -> list[TemplateVariableDefinition]:
|
||||||
|
return list(SCHEDULER_VARIABLES)
|
||||||
|
|
||||||
|
def get_provider_config_schema(self) -> dict[str, Any]:
|
||||||
|
return {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {},
|
||||||
|
"required": [],
|
||||||
|
}
|
||||||
|
|
||||||
|
async def list_collections(self) -> list[dict[str, Any]]:
|
||||||
|
return [] # no collections concept
|
||||||
|
|
||||||
|
async def test_connection(self) -> dict[str, Any]:
|
||||||
|
return {"ok": True, "message": "Virtual provider — always available"}
|
||||||
@@ -126,4 +126,14 @@ def build_template_context(
|
|||||||
if event.new_name:
|
if event.new_name:
|
||||||
ctx.setdefault("new_album_name", event.new_name)
|
ctx.setdefault("new_album_name", event.new_name)
|
||||||
|
|
||||||
|
# Provider-specific defaults for Scheduler
|
||||||
|
if event.provider_type.value == "scheduler":
|
||||||
|
ctx.setdefault("schedule_name", event.collection_name)
|
||||||
|
ctx.setdefault("fire_count", event.extra.get("fire_count", 0))
|
||||||
|
ctx.setdefault("current_date", event.extra.get("current_date", ""))
|
||||||
|
ctx.setdefault("current_time", event.extra.get("current_time", ""))
|
||||||
|
ctx.setdefault("current_datetime", event.extra.get("current_datetime", ""))
|
||||||
|
ctx.setdefault("weekday", event.extra.get("weekday", ""))
|
||||||
|
ctx.setdefault("custom_vars", event.extra.get("custom_vars", {}))
|
||||||
|
|
||||||
return ctx
|
return ctx
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
🔔 <b>{{ schedule_name }}</b> (#{{ fire_count }})
|
||||||
|
📅 {{ current_datetime }}
|
||||||
|
{%- if custom_vars %}
|
||||||
|
{%- for key, value in custom_vars.items() %}
|
||||||
|
{{ key }}: {{ value }}
|
||||||
|
{%- endfor %}
|
||||||
|
{%- endif %}
|
||||||
@@ -33,6 +33,9 @@ PROVIDER_SLOT_FILE_MAP: dict[str, dict[str, str]] = {
|
|||||||
"message_pr_commented": "gitea_pr_commented.jinja2",
|
"message_pr_commented": "gitea_pr_commented.jinja2",
|
||||||
"message_release_published": "gitea_release_published.jinja2",
|
"message_release_published": "gitea_release_published.jinja2",
|
||||||
},
|
},
|
||||||
|
"scheduler": {
|
||||||
|
"message_scheduled_message": "scheduled_message.jinja2",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
# Backward-compatible alias
|
# Backward-compatible alias
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
🔔 <b>{{ schedule_name }}</b> (#{{ fire_count }})
|
||||||
|
📅 {{ current_datetime }}
|
||||||
|
{%- if custom_vars %}
|
||||||
|
{%- for key, value in custom_vars.items() %}
|
||||||
|
{{ key }}: {{ value }}
|
||||||
|
{%- endfor %}
|
||||||
|
{%- endif %}
|
||||||
@@ -94,7 +94,7 @@ async def create_notification_tracker_target(
|
|||||||
# Validate config ownership + provider type match
|
# Validate config ownership + provider type match
|
||||||
if body.tracking_config_id:
|
if body.tracking_config_id:
|
||||||
tc = await session.get(TrackingConfig, body.tracking_config_id)
|
tc = await session.get(TrackingConfig, body.tracking_config_id)
|
||||||
if not tc or tc.user_id != user.id:
|
if not tc or (tc.user_id != user.id and tc.user_id != 0):
|
||||||
raise HTTPException(status_code=404, detail="Tracking config not found")
|
raise HTTPException(status_code=404, detail="Tracking config not found")
|
||||||
if tc.provider_type != provider.type:
|
if tc.provider_type != provider.type:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
@@ -139,7 +139,7 @@ async def update_notification_tracker_target(
|
|||||||
# Validate config ownership + provider type match if being changed
|
# Validate config ownership + provider type match if being changed
|
||||||
if "tracking_config_id" in updates and updates["tracking_config_id"]:
|
if "tracking_config_id" in updates and updates["tracking_config_id"]:
|
||||||
tc = await session.get(TrackingConfig, updates["tracking_config_id"])
|
tc = await session.get(TrackingConfig, updates["tracking_config_id"])
|
||||||
if not tc or tc.user_id != user.id:
|
if not tc or (tc.user_id != user.id and tc.user_id != 0):
|
||||||
raise HTTPException(status_code=404, detail="Tracking config not found")
|
raise HTTPException(status_code=404, detail="Tracking config not found")
|
||||||
if tc.provider_type != provider.type:
|
if tc.provider_type != provider.type:
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
|
|||||||
@@ -97,6 +97,8 @@ async def create_provider(
|
|||||||
detail=test_result.get("message", "Cannot connect to Gitea"),
|
detail=test_result.get("message", "Cannot connect to Gitea"),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Scheduler: no validation needed (virtual provider)
|
||||||
|
|
||||||
provider = ServiceProvider(
|
provider = ServiceProvider(
|
||||||
user_id=user.id,
|
user_id=user.id,
|
||||||
type=body.type,
|
type=body.type,
|
||||||
@@ -253,6 +255,9 @@ async def test_provider(
|
|||||||
gitea = make_gitea_provider(http_session, provider)
|
gitea = make_gitea_provider(http_session, provider)
|
||||||
return await gitea.test_connection()
|
return await gitea.test_connection()
|
||||||
|
|
||||||
|
if provider.type == "scheduler":
|
||||||
|
return {"ok": True, "message": "Virtual provider — always available"}
|
||||||
|
|
||||||
return {"ok": False, "message": f"Unknown provider type: {provider.type}"}
|
return {"ok": False, "message": f"Unknown provider type: {provider.type}"}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -101,7 +101,10 @@ async def list_configs(
|
|||||||
user: User = Depends(get_current_user),
|
user: User = Depends(get_current_user),
|
||||||
session: AsyncSession = Depends(get_session),
|
session: AsyncSession = Depends(get_session),
|
||||||
):
|
):
|
||||||
query = select(TrackingConfig).where(TrackingConfig.user_id == user.id)
|
from sqlmodel import or_
|
||||||
|
query = select(TrackingConfig).where(
|
||||||
|
or_(TrackingConfig.user_id == user.id, TrackingConfig.user_id == 0)
|
||||||
|
)
|
||||||
if provider_type:
|
if provider_type:
|
||||||
query = query.where(TrackingConfig.provider_type == provider_type)
|
query = query.where(TrackingConfig.provider_type == provider_type)
|
||||||
result = await session.exec(query)
|
result = await session.exec(query)
|
||||||
@@ -167,6 +170,6 @@ def _response(c: TrackingConfig) -> dict:
|
|||||||
|
|
||||||
async def _get(session: AsyncSession, config_id: int, user_id: int) -> TrackingConfig:
|
async def _get(session: AsyncSession, config_id: int, user_id: int) -> TrackingConfig:
|
||||||
config = await session.get(TrackingConfig, config_id)
|
config = await session.get(TrackingConfig, config_id)
|
||||||
if not config or config.user_id != user_id:
|
if not config or (config.user_id != user_id and config.user_id != 0):
|
||||||
raise HTTPException(status_code=404, detail="Tracking config not found")
|
raise HTTPException(status_code=404, detail="Tracking config not found")
|
||||||
return config
|
return config
|
||||||
|
|||||||
@@ -277,6 +277,8 @@ def _event_allowed_by_tracking_config(event: ServiceEvent, tc: TrackingConfig) -
|
|||||||
"pr_merged": tc.track_pr_merged,
|
"pr_merged": tc.track_pr_merged,
|
||||||
"pr_commented": tc.track_pr_commented,
|
"pr_commented": tc.track_pr_commented,
|
||||||
"release_published": tc.track_release_published,
|
"release_published": tc.track_release_published,
|
||||||
|
# Scheduler events
|
||||||
|
"scheduled_message": tc.track_scheduled_message,
|
||||||
# Immich events
|
# Immich events
|
||||||
"assets_added": tc.track_assets_added,
|
"assets_added": tc.track_assets_added,
|
||||||
"assets_removed": tc.track_assets_removed,
|
"assets_removed": tc.track_assets_removed,
|
||||||
|
|||||||
@@ -150,6 +150,7 @@ async def migrate_schema(engine: AsyncEngine) -> None:
|
|||||||
("track_pr_merged", "INTEGER DEFAULT 1"),
|
("track_pr_merged", "INTEGER DEFAULT 1"),
|
||||||
("track_pr_commented", "INTEGER DEFAULT 0"),
|
("track_pr_commented", "INTEGER DEFAULT 0"),
|
||||||
("track_release_published", "INTEGER DEFAULT 1"),
|
("track_release_published", "INTEGER DEFAULT 1"),
|
||||||
|
("track_scheduled_message", "INTEGER DEFAULT 1"),
|
||||||
]
|
]
|
||||||
for col_name, col_type in gitea_flags:
|
for col_name, col_type in gitea_flags:
|
||||||
if not await _has_column(conn, "tracking_config", col_name):
|
if not await _has_column(conn, "tracking_config", col_name):
|
||||||
|
|||||||
@@ -127,6 +127,9 @@ class TrackingConfig(SQLModel, table=True):
|
|||||||
track_pr_commented: bool = Field(default=False)
|
track_pr_commented: bool = Field(default=False)
|
||||||
track_release_published: bool = Field(default=True)
|
track_release_published: bool = Field(default=True)
|
||||||
|
|
||||||
|
# Scheduler event tracking
|
||||||
|
track_scheduled_message: bool = Field(default=True)
|
||||||
|
|
||||||
# Immich asset display
|
# Immich asset display
|
||||||
track_images: bool = Field(default=True)
|
track_images: bool = Field(default=True)
|
||||||
track_videos: bool = Field(default=True)
|
track_videos: bool = Field(default=True)
|
||||||
|
|||||||
@@ -52,6 +52,7 @@ async def lifespan(app: FastAPI):
|
|||||||
await migrate_command_slot_locale(engine)
|
await migrate_command_slot_locale(engine)
|
||||||
await _seed_default_templates()
|
await _seed_default_templates()
|
||||||
await _seed_default_command_templates()
|
await _seed_default_command_templates()
|
||||||
|
await _seed_default_tracking_configs()
|
||||||
# Configure webhook secret from DB setting (falls back to env var)
|
# Configure webhook secret from DB setting (falls back to env var)
|
||||||
from sqlmodel.ext.asyncio.session import AsyncSession as _AS
|
from sqlmodel.ext.asyncio.session import AsyncSession as _AS
|
||||||
from .api.app_settings import get_setting as _get_setting
|
from .api.app_settings import get_setting as _get_setting
|
||||||
@@ -275,6 +276,85 @@ async def _seed_default_templates():
|
|||||||
template=template_text,
|
template=template_text,
|
||||||
))
|
))
|
||||||
|
|
||||||
|
# --- Seed Scheduler default templates ---
|
||||||
|
sched_result = await session.exec(
|
||||||
|
select(TemplateConfig).where(
|
||||||
|
TemplateConfig.user_id == 0,
|
||||||
|
TemplateConfig.provider_type == "scheduler",
|
||||||
|
)
|
||||||
|
)
|
||||||
|
sched_configs = sched_result.all()
|
||||||
|
sched_existing_locales = {
|
||||||
|
(c.locale if c.locale else "en"): c for c in sched_configs
|
||||||
|
}
|
||||||
|
|
||||||
|
for locale in ("en", "ru"):
|
||||||
|
sched_slots = load_default_templates(locale, provider_type="scheduler")
|
||||||
|
if not sched_slots:
|
||||||
|
continue
|
||||||
|
|
||||||
|
if locale not in sched_existing_locales:
|
||||||
|
from datetime import datetime as _dt2, timezone as _tz2
|
||||||
|
now2 = _dt2.now(_tz2.utc).isoformat()
|
||||||
|
name2 = f"Default Scheduler ({locale.upper()})"
|
||||||
|
desc2 = f"Default Scheduler templates ({locale.upper()})"
|
||||||
|
col_info2 = (await session.execute(
|
||||||
|
text("PRAGMA table_info(template_config)")
|
||||||
|
)).fetchall()
|
||||||
|
col_names2 = [c[1] for c in col_info2 if c[1] != "id"]
|
||||||
|
values2 = {}
|
||||||
|
for col in col_names2:
|
||||||
|
if col == "user_id":
|
||||||
|
values2[col] = 0
|
||||||
|
elif col == "provider_type":
|
||||||
|
values2[col] = "scheduler"
|
||||||
|
elif col == "name":
|
||||||
|
values2[col] = name2
|
||||||
|
elif col == "description":
|
||||||
|
values2[col] = desc2
|
||||||
|
elif col == "created_at":
|
||||||
|
values2[col] = now2
|
||||||
|
elif col == "date_format":
|
||||||
|
values2[col] = "%d.%m.%Y, %H:%M UTC"
|
||||||
|
elif col == "date_only_format":
|
||||||
|
values2[col] = "%d.%m.%Y"
|
||||||
|
elif col == "locale":
|
||||||
|
values2[col] = locale
|
||||||
|
else:
|
||||||
|
values2[col] = ""
|
||||||
|
cols_str2 = ", ".join(values2.keys())
|
||||||
|
placeholders2 = ", ".join(f":{k}" for k in values2.keys())
|
||||||
|
await session.execute(
|
||||||
|
text(f"INSERT INTO template_config ({cols_str2}) VALUES ({placeholders2})"),
|
||||||
|
values2,
|
||||||
|
)
|
||||||
|
row2 = (await session.execute(text("SELECT last_insert_rowid()"))).scalar()
|
||||||
|
for slot_name, template_text in sched_slots.items():
|
||||||
|
session.add(TemplateSlot(
|
||||||
|
config_id=row2,
|
||||||
|
slot_name=slot_name,
|
||||||
|
template=template_text,
|
||||||
|
))
|
||||||
|
else:
|
||||||
|
config = sched_existing_locales[locale]
|
||||||
|
for slot_name, template_text in sched_slots.items():
|
||||||
|
slot_result = await session.exec(
|
||||||
|
select(TemplateSlot).where(
|
||||||
|
TemplateSlot.config_id == config.id,
|
||||||
|
TemplateSlot.slot_name == slot_name,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
existing = slot_result.first()
|
||||||
|
if existing:
|
||||||
|
existing.template = template_text
|
||||||
|
session.add(existing)
|
||||||
|
else:
|
||||||
|
session.add(TemplateSlot(
|
||||||
|
config_id=config.id,
|
||||||
|
slot_name=slot_name,
|
||||||
|
template=template_text,
|
||||||
|
))
|
||||||
|
|
||||||
await session.commit()
|
await session.commit()
|
||||||
|
|
||||||
|
|
||||||
@@ -339,6 +419,51 @@ async def _seed_default_command_templates():
|
|||||||
await session.commit()
|
await session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
async def _seed_default_tracking_configs():
|
||||||
|
"""Seed system-owned default tracking configs for each provider type."""
|
||||||
|
from sqlmodel import select
|
||||||
|
from sqlmodel.ext.asyncio.session import AsyncSession
|
||||||
|
from .database.engine import get_engine
|
||||||
|
from .database.models import TrackingConfig
|
||||||
|
|
||||||
|
engine = get_engine()
|
||||||
|
async with AsyncSession(engine) as session:
|
||||||
|
# Find existing system-owned tracking configs
|
||||||
|
result = await session.exec(
|
||||||
|
select(TrackingConfig).where(TrackingConfig.user_id == 0)
|
||||||
|
)
|
||||||
|
existing = {c.provider_type: c for c in result.all()}
|
||||||
|
|
||||||
|
defaults = [
|
||||||
|
{
|
||||||
|
"provider_type": "gitea",
|
||||||
|
"name": "Default Gitea",
|
||||||
|
"track_push": True,
|
||||||
|
"track_issue_opened": True,
|
||||||
|
"track_issue_closed": True,
|
||||||
|
"track_issue_commented": False,
|
||||||
|
"track_pr_opened": True,
|
||||||
|
"track_pr_closed": True,
|
||||||
|
"track_pr_merged": True,
|
||||||
|
"track_pr_commented": False,
|
||||||
|
"track_release_published": True,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"provider_type": "scheduler",
|
||||||
|
"name": "Default Scheduler",
|
||||||
|
"track_scheduled_message": True,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
|
||||||
|
for cfg in defaults:
|
||||||
|
ptype = cfg["provider_type"]
|
||||||
|
if ptype in existing:
|
||||||
|
continue
|
||||||
|
session.add(TrackingConfig(user_id=0, **cfg))
|
||||||
|
|
||||||
|
await session.commit()
|
||||||
|
|
||||||
|
|
||||||
def run():
|
def run():
|
||||||
import uvicorn
|
import uvicorn
|
||||||
uvicorn.run(app, host="0.0.0.0", port=8420)
|
uvicorn.run(app, host="0.0.0.0", port=8420)
|
||||||
|
|||||||
@@ -91,4 +91,50 @@ _SAMPLE_CONTEXT = {
|
|||||||
"photo_count": 30,
|
"photo_count": 30,
|
||||||
"video_count": 5,
|
"video_count": 5,
|
||||||
"owner": "Alice",
|
"owner": "Alice",
|
||||||
|
# Gitea variables (for gitea provider templates)
|
||||||
|
"sender": "alexei",
|
||||||
|
"sender_name": "Alexei",
|
||||||
|
"sender_avatar": "",
|
||||||
|
"repo_name": "my-project",
|
||||||
|
"repo_full_name": "alexei/my-project",
|
||||||
|
"repo_url": "https://gitea.example.com/alexei/my-project",
|
||||||
|
"repo_description": "Example project",
|
||||||
|
"branch": "main",
|
||||||
|
"commits": [{"id": "abc1234567", "short_id": "abc1234", "message": "fix: example commit", "url": "", "author": "Alexei"}],
|
||||||
|
"commit_count": 1,
|
||||||
|
"compare_url": "https://gitea.example.com/alexei/my-project/compare/abc...def",
|
||||||
|
"issue_number": 42,
|
||||||
|
"issue_title": "Example issue",
|
||||||
|
"issue_url": "https://gitea.example.com/alexei/my-project/issues/42",
|
||||||
|
"issue_state": "open",
|
||||||
|
"issue_body": "",
|
||||||
|
"issue_labels": ["bug"],
|
||||||
|
"pr_number": 17,
|
||||||
|
"pr_title": "Add feature",
|
||||||
|
"pr_url": "https://gitea.example.com/alexei/my-project/pulls/17",
|
||||||
|
"pr_state": "open",
|
||||||
|
"pr_body": "",
|
||||||
|
"pr_merged": False,
|
||||||
|
"pr_base": "main",
|
||||||
|
"pr_head": "feature/example",
|
||||||
|
"pr_labels": [],
|
||||||
|
"comment_body": "Looks good!",
|
||||||
|
"comment_url": "",
|
||||||
|
"comment_author": "alexei",
|
||||||
|
"release_tag": "v1.0.0",
|
||||||
|
"release_name": "Version 1.0.0",
|
||||||
|
"release_url": "https://gitea.example.com/alexei/my-project/releases/tag/v1.0.0",
|
||||||
|
"release_body": "Initial release",
|
||||||
|
"release_draft": False,
|
||||||
|
"release_prerelease": False,
|
||||||
|
# Scheduler variables (for scheduler provider templates)
|
||||||
|
"schedule_name": "Daily Reminder",
|
||||||
|
"fire_count": 42,
|
||||||
|
"current_date": "22.03.2026",
|
||||||
|
"current_time": "09:00",
|
||||||
|
"current_datetime": "22.03.2026, 09:00 UTC",
|
||||||
|
"weekday": "Monday",
|
||||||
|
"custom_vars": {"team": "Engineering", "message": "Time for standup!"},
|
||||||
|
"team": "Engineering",
|
||||||
|
"message": "Time for standup!",
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ async def _load_tracker_jobs() -> None:
|
|||||||
from sqlmodel import select
|
from sqlmodel import select
|
||||||
from sqlmodel.ext.asyncio.session import AsyncSession
|
from sqlmodel.ext.asyncio.session import AsyncSession
|
||||||
from ..database.engine import get_engine
|
from ..database.engine import get_engine
|
||||||
from ..database.models import NotificationTracker
|
from ..database.models import NotificationTracker, ServiceProvider as ServiceProviderModel
|
||||||
|
|
||||||
engine = get_engine()
|
engine = get_engine()
|
||||||
scheduler = get_scheduler()
|
scheduler = get_scheduler()
|
||||||
@@ -49,11 +49,35 @@ async def _load_tracker_jobs() -> None:
|
|||||||
result = await session.exec(select(NotificationTracker).where(NotificationTracker.enabled == True))
|
result = await session.exec(select(NotificationTracker).where(NotificationTracker.enabled == True))
|
||||||
trackers = result.all()
|
trackers = result.all()
|
||||||
|
|
||||||
|
# Pre-load provider types for scheduler detection
|
||||||
|
provider_types: dict[int, str] = {}
|
||||||
|
for tracker in trackers:
|
||||||
|
if tracker.provider_id not in provider_types:
|
||||||
|
provider = await session.get(ServiceProviderModel, tracker.provider_id)
|
||||||
|
if provider:
|
||||||
|
provider_types[tracker.provider_id] = provider.type
|
||||||
|
|
||||||
for tracker in trackers:
|
for tracker in trackers:
|
||||||
job_id = f"tracker_{tracker.id}"
|
job_id = f"tracker_{tracker.id}"
|
||||||
if scheduler.get_job(job_id):
|
if scheduler.get_job(job_id):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
|
ptype = provider_types.get(tracker.provider_id, "")
|
||||||
|
filters = tracker.filters or {}
|
||||||
|
|
||||||
|
# Scheduler providers can use cron triggers
|
||||||
|
if ptype == "scheduler" and filters.get("schedule_type") == "cron":
|
||||||
|
cron_expr = filters.get("cron_expression", "")
|
||||||
|
if cron_expr:
|
||||||
|
try:
|
||||||
|
_add_cron_job(scheduler, job_id, tracker.id, cron_expr, tracker.name)
|
||||||
|
continue
|
||||||
|
except Exception as e:
|
||||||
|
_LOGGER.error(
|
||||||
|
"Invalid cron expression for tracker %d (%s): %s — falling back to interval",
|
||||||
|
tracker.id, tracker.name, e,
|
||||||
|
)
|
||||||
|
|
||||||
scheduler.add_job(
|
scheduler.add_job(
|
||||||
_poll_tracker,
|
_poll_tracker,
|
||||||
"interval",
|
"interval",
|
||||||
@@ -65,23 +89,55 @@ async def _load_tracker_jobs() -> None:
|
|||||||
_LOGGER.info("Scheduled tracker %d (%s) every %ds", tracker.id, tracker.name, tracker.scan_interval)
|
_LOGGER.info("Scheduled tracker %d (%s) every %ds", tracker.id, tracker.name, tracker.scan_interval)
|
||||||
|
|
||||||
|
|
||||||
async def schedule_tracker(tracker_id: int, interval: int) -> None:
|
def _add_cron_job(
|
||||||
|
scheduler: AsyncIOScheduler,
|
||||||
|
job_id: str,
|
||||||
|
tracker_id: int,
|
||||||
|
cron_expression: str,
|
||||||
|
tracker_name: str,
|
||||||
|
) -> None:
|
||||||
|
"""Add a cron-triggered job for a scheduler-type tracker."""
|
||||||
|
from apscheduler.triggers.cron import CronTrigger
|
||||||
|
trigger = CronTrigger.from_crontab(cron_expression)
|
||||||
|
scheduler.add_job(
|
||||||
|
_poll_tracker,
|
||||||
|
trigger,
|
||||||
|
id=job_id,
|
||||||
|
args=[tracker_id],
|
||||||
|
replace_existing=True,
|
||||||
|
)
|
||||||
|
_LOGGER.info("Scheduled tracker %d (%s) with cron: %s", tracker_id, tracker_name, cron_expression)
|
||||||
|
|
||||||
|
|
||||||
|
async def schedule_tracker(
|
||||||
|
tracker_id: int,
|
||||||
|
interval: int,
|
||||||
|
cron_expression: str | None = None,
|
||||||
|
) -> None:
|
||||||
"""Add or update a scheduler job for a tracker."""
|
"""Add or update a scheduler job for a tracker."""
|
||||||
scheduler = get_scheduler()
|
scheduler = get_scheduler()
|
||||||
job_id = f"tracker_{tracker_id}"
|
job_id = f"tracker_{tracker_id}"
|
||||||
|
|
||||||
|
# Remove existing job first to allow trigger type changes
|
||||||
if scheduler.get_job(job_id):
|
if scheduler.get_job(job_id):
|
||||||
scheduler.reschedule_job(job_id, trigger="interval", seconds=interval)
|
scheduler.remove_job(job_id)
|
||||||
_LOGGER.info("Rescheduled tracker %d every %ds", tracker_id, interval)
|
|
||||||
else:
|
if cron_expression:
|
||||||
scheduler.add_job(
|
try:
|
||||||
_poll_tracker,
|
_add_cron_job(scheduler, job_id, tracker_id, cron_expression, f"tracker-{tracker_id}")
|
||||||
"interval",
|
return
|
||||||
seconds=interval,
|
except Exception as e:
|
||||||
id=job_id,
|
_LOGGER.error("Invalid cron for tracker %d: %s — using interval", tracker_id, e)
|
||||||
args=[tracker_id],
|
|
||||||
replace_existing=True,
|
scheduler.add_job(
|
||||||
)
|
_poll_tracker,
|
||||||
_LOGGER.info("Scheduled tracker %d every %ds", tracker_id, interval)
|
"interval",
|
||||||
|
seconds=interval,
|
||||||
|
id=job_id,
|
||||||
|
args=[tracker_id],
|
||||||
|
replace_existing=True,
|
||||||
|
)
|
||||||
|
_LOGGER.info("Scheduled tracker %d every %ds", tracker_id, interval)
|
||||||
|
|
||||||
|
|
||||||
async def unschedule_tracker(tracker_id: int) -> None:
|
async def unschedule_tracker(tracker_id: int) -> None:
|
||||||
|
|||||||
@@ -94,6 +94,8 @@ def _event_allowed_by_config(event: ServiceEvent, tc: TrackingConfig) -> bool:
|
|||||||
"pr_merged": tc.track_pr_merged,
|
"pr_merged": tc.track_pr_merged,
|
||||||
"pr_commented": tc.track_pr_commented,
|
"pr_commented": tc.track_pr_commented,
|
||||||
"release_published": tc.track_release_published,
|
"release_published": tc.track_release_published,
|
||||||
|
# Scheduler events
|
||||||
|
"scheduled_message": tc.track_scheduled_message,
|
||||||
}
|
}
|
||||||
return flag_map.get(event_type, True)
|
return flag_map.get(event_type, True)
|
||||||
|
|
||||||
@@ -210,6 +212,8 @@ async def check_tracker(tracker_id: int) -> dict[str, Any]:
|
|||||||
provider_type = provider.type
|
provider_type = provider.type
|
||||||
provider_config = dict(provider.config)
|
provider_config = dict(provider.config)
|
||||||
provider_name = provider.name
|
provider_name = provider.name
|
||||||
|
tracker_name = tracker.name
|
||||||
|
tracker_filters = dict(tracker.filters) if tracker.filters else {}
|
||||||
collection_ids = list(tracker.collection_ids or [])
|
collection_ids = list(tracker.collection_ids or [])
|
||||||
|
|
||||||
# Now create aiohttp session and poll
|
# Now create aiohttp session and poll
|
||||||
@@ -235,6 +239,15 @@ async def check_tracker(tracker_id: int) -> dict[str, Any]:
|
|||||||
# Gitea is webhook-based — events arrive via /api/webhooks/gitea endpoint.
|
# Gitea is webhook-based — events arrive via /api/webhooks/gitea endpoint.
|
||||||
# The scheduler still calls check_tracker but there's nothing to poll.
|
# The scheduler still calls check_tracker but there's nothing to poll.
|
||||||
return {"status": "ok", "events_detected": 0, "collections_checked": 0}
|
return {"status": "ok", "events_detected": 0, "collections_checked": 0}
|
||||||
|
elif provider_type == "scheduler":
|
||||||
|
from notify_bridge_core.providers.scheduler import SchedulerServiceProvider
|
||||||
|
custom_vars = tracker_filters.get("custom_variables", {})
|
||||||
|
sched = SchedulerServiceProvider(
|
||||||
|
name=provider_name,
|
||||||
|
tracker_name=tracker_name,
|
||||||
|
custom_variables=custom_vars,
|
||||||
|
)
|
||||||
|
events, new_state = await sched.poll(collection_ids, state_dict)
|
||||||
else:
|
else:
|
||||||
return {"status": "error", "reason": f"unsupported provider type: {provider_type}"}
|
return {"status": "error", "reason": f"unsupported provider type: {provider_type}"}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user