libre-webui 0.15.1 → 0.16.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/backend/dist/db.d.ts.map +1 -1
- package/backend/dist/db.js +63 -0
- package/backend/dist/db.js.map +1 -1
- package/backend/dist/index.d.ts.map +1 -1
- package/backend/dist/index.js +4 -4
- package/backend/dist/index.js.map +1 -1
- package/backend/dist/routes/chat.d.ts.map +1 -1
- package/backend/dist/routes/chat.js +93 -10
- package/backend/dist/routes/chat.js.map +1 -1
- package/backend/dist/routes/imageGen.d.ts.map +1 -1
- package/backend/dist/routes/imageGen.js +52 -29
- package/backend/dist/routes/imageGen.js.map +1 -1
- package/backend/dist/routes/plugins.d.ts.map +1 -1
- package/backend/dist/routes/plugins.js +218 -41
- package/backend/dist/routes/plugins.js.map +1 -1
- package/backend/dist/routes/preferences.d.ts.map +1 -1
- package/backend/dist/routes/preferences.js +5 -4
- package/backend/dist/routes/preferences.js.map +1 -1
- package/backend/dist/routes/tts.js +2 -2
- package/backend/dist/routes/tts.js.map +1 -1
- package/backend/dist/services/assistantCompletionService.d.ts +2 -1
- package/backend/dist/services/assistantCompletionService.d.ts.map +1 -1
- package/backend/dist/services/assistantCompletionService.js +3 -1
- package/backend/dist/services/assistantCompletionService.js.map +1 -1
- package/backend/dist/services/chatGenerationService.d.ts +5 -3
- package/backend/dist/services/chatGenerationService.d.ts.map +1 -1
- package/backend/dist/services/chatGenerationService.js +18 -6
- package/backend/dist/services/chatGenerationService.js.map +1 -1
- package/backend/dist/services/chatRequestService.d.ts +6 -4
- package/backend/dist/services/chatRequestService.d.ts.map +1 -1
- package/backend/dist/services/chatRequestService.js +10 -2
- package/backend/dist/services/chatRequestService.js.map +1 -1
- package/backend/dist/services/chatService.d.ts +2 -2
- package/backend/dist/services/chatService.d.ts.map +1 -1
- package/backend/dist/services/chatService.js +29 -17
- package/backend/dist/services/chatService.js.map +1 -1
- package/backend/dist/services/embeddingService.js +1 -1
- package/backend/dist/services/embeddingService.js.map +1 -1
- package/backend/dist/services/pluginActivationService.d.ts +11 -0
- package/backend/dist/services/pluginActivationService.d.ts.map +1 -0
- package/backend/dist/services/pluginActivationService.js +163 -0
- package/backend/dist/services/pluginActivationService.js.map +1 -0
- package/backend/dist/services/pluginCapabilityRegistryService.d.ts +1 -1
- package/backend/dist/services/pluginCapabilityRegistryService.d.ts.map +1 -1
- package/backend/dist/services/pluginCapabilityRegistryService.js +1 -1
- package/backend/dist/services/pluginCapabilityRegistryService.js.map +1 -1
- package/backend/dist/services/pluginCredentialsService.d.ts +16 -8
- package/backend/dist/services/pluginCredentialsService.d.ts.map +1 -1
- package/backend/dist/services/pluginCredentialsService.js +47 -14
- package/backend/dist/services/pluginCredentialsService.js.map +1 -1
- package/backend/dist/services/pluginEmbeddingService.d.ts +2 -2
- package/backend/dist/services/pluginEmbeddingService.d.ts.map +1 -1
- package/backend/dist/services/pluginEmbeddingService.js +33 -13
- package/backend/dist/services/pluginEmbeddingService.js.map +1 -1
- package/backend/dist/services/pluginImageGenerationService.d.ts +11 -7
- package/backend/dist/services/pluginImageGenerationService.d.ts.map +1 -1
- package/backend/dist/services/pluginImageGenerationService.js +265 -81
- package/backend/dist/services/pluginImageGenerationService.js.map +1 -1
- package/backend/dist/services/pluginService.d.ts +55 -25
- package/backend/dist/services/pluginService.d.ts.map +1 -1
- package/backend/dist/services/pluginService.js +658 -170
- package/backend/dist/services/pluginService.js.map +1 -1
- package/backend/dist/services/pluginTTSService.d.ts +4 -4
- package/backend/dist/services/pluginTTSService.d.ts.map +1 -1
- package/backend/dist/services/pluginTTSService.js +24 -28
- package/backend/dist/services/pluginTTSService.js.map +1 -1
- package/backend/dist/services/pluginVariablesService.d.ts +6 -1
- package/backend/dist/services/pluginVariablesService.d.ts.map +1 -1
- package/backend/dist/services/pluginVariablesService.js +59 -1
- package/backend/dist/services/pluginVariablesService.js.map +1 -1
- package/backend/dist/services/preferencesService.d.ts +2 -2
- package/backend/dist/services/preferencesService.d.ts.map +1 -1
- package/backend/dist/services/preferencesService.js +78 -10
- package/backend/dist/services/preferencesService.js.map +1 -1
- package/backend/dist/services/titleGenerationService.d.ts +6 -4
- package/backend/dist/services/titleGenerationService.d.ts.map +1 -1
- package/backend/dist/services/titleGenerationService.js +9 -5
- package/backend/dist/services/titleGenerationService.js.map +1 -1
- package/backend/dist/services/workAgentService.d.ts +5 -2
- package/backend/dist/services/workAgentService.d.ts.map +1 -1
- package/backend/dist/services/workAgentService.js +315 -44
- package/backend/dist/services/workAgentService.js.map +1 -1
- package/backend/dist/services/workModelProviderService.d.ts +6 -3
- package/backend/dist/services/workModelProviderService.d.ts.map +1 -1
- package/backend/dist/services/workModelProviderService.js +243 -19
- package/backend/dist/services/workModelProviderService.js.map +1 -1
- package/backend/dist/services/workTaskService.d.ts +2 -0
- package/backend/dist/services/workTaskService.d.ts.map +1 -1
- package/backend/dist/services/workTaskService.js +89 -14
- package/backend/dist/services/workTaskService.js.map +1 -1
- package/backend/dist/storage.d.ts.map +1 -1
- package/backend/dist/storage.js +9 -6
- package/backend/dist/storage.js.map +1 -1
- package/backend/dist/storageMappers.d.ts +3 -0
- package/backend/dist/storageMappers.d.ts.map +1 -1
- package/backend/dist/storageMappers.js +3 -0
- package/backend/dist/storageMappers.js.map +1 -1
- package/backend/dist/types/index.d.ts +54 -1
- package/backend/dist/types/index.d.ts.map +1 -1
- package/backend/dist/types/index.js.map +1 -1
- package/backend/dist/types/work.d.ts +1 -1
- package/backend/dist/types/work.d.ts.map +1 -1
- package/backend/dist/utils/chatContext.d.ts +13 -1
- package/backend/dist/utils/chatContext.d.ts.map +1 -1
- package/backend/dist/utils/chatContext.js +52 -0
- package/backend/dist/utils/chatContext.js.map +1 -1
- package/backend/dist/utils/chatProviderSelection.d.ts +15 -0
- package/backend/dist/utils/chatProviderSelection.d.ts.map +1 -0
- package/backend/dist/utils/chatProviderSelection.js +59 -0
- package/backend/dist/utils/chatProviderSelection.js.map +1 -0
- package/backend/dist/utils/imageGenerationValidation.d.ts +3 -0
- package/backend/dist/utils/imageGenerationValidation.d.ts.map +1 -0
- package/backend/dist/utils/imageGenerationValidation.js +55 -0
- package/backend/dist/utils/imageGenerationValidation.js.map +1 -0
- package/backend/dist/utils/openAIResponsesAdapter.d.ts +88 -0
- package/backend/dist/utils/openAIResponsesAdapter.d.ts.map +1 -0
- package/backend/dist/utils/openAIResponsesAdapter.js +521 -0
- package/backend/dist/utils/openAIResponsesAdapter.js.map +1 -0
- package/backend/dist/utils/pluginChatAdapter.d.ts +7 -4
- package/backend/dist/utils/pluginChatAdapter.d.ts.map +1 -1
- package/backend/dist/utils/pluginChatAdapter.js +33 -5
- package/backend/dist/utils/pluginChatAdapter.js.map +1 -1
- package/backend/dist/utils/pluginChatContext.d.ts.map +1 -1
- package/backend/dist/utils/pluginChatContext.js +5 -1
- package/backend/dist/utils/pluginChatContext.js.map +1 -1
- package/backend/dist/utils/pluginConnectionVariables.d.ts +6 -0
- package/backend/dist/utils/pluginConnectionVariables.d.ts.map +1 -0
- package/backend/dist/utils/pluginConnectionVariables.js +52 -0
- package/backend/dist/utils/pluginConnectionVariables.js.map +1 -0
- package/backend/dist/utils/pluginDefinitionTrust.d.ts +9 -0
- package/backend/dist/utils/pluginDefinitionTrust.d.ts.map +1 -0
- package/backend/dist/utils/pluginDefinitionTrust.js +71 -0
- package/backend/dist/utils/pluginDefinitionTrust.js.map +1 -0
- package/backend/dist/utils/pluginStreamAdapter.d.ts +3 -0
- package/backend/dist/utils/pluginStreamAdapter.d.ts.map +1 -1
- package/backend/dist/utils/pluginStreamAdapter.js +410 -0
- package/backend/dist/utils/pluginStreamAdapter.js.map +1 -1
- package/backend/dist/utils/pluginStreaming.d.ts +7 -1
- package/backend/dist/utils/pluginStreaming.d.ts.map +1 -1
- package/backend/dist/utils/pluginStreaming.js +12 -1
- package/backend/dist/utils/pluginStreaming.js.map +1 -1
- package/backend/dist/utils/pluginValidation.d.ts +20 -2
- package/backend/dist/utils/pluginValidation.d.ts.map +1 -1
- package/backend/dist/utils/pluginValidation.js +187 -17
- package/backend/dist/utils/pluginValidation.js.map +1 -1
- package/backend/dist/utils/pluginVariableValidation.d.ts +7 -0
- package/backend/dist/utils/pluginVariableValidation.d.ts.map +1 -1
- package/backend/dist/utils/pluginVariableValidation.js +79 -4
- package/backend/dist/utils/pluginVariableValidation.js.map +1 -1
- package/backend/dist/websocketServer.d.ts.map +1 -1
- package/backend/dist/websocketServer.js +16 -3
- package/backend/dist/websocketServer.js.map +1 -1
- package/backend/package.json +1 -1
- package/frontend/dist/assets/index-CKV9Lnj8.js +5 -0
- package/frontend/dist/assets/index-Dme2Ozol.css +1 -0
- package/frontend/dist/index.html +3 -3
- package/frontend/dist/js/{ArtifactContainer-BHSBrlQB.js → ArtifactContainer-B0uVR8Z9.js} +1 -1
- package/frontend/dist/js/{ArtifactDemoPage-BHGJmJAT.js → ArtifactDemoPage-DBVPHFxk.js} +1 -1
- package/frontend/dist/js/{ArtifactSlideOutPanel-s8vcE5Ea.js → ArtifactSlideOutPanel-Cg5kAwv9.js} +1 -1
- package/frontend/dist/js/ChatPage-CPHlIZqU.js +16 -0
- package/frontend/dist/js/{FirstTimeSetup-BYWAVAdE.js → FirstTimeSetup-DksL5arK.js} +1 -1
- package/frontend/dist/js/GalleryPage-1mdUGo_N.js +1 -0
- package/frontend/dist/js/LibreClawPage-qGr1Jy8p.js +1 -0
- package/frontend/dist/js/ModelSelector-CUnwRmNU.js +1 -0
- package/frontend/dist/js/ModelsPage-DMYVg3LT.js +2 -0
- package/frontend/dist/js/PersonasPage-Ct-KKW-j.js +13 -0
- package/frontend/dist/js/{RichMessageContent-BdU5vXz9.js → RichMessageContent-CGBAcUES.js} +1 -1
- package/frontend/dist/js/SettingsModal-BVj3gFCS.js +1 -0
- package/frontend/dist/js/UserManagementPage-D3tLGtTu.js +1 -0
- package/frontend/dist/js/WorkPage-DhTjy-kf.js +2 -0
- package/frontend/dist/js/api-YWoSobKv.js +19 -0
- package/frontend/dist/js/{estree-Bu_-Wi6O.js → estree-PDLT672k.js} +1 -1
- package/frontend/dist/js/{html-Ca764Rus.js → html-CkhF9wDQ.js} +1 -1
- package/frontend/dist/js/{markdown-DaiQGPEs.js → markdown-B1iNUbse.js} +1 -1
- package/frontend/dist/js/{standalone-DWWnsbIr.js → standalone-CCd6rkf-.js} +1 -1
- package/frontend/dist/js/{typescript-CatjJeHm.js → typescript-DKJ1uM5L.js} +1 -1
- package/frontend/dist/js/useBaseQuery-MuQj7vA5.js +1 -0
- package/frontend/dist/js/useQuery-CYGPkxWR.js +1 -0
- package/package.json +2 -2
- package/plugins/github.json +1 -2
- package/plugins/huggingface.json +30 -30
- package/plugins/openai.json +53 -22
- package/frontend/dist/assets/index-DkShhNBf.js +0 -5
- package/frontend/dist/assets/index-bdSWBsAM.css +0 -1
- package/frontend/dist/js/ChatPage-B6Hm_pdu.js +0 -16
- package/frontend/dist/js/GalleryPage-CH4f65q8.js +0 -1
- package/frontend/dist/js/LibreClawPage-CcH7M3mJ.js +0 -1
- package/frontend/dist/js/ModelSelector-T1KZtIde.js +0 -1
- package/frontend/dist/js/ModelsPage-C1bM_Yoc.js +0 -2
- package/frontend/dist/js/PersonasPage-T_PrhnPG.js +0 -13
- package/frontend/dist/js/SettingsModal-BVj-D1L4.js +0 -1
- package/frontend/dist/js/UserManagementPage-Pix71oRW.js +0 -1
- package/frontend/dist/js/WorkPage-DdOVGyj_.js +0 -2
- package/frontend/dist/js/api-Do6u0tMM.js +0 -19
- package/frontend/dist/js/useBaseQuery-CVNuhuID.js +0 -1
- package/frontend/dist/js/useQuery-CYhC_da4.js +0 -1
|
@@ -17,7 +17,27 @@
|
|
|
17
17
|
import { createLogger } from './logger.js';
|
|
18
18
|
const logger = createLogger('utils:plugin-validation');
|
|
19
19
|
const MODEL_PATTERN = /^[a-zA-Z0-9\-_:./~]+$/;
|
|
20
|
-
const
|
|
20
|
+
const PLUGIN_API_MODES = new Set([
|
|
21
|
+
'chat_completions',
|
|
22
|
+
'responses',
|
|
23
|
+
]);
|
|
24
|
+
const MAX_API_PATH_DECODE_PASSES = 8;
|
|
25
|
+
export const PLUGIN_MODEL_DISCOVERY_VARIABLES = [
|
|
26
|
+
'endpoint',
|
|
27
|
+
'api_url',
|
|
28
|
+
'models_endpoint',
|
|
29
|
+
'base_url',
|
|
30
|
+
'api_path',
|
|
31
|
+
'api_mode',
|
|
32
|
+
];
|
|
33
|
+
function optionalPluginVariableString(value) {
|
|
34
|
+
return typeof value === 'string' && value.trim().length > 0
|
|
35
|
+
? value.trim()
|
|
36
|
+
: undefined;
|
|
37
|
+
}
|
|
38
|
+
export function isPluginConnectionEndpointVariable(name) {
|
|
39
|
+
return PLUGIN_MODEL_DISCOVERY_VARIABLES.includes(name);
|
|
40
|
+
}
|
|
21
41
|
export function validatePluginModel(model) {
|
|
22
42
|
if (!model || typeof model !== 'string') {
|
|
23
43
|
throw new Error('Invalid model parameter: must be a non-empty string');
|
|
@@ -31,14 +51,12 @@ export function validatePluginModel(model) {
|
|
|
31
51
|
}
|
|
32
52
|
export function isSafePluginEndpoint(endpoint) {
|
|
33
53
|
const url = new URL(endpoint);
|
|
34
|
-
|
|
35
|
-
const isPrivateNetwork = PRIVATE_NETWORK_PATTERN.test(url.hostname);
|
|
36
|
-
return url.protocol === 'https:' || isLocalhost || isPrivateNetwork;
|
|
54
|
+
return url.protocol === 'https:' || url.protocol === 'http:';
|
|
37
55
|
}
|
|
38
56
|
export function validatePluginEndpointOverride(endpoint) {
|
|
39
57
|
try {
|
|
40
58
|
if (!isSafePluginEndpoint(endpoint)) {
|
|
41
|
-
logger.warn(`Rejected
|
|
59
|
+
logger.warn(`Rejected unsupported endpoint override: ${endpoint} (only HTTP and HTTPS URLs are allowed)`);
|
|
42
60
|
return null;
|
|
43
61
|
}
|
|
44
62
|
return endpoint;
|
|
@@ -52,30 +70,182 @@ export function assertSafePluginEndpoint(endpoint, label = 'endpoint URL') {
|
|
|
52
70
|
try {
|
|
53
71
|
if (!isSafePluginEndpoint(endpoint)) {
|
|
54
72
|
const url = new URL(endpoint);
|
|
55
|
-
throw new Error(`
|
|
56
|
-
`(HTTP is permitted for localhost and private network IPs)`);
|
|
73
|
+
throw new Error(`Unsupported endpoint protocol: ${url.protocol}. Only HTTP and HTTPS URLs are allowed.`);
|
|
57
74
|
}
|
|
58
75
|
}
|
|
59
76
|
catch (error) {
|
|
60
|
-
if (error instanceof Error && error.message.startsWith('
|
|
77
|
+
if (error instanceof Error && error.message.startsWith('Unsupported')) {
|
|
61
78
|
throw error;
|
|
62
79
|
}
|
|
63
80
|
throw new Error(`Invalid ${label}: ${endpoint}`);
|
|
64
81
|
}
|
|
65
82
|
}
|
|
66
83
|
export function resolvePluginEndpoint(endpoint, endpointOverride) {
|
|
67
|
-
|
|
68
|
-
|
|
84
|
+
const normalizedOverride = endpointOverride?.trim();
|
|
85
|
+
if (!normalizedOverride) {
|
|
86
|
+
return endpoint;
|
|
87
|
+
}
|
|
88
|
+
const validatedOverride = validatePluginEndpointOverride(normalizedOverride);
|
|
89
|
+
if (!validatedOverride) {
|
|
90
|
+
throw new Error('Invalid plugin endpoint override. Use an absolute HTTP or HTTPS URL.');
|
|
91
|
+
}
|
|
92
|
+
return validatedOverride;
|
|
93
|
+
}
|
|
94
|
+
function optionalPluginString(value) {
|
|
95
|
+
return typeof value === 'string' && value.trim().length > 0
|
|
96
|
+
? value.trim()
|
|
97
|
+
: undefined;
|
|
98
|
+
}
|
|
99
|
+
function inferKnownPluginApiMode(endpoint) {
|
|
100
|
+
try {
|
|
101
|
+
const pathname = new URL(endpoint).pathname.replace(/\/+$/, '');
|
|
102
|
+
if (pathname.endsWith('/responses'))
|
|
103
|
+
return 'responses';
|
|
104
|
+
if (pathname.endsWith('/chat/completions') ||
|
|
105
|
+
pathname.endsWith('/completions')) {
|
|
106
|
+
return 'chat_completions';
|
|
107
|
+
}
|
|
108
|
+
return undefined;
|
|
109
|
+
}
|
|
110
|
+
catch {
|
|
111
|
+
return undefined;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
export function inferPluginApiMode(endpoint) {
|
|
115
|
+
return inferKnownPluginApiMode(endpoint) || 'chat_completions';
|
|
116
|
+
}
|
|
117
|
+
export function validatePluginApiPath(apiPath) {
|
|
118
|
+
const trimmed = apiPath.trim();
|
|
119
|
+
if (!trimmed.startsWith('/') ||
|
|
120
|
+
trimmed.startsWith('//') ||
|
|
121
|
+
trimmed.includes('://') ||
|
|
122
|
+
trimmed.includes('\\') ||
|
|
123
|
+
trimmed.includes('?') ||
|
|
124
|
+
trimmed.includes('#')) {
|
|
125
|
+
return null;
|
|
126
|
+
}
|
|
127
|
+
let decoded = trimmed;
|
|
128
|
+
let decodingStable = false;
|
|
129
|
+
for (let decodePass = 0; decodePass <= MAX_API_PATH_DECODE_PASSES; decodePass += 1) {
|
|
130
|
+
let next;
|
|
131
|
+
try {
|
|
132
|
+
next = decodeURIComponent(decoded);
|
|
133
|
+
}
|
|
134
|
+
catch {
|
|
135
|
+
return null;
|
|
136
|
+
}
|
|
137
|
+
if (next === decoded) {
|
|
138
|
+
decodingStable = true;
|
|
139
|
+
break;
|
|
140
|
+
}
|
|
141
|
+
if (decodePass === MAX_API_PATH_DECODE_PASSES) {
|
|
142
|
+
return null;
|
|
143
|
+
}
|
|
144
|
+
decoded = next;
|
|
145
|
+
}
|
|
146
|
+
if (!decodingStable ||
|
|
147
|
+
decoded.includes('\\') ||
|
|
148
|
+
decoded.includes('?') ||
|
|
149
|
+
decoded.includes('#') ||
|
|
150
|
+
decoded.split('/').some(segment => segment === '.' || segment === '..')) {
|
|
151
|
+
return null;
|
|
152
|
+
}
|
|
153
|
+
return `/${trimmed.replace(/^\/+|\/+$/g, '')}`;
|
|
154
|
+
}
|
|
155
|
+
function combinePluginBaseUrlAndPath(baseUrl, apiPath) {
|
|
156
|
+
assertSafePluginEndpoint(baseUrl, 'plugin base URL');
|
|
157
|
+
const base = new URL(baseUrl);
|
|
158
|
+
if (base.search || base.hash) {
|
|
159
|
+
throw new Error('Invalid plugin base URL: query strings and fragments are not supported');
|
|
160
|
+
}
|
|
161
|
+
const validatedPath = validatePluginApiPath(apiPath);
|
|
162
|
+
if (!validatedPath) {
|
|
163
|
+
throw new Error(`Invalid plugin API path: ${apiPath}`);
|
|
164
|
+
}
|
|
165
|
+
const basePath = base.pathname.replace(/\/+$/, '');
|
|
166
|
+
base.pathname = `${basePath}${validatedPath}`;
|
|
167
|
+
const requiredPrefix = basePath ? `${basePath}/` : '/';
|
|
168
|
+
if (base.pathname !== basePath && !base.pathname.startsWith(requiredPrefix)) {
|
|
169
|
+
throw new Error(`Invalid plugin API path: ${apiPath}`);
|
|
170
|
+
}
|
|
171
|
+
return base.toString();
|
|
69
172
|
}
|
|
70
|
-
export function
|
|
173
|
+
export function resolvePluginApiConfig(plugin, variables = {}) {
|
|
174
|
+
const userConfiguredMode = optionalPluginString(variables.api_mode);
|
|
175
|
+
const configuredMode = userConfiguredMode || plugin.api_mode;
|
|
176
|
+
if (configuredMode !== undefined &&
|
|
177
|
+
!PLUGIN_API_MODES.has(configuredMode)) {
|
|
178
|
+
throw new Error(`Invalid plugin API mode: ${configuredMode}`);
|
|
179
|
+
}
|
|
180
|
+
let apiMode = configuredMode ||
|
|
181
|
+
inferPluginApiMode(plugin.endpoint);
|
|
182
|
+
const endpointOverride = optionalPluginString(variables.endpoint) ||
|
|
183
|
+
optionalPluginString(variables.api_url);
|
|
184
|
+
const configuredBaseUrl = optionalPluginString(variables.base_url);
|
|
185
|
+
const configuredApiPath = optionalPluginString(variables.api_path);
|
|
186
|
+
const hasStructuredApiOverride = (configuredBaseUrl !== undefined &&
|
|
187
|
+
configuredBaseUrl !== optionalPluginString(plugin.base_url)) ||
|
|
188
|
+
(configuredApiPath !== undefined &&
|
|
189
|
+
configuredApiPath !== optionalPluginString(plugin.api_path)) ||
|
|
190
|
+
(configuredMode !== undefined && configuredMode !== plugin.api_mode);
|
|
191
|
+
// Older bundled manifests stored their own default endpoint as a user
|
|
192
|
+
// variable. Treat that exact value as a default rather than an override so
|
|
193
|
+
// upgraded users can change Base URL without first clearing stale data.
|
|
194
|
+
if (endpointOverride &&
|
|
195
|
+
(endpointOverride !== plugin.endpoint || !hasStructuredApiOverride)) {
|
|
196
|
+
const endpoint = resolvePluginEndpoint(plugin.endpoint, endpointOverride);
|
|
197
|
+
apiMode = inferKnownPluginApiMode(endpoint) || apiMode;
|
|
198
|
+
return { apiMode, endpoint };
|
|
199
|
+
}
|
|
200
|
+
const baseUrl = configuredBaseUrl || optionalPluginString(plugin.base_url);
|
|
201
|
+
if (baseUrl) {
|
|
202
|
+
const modeOverridesManifest = userConfiguredMode !== undefined &&
|
|
203
|
+
userConfiguredMode !== plugin.api_mode &&
|
|
204
|
+
configuredApiPath === undefined;
|
|
205
|
+
const configuredPath = configuredApiPath ||
|
|
206
|
+
(modeOverridesManifest
|
|
207
|
+
? undefined
|
|
208
|
+
: optionalPluginString(plugin.api_path));
|
|
209
|
+
const defaultPath = apiMode === 'responses' ? '/responses' : '/chat/completions';
|
|
210
|
+
const endpoint = combinePluginBaseUrlAndPath(baseUrl, configuredPath || defaultPath);
|
|
211
|
+
return {
|
|
212
|
+
apiMode: inferKnownPluginApiMode(endpoint) || apiMode,
|
|
213
|
+
endpoint,
|
|
214
|
+
};
|
|
215
|
+
}
|
|
216
|
+
if (optionalPluginString(variables.api_path)) {
|
|
217
|
+
throw new Error('A plugin base URL is required when API path is set');
|
|
218
|
+
}
|
|
219
|
+
apiMode = inferKnownPluginApiMode(plugin.endpoint) || apiMode;
|
|
220
|
+
return { apiMode, endpoint: plugin.endpoint };
|
|
221
|
+
}
|
|
222
|
+
/**
|
|
223
|
+
* Resolve a plugin's full operation URL.
|
|
224
|
+
*
|
|
225
|
+
* `endpoint` is the canonical variable. Imported legacy plugins may use
|
|
226
|
+
* `api_url`; it is consulted only when `endpoint` is blank or absent.
|
|
227
|
+
*/
|
|
228
|
+
export function resolvePluginOperationEndpoint(endpoint, variables = {}) {
|
|
229
|
+
const endpointOverride = optionalPluginVariableString(variables.endpoint) ||
|
|
230
|
+
optionalPluginVariableString(variables.api_url);
|
|
231
|
+
return resolvePluginEndpoint(endpoint, endpointOverride);
|
|
232
|
+
}
|
|
233
|
+
export function resolvePluginModelsEndpoint(endpoint, modelsEndpointOverride) {
|
|
234
|
+
const explicitModelsEndpoint = optionalPluginVariableString(modelsEndpointOverride);
|
|
235
|
+
if (explicitModelsEndpoint) {
|
|
236
|
+
return resolvePluginEndpoint('', explicitModelsEndpoint);
|
|
237
|
+
}
|
|
71
238
|
const url = new URL(endpoint);
|
|
72
239
|
url.search = '';
|
|
240
|
+
url.hash = '';
|
|
241
|
+
url.pathname = url.pathname.replace(/\/+$/, '') || '/';
|
|
73
242
|
if (url.pathname.endsWith('/models')) {
|
|
74
243
|
return url.toString();
|
|
75
244
|
}
|
|
76
245
|
for (const suffix of [
|
|
77
246
|
'/chat/completions',
|
|
78
247
|
'/completions',
|
|
248
|
+
'/responses',
|
|
79
249
|
'/embeddings',
|
|
80
250
|
'/messages',
|
|
81
251
|
]) {
|
|
@@ -84,16 +254,16 @@ export function resolvePluginModelsEndpoint(endpoint) {
|
|
|
84
254
|
return url.toString();
|
|
85
255
|
}
|
|
86
256
|
}
|
|
87
|
-
const basePath = url.pathname === '/'
|
|
88
|
-
? ''
|
|
89
|
-
: url.pathname.endsWith('/')
|
|
90
|
-
? url.pathname.slice(0, -1)
|
|
91
|
-
: url.pathname;
|
|
257
|
+
const basePath = url.pathname === '/' ? '' : url.pathname;
|
|
92
258
|
url.pathname = `${basePath}/models`;
|
|
93
259
|
return url.toString();
|
|
94
260
|
}
|
|
95
261
|
export function applyModelEndpointTemplate(endpoint, model) {
|
|
96
|
-
|
|
262
|
+
const encodedModelPath = model
|
|
263
|
+
.split('/')
|
|
264
|
+
.map(segment => encodeURIComponent(segment))
|
|
265
|
+
.join('/');
|
|
266
|
+
return endpoint.replace('{model}', encodedModelPath);
|
|
97
267
|
}
|
|
98
268
|
export function buildPluginAuthHeaders(plugin, apiKey) {
|
|
99
269
|
const headers = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pluginValidation.js","sourceRoot":"","sources":["../../src/utils/pluginValidation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,MAAM,GAAG,YAAY,CAAC,yBAAyB,CAAC,CAAC;AAEvD,MAAM,aAAa,GAAG,uBAAuB,CAAC;AAC9C,MAAM,
|
|
1
|
+
{"version":3,"file":"pluginValidation.js","sourceRoot":"","sources":["../../src/utils/pluginValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import type { PluginVariableDefinition } from '../types/index.js';
|
|
2
2
|
export type ValidatedPluginVariables = Record<string, string | number | boolean>;
|
|
3
|
+
export declare function validatePluginVariablesToUnset(definitions: PluginVariableDefinition[], value: unknown): {
|
|
4
|
+
success: true;
|
|
5
|
+
variables: string[];
|
|
6
|
+
} | {
|
|
7
|
+
success: false;
|
|
8
|
+
error: string;
|
|
9
|
+
};
|
|
3
10
|
export declare function validatePluginVariables(definitions: PluginVariableDefinition[], values: Record<string, unknown>): {
|
|
4
11
|
success: true;
|
|
5
12
|
variables: ValidatedPluginVariables;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pluginVariableValidation.d.ts","sourceRoot":"","sources":["../../src/utils/pluginVariableValidation.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"pluginVariableValidation.d.ts","sourceRoot":"","sources":["../../src/utils/pluginVariableValidation.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mBAAmB,CAAC;AAMlE,MAAM,MAAM,wBAAwB,GAAG,MAAM,CAC3C,MAAM,EACN,MAAM,GAAG,MAAM,GAAG,OAAO,CAC1B,CAAC;AAcF,wBAAgB,8BAA8B,CAC5C,WAAW,EAAE,wBAAwB,EAAE,EACvC,KAAK,EAAE,OAAO,GACb;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CA+B5E;AAED,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,wBAAwB,EAAE,EACvC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAE7B;IAAE,OAAO,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,wBAAwB,CAAA;CAAE,GACtD;IAAE,OAAO,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAgHpC"}
|
|
@@ -14,13 +14,54 @@
|
|
|
14
14
|
* See the License for the specific language governing permissions and
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
|
+
import { validatePluginApiPath, validatePluginEndpointOverride, } from './pluginValidation.js';
|
|
18
|
+
function isUrlVariable(name) {
|
|
19
|
+
const normalized = name.toLowerCase();
|
|
20
|
+
return (normalized === 'endpoint' ||
|
|
21
|
+
normalized === 'base_url' ||
|
|
22
|
+
normalized === 'api_url' ||
|
|
23
|
+
normalized === 'models_endpoint' ||
|
|
24
|
+
normalized.endsWith('_endpoint') ||
|
|
25
|
+
normalized.endsWith('_base_url'));
|
|
26
|
+
}
|
|
27
|
+
export function validatePluginVariablesToUnset(definitions, value) {
|
|
28
|
+
if (value === undefined) {
|
|
29
|
+
return { success: true, variables: [] };
|
|
30
|
+
}
|
|
31
|
+
if (!Array.isArray(value)) {
|
|
32
|
+
return {
|
|
33
|
+
success: false,
|
|
34
|
+
error: 'Variable names to unset must be an array',
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
const schemaNames = new Set(definitions.map(definition => definition.name));
|
|
38
|
+
const variables = [];
|
|
39
|
+
const seen = new Set();
|
|
40
|
+
for (const name of value) {
|
|
41
|
+
if (typeof name !== 'string' || !schemaNames.has(name)) {
|
|
42
|
+
return {
|
|
43
|
+
success: false,
|
|
44
|
+
error: `Cannot unset unknown plugin variable "${String(name)}"`,
|
|
45
|
+
};
|
|
46
|
+
}
|
|
47
|
+
if (!seen.has(name)) {
|
|
48
|
+
seen.add(name);
|
|
49
|
+
variables.push(name);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return { success: true, variables };
|
|
53
|
+
}
|
|
17
54
|
export function validatePluginVariables(definitions, values) {
|
|
18
55
|
const schemaMap = new Map(definitions.map(definition => [definition.name, definition]));
|
|
19
56
|
const validated = {};
|
|
20
57
|
for (const [key, value] of Object.entries(values)) {
|
|
21
58
|
const definition = schemaMap.get(key);
|
|
22
|
-
if (!definition)
|
|
23
|
-
|
|
59
|
+
if (!definition) {
|
|
60
|
+
return {
|
|
61
|
+
success: false,
|
|
62
|
+
error: `Unknown plugin variable "${key}"`,
|
|
63
|
+
};
|
|
64
|
+
}
|
|
24
65
|
if (definition.type === 'number') {
|
|
25
66
|
const num = Number(value);
|
|
26
67
|
if (isNaN(num)) {
|
|
@@ -62,9 +103,14 @@ export function validatePluginVariables(definitions, values) {
|
|
|
62
103
|
error: `Variable "${key}" exceeds maximum length of 2048 characters`,
|
|
63
104
|
};
|
|
64
105
|
}
|
|
65
|
-
if (key
|
|
106
|
+
if (isUrlVariable(key) && str.length > 0) {
|
|
107
|
+
const normalizedUrl = str.trim();
|
|
108
|
+
if (normalizedUrl.length === 0) {
|
|
109
|
+
validated[key] = '';
|
|
110
|
+
continue;
|
|
111
|
+
}
|
|
66
112
|
try {
|
|
67
|
-
new URL(
|
|
113
|
+
new URL(normalizedUrl);
|
|
68
114
|
}
|
|
69
115
|
catch {
|
|
70
116
|
return {
|
|
@@ -72,6 +118,35 @@ export function validatePluginVariables(definitions, values) {
|
|
|
72
118
|
error: `Variable "${key}" must be a valid URL`,
|
|
73
119
|
};
|
|
74
120
|
}
|
|
121
|
+
const validatedUrl = validatePluginEndpointOverride(normalizedUrl);
|
|
122
|
+
if (!validatedUrl) {
|
|
123
|
+
return {
|
|
124
|
+
success: false,
|
|
125
|
+
error: `Variable "${key}" must use an absolute HTTP or HTTPS URL`,
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
if (key.toLowerCase().endsWith('base_url')) {
|
|
129
|
+
const url = new URL(validatedUrl);
|
|
130
|
+
if (url.search || url.hash) {
|
|
131
|
+
return {
|
|
132
|
+
success: false,
|
|
133
|
+
error: `Variable "${key}" cannot contain a query string or fragment`,
|
|
134
|
+
};
|
|
135
|
+
}
|
|
136
|
+
}
|
|
137
|
+
validated[key] = validatedUrl;
|
|
138
|
+
continue;
|
|
139
|
+
}
|
|
140
|
+
if (key === 'api_path' && str.length > 0) {
|
|
141
|
+
const validatedPath = validatePluginApiPath(str);
|
|
142
|
+
if (!validatedPath) {
|
|
143
|
+
return {
|
|
144
|
+
success: false,
|
|
145
|
+
error: 'Variable "api_path" must be an absolute API path',
|
|
146
|
+
};
|
|
147
|
+
}
|
|
148
|
+
validated[key] = validatedPath;
|
|
149
|
+
continue;
|
|
75
150
|
}
|
|
76
151
|
validated[key] = str;
|
|
77
152
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pluginVariableValidation.js","sourceRoot":"","sources":["../../src/utils/pluginVariableValidation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;
|
|
1
|
+
{"version":3,"file":"pluginVariableValidation.js","sourceRoot":"","sources":["../../src/utils/pluginVariableValidation.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocketServer.d.ts","sourceRoot":"","sources":["../src/websocketServer.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"websocketServer.d.ts","sourceRoot":"","sources":["../src/websocketServer.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAkCnC,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CA0d5D"}
|
|
@@ -28,6 +28,7 @@ import { streamPluginResponse } from './utils/pluginStreaming.js';
|
|
|
28
28
|
import { createLogger } from './utils/logger.js';
|
|
29
29
|
import { sendAssistantComplete, sendConnected, sendError, sendUserMessage, streamAssistantFakeChunks, } from './utils/websocketMessages.js';
|
|
30
30
|
import { verifyToken } from './utils/jwt.js';
|
|
31
|
+
import { normalizeChatProviderSelection } from './utils/chatProviderSelection.js';
|
|
31
32
|
const chatRequestService = new ChatRequestService({
|
|
32
33
|
chatGenerationService,
|
|
33
34
|
personaService,
|
|
@@ -66,7 +67,10 @@ export function registerWebSocketServer(server) {
|
|
|
66
67
|
try {
|
|
67
68
|
const message = JSON.parse(data.toString());
|
|
68
69
|
if (message.type === 'chat_stream') {
|
|
69
|
-
const { sessionId, content, images, format, options, assistantMessageId, regenerate, originalMessageId, isPrivate, model: privateModel, messageHistory, } = message.data;
|
|
70
|
+
const { sessionId, content, images, format, options, assistantMessageId, regenerate, originalMessageId, isPrivate, model: privateModel, providerType, providerId, messageHistory, } = message.data;
|
|
71
|
+
const requestProviderSelection = isPrivate
|
|
72
|
+
? normalizeChatProviderSelection({ providerType, providerId })
|
|
73
|
+
: undefined;
|
|
70
74
|
logger.debug('Backend: Received chat_stream for session:', sessionId, 'with images:', !!images, 'format:', !!format, 'regenerate:', !!regenerate, 'originalMessageId:', originalMessageId, 'isPrivate:', !!isPrivate);
|
|
71
75
|
// For private sessions, skip database operations
|
|
72
76
|
let session;
|
|
@@ -79,6 +83,7 @@ export function registerWebSocketServer(server) {
|
|
|
79
83
|
title: 'Private Chat',
|
|
80
84
|
createdAt: Date.now(),
|
|
81
85
|
updatedAt: Date.now(),
|
|
86
|
+
...requestProviderSelection,
|
|
82
87
|
};
|
|
83
88
|
}
|
|
84
89
|
else {
|
|
@@ -131,6 +136,7 @@ export function registerWebSocketServer(server) {
|
|
|
131
136
|
logger.debug('Enhanced user message with document context');
|
|
132
137
|
}
|
|
133
138
|
let assistantContent = '';
|
|
139
|
+
let assistantProviderMetadata;
|
|
134
140
|
logger.debug('Backend: Using assistantMessageId:', assistantMessageId);
|
|
135
141
|
const persistedMessages = isPrivate
|
|
136
142
|
? []
|
|
@@ -139,6 +145,8 @@ export function registerWebSocketServer(server) {
|
|
|
139
145
|
session,
|
|
140
146
|
userId,
|
|
141
147
|
options,
|
|
148
|
+
providerType: isPrivate ? providerType : undefined,
|
|
149
|
+
providerId: isPrivate ? providerId : undefined,
|
|
142
150
|
isPrivate,
|
|
143
151
|
persistedMessages,
|
|
144
152
|
messageHistory: messageHistory || [],
|
|
@@ -160,11 +168,13 @@ export function registerWebSocketServer(server) {
|
|
|
160
168
|
// ---------------------------------------------------------------
|
|
161
169
|
try {
|
|
162
170
|
if (shouldStreamPlugin) {
|
|
163
|
-
|
|
171
|
+
const streamResult = await streamPluginResponse({
|
|
164
172
|
ws,
|
|
165
|
-
chunks: pluginService.executePluginStreamRequest(actualModelName, pluginMessages, mergedOptions, userId),
|
|
173
|
+
chunks: pluginService.executePluginStreamRequest(actualModelName, pluginMessages, mergedOptions, userId, activePlugin.id),
|
|
166
174
|
messageId: assistantMessageId,
|
|
167
175
|
});
|
|
176
|
+
assistantContent = streamResult.content;
|
|
177
|
+
assistantProviderMetadata = streamResult.providerMetadata;
|
|
168
178
|
}
|
|
169
179
|
else {
|
|
170
180
|
const generationResult = await chatGenerationService.executeNonStreaming({
|
|
@@ -175,6 +185,8 @@ export function registerWebSocketServer(server) {
|
|
|
175
185
|
pluginFallbackPolicy: 'disabled',
|
|
176
186
|
});
|
|
177
187
|
assistantContent = generationResult.assistantContent;
|
|
188
|
+
assistantProviderMetadata =
|
|
189
|
+
generationResult.response.message.providerMetadata;
|
|
178
190
|
await streamAssistantFakeChunks(ws, assistantContent, assistantMessageId);
|
|
179
191
|
}
|
|
180
192
|
// Save the complete assistant message (skip for private sessions)
|
|
@@ -189,6 +201,7 @@ export function registerWebSocketServer(server) {
|
|
|
189
201
|
isPrivate,
|
|
190
202
|
regenerate,
|
|
191
203
|
originalMessageId,
|
|
204
|
+
providerMetadata: assistantProviderMetadata,
|
|
192
205
|
});
|
|
193
206
|
if (isPrivate) {
|
|
194
207
|
// For private sessions, just send completion without saving
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"websocketServer.js","sourceRoot":"","sources":["../src/websocketServer.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"websocketServer.js","sourceRoot":"","sources":["../src/websocketServer.ts"],"names":[],"mappings":"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"}
|