libre-webui 0.24.1 → 0.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +26 -15
- package/backend/dist/index.d.ts.map +1 -1
- package/backend/dist/index.js +9 -0
- package/backend/dist/index.js.map +1 -1
- package/backend/dist/persistence/postgresMigrationRegistry.d.ts.map +1 -1
- package/backend/dist/persistence/postgresMigrationRegistry.js +2 -0
- package/backend/dist/persistence/postgresMigrationRegistry.js.map +1 -1
- package/backend/dist/persistence/postgresPersonalAutomationsMigration.d.ts +8 -0
- package/backend/dist/persistence/postgresPersonalAutomationsMigration.d.ts.map +1 -0
- package/backend/dist/persistence/postgresPersonalAutomationsMigration.js +98 -0
- package/backend/dist/persistence/postgresPersonalAutomationsMigration.js.map +1 -0
- package/backend/dist/persistence/postgresResourceRepositories.d.ts.map +1 -1
- package/backend/dist/persistence/postgresResourceRepositories.js +274 -0
- package/backend/dist/persistence/postgresResourceRepositories.js.map +1 -1
- package/backend/dist/persistence/resourceTypes.d.ts +83 -2
- package/backend/dist/persistence/resourceTypes.d.ts.map +1 -1
- package/backend/dist/persistence/resourceTypes.js.map +1 -1
- package/backend/dist/persistence/sqliteMigrations.d.ts +1 -0
- package/backend/dist/persistence/sqliteMigrations.d.ts.map +1 -1
- package/backend/dist/persistence/sqliteMigrations.js +181 -0
- package/backend/dist/persistence/sqliteMigrations.js.map +1 -1
- package/backend/dist/persistence/sqliteResourceRepositories.d.ts.map +1 -1
- package/backend/dist/persistence/sqliteResourceRepositories.js +233 -0
- package/backend/dist/persistence/sqliteResourceRepositories.js.map +1 -1
- package/backend/dist/persistence/sqliteToPostgresMigration.d.ts.map +1 -1
- package/backend/dist/persistence/sqliteToPostgresMigration.js +41 -0
- package/backend/dist/persistence/sqliteToPostgresMigration.js.map +1 -1
- package/backend/dist/platform/jobs/domainJobContracts.d.ts +3 -0
- package/backend/dist/platform/jobs/domainJobContracts.d.ts.map +1 -1
- package/backend/dist/platform/jobs/domainJobContracts.js +3 -0
- package/backend/dist/platform/jobs/domainJobContracts.js.map +1 -1
- package/backend/dist/platform/jobs/domainJobHandlers.d.ts.map +1 -1
- package/backend/dist/platform/jobs/domainJobHandlers.js +101 -1
- package/backend/dist/platform/jobs/domainJobHandlers.js.map +1 -1
- package/backend/dist/routes/automations.d.ts +3 -0
- package/backend/dist/routes/automations.d.ts.map +1 -0
- package/backend/dist/routes/automations.js +232 -0
- package/backend/dist/routes/automations.js.map +1 -0
- package/backend/dist/routes/calendar.d.ts +3 -0
- package/backend/dist/routes/calendar.d.ts.map +1 -0
- package/backend/dist/routes/calendar.js +206 -0
- package/backend/dist/routes/calendar.js.map +1 -0
- package/backend/dist/routes/chat.d.ts.map +1 -1
- package/backend/dist/routes/chat.js +42 -3
- package/backend/dist/routes/chat.js.map +1 -1
- package/backend/dist/routes/ollama.d.ts.map +1 -1
- package/backend/dist/routes/ollama.js +4 -1
- package/backend/dist/routes/ollama.js.map +1 -1
- package/backend/dist/routes/search.d.ts.map +1 -1
- package/backend/dist/routes/search.js +5 -3
- package/backend/dist/routes/search.js.map +1 -1
- package/backend/dist/services/automationSchedulerService.d.ts +28 -0
- package/backend/dist/services/automationSchedulerService.d.ts.map +1 -0
- package/backend/dist/services/automationSchedulerService.js +191 -0
- package/backend/dist/services/automationSchedulerService.js.map +1 -0
- package/backend/dist/services/automationService.d.ts +53 -0
- package/backend/dist/services/automationService.d.ts.map +1 -0
- package/backend/dist/services/automationService.js +224 -0
- package/backend/dist/services/automationService.js.map +1 -0
- package/backend/dist/services/chatGenerationService.d.ts.map +1 -1
- package/backend/dist/services/chatGenerationService.js +7 -1
- package/backend/dist/services/chatGenerationService.js.map +1 -1
- package/backend/dist/services/chatService.d.ts +1 -0
- package/backend/dist/services/chatService.d.ts.map +1 -1
- package/backend/dist/services/chatService.js +24 -0
- package/backend/dist/services/chatService.js.map +1 -1
- package/backend/dist/services/durableChatGenerationService.d.ts.map +1 -1
- package/backend/dist/services/durableChatGenerationService.js +8 -2
- package/backend/dist/services/durableChatGenerationService.js.map +1 -1
- package/backend/dist/services/ollamaService.d.ts.map +1 -1
- package/backend/dist/services/ollamaService.js +3 -1
- package/backend/dist/services/ollamaService.js.map +1 -1
- package/backend/dist/services/titleGenerationService.d.ts.map +1 -1
- package/backend/dist/services/titleGenerationService.js +5 -1
- package/backend/dist/services/titleGenerationService.js.map +1 -1
- package/backend/dist/services/webSearchPlanService.d.ts +18 -0
- package/backend/dist/services/webSearchPlanService.d.ts.map +1 -0
- package/backend/dist/services/webSearchPlanService.js +160 -0
- package/backend/dist/services/webSearchPlanService.js.map +1 -0
- package/backend/dist/services/webSearchService.d.ts +9 -3
- package/backend/dist/services/webSearchService.d.ts.map +1 -1
- package/backend/dist/services/webSearchService.js +8 -2
- package/backend/dist/services/webSearchService.js.map +1 -1
- package/backend/dist/storage.d.ts +7 -1
- package/backend/dist/storage.d.ts.map +1 -1
- package/backend/dist/storage.js +65 -1
- package/backend/dist/storage.js.map +1 -1
- package/backend/dist/types/index.d.ts +72 -0
- package/backend/dist/types/index.d.ts.map +1 -1
- package/backend/dist/types/index.js.map +1 -1
- package/backend/dist/utils/automationSchedule.d.ts +26 -0
- package/backend/dist/utils/automationSchedule.d.ts.map +1 -0
- package/backend/dist/utils/automationSchedule.js +231 -0
- package/backend/dist/utils/automationSchedule.js.map +1 -0
- package/backend/dist/utils/resourceLimits.d.ts +7 -0
- package/backend/dist/utils/resourceLimits.d.ts.map +1 -1
- package/backend/dist/utils/resourceLimits.js +7 -0
- package/backend/dist/utils/resourceLimits.js.map +1 -1
- package/backend/dist/websocketServer.d.ts.map +1 -1
- package/backend/dist/websocketServer.js +8 -2
- package/backend/dist/websocketServer.js.map +1 -1
- package/backend/package.json +1 -1
- package/frontend/dist/artifact-runtime/.build-fingerprint +1 -1
- package/frontend/dist/assets/index-6o-Hc2wS.js +41 -0
- package/frontend/dist/assets/index-D-pM957b.css +1 -0
- package/frontend/dist/index.html +12 -12
- package/frontend/dist/js/{ArtifactContainer-B-hs0F5K.js → ArtifactContainer-CpUi6ekF.js} +1 -1
- package/frontend/dist/js/{ArtifactDemoPage-QFtJw-u4.js → ArtifactDemoPage-BeNs3gHp.js} +1 -1
- package/frontend/dist/js/{ArtifactSandboxFrame-S9g_q47-.js → ArtifactSandboxFrame-qsj_Y3LV.js} +2 -2
- package/frontend/dist/js/ArtifactSlideOutPanel-CSFRluWA.js +1 -0
- package/frontend/dist/js/AutomationsPage-KUeWoZNv.js +1 -0
- package/frontend/dist/js/CalendarPage-D9I972w8.js +1 -0
- package/frontend/dist/js/ChatPage-CmBx4oAL.js +16 -0
- package/frontend/dist/js/FirstTimeSetup-Df0YJni3.js +1 -0
- package/frontend/dist/js/GalleryPage-bLCrdJN_.js +1 -0
- package/frontend/dist/js/HomePage-Uc6PEg-U.js +1 -0
- package/frontend/dist/js/LibreClawPage-CG63DHg1.js +1 -0
- package/frontend/dist/js/{ModelManagerModals-DBmm_slu.js → ModelManagerModals-DcLGYN3l.js} +1 -1
- package/frontend/dist/js/ModelSelector-yxJC64rM.js +1 -0
- package/frontend/dist/js/ModelsPage-1R_TxgmJ.js +2 -0
- package/frontend/dist/js/{NotesPage-C7bPU_KF.js → NotesPage-L65j5HoW.js} +1 -1
- package/frontend/dist/js/PersonasPage-CKeBpHIH.js +13 -0
- package/frontend/dist/js/PluginUsagePage-BX1SKMbW.js +1 -0
- package/frontend/dist/js/{RichMessageContent-D0mK9vRA.js → RichMessageContent-DiySVYGB.js} +1 -1
- package/frontend/dist/js/SettingsModal-68SG1uZ2.js +1 -0
- package/frontend/dist/js/SystemPage-CytpZiQV.js +1 -0
- package/frontend/dist/js/UserManagementPage-BzJBvZiS.js +1 -0
- package/frontend/dist/js/WorkPage-C8gr0QJe.js +6 -0
- package/frontend/dist/js/api-BDtqBtqw.js +14 -0
- package/frontend/dist/js/{appStore-DXlmTjIC.js → appStore-0JnCUlEq.js} +2 -2
- package/frontend/dist/js/{ar-DW79oSyN.js → ar-CSpi37Gr.js} +2 -2
- package/frontend/dist/js/{authStore-B97lJ5Ee.js → authStore-DbMdvNgJ.js} +3 -3
- package/frontend/dist/js/{babel-D24oDI9y.js → babel-BsYoxD-7.js} +1 -1
- package/frontend/dist/js/{bn-BEAmE7VH.js → bn-CyH1BeDD.js} +2 -2
- package/frontend/dist/js/calendarDates-Co3o_05Y.js +1 -0
- package/frontend/dist/js/chatStore-CHQ2uINS.js +3 -0
- package/frontend/dist/js/{config-CmEh9o8U.js → config-DSOYQ9a3.js} +1 -1
- package/frontend/dist/js/{cs-irpRMzRo.js → cs-Cv2NfRK5.js} +2 -2
- package/frontend/dist/js/{da-cgilTVxc.js → da-D6D6IvPK.js} +2 -2
- package/frontend/dist/js/{de-BU-eH3gU.js → de-BNoJJTrT.js} +2 -2
- package/frontend/dist/js/{es-B2LRpZ0p.js → es-kzo9C7q_.js} +2 -2
- package/frontend/dist/js/{estree-CZO8RS52.js → estree-BcnBcOAx.js} +7 -7
- package/frontend/dist/js/{fr-Cd5JM-oQ.js → fr-CjHYvJRp.js} +2 -2
- package/frontend/dist/js/{hi-CvOhdtiK.js → hi-BU98AdCQ.js} +2 -2
- package/frontend/dist/js/{html-C31pxhBG.js → html-DkY55Jys.js} +10 -10
- package/frontend/dist/js/{id-BtRK5nR_.js → id-CpdedejX.js} +2 -2
- package/frontend/dist/js/{is-CnEqwgRF.js → is-Cp5dDWBH.js} +2 -2
- package/frontend/dist/js/{it-CI6WjId6.js → it-CuH_cK4U.js} +2 -2
- package/frontend/dist/js/{ja-B6gFOHi6.js → ja-BWXXXiHn.js} +2 -2
- package/frontend/dist/js/{ko-DuAhnmMf.js → ko-DQgv2M1t.js} +2 -2
- package/frontend/dist/js/{markdown-C1CEqXpL.js → markdown-IZSI9DXw.js} +6 -6
- package/frontend/dist/js/{messageCodeStyles-BqQ6kOSU.js → messageCodeStyles-BFNR9Wv6.js} +2 -2
- package/frontend/dist/js/{ms-C8BIP7MZ.js → ms-DCcRoIcX.js} +2 -2
- package/frontend/dist/js/{nl-DnEdspER.js → nl-CbKR1_EU.js} +2 -2
- package/frontend/dist/js/{pl-Ddyyvbse.js → pl-CRyJZccn.js} +2 -2
- package/frontend/dist/js/{postcss-Bx9CTcIc.js → postcss-BJ0okz7n.js} +1 -1
- package/frontend/dist/js/{pt-BYuzm70F.js → pt-BXYmHFGH.js} +2 -2
- package/frontend/dist/js/{router-vendor-CbPDks39.js → router-vendor-DGFGM3EP.js} +1 -1
- package/frontend/dist/js/{ru-CmSPFxPX.js → ru-M9SyZG4b.js} +2 -2
- package/frontend/dist/js/{standalone-Dz0pkxn0.js → standalone-Csw3jfJ_.js} +5 -5
- package/frontend/dist/js/{sv-Dd6SQ9f1.js → sv-DJ486LTU.js} +2 -2
- package/frontend/dist/js/{th-CpH8745B.js → th-Ch7gKtZv.js} +2 -2
- package/frontend/dist/js/{tr-DuVD75iJ.js → tr-ClehWhSC.js} +2 -2
- package/frontend/dist/js/{typescript-DeXPhp90.js → typescript-CnF4UVx7.js} +2 -2
- package/frontend/dist/js/{ui-CO0DPqrI.js → ui-CC-K19wO.js} +2 -2
- package/frontend/dist/js/ui-vendor-B1UgO3vd.js +177 -0
- package/frontend/dist/js/{uk-B0MU-M8k.js → uk-BqAd5zHF.js} +2 -2
- package/frontend/dist/js/{vi-BLmFNp_z.js → vi-D9gjlDVB.js} +2 -2
- package/frontend/dist/js/{workApi-C4QtuhcE.js → workApi-C3uy9EDT.js} +3 -3
- package/frontend/dist/js/{yaml-DioTxVLA.js → yaml-DzT5hBSH.js} +5 -5
- package/frontend/dist/js/{zh-BQu0TLhw.js → zh-DKTyHkiR.js} +2 -2
- package/package.json +2 -2
- package/frontend/dist/assets/index-CDQ12KBq.js +0 -34
- package/frontend/dist/assets/index-DkFWzmFD.css +0 -1
- package/frontend/dist/js/ArtifactSlideOutPanel-D0UOo8RW.js +0 -1
- package/frontend/dist/js/ChatPage-fdd8500b.js +0 -23
- package/frontend/dist/js/FirstTimeSetup-BTjafGOq.js +0 -1
- package/frontend/dist/js/GalleryPage-hR9AJ6b-.js +0 -1
- package/frontend/dist/js/HomePage-JvTzq-Pp.js +0 -1
- package/frontend/dist/js/LibreClawPage-CLJvtXft.js +0 -1
- package/frontend/dist/js/ModelSelector-A-viVFEc.js +0 -1
- package/frontend/dist/js/ModelsPage-C4Rm-TZF.js +0 -2
- package/frontend/dist/js/PersonasPage-DpvxbFzv.js +0 -13
- package/frontend/dist/js/PluginUsagePage-laF-M2X9.js +0 -1
- package/frontend/dist/js/SettingsModal-DNEQ5sTt.js +0 -1
- package/frontend/dist/js/SystemPage-Xr7XJv8c.js +0 -1
- package/frontend/dist/js/UserManagementPage-DGmbGTC2.js +0 -1
- package/frontend/dist/js/WorkPage-DNKFD9gS.js +0 -6
- package/frontend/dist/js/api-DGVZHSkS.js +0 -14
- package/frontend/dist/js/chatStore-zilBUd1p.js +0 -3
- package/frontend/dist/js/ui-vendor-mqjSfAaS.js +0 -177
|
@@ -0,0 +1,191 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Libre WebUI
|
|
3
|
+
* Copyright (C) 2025 Kroonen AI, Inc.
|
|
4
|
+
*
|
|
5
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
|
+
* you may not use this file except in compliance with the License.
|
|
7
|
+
* You may obtain a copy of the License at:
|
|
8
|
+
*
|
|
9
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
10
|
+
*
|
|
11
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
12
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
13
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
14
|
+
* See the License for the specific language governing permissions and
|
|
15
|
+
* limitations under the License.
|
|
16
|
+
*/
|
|
17
|
+
import { encryptionService } from './encryptionService.js';
|
|
18
|
+
import { getPersistence } from '../persistence/index.js';
|
|
19
|
+
import { getCoordinator } from '../platform/coordination/service.js';
|
|
20
|
+
import { getDurableJobRuntime } from '../platform/jobs/durableJobRuntime.js';
|
|
21
|
+
import { AUTOMATION_RUN_JOB_TYPE, automationRunIdempotencyScope, chatGenerationIdempotencyScope, } from '../platform/jobs/domainJobContracts.js';
|
|
22
|
+
import automationService from './automationService.js';
|
|
23
|
+
import { nextRunAt } from '../utils/automationSchedule.js';
|
|
24
|
+
import { createLogger } from '../utils/logger.js';
|
|
25
|
+
const logger = createLogger('automation-scheduler');
|
|
26
|
+
const TICK_INTERVAL_MS = 60000;
|
|
27
|
+
const LEASE_KEY = 'automation-scheduler';
|
|
28
|
+
const LEASE_TTL_MS = 55000;
|
|
29
|
+
const DUE_BATCH_LIMIT = 50;
|
|
30
|
+
/** A queued run whose start never materialized is abandoned after this. */
|
|
31
|
+
const STALE_QUEUED_MS = 30 * 60 * 1000;
|
|
32
|
+
class AutomationSchedulerService {
|
|
33
|
+
constructor() {
|
|
34
|
+
this.stopped = false;
|
|
35
|
+
}
|
|
36
|
+
start() {
|
|
37
|
+
this.stopped = false;
|
|
38
|
+
this.scheduleTick();
|
|
39
|
+
}
|
|
40
|
+
stop() {
|
|
41
|
+
this.stopped = true;
|
|
42
|
+
if (this.timer) {
|
|
43
|
+
clearTimeout(this.timer);
|
|
44
|
+
this.timer = undefined;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
scheduleTick() {
|
|
48
|
+
if (this.stopped || this.timer)
|
|
49
|
+
return;
|
|
50
|
+
this.timer = setTimeout(() => {
|
|
51
|
+
this.timer = undefined;
|
|
52
|
+
void this.tick()
|
|
53
|
+
.catch(error => {
|
|
54
|
+
logger.warn('Automation scheduler tick failed:', error);
|
|
55
|
+
})
|
|
56
|
+
.finally(() => {
|
|
57
|
+
this.scheduleTick();
|
|
58
|
+
});
|
|
59
|
+
}, TICK_INTERVAL_MS);
|
|
60
|
+
this.timer.unref();
|
|
61
|
+
}
|
|
62
|
+
async tick(now = Date.now()) {
|
|
63
|
+
const lease = await getCoordinator().acquireLease(LEASE_KEY, LEASE_TTL_MS);
|
|
64
|
+
if (!lease)
|
|
65
|
+
return { fired: 0, settled: 0 };
|
|
66
|
+
try {
|
|
67
|
+
const fired = await this.fireDue(now);
|
|
68
|
+
const settled = await this.settleRuns(now);
|
|
69
|
+
return { fired, settled };
|
|
70
|
+
}
|
|
71
|
+
finally {
|
|
72
|
+
await lease.release().catch(() => false);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
/**
|
|
76
|
+
* Fire every automation whose next_run_at has arrived. Missed occurrences
|
|
77
|
+
* collapse into one run: the overdue slot fires, and the schedule advances
|
|
78
|
+
* to the next occurrence after now.
|
|
79
|
+
*/
|
|
80
|
+
async fireDue(now) {
|
|
81
|
+
const repositories = getPersistence(encryptionService).repositories;
|
|
82
|
+
const due = await repositories.resources.automations.listDue(now, DUE_BATCH_LIMIT);
|
|
83
|
+
let fired = 0;
|
|
84
|
+
for (const automation of due) {
|
|
85
|
+
const observed = automation.next_run_at;
|
|
86
|
+
if (observed === null)
|
|
87
|
+
continue;
|
|
88
|
+
let next = null;
|
|
89
|
+
try {
|
|
90
|
+
next = nextRunAt(JSON.parse(automation.triggers), now);
|
|
91
|
+
}
|
|
92
|
+
catch (error) {
|
|
93
|
+
logger.warn(`Automation ${automation.id} has unreadable triggers:`, error);
|
|
94
|
+
}
|
|
95
|
+
// The compare-and-set claims this occurrence; a concurrent tick that
|
|
96
|
+
// lost the race skips it entirely.
|
|
97
|
+
const claimed = await repositories.resources.automations.advanceNextRun(automation.id, observed, next, now);
|
|
98
|
+
if (!claimed)
|
|
99
|
+
continue;
|
|
100
|
+
try {
|
|
101
|
+
const run = await automationService.createRun(automation.id, automation.user_id, observed);
|
|
102
|
+
await getDurableJobRuntime().service.enqueue({
|
|
103
|
+
jobType: AUTOMATION_RUN_JOB_TYPE,
|
|
104
|
+
actorUserId: automation.user_id,
|
|
105
|
+
idempotencyScope: automationRunIdempotencyScope(automation.id),
|
|
106
|
+
idempotencyKey: String(observed),
|
|
107
|
+
payload: {
|
|
108
|
+
mode: 'encrypted',
|
|
109
|
+
value: { runId: run.id, automationId: automation.id },
|
|
110
|
+
},
|
|
111
|
+
maxAttempts: 3,
|
|
112
|
+
});
|
|
113
|
+
fired += 1;
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
logger.error(`Could not enqueue run for automation ${automation.id}:`, error);
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
return fired;
|
|
120
|
+
}
|
|
121
|
+
/** Enqueue a manual run outside the schedule (Run now). */
|
|
122
|
+
async runNow(automationId, userId) {
|
|
123
|
+
const now = Date.now();
|
|
124
|
+
const run = await automationService.createRun(automationId, userId, now);
|
|
125
|
+
await getDurableJobRuntime().service.enqueue({
|
|
126
|
+
jobType: AUTOMATION_RUN_JOB_TYPE,
|
|
127
|
+
actorUserId: userId,
|
|
128
|
+
idempotencyScope: automationRunIdempotencyScope(automationId),
|
|
129
|
+
idempotencyKey: `manual:${run.id}`,
|
|
130
|
+
payload: {
|
|
131
|
+
mode: 'encrypted',
|
|
132
|
+
value: { runId: run.id, automationId },
|
|
133
|
+
},
|
|
134
|
+
maxAttempts: 3,
|
|
135
|
+
});
|
|
136
|
+
return run.id;
|
|
137
|
+
}
|
|
138
|
+
/**
|
|
139
|
+
* Settle unfinished runs from the durable job ledger: a run succeeds when
|
|
140
|
+
* its chat generation job succeeded, fails when either job dead-lettered,
|
|
141
|
+
* and is abandoned when it never started within the stale window.
|
|
142
|
+
*/
|
|
143
|
+
async settleRuns(now) {
|
|
144
|
+
const service = getDurableJobRuntime().service;
|
|
145
|
+
const runs = await automationService.listUnfinishedRunRecords();
|
|
146
|
+
let settled = 0;
|
|
147
|
+
for (const run of runs) {
|
|
148
|
+
try {
|
|
149
|
+
if (run.session_id && run.assistant_message_id) {
|
|
150
|
+
const chatJob = await service.getByIdempotency(run.user_id, chatGenerationIdempotencyScope(run.session_id), run.assistant_message_id);
|
|
151
|
+
if (chatJob?.state === 'succeeded') {
|
|
152
|
+
if (await automationService.finalizeRun(run.id, 'succeeded')) {
|
|
153
|
+
settled += 1;
|
|
154
|
+
}
|
|
155
|
+
continue;
|
|
156
|
+
}
|
|
157
|
+
if (chatJob?.state === 'dead_letter' ||
|
|
158
|
+
chatJob?.state === 'cancelled') {
|
|
159
|
+
if (await automationService.finalizeRun(run.id, 'failed', chatJob.errorSummary ?? chatJob.state)) {
|
|
160
|
+
settled += 1;
|
|
161
|
+
}
|
|
162
|
+
continue;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
// Scheduled runs key by their occurrence time, manual runs by id.
|
|
166
|
+
let runJob = await service.getByIdempotency(run.user_id, automationRunIdempotencyScope(run.automation_id), String(run.scheduled_for));
|
|
167
|
+
if (!runJob) {
|
|
168
|
+
runJob = await service.getByIdempotency(run.user_id, automationRunIdempotencyScope(run.automation_id), `manual:${run.id}`);
|
|
169
|
+
}
|
|
170
|
+
if (runJob?.state === 'dead_letter' || runJob?.state === 'cancelled') {
|
|
171
|
+
if (await automationService.finalizeRun(run.id, 'failed', runJob.errorSummary ?? runJob.state)) {
|
|
172
|
+
settled += 1;
|
|
173
|
+
}
|
|
174
|
+
continue;
|
|
175
|
+
}
|
|
176
|
+
if (run.status === 'queued' && now - run.created_at > STALE_QUEUED_MS) {
|
|
177
|
+
if (await automationService.finalizeRun(run.id, 'failed', 'stalled')) {
|
|
178
|
+
settled += 1;
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
}
|
|
182
|
+
catch (error) {
|
|
183
|
+
logger.warn(`Could not settle automation run ${run.id}:`, error);
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
return settled;
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
const automationSchedulerService = new AutomationSchedulerService();
|
|
190
|
+
export default automationSchedulerService;
|
|
191
|
+
//# sourceMappingURL=automationSchedulerService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"automationSchedulerService.js","sourceRoot":"","sources":["../../src/services/automationSchedulerService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import type { Automation, AutomationNotify, AutomationRun, AutomationStatus } from '../types/index.js';
|
|
2
|
+
import type { StoredAutomationRunRecord } from '../persistence/resourceTypes.js';
|
|
3
|
+
/**
|
|
4
|
+
* The stored provider column carries the normalized selection as
|
|
5
|
+
* `providerType` or `providerType:providerId`; null means Auto.
|
|
6
|
+
*/
|
|
7
|
+
export declare const encodeProvider: (providerType?: string, providerId?: string) => string | null;
|
|
8
|
+
export declare const decodeProvider: (value: string | null) => {
|
|
9
|
+
providerType?: string;
|
|
10
|
+
providerId?: string;
|
|
11
|
+
};
|
|
12
|
+
export interface AutomationInput {
|
|
13
|
+
name: string;
|
|
14
|
+
instructions: string;
|
|
15
|
+
triggers: unknown;
|
|
16
|
+
provider?: string;
|
|
17
|
+
model?: string;
|
|
18
|
+
notify?: AutomationNotify;
|
|
19
|
+
}
|
|
20
|
+
declare class AutomationService {
|
|
21
|
+
getAutomations(userId: string): Promise<Automation[]>;
|
|
22
|
+
getAutomation(automationId: string, userId: string): Promise<Automation | undefined>;
|
|
23
|
+
/** Owner-blind lookup for the durable job handler and scheduler. */
|
|
24
|
+
getAutomationRecord(automationId: string): Promise<(Automation & {
|
|
25
|
+
userId: string;
|
|
26
|
+
}) | undefined>;
|
|
27
|
+
createAutomation(input: AutomationInput, userId: string): Promise<Automation>;
|
|
28
|
+
updateAutomation(automationId: string, input: AutomationInput, userId: string): Promise<Automation | undefined>;
|
|
29
|
+
private persistAutomation;
|
|
30
|
+
setAutomationStatus(automationId: string, userId: string, status: AutomationStatus): Promise<Automation | undefined>;
|
|
31
|
+
deleteAutomation(automationId: string, userId: string): Promise<boolean>;
|
|
32
|
+
createRun(automationId: string, userId: string, scheduledFor: number): Promise<AutomationRun>;
|
|
33
|
+
getRunRecord(runId: string, userId: string): Promise<StoredAutomationRunRecord | null>;
|
|
34
|
+
listRuns(userId: string, options?: {
|
|
35
|
+
automationId?: string;
|
|
36
|
+
from?: number;
|
|
37
|
+
to?: number;
|
|
38
|
+
}): Promise<AutomationRun[]>;
|
|
39
|
+
listUnfinishedRunRecords(): Promise<StoredAutomationRunRecord[]>;
|
|
40
|
+
markRunStarted(runId: string, sessionId: string, assistantMessageId: string): Promise<boolean>;
|
|
41
|
+
finalizeRun(runId: string, status: 'succeeded' | 'failed', error?: string | null): Promise<boolean>;
|
|
42
|
+
runsSummary(userId: string): Promise<{
|
|
43
|
+
unseenCount: number;
|
|
44
|
+
days: {
|
|
45
|
+
succeeded: number;
|
|
46
|
+
failed: number;
|
|
47
|
+
}[];
|
|
48
|
+
}>;
|
|
49
|
+
markRunsSeen(userId: string): Promise<number>;
|
|
50
|
+
}
|
|
51
|
+
declare const automationService: AutomationService;
|
|
52
|
+
export default automationService;
|
|
53
|
+
//# sourceMappingURL=automationService.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"automationService.d.ts","sourceRoot":"","sources":["../../src/services/automationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,224 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Libre WebUI
|
|
3
|
+
* Copyright (C) 2025 Kroonen AI, Inc.
|
|
4
|
+
*
|
|
5
|
+
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
6
|
+
* you may not use this file except in compliance with the License.
|
|
7
|
+
* You may obtain a copy of the License at:
|
|
8
|
+
*
|
|
9
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
|
10
|
+
*
|
|
11
|
+
* Unless required by applicable law or agreed to in writing, software
|
|
12
|
+
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
13
|
+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
14
|
+
* See the License for the specific language governing permissions and
|
|
15
|
+
* limitations under the License.
|
|
16
|
+
*/
|
|
17
|
+
import { v4 as uuidv4 } from 'uuid';
|
|
18
|
+
import { encryptionService } from './encryptionService.js';
|
|
19
|
+
import { getPersistence } from '../persistence/index.js';
|
|
20
|
+
import { PersistenceResourceLimitError } from '../persistence/resourceTypes.js';
|
|
21
|
+
import { nextRunAt, validateTriggers } from '../utils/automationSchedule.js';
|
|
22
|
+
import { MAX_AUTOMATION_INSTRUCTIONS_LENGTH, MAX_AUTOMATION_NAME_LENGTH, MAX_AUTOMATIONS_PER_USER, ResourcePolicyError, } from '../utils/resourceLimits.js';
|
|
23
|
+
const RUN_LIST_LIMIT = 500;
|
|
24
|
+
const repositories = () => getPersistence(encryptionService).repositories.resources;
|
|
25
|
+
/**
|
|
26
|
+
* The stored provider column carries the normalized selection as
|
|
27
|
+
* `providerType` or `providerType:providerId`; null means Auto.
|
|
28
|
+
*/
|
|
29
|
+
export const encodeProvider = (providerType, providerId) => {
|
|
30
|
+
if (!providerType)
|
|
31
|
+
return null;
|
|
32
|
+
return providerId ? `${providerType}:${providerId}` : providerType;
|
|
33
|
+
};
|
|
34
|
+
export const decodeProvider = (value) => {
|
|
35
|
+
if (!value)
|
|
36
|
+
return {};
|
|
37
|
+
const separator = value.indexOf(':');
|
|
38
|
+
if (separator === -1)
|
|
39
|
+
return { providerType: value };
|
|
40
|
+
return {
|
|
41
|
+
providerType: value.slice(0, separator),
|
|
42
|
+
providerId: value.slice(separator + 1),
|
|
43
|
+
};
|
|
44
|
+
};
|
|
45
|
+
const mapAutomationRow = (row) => ({
|
|
46
|
+
id: row.id,
|
|
47
|
+
name: encryptionService.decrypt(row.name),
|
|
48
|
+
instructions: encryptionService.decrypt(row.instructions),
|
|
49
|
+
triggers: JSON.parse(row.triggers),
|
|
50
|
+
...(row.provider ? { provider: row.provider } : {}),
|
|
51
|
+
...(row.model ? { model: row.model } : {}),
|
|
52
|
+
notify: row.notify,
|
|
53
|
+
status: row.status,
|
|
54
|
+
...(row.next_run_at !== null ? { nextRunAt: row.next_run_at } : {}),
|
|
55
|
+
...(row.last_run_at !== null ? { lastRunAt: row.last_run_at } : {}),
|
|
56
|
+
createdAt: row.created_at,
|
|
57
|
+
updatedAt: row.updated_at,
|
|
58
|
+
});
|
|
59
|
+
const mapRunRow = (row) => ({
|
|
60
|
+
id: row.id,
|
|
61
|
+
automationId: row.automation_id,
|
|
62
|
+
scheduledFor: row.scheduled_for,
|
|
63
|
+
...(row.started_at !== null ? { startedAt: row.started_at } : {}),
|
|
64
|
+
...(row.finished_at !== null ? { finishedAt: row.finished_at } : {}),
|
|
65
|
+
status: row.status,
|
|
66
|
+
...(row.session_id !== null ? { sessionId: row.session_id } : {}),
|
|
67
|
+
...(row.error !== null ? { error: row.error } : {}),
|
|
68
|
+
seen: row.seen_at !== null,
|
|
69
|
+
createdAt: row.created_at,
|
|
70
|
+
});
|
|
71
|
+
class AutomationService {
|
|
72
|
+
async getAutomations(userId) {
|
|
73
|
+
const rows = await repositories().automations.listByOwner(userId, MAX_AUTOMATIONS_PER_USER);
|
|
74
|
+
return rows.map(mapAutomationRow);
|
|
75
|
+
}
|
|
76
|
+
async getAutomation(automationId, userId) {
|
|
77
|
+
const row = await repositories().automations.findByOwner(automationId, userId);
|
|
78
|
+
return row ? mapAutomationRow(row) : undefined;
|
|
79
|
+
}
|
|
80
|
+
/** Owner-blind lookup for the durable job handler and scheduler. */
|
|
81
|
+
async getAutomationRecord(automationId) {
|
|
82
|
+
const row = await repositories().automations.findById(automationId);
|
|
83
|
+
return row ? { ...mapAutomationRow(row), userId: row.user_id } : undefined;
|
|
84
|
+
}
|
|
85
|
+
async createAutomation(input, userId) {
|
|
86
|
+
return this.persistAutomation(input, userId, undefined);
|
|
87
|
+
}
|
|
88
|
+
async updateAutomation(automationId, input, userId) {
|
|
89
|
+
const existing = await repositories().automations.findByOwner(automationId, userId);
|
|
90
|
+
if (!existing)
|
|
91
|
+
return undefined;
|
|
92
|
+
return this.persistAutomation(input, userId, existing);
|
|
93
|
+
}
|
|
94
|
+
async persistAutomation(input, userId, existing) {
|
|
95
|
+
if (!input.name.trim() ||
|
|
96
|
+
input.name.length > MAX_AUTOMATION_NAME_LENGTH ||
|
|
97
|
+
!input.instructions.trim() ||
|
|
98
|
+
input.instructions.length > MAX_AUTOMATION_INSTRUCTIONS_LENGTH) {
|
|
99
|
+
throw new ResourcePolicyError('Automation name or instructions are missing or exceed the maximum size', 400);
|
|
100
|
+
}
|
|
101
|
+
const triggers = validateTriggers(input.triggers);
|
|
102
|
+
const now = Date.now();
|
|
103
|
+
const status = (existing?.status ?? 'active');
|
|
104
|
+
const record = {
|
|
105
|
+
id: existing?.id ?? uuidv4(),
|
|
106
|
+
user_id: userId,
|
|
107
|
+
name: encryptionService.encrypt(input.name.trim()),
|
|
108
|
+
instructions: encryptionService.encrypt(input.instructions.trim()),
|
|
109
|
+
triggers: JSON.stringify(triggers),
|
|
110
|
+
provider: input.provider ?? null,
|
|
111
|
+
model: input.model ?? null,
|
|
112
|
+
notify: input.notify === 'off' ? 'off' : 'app',
|
|
113
|
+
status,
|
|
114
|
+
// Editing reschedules from now; a paused automation stays dormant.
|
|
115
|
+
next_run_at: status === 'active' ? nextRunAt(triggers, now) : null,
|
|
116
|
+
last_run_at: existing?.last_run_at ?? null,
|
|
117
|
+
created_at: existing?.created_at ?? now,
|
|
118
|
+
updated_at: now,
|
|
119
|
+
};
|
|
120
|
+
try {
|
|
121
|
+
await repositories().automations.replaceWithLimit(record, MAX_AUTOMATIONS_PER_USER);
|
|
122
|
+
}
|
|
123
|
+
catch (error) {
|
|
124
|
+
if (error instanceof PersistenceResourceLimitError) {
|
|
125
|
+
throw new ResourcePolicyError(`A user may store at most ${MAX_AUTOMATIONS_PER_USER} automations`, 409);
|
|
126
|
+
}
|
|
127
|
+
throw error;
|
|
128
|
+
}
|
|
129
|
+
return mapAutomationRow(record);
|
|
130
|
+
}
|
|
131
|
+
async setAutomationStatus(automationId, userId, status) {
|
|
132
|
+
const row = await repositories().automations.findByOwner(automationId, userId);
|
|
133
|
+
if (!row)
|
|
134
|
+
return undefined;
|
|
135
|
+
const now = Date.now();
|
|
136
|
+
const nextRun = status === 'active'
|
|
137
|
+
? nextRunAt(JSON.parse(row.triggers), now)
|
|
138
|
+
: null;
|
|
139
|
+
const updated = await repositories().automations.setStatus(automationId, userId, status, nextRun, now);
|
|
140
|
+
if (!updated)
|
|
141
|
+
return undefined;
|
|
142
|
+
return mapAutomationRow({
|
|
143
|
+
...row,
|
|
144
|
+
status,
|
|
145
|
+
next_run_at: nextRun,
|
|
146
|
+
updated_at: now,
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
async deleteAutomation(automationId, userId) {
|
|
150
|
+
return repositories().automations.deleteByOwner(automationId, userId);
|
|
151
|
+
}
|
|
152
|
+
// ----- runs -----
|
|
153
|
+
async createRun(automationId, userId, scheduledFor) {
|
|
154
|
+
const record = {
|
|
155
|
+
id: uuidv4(),
|
|
156
|
+
automation_id: automationId,
|
|
157
|
+
user_id: userId,
|
|
158
|
+
scheduled_for: scheduledFor,
|
|
159
|
+
started_at: null,
|
|
160
|
+
finished_at: null,
|
|
161
|
+
status: 'queued',
|
|
162
|
+
session_id: null,
|
|
163
|
+
assistant_message_id: null,
|
|
164
|
+
error: null,
|
|
165
|
+
seen_at: null,
|
|
166
|
+
created_at: Date.now(),
|
|
167
|
+
};
|
|
168
|
+
await repositories().automationRuns.insert(record);
|
|
169
|
+
return mapRunRow(record);
|
|
170
|
+
}
|
|
171
|
+
async getRunRecord(runId, userId) {
|
|
172
|
+
return repositories().automationRuns.findByOwner(runId, userId);
|
|
173
|
+
}
|
|
174
|
+
async listRuns(userId, options = {}) {
|
|
175
|
+
const rows = await repositories().automationRuns.listByOwner(userId, {
|
|
176
|
+
...options,
|
|
177
|
+
maximum: RUN_LIST_LIMIT,
|
|
178
|
+
});
|
|
179
|
+
return rows.map(mapRunRow);
|
|
180
|
+
}
|
|
181
|
+
async listUnfinishedRunRecords() {
|
|
182
|
+
return repositories().automationRuns.listUnfinished(200);
|
|
183
|
+
}
|
|
184
|
+
async markRunStarted(runId, sessionId, assistantMessageId) {
|
|
185
|
+
return repositories().automationRuns.markStarted(runId, sessionId, assistantMessageId, Date.now());
|
|
186
|
+
}
|
|
187
|
+
async finalizeRun(runId, status, error = null) {
|
|
188
|
+
return repositories().automationRuns.finalize(runId, status, Date.now(), error);
|
|
189
|
+
}
|
|
190
|
+
async runsSummary(userId) {
|
|
191
|
+
const now = Date.now();
|
|
192
|
+
const dayMs = 24 * 60 * 60 * 1000;
|
|
193
|
+
const start = new Date(now);
|
|
194
|
+
const todayStart = new Date(start.getFullYear(), start.getMonth(), start.getDate()).getTime();
|
|
195
|
+
const windowStart = todayStart - 29 * dayMs;
|
|
196
|
+
const [unseenCount, runs] = await Promise.all([
|
|
197
|
+
repositories().automationRuns.countUnseenFinished(userId),
|
|
198
|
+
repositories().automationRuns.listByOwner(userId, {
|
|
199
|
+
from: windowStart,
|
|
200
|
+
maximum: RUN_LIST_LIMIT,
|
|
201
|
+
}),
|
|
202
|
+
]);
|
|
203
|
+
const days = Array.from({ length: 30 }, () => ({
|
|
204
|
+
succeeded: 0,
|
|
205
|
+
failed: 0,
|
|
206
|
+
}));
|
|
207
|
+
for (const run of runs) {
|
|
208
|
+
const index = Math.floor((run.scheduled_for - windowStart) / dayMs);
|
|
209
|
+
if (index < 0 || index >= 30)
|
|
210
|
+
continue;
|
|
211
|
+
if (run.status === 'succeeded')
|
|
212
|
+
days[index].succeeded += 1;
|
|
213
|
+
else if (run.status === 'failed')
|
|
214
|
+
days[index].failed += 1;
|
|
215
|
+
}
|
|
216
|
+
return { unseenCount, days };
|
|
217
|
+
}
|
|
218
|
+
async markRunsSeen(userId) {
|
|
219
|
+
return repositories().automationRuns.markSeenBefore(userId, Date.now());
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
const automationService = new AutomationService();
|
|
223
|
+
export default automationService;
|
|
224
|
+
//# sourceMappingURL=automationService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"automationService.js","sourceRoot":"","sources":["../../src/services/automationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatGenerationService.d.ts","sourceRoot":"","sources":["../../src/services/chatGenerationService.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,MAAM,EACN,cAAc,EACf,MAAM,mBAAmB,CAAC;AAO3B,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,iBAAiB,CAAC;IACjC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IAC3D,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,UAAU,CAAC;AAExD,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,gBAAgB,CAAC;IACzB,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACpC,cAAc,EAAE,WAAW,EAAE,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC5B,WAAW,CAAC,EAAE,KAAK,CAAC;CACrB;AAED,cAAM,qBAAqB;IACnB,sBAAsB,CAC1B,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,MAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,CAyBjB;IAEK,YAAY,CAChB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAK5B;IAED;;;;;;;;;OASG;IACG,oBAAoB,CACxB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,iBAAsB,EAC/B,MAAM,CAAC,EAAE,WAAW,EACpB,qBAAqB,UAAO,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAoB5B;IAEK,uBAAuB,CAC3B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,iBAAsB,EAC/B,iBAAiB,CAAC,EAAE,qBAAqB,EACzC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"chatGenerationService.d.ts","sourceRoot":"","sources":["../../src/services/chatGenerationService.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACrB,gBAAgB,EAChB,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,MAAM,EACN,cAAc,EACf,MAAM,mBAAmB,CAAC;AAO3B,MAAM,WAAW,gBAAgB;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,iBAAiB,CAAC;IACjC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC;IAC3D,YAAY,CAAC,EAAE,gBAAgB,CAAC;IAChC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,MAAM,oBAAoB,GAAG,OAAO,GAAG,UAAU,CAAC;AAExD,MAAM,WAAW,4BAA4B;IAC3C,MAAM,EAAE,gBAAgB,CAAC;IACzB,cAAc,EAAE,iBAAiB,EAAE,CAAC;IACpC,cAAc,EAAE,WAAW,EAAE,CAAC;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;IAC5C,MAAM,CAAC,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,2BAA2B;IAC1C,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,MAAM,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC5B,WAAW,CAAC,EAAE,KAAK,CAAC;CACrB;AAED,cAAM,qBAAqB;IACnB,sBAAsB,CAC1B,YAAY,EAAE,MAAM,EACpB,MAAM,GAAE,MAAkB,GACzB,OAAO,CAAC,MAAM,CAAC,CAyBjB;IAEK,YAAY,CAChB,OAAO,GAAE,iBAAsB,GAC9B,OAAO,CAAC,iBAAiB,CAAC,CAK5B;IAED;;;;;;;;;OASG;IACG,oBAAoB,CACxB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,iBAAsB,EAC/B,MAAM,CAAC,EAAE,WAAW,EACpB,qBAAqB,UAAO,GAC3B,OAAO,CAAC,iBAAiB,CAAC,CAoB5B;IAEK,uBAAuB,CAC3B,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,OAAO,GAAE,iBAAsB,EAC/B,iBAAiB,CAAC,EAAE,qBAAqB,EACzC,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC,gBAAgB,CAAC,CAwC3B;IAED,6BAA6B,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,CAE9D;IAED,wBAAwB,CACtB,KAAK,EAAE,MAAM,EACb,gBAAgB,EAAE,MAAM,EACxB,iBAAiB,CAAC,EAAE,MAAM,EAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1C,KAAK,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAC;QAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;KAAE,EAC9D,OAAO,CAAC,EAAE;QACR,iDAAiD;QACjD,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,0EAA0E;QAC1E,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,wDAAwD;QACxD,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GACA,kBAAkB,CAgCpB;IAEK,mBAAmB,CAAC,EACxB,MAAM,EACN,cAAc,EACd,cAAc,EACd,MAAM,EACN,oBAAiC,EACjC,MAAM,GACP,EAAE,4BAA4B,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAqHrE;CACF"}
|
|
@@ -74,7 +74,13 @@ class ChatGenerationService {
|
|
|
74
74
|
return mergeGenerationOptions(mergeGenerationOptions(mergeGenerationOptions(global, recommended), pinned), options);
|
|
75
75
|
}
|
|
76
76
|
async prepareGenerationTarget(sessionModel, userId, options = {}, providerSelection, signal) {
|
|
77
|
-
|
|
77
|
+
// A persona session's provider binding describes the persona
|
|
78
|
+
// pseudo-model, not its backing model (the UI historically stamped
|
|
79
|
+
// "ollama" on every persona). The backing model's own name decides
|
|
80
|
+
// the provider, so the binding must not pin routing here.
|
|
81
|
+
const provider = sessionModel.startsWith('persona:')
|
|
82
|
+
? undefined
|
|
83
|
+
: normalizeChatProviderSelection(providerSelection);
|
|
78
84
|
const actualModelName = await this.resolveActualModelName(sessionModel, userId);
|
|
79
85
|
const activePlugin = provider?.providerType === 'ollama' || provider?.providerType === 'agent'
|
|
80
86
|
? null
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatGenerationService.js","sourceRoot":"","sources":["../../src/services/chatGenerationService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"chatGenerationService.js","sourceRoot":"","sources":["../../src/services/chatGenerationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,7 @@ declare class ChatService {
|
|
|
59
59
|
}): Promise<number>;
|
|
60
60
|
updateMessage(sessionId: string, messageId: string, updates: Partial<ChatMessage>, userId?: string): Promise<ChatMessage | undefined>;
|
|
61
61
|
private updateMessageWithLeaseHeld;
|
|
62
|
+
truncateMessagesFrom(sessionId: string, messageId: string, userId?: string): Promise<ChatSession | undefined>;
|
|
62
63
|
deleteSession(sessionId: string, userId?: string): Promise<boolean>;
|
|
63
64
|
private deleteSessionWithLeaseHeld;
|
|
64
65
|
getSessionFolders(userId?: string): Promise<SessionFolder[]>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chatService.d.ts","sourceRoot":"","sources":["../../src/services/chatService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"chatService.d.ts","sourceRoot":"","sources":["../../src/services/chatService.ts"],"names":[],"mappings":"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"}
|
|
@@ -515,6 +515,30 @@ class ChatService {
|
|
|
515
515
|
await storageService.saveSession(session, userId, assertHeld);
|
|
516
516
|
return updatedMessage;
|
|
517
517
|
}
|
|
518
|
+
// Remove a message and everything after it (edit-and-resend). The client
|
|
519
|
+
// only names the cut point; the kept prefix comes from the server's own
|
|
520
|
+
// copy, so a stale client snapshot can never erase a worker response.
|
|
521
|
+
async truncateMessagesFrom(sessionId, messageId, userId = 'default') {
|
|
522
|
+
return this.withSessionWriteLease(sessionId, userId, async (assertHeld) => {
|
|
523
|
+
const session = await this.getSession(sessionId, userId);
|
|
524
|
+
if (!session)
|
|
525
|
+
return undefined;
|
|
526
|
+
const index = session.messages.findIndex(msg => msg.id === messageId);
|
|
527
|
+
if (index === -1)
|
|
528
|
+
return undefined;
|
|
529
|
+
// Any generation still in flight targets the tail being removed.
|
|
530
|
+
await getDurableJobRuntime().service.cancelAllForActor(userId, 'superseded', {
|
|
531
|
+
jobTypes: [CHAT_GENERATE_JOB_TYPE],
|
|
532
|
+
idempotencyScopes: [chatGenerationIdempotencyScope(sessionId)],
|
|
533
|
+
});
|
|
534
|
+
session.messages = session.messages.slice(0, index);
|
|
535
|
+
session.updatedAt = Date.now();
|
|
536
|
+
this.sessions.set(sessionId, session);
|
|
537
|
+
await assertHeld();
|
|
538
|
+
await storageService.saveSession(session, userId, assertHeld);
|
|
539
|
+
return session;
|
|
540
|
+
});
|
|
541
|
+
}
|
|
518
542
|
async deleteSession(sessionId, userId = 'default') {
|
|
519
543
|
return this.withSessionWriteLease(sessionId, userId, async (assertHeld) => {
|
|
520
544
|
await getDurableJobRuntime().service.cancelAllForActor(userId, 'superseded', {
|