libre-webui 0.10.0 → 0.12.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 +75 -61
- package/backend/dist/db.d.ts.map +1 -1
- package/backend/dist/db.js +21 -19
- package/backend/dist/db.js.map +1 -1
- package/backend/dist/index.d.ts.map +1 -1
- package/backend/dist/index.js +39 -908
- package/backend/dist/index.js.map +1 -1
- package/backend/dist/middleware/auth.d.ts.map +1 -1
- package/backend/dist/middleware/auth.js +4 -2
- package/backend/dist/middleware/auth.js.map +1 -1
- package/backend/dist/middleware/index.d.ts.map +1 -1
- package/backend/dist/middleware/index.js +4 -2
- package/backend/dist/middleware/index.js.map +1 -1
- package/backend/dist/models/personaModel.d.ts.map +1 -1
- package/backend/dist/models/personaModel.js +11 -9
- package/backend/dist/models/personaModel.js.map +1 -1
- package/backend/dist/routes/auth.d.ts.map +1 -1
- package/backend/dist/routes/auth.js +36 -14
- package/backend/dist/routes/auth.js.map +1 -1
- package/backend/dist/routes/chat.d.ts.map +1 -1
- package/backend/dist/routes/chat.js +61 -249
- package/backend/dist/routes/chat.js.map +1 -1
- package/backend/dist/routes/documents.d.ts.map +1 -1
- package/backend/dist/routes/documents.js +10 -8
- package/backend/dist/routes/documents.js.map +1 -1
- package/backend/dist/routes/imageGen.d.ts.map +1 -1
- package/backend/dist/routes/imageGen.js +9 -7
- package/backend/dist/routes/imageGen.js.map +1 -1
- package/backend/dist/routes/libreClaw.d.ts +3 -0
- package/backend/dist/routes/libreClaw.d.ts.map +1 -0
- package/backend/dist/routes/libreClaw.js +156 -0
- package/backend/dist/routes/libreClaw.js.map +1 -0
- package/backend/dist/routes/ollama.d.ts.map +1 -1
- package/backend/dist/routes/ollama.js +7 -247
- package/backend/dist/routes/ollama.js.map +1 -1
- package/backend/dist/routes/plugins.d.ts.map +1 -1
- package/backend/dist/routes/plugins.js +7 -105
- package/backend/dist/routes/plugins.js.map +1 -1
- package/backend/dist/routes/tts.d.ts.map +1 -1
- package/backend/dist/routes/tts.js +7 -5
- package/backend/dist/routes/tts.js.map +1 -1
- package/backend/dist/routes/users.d.ts.map +1 -1
- package/backend/dist/routes/users.js +7 -5
- package/backend/dist/routes/users.js.map +1 -1
- package/backend/dist/services/assistantCompletionService.d.ts +26 -0
- package/backend/dist/services/assistantCompletionService.d.ts.map +1 -0
- package/backend/dist/services/assistantCompletionService.js +53 -0
- package/backend/dist/services/assistantCompletionService.js.map +1 -0
- package/backend/dist/services/authService.d.ts +2 -0
- package/backend/dist/services/authService.d.ts.map +1 -1
- package/backend/dist/services/authService.js +9 -5
- package/backend/dist/services/authService.js.map +1 -1
- package/backend/dist/services/chatGenerationService.d.ts +32 -0
- package/backend/dist/services/chatGenerationService.d.ts.map +1 -0
- package/backend/dist/services/chatGenerationService.js +118 -0
- package/backend/dist/services/chatGenerationService.js.map +1 -0
- package/backend/dist/services/chatRequestService.d.ts +55 -0
- package/backend/dist/services/chatRequestService.d.ts.map +1 -0
- package/backend/dist/services/chatRequestService.js +103 -0
- package/backend/dist/services/chatRequestService.js.map +1 -0
- package/backend/dist/services/chatService.d.ts +0 -1
- package/backend/dist/services/chatService.d.ts.map +1 -1
- package/backend/dist/services/chatService.js +13 -27
- package/backend/dist/services/chatService.js.map +1 -1
- package/backend/dist/services/documentService.d.ts.map +1 -1
- package/backend/dist/services/documentService.js +21 -19
- package/backend/dist/services/documentService.js.map +1 -1
- package/backend/dist/services/embeddingService.d.ts.map +1 -1
- package/backend/dist/services/embeddingService.js +3 -1
- package/backend/dist/services/embeddingService.js.map +1 -1
- package/backend/dist/services/encryptionService.d.ts.map +1 -1
- package/backend/dist/services/encryptionService.js +26 -24
- package/backend/dist/services/encryptionService.js.map +1 -1
- package/backend/dist/services/galleryService.d.ts.map +1 -1
- package/backend/dist/services/galleryService.js +8 -6
- package/backend/dist/services/galleryService.js.map +1 -1
- package/backend/dist/services/libreClawService.d.ts +105 -0
- package/backend/dist/services/libreClawService.d.ts.map +1 -0
- package/backend/dist/services/libreClawService.js +169 -0
- package/backend/dist/services/libreClawService.js.map +1 -0
- package/backend/dist/services/memoryService.d.ts +2 -13
- package/backend/dist/services/memoryService.d.ts.map +1 -1
- package/backend/dist/services/memoryService.js +37 -198
- package/backend/dist/services/memoryService.js.map +1 -1
- package/backend/dist/services/memoryUtils.d.ts +29 -0
- package/backend/dist/services/memoryUtils.d.ts.map +1 -0
- package/backend/dist/services/memoryUtils.js +165 -0
- package/backend/dist/services/memoryUtils.js.map +1 -0
- package/backend/dist/services/mutationEngineService.d.ts.map +1 -1
- package/backend/dist/services/mutationEngineService.js +3 -1
- package/backend/dist/services/mutationEngineService.js.map +1 -1
- package/backend/dist/services/ollamaService.d.ts.map +1 -1
- package/backend/dist/services/ollamaService.js +36 -34
- package/backend/dist/services/ollamaService.js.map +1 -1
- package/backend/dist/services/personaService.d.ts.map +1 -1
- package/backend/dist/services/personaService.js +3 -1
- package/backend/dist/services/personaService.js.map +1 -1
- package/backend/dist/services/pluginCapabilityRegistryService.d.ts +11 -0
- package/backend/dist/services/pluginCapabilityRegistryService.d.ts.map +1 -0
- package/backend/dist/services/pluginCapabilityRegistryService.js +70 -0
- package/backend/dist/services/pluginCapabilityRegistryService.js.map +1 -0
- package/backend/dist/services/pluginCredentialsService.d.ts.map +1 -1
- package/backend/dist/services/pluginCredentialsService.js +13 -11
- package/backend/dist/services/pluginCredentialsService.js.map +1 -1
- package/backend/dist/services/pluginEmbeddingService.d.ts +26 -0
- package/backend/dist/services/pluginEmbeddingService.d.ts.map +1 -0
- package/backend/dist/services/pluginEmbeddingService.js +159 -0
- package/backend/dist/services/pluginEmbeddingService.js.map +1 -0
- package/backend/dist/services/pluginImageGenerationService.d.ts +29 -0
- package/backend/dist/services/pluginImageGenerationService.d.ts.map +1 -0
- package/backend/dist/services/pluginImageGenerationService.js +402 -0
- package/backend/dist/services/pluginImageGenerationService.js.map +1 -0
- package/backend/dist/services/pluginService.d.ts +9 -18
- package/backend/dist/services/pluginService.d.ts.map +1 -1
- package/backend/dist/services/pluginService.js +118 -1469
- package/backend/dist/services/pluginService.js.map +1 -1
- package/backend/dist/services/pluginTTSService.d.ts +28 -0
- package/backend/dist/services/pluginTTSService.d.ts.map +1 -0
- package/backend/dist/services/pluginTTSService.js +286 -0
- package/backend/dist/services/pluginTTSService.js.map +1 -0
- package/backend/dist/services/pluginVariablesService.d.ts.map +1 -1
- package/backend/dist/services/pluginVariablesService.js +7 -5
- package/backend/dist/services/pluginVariablesService.js.map +1 -1
- package/backend/dist/services/preferencesService.d.ts.map +1 -1
- package/backend/dist/services/preferencesService.js +9 -7
- package/backend/dist/services/preferencesService.js.map +1 -1
- package/backend/dist/services/simpleGitHubOAuth.d.ts.map +1 -1
- package/backend/dist/services/simpleGitHubOAuth.js +10 -8
- package/backend/dist/services/simpleGitHubOAuth.js.map +1 -1
- package/backend/dist/services/simpleHuggingFaceOAuth.d.ts.map +1 -1
- package/backend/dist/services/simpleHuggingFaceOAuth.js +11 -9
- package/backend/dist/services/simpleHuggingFaceOAuth.js.map +1 -1
- package/backend/dist/services/systemSettingsService.d.ts.map +1 -1
- package/backend/dist/services/systemSettingsService.js +4 -2
- package/backend/dist/services/systemSettingsService.js.map +1 -1
- package/backend/dist/services/titleGenerationService.d.ts +55 -0
- package/backend/dist/services/titleGenerationService.d.ts.map +1 -0
- package/backend/dist/services/titleGenerationService.js +121 -0
- package/backend/dist/services/titleGenerationService.js.map +1 -0
- package/backend/dist/services/turnstileService.d.ts +13 -0
- package/backend/dist/services/turnstileService.d.ts.map +1 -0
- package/backend/dist/services/turnstileService.js +79 -0
- package/backend/dist/services/turnstileService.js.map +1 -0
- package/backend/dist/storage.d.ts +2 -22
- package/backend/dist/storage.d.ts.map +1 -1
- package/backend/dist/storage.js +22 -170
- package/backend/dist/storage.js.map +1 -1
- package/backend/dist/storageMappers.d.ts +82 -0
- package/backend/dist/storageMappers.d.ts.map +1 -0
- package/backend/dist/storageMappers.js +85 -0
- package/backend/dist/storageMappers.js.map +1 -0
- package/backend/dist/test-encryption.js +20 -18
- package/backend/dist/test-encryption.js.map +1 -1
- package/backend/dist/types/index.d.ts.map +1 -1
- package/backend/dist/types/index.js.map +1 -1
- package/backend/dist/utils/assistantBranching.d.ts +8 -0
- package/backend/dist/utils/assistantBranching.d.ts.map +1 -0
- package/backend/dist/utils/assistantBranching.js +30 -0
- package/backend/dist/utils/assistantBranching.js.map +1 -0
- package/backend/dist/utils/chatContext.d.ts +17 -0
- package/backend/dist/utils/chatContext.d.ts.map +1 -0
- package/backend/dist/utils/chatContext.js +82 -0
- package/backend/dist/utils/chatContext.js.map +1 -0
- package/backend/dist/utils/chatDocumentContext.d.ts +7 -0
- package/backend/dist/utils/chatDocumentContext.d.ts.map +1 -0
- package/backend/dist/utils/chatDocumentContext.js +51 -0
- package/backend/dist/utils/chatDocumentContext.js.map +1 -0
- package/backend/dist/utils/logger.d.ts +12 -0
- package/backend/dist/utils/logger.d.ts.map +1 -0
- package/backend/dist/utils/logger.js +82 -0
- package/backend/dist/utils/logger.js.map +1 -0
- package/backend/dist/utils/ollamaLibrary.d.ts +17 -0
- package/backend/dist/utils/ollamaLibrary.d.ts.map +1 -0
- package/backend/dist/utils/ollamaLibrary.js +253 -0
- package/backend/dist/utils/ollamaLibrary.js.map +1 -0
- package/backend/dist/utils/ollamaStreaming.d.ts +19 -0
- package/backend/dist/utils/ollamaStreaming.d.ts.map +1 -0
- package/backend/dist/utils/ollamaStreaming.js +67 -0
- package/backend/dist/utils/ollamaStreaming.js.map +1 -0
- package/backend/dist/utils/pluginChatAdapter.d.ts +32 -0
- package/backend/dist/utils/pluginChatAdapter.d.ts.map +1 -0
- package/backend/dist/utils/pluginChatAdapter.js +308 -0
- package/backend/dist/utils/pluginChatAdapter.js.map +1 -0
- package/backend/dist/utils/pluginChatContext.d.ts +23 -0
- package/backend/dist/utils/pluginChatContext.d.ts.map +1 -0
- package/backend/dist/utils/pluginChatContext.js +77 -0
- package/backend/dist/utils/pluginChatContext.js.map +1 -0
- package/backend/dist/utils/pluginResponse.d.ts +6 -0
- package/backend/dist/utils/pluginResponse.d.ts.map +1 -0
- package/backend/dist/utils/pluginResponse.js +70 -0
- package/backend/dist/utils/pluginResponse.js.map +1 -0
- package/backend/dist/utils/pluginStreamAdapter.d.ts +16 -0
- package/backend/dist/utils/pluginStreamAdapter.d.ts.map +1 -0
- package/backend/dist/utils/pluginStreamAdapter.js +141 -0
- package/backend/dist/utils/pluginStreamAdapter.js.map +1 -0
- package/backend/dist/utils/pluginStreaming.d.ts +24 -0
- package/backend/dist/utils/pluginStreaming.d.ts.map +1 -0
- package/backend/dist/utils/pluginStreaming.js +106 -0
- package/backend/dist/utils/pluginStreaming.js.map +1 -0
- package/backend/dist/utils/pluginUpload.d.ts +8 -0
- package/backend/dist/utils/pluginUpload.d.ts.map +1 -0
- package/backend/dist/utils/pluginUpload.js +51 -0
- package/backend/dist/utils/pluginUpload.js.map +1 -0
- package/backend/dist/utils/pluginValidation.d.ts +9 -0
- package/backend/dist/utils/pluginValidation.d.ts.map +1 -0
- package/backend/dist/utils/pluginValidation.js +84 -0
- package/backend/dist/utils/pluginValidation.js.map +1 -0
- package/backend/dist/utils/pluginVariableValidation.d.ts +10 -0
- package/backend/dist/utils/pluginVariableValidation.d.ts.map +1 -0
- package/backend/dist/utils/pluginVariableValidation.js +80 -0
- package/backend/dist/utils/pluginVariableValidation.js.map +1 -0
- package/backend/dist/utils/websocketMessages.d.ts +26 -0
- package/backend/dist/utils/websocketMessages.d.ts.map +1 -0
- package/backend/dist/utils/websocketMessages.js +74 -0
- package/backend/dist/utils/websocketMessages.js.map +1 -0
- package/backend/dist/websocketServer.d.ts +3 -0
- package/backend/dist/websocketServer.d.ts.map +1 -0
- package/backend/dist/websocketServer.js +332 -0
- package/backend/dist/websocketServer.js.map +1 -0
- package/backend/package.json +2 -2
- package/frontend/dist/assets/index-Dc8Q4dJZ.css +1 -0
- package/frontend/dist/assets/index-ONn9VIq7.js +5 -0
- package/frontend/dist/assets/markdown-math-CYlHEDRF.css +1 -0
- package/frontend/dist/index.html +11 -10
- package/frontend/dist/js/ArtifactContainer-CqKsiKz0.js +1 -0
- package/frontend/dist/js/ArtifactDemoPage-Dd5BjIu2.js +200 -0
- package/frontend/dist/js/ArtifactSlideOutPanel-Yc7ttIaY.js +1 -0
- package/frontend/dist/js/Button-BUjLpHmR.js +1 -0
- package/frontend/dist/js/ChatPage-Cpy7lQ0D.js +16 -0
- package/frontend/dist/js/FirstTimeSetup-DcGhm0H0.js +1 -0
- package/frontend/dist/js/GalleryPage-DNI2Evvf.js +1 -0
- package/frontend/dist/js/LibreClawPage-CmTiROsJ.js +1 -0
- package/frontend/dist/js/ModelManagerModals-CfvSeNsT.js +1 -0
- package/frontend/dist/js/ModelsPage-CeTGqx4q.js +2 -0
- package/frontend/dist/js/OptimizedSyntaxHighlighter-CNjLqj1Z.js +1 -0
- package/frontend/dist/js/PersonasPage-BUqu7gJ3.js +13 -0
- package/frontend/dist/js/RichMessageContent-B0JO8vkR.js +3 -0
- package/frontend/dist/js/SettingsModal-B5aJ5vfV.js +1 -0
- package/frontend/dist/js/UserManagementPage-BqIIWX2M.js +1 -0
- package/frontend/dist/js/api-CbmZzKBu.js +15 -0
- package/frontend/dist/js/ar-BAOdgn6O.js +2 -0
- package/frontend/dist/js/artifactHtml-B7Oy2e__.js +27 -0
- package/frontend/dist/js/bn-Bp2KS5mx.js +2 -0
- package/frontend/dist/js/cs-DOgJ0c5p.js +2 -0
- package/frontend/dist/js/da-BCKTkC35.js +2 -0
- package/frontend/dist/js/de-BXyECph5.js +2 -0
- package/frontend/dist/js/demoMode-BhEpMVh5.js +1 -0
- package/frontend/dist/js/es-Db4bDYIF.js +2 -0
- package/frontend/dist/js/fr-BPIkf6zH.js +2 -0
- package/frontend/dist/js/hi-Bm8D_Aux.js +2 -0
- package/frontend/dist/js/id-DiWaH74_.js +2 -0
- package/frontend/dist/js/is-DLgJywtZ.js +2 -0
- package/frontend/dist/js/it-lldrM8pE.js +2 -0
- package/frontend/dist/js/ja-Cfe9uZmQ.js +2 -0
- package/frontend/dist/js/ko-BhChO3MQ.js +2 -0
- package/frontend/dist/js/logger-BmpKNkls.js +1 -0
- package/frontend/dist/js/markdown-core-fkbHPd-g.js +16 -0
- package/frontend/dist/js/markdown-math-Ci4QOsf-.js +261 -0
- package/frontend/dist/js/ms-SWtmetXo.js +2 -0
- package/frontend/dist/js/nl-CUO6I3nO.js +2 -0
- package/frontend/dist/js/pl-BUAu96P6.js +2 -0
- package/frontend/dist/js/pt-DCHwoWiE.js +2 -0
- package/frontend/dist/js/{react-vendor-Dh6nfvM2.js → react-vendor-Co1u1rWb.js} +2 -2
- package/frontend/dist/js/ru-Ciz053N7.js +2 -0
- package/frontend/dist/js/sv-D38ZHjv-.js +2 -0
- package/frontend/dist/js/syntax-highlight-D5wpTVgr.js +8 -0
- package/frontend/dist/js/th-D2cAucvn.js +2 -0
- package/frontend/dist/js/tr-Go355oDu.js +2 -0
- package/frontend/dist/js/ui-vendor-BJAeWL11.js +177 -0
- package/frontend/dist/js/uk-cdzjhgya.js +2 -0
- package/frontend/dist/js/useBaseQuery-6OJiOiyu.js +1 -0
- package/frontend/dist/js/useQuery-DfkI6VAv.js +1 -0
- package/frontend/dist/js/utils-BaPYjs_z.js +1 -0
- package/frontend/dist/js/utils-vendor-BX3ZwoIK.js +9 -0
- package/frontend/dist/js/vi-BSOpE423.js +2 -0
- package/frontend/dist/js/zh-BFh6sHZG.js +2 -0
- package/package.json +12 -8
- package/backend/dist/services/openclawSessionService.d.ts +0 -63
- package/backend/dist/services/openclawSessionService.d.ts.map +0 -1
- package/backend/dist/services/openclawSessionService.js +0 -307
- package/backend/dist/services/openclawSessionService.js.map +0 -1
- package/frontend/dist/assets/index-cOuIFv6G.js +0 -314
- package/frontend/dist/assets/index-tuVjvNle.css +0 -1
- package/frontend/dist/js/ArtifactContainer-DXa2t8GS.js +0 -24
- package/frontend/dist/js/ArtifactDemoPage-Dms7P2gI.js +0 -98
- package/frontend/dist/js/ChatPage-C6hOVIAS.js +0 -15
- package/frontend/dist/js/GalleryPage-CGKPECJV.js +0 -1
- package/frontend/dist/js/ModelsPage-CNB-c-JM.js +0 -1
- package/frontend/dist/js/PersonasPage-hDiS0Rvl.js +0 -13
- package/frontend/dist/js/UserManagementPage-1H9kcHeR.js +0 -1
- package/frontend/dist/js/api-MQ7bONaU.js +0 -3
- package/frontend/dist/js/appStore-BpzQfKOd.js +0 -2
- package/frontend/dist/js/authStore-Cn_WS6Kb.js +0 -2
- package/frontend/dist/js/demoMode-PKHbba1m.js +0 -1
- package/frontend/dist/js/markdown-vendor-DLzJCMRQ.js +0 -22
- package/frontend/dist/js/ui-vendor-ClcVY3m-.js +0 -177
- package/frontend/dist/js/utils-vendor-BCQRX-0Q.js +0 -9
- package/plugins/openclaw-agent.json +0 -69
|
@@ -15,11 +15,13 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
import storageService from '../storage.js';
|
|
18
|
+
import { createLogger } from '../utils/logger.js';
|
|
19
|
+
const logger = createLogger('services:preferences-service');
|
|
18
20
|
class PreferencesService {
|
|
19
21
|
constructor() {
|
|
20
22
|
this.defaultPreferences = {
|
|
21
23
|
defaultModel: '',
|
|
22
|
-
theme: { mode: 'light', accent: '
|
|
24
|
+
theme: { mode: 'light', accent: 'blue', customAccent: '#2563eb' },
|
|
23
25
|
systemMessage: 'You are a helpful assistant.',
|
|
24
26
|
generationOptions: {
|
|
25
27
|
// Core parameters
|
|
@@ -70,11 +72,11 @@ class PreferencesService {
|
|
|
70
72
|
if (!preferences) {
|
|
71
73
|
// Create default preferences for this user if none exist
|
|
72
74
|
storageService.savePreferences(this.defaultPreferences, userId);
|
|
73
|
-
|
|
75
|
+
logger.debug(`Created default preferences for user: ${userId || 'default'}`);
|
|
74
76
|
}
|
|
75
77
|
}
|
|
76
78
|
catch (error) {
|
|
77
|
-
|
|
79
|
+
logger.error('Failed to ensure preferences exist:', error);
|
|
78
80
|
}
|
|
79
81
|
}
|
|
80
82
|
getPreferences(userId) {
|
|
@@ -88,7 +90,7 @@ class PreferencesService {
|
|
|
88
90
|
}
|
|
89
91
|
}
|
|
90
92
|
catch (error) {
|
|
91
|
-
|
|
93
|
+
logger.error('Failed to get preferences:', error);
|
|
92
94
|
}
|
|
93
95
|
return this.defaultPreferences;
|
|
94
96
|
}
|
|
@@ -152,7 +154,7 @@ class PreferencesService {
|
|
|
152
154
|
return updatedPreferences;
|
|
153
155
|
}
|
|
154
156
|
catch (error) {
|
|
155
|
-
|
|
157
|
+
logger.error('Failed to update preferences:', error);
|
|
156
158
|
throw error;
|
|
157
159
|
}
|
|
158
160
|
}
|
|
@@ -221,7 +223,7 @@ class PreferencesService {
|
|
|
221
223
|
return this.defaultPreferences;
|
|
222
224
|
}
|
|
223
225
|
catch (error) {
|
|
224
|
-
|
|
226
|
+
logger.error('Failed to reset preferences to defaults:', error);
|
|
225
227
|
throw error;
|
|
226
228
|
}
|
|
227
229
|
}
|
|
@@ -257,7 +259,7 @@ class PreferencesService {
|
|
|
257
259
|
return updatedPreferences;
|
|
258
260
|
}
|
|
259
261
|
catch (error) {
|
|
260
|
-
|
|
262
|
+
logger.error('Failed to import preferences data:', error);
|
|
261
263
|
throw error;
|
|
262
264
|
}
|
|
263
265
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"preferencesService.js","sourceRoot":"","sources":["../../src/services/preferencesService.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,cAAc,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"preferencesService.js","sourceRoot":"","sources":["../../src/services/preferencesService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simpleGitHubOAuth.d.ts","sourceRoot":"","sources":["../../src/services/simpleGitHubOAuth.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAa,UAAU,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"simpleGitHubOAuth.d.ts","sourceRoot":"","sources":["../../src/services/simpleGitHubOAuth.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAa,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAM/D,UAAU,aAAa;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,kBAAkB;;IAK7B,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,KAAK,YAAY,GAEvB;IAED,OAAO,KAAK,WAAW,GAKtB;IAED;;OAEG;IACH,UAAU,IAAI,MAAM;IAiBpB;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACG,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAkChE;;OAEG;IACG,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IA6CxE;;OAEG;IACG,eAAe,CACnB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC;QAAE,IAAI,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAwBtD;;OAEG;IACG,WAAW,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IAIrE;;OAEG;YACW,gBAAgB;CAmD/B;AAGD,eAAO,MAAM,kBAAkB,oBAA2B,CAAC"}
|
|
@@ -17,6 +17,8 @@
|
|
|
17
17
|
import { authService } from './authService.js';
|
|
18
18
|
import { userModel } from '../models/userModel.js';
|
|
19
19
|
import * as crypto from 'crypto';
|
|
20
|
+
import { createLogger } from '../utils/logger.js';
|
|
21
|
+
const logger = createLogger('services:simple-git-hub-oauth');
|
|
20
22
|
export class GitHubOAuthService {
|
|
21
23
|
constructor() {
|
|
22
24
|
// No parameters needed - will read from environment
|
|
@@ -57,7 +59,7 @@ export class GitHubOAuthService {
|
|
|
57
59
|
*/
|
|
58
60
|
async exchangeCodeForToken(code) {
|
|
59
61
|
if (!this.clientId || !this.clientSecret) {
|
|
60
|
-
|
|
62
|
+
logger.error('GitHub OAuth credentials not configured');
|
|
61
63
|
return null;
|
|
62
64
|
}
|
|
63
65
|
try {
|
|
@@ -77,7 +79,7 @@ export class GitHubOAuthService {
|
|
|
77
79
|
return data.access_token || null;
|
|
78
80
|
}
|
|
79
81
|
catch (error) {
|
|
80
|
-
|
|
82
|
+
logger.error('GitHub token exchange error:', error);
|
|
81
83
|
return null;
|
|
82
84
|
}
|
|
83
85
|
}
|
|
@@ -114,7 +116,7 @@ export class GitHubOAuthService {
|
|
|
114
116
|
return profile;
|
|
115
117
|
}
|
|
116
118
|
catch (error) {
|
|
117
|
-
|
|
119
|
+
logger.error('GitHub profile fetch error:', error);
|
|
118
120
|
return null;
|
|
119
121
|
}
|
|
120
122
|
}
|
|
@@ -140,7 +142,7 @@ export class GitHubOAuthService {
|
|
|
140
142
|
return { user, token: jwtToken };
|
|
141
143
|
}
|
|
142
144
|
catch (error) {
|
|
143
|
-
|
|
145
|
+
logger.error('GitHub OAuth callback error:', error);
|
|
144
146
|
return null;
|
|
145
147
|
}
|
|
146
148
|
}
|
|
@@ -160,7 +162,7 @@ export class GitHubOAuthService {
|
|
|
160
162
|
// Check if user already exists
|
|
161
163
|
const existingUser = userModel.getUserByUsername(githubUsername);
|
|
162
164
|
if (existingUser) {
|
|
163
|
-
|
|
165
|
+
logger.debug('Found existing GitHub user:', existingUser.username);
|
|
164
166
|
// Convert User to UserPublic format
|
|
165
167
|
return {
|
|
166
168
|
id: existingUser.id,
|
|
@@ -180,7 +182,7 @@ export class GitHubOAuthService {
|
|
|
180
182
|
counter++;
|
|
181
183
|
}
|
|
182
184
|
// Create new user
|
|
183
|
-
|
|
185
|
+
logger.debug('Creating new GitHub user:', uniqueUsername);
|
|
184
186
|
const newUser = await userModel.createUser({
|
|
185
187
|
username: uniqueUsername,
|
|
186
188
|
email: profile.email || null,
|
|
@@ -189,11 +191,11 @@ export class GitHubOAuthService {
|
|
|
189
191
|
password: 'oauth:' + crypto.randomBytes(24).toString('base64'),
|
|
190
192
|
role: 'user', // Default role
|
|
191
193
|
});
|
|
192
|
-
|
|
194
|
+
logger.debug('Created new GitHub user:', newUser.username);
|
|
193
195
|
return newUser;
|
|
194
196
|
}
|
|
195
197
|
catch (error) {
|
|
196
|
-
|
|
198
|
+
logger.error('Error creating/finding GitHub user:', error);
|
|
197
199
|
return null;
|
|
198
200
|
}
|
|
199
201
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simpleGitHubOAuth.js","sourceRoot":"","sources":["../../src/services/simpleGitHubOAuth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAc,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"simpleGitHubOAuth.js","sourceRoot":"","sources":["../../src/services/simpleGitHubOAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simpleHuggingFaceOAuth.d.ts","sourceRoot":"","sources":["../../src/services/simpleHuggingFaceOAuth.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAa,UAAU,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"simpleHuggingFaceOAuth.d.ts","sourceRoot":"","sources":["../../src/services/simpleHuggingFaceOAuth.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAa,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAM/D,UAAU,kBAAkB;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,IAAI,CAAC,EAAE,KAAK,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,YAAY,EAAE,OAAO,CAAC;KACvB,CAAC,CAAC;CACJ;AAED,qBAAa,uBAAuB;;IAKlC,OAAO,KAAK,QAAQ,GAEnB;IAED,OAAO,KAAK,YAAY,GAEvB;IAED,OAAO,KAAK,WAAW,GAKtB;IAED;;OAEG;IACH,YAAY,IAAI,OAAO;IAIvB;;OAEG;IACH,UAAU,IAAI,MAAM;IAoBpB;;OAEG;IACG,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IA4BhE;;OAEG;IACG,cAAc,CAClB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC;IAuBrC;;OAEG;IACG,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;CAoD3E;AAGD,eAAO,MAAM,uBAAuB,yBAAgC,CAAC"}
|
|
@@ -16,6 +16,8 @@
|
|
|
16
16
|
*/
|
|
17
17
|
import { userModel } from '../models/userModel.js';
|
|
18
18
|
import * as crypto from 'crypto';
|
|
19
|
+
import { createLogger } from '../utils/logger.js';
|
|
20
|
+
const logger = createLogger('services:simple-hugging-face-oauth');
|
|
19
21
|
export class HuggingFaceOAuthService {
|
|
20
22
|
constructor() {
|
|
21
23
|
// No parameters needed - will read from environment
|
|
@@ -51,7 +53,7 @@ export class HuggingFaceOAuthService {
|
|
|
51
53
|
state: crypto.randomBytes(32).toString('hex'), // CSRF protection
|
|
52
54
|
});
|
|
53
55
|
const authUrl = `https://huggingface.co/oauth/authorize?${params.toString()}`;
|
|
54
|
-
|
|
56
|
+
logger.debug('🤗 Hugging Face auth URL generated:', authUrl);
|
|
55
57
|
return authUrl;
|
|
56
58
|
}
|
|
57
59
|
/**
|
|
@@ -77,7 +79,7 @@ export class HuggingFaceOAuthService {
|
|
|
77
79
|
return data.access_token || null;
|
|
78
80
|
}
|
|
79
81
|
catch (error) {
|
|
80
|
-
|
|
82
|
+
logger.error('Hugging Face token exchange error:', error);
|
|
81
83
|
return null;
|
|
82
84
|
}
|
|
83
85
|
}
|
|
@@ -93,15 +95,15 @@ export class HuggingFaceOAuthService {
|
|
|
93
95
|
},
|
|
94
96
|
});
|
|
95
97
|
if (!response.ok) {
|
|
96
|
-
|
|
98
|
+
logger.error('Failed to fetch Hugging Face profile:', response.status);
|
|
97
99
|
return null;
|
|
98
100
|
}
|
|
99
101
|
const profile = (await response.json());
|
|
100
|
-
|
|
102
|
+
logger.debug('🤗 Hugging Face profile fetched:', profile.name);
|
|
101
103
|
return profile;
|
|
102
104
|
}
|
|
103
105
|
catch (error) {
|
|
104
|
-
|
|
106
|
+
logger.error('Error fetching Hugging Face profile:', error);
|
|
105
107
|
return null;
|
|
106
108
|
}
|
|
107
109
|
}
|
|
@@ -123,7 +125,7 @@ export class HuggingFaceOAuthService {
|
|
|
123
125
|
// Check if user already exists by username first (Hugging Face doesn't always provide email)
|
|
124
126
|
const existingUser = userModel.getUserByUsername(`hf_${profile.name}`);
|
|
125
127
|
if (existingUser) {
|
|
126
|
-
|
|
128
|
+
logger.debug('Found existing Hugging Face user by username:', existingUser.username);
|
|
127
129
|
// Convert User to UserPublic format
|
|
128
130
|
return {
|
|
129
131
|
id: existingUser.id,
|
|
@@ -136,7 +138,7 @@ export class HuggingFaceOAuthService {
|
|
|
136
138
|
};
|
|
137
139
|
}
|
|
138
140
|
// Create new user
|
|
139
|
-
|
|
141
|
+
logger.debug('Creating new Hugging Face user:', uniqueUsername);
|
|
140
142
|
const newUser = await userModel.createUser({
|
|
141
143
|
username: uniqueUsername,
|
|
142
144
|
email: profile.email || null,
|
|
@@ -145,11 +147,11 @@ export class HuggingFaceOAuthService {
|
|
|
145
147
|
password: 'oauth:hf:' + crypto.randomBytes(24).toString('base64'),
|
|
146
148
|
role: 'user', // Default role
|
|
147
149
|
});
|
|
148
|
-
|
|
150
|
+
logger.debug('Created new Hugging Face user:', newUser.username);
|
|
149
151
|
return newUser;
|
|
150
152
|
}
|
|
151
153
|
catch (error) {
|
|
152
|
-
|
|
154
|
+
logger.error('Error creating/finding Hugging Face user:', error);
|
|
153
155
|
return null;
|
|
154
156
|
}
|
|
155
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simpleHuggingFaceOAuth.js","sourceRoot":"","sources":["../../src/services/simpleHuggingFaceOAuth.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,SAAS,EAAc,MAAM,wBAAwB,CAAC;AAC/D,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"simpleHuggingFaceOAuth.js","sourceRoot":"","sources":["../../src/services/simpleHuggingFaceOAuth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"systemSettingsService.d.ts","sourceRoot":"","sources":["../../src/services/systemSettingsService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"systemSettingsService.d.ts","sourceRoot":"","sources":["../../src/services/systemSettingsService.ts"],"names":[],"mappings":"AAyBA,qBAAa,qBAAqB;IAChC;;OAEG;IACH,qBAAqB,IAAI,OAAO;IA0BhC;;OAEG;IACH,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;CAwB5C;AAED,eAAO,MAAM,qBAAqB,uBAA8B,CAAC"}
|
|
@@ -15,6 +15,8 @@
|
|
|
15
15
|
* limitations under the License.
|
|
16
16
|
*/
|
|
17
17
|
import { getDatabaseSafe } from '../db.js';
|
|
18
|
+
import { createLogger } from '../utils/logger.js';
|
|
19
|
+
const logger = createLogger('services:system-settings-service');
|
|
18
20
|
const ALLOW_USER_MODEL_PULL_KEY = 'allow_user_model_pull';
|
|
19
21
|
const DEFAULT_ALLOW_USER_MODEL_PULL = true;
|
|
20
22
|
export class SystemSettingsService {
|
|
@@ -37,7 +39,7 @@ export class SystemSettingsService {
|
|
|
37
39
|
return row.value === 'true';
|
|
38
40
|
}
|
|
39
41
|
catch (error) {
|
|
40
|
-
|
|
42
|
+
logger.error('Failed to read system setting allow_user_model_pull:', error);
|
|
41
43
|
return DEFAULT_ALLOW_USER_MODEL_PULL;
|
|
42
44
|
}
|
|
43
45
|
}
|
|
@@ -60,7 +62,7 @@ export class SystemSettingsService {
|
|
|
60
62
|
`).run(ALLOW_USER_MODEL_PULL_KEY, allow ? 'true' : 'false', now);
|
|
61
63
|
}
|
|
62
64
|
catch (error) {
|
|
63
|
-
|
|
65
|
+
logger.error('Failed to update system setting allow_user_model_pull:', error);
|
|
64
66
|
}
|
|
65
67
|
}
|
|
66
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"systemSettingsService.js","sourceRoot":"","sources":["../../src/services/systemSettingsService.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"systemSettingsService.js","sourceRoot":"","sources":["../../src/services/systemSettingsService.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,MAAM,MAAM,GAAG,YAAY,CAAC,kCAAkC,CAAC,CAAC;AAEhE,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAC1D,MAAM,6BAA6B,GAAG,IAAI,CAAC;AAE3C,MAAM,OAAO,qBAAqB;IAChC;;OAEG;IACH,qBAAqB;QACnB,MAAM,EAAE,GAAG,eAAe,EAAE,CAAC;QAC7B,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO,6BAA6B,CAAC;QACvC,CAAC;QAED,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,EAAE;iBACX,OAAO,CAAC,iDAAiD,CAAC;iBAC1D,GAAG,CAAC,yBAAyB,CAAkC,CAAC;YAEnE,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,IAAI,CAAC,qBAAqB,CAAC,6BAA6B,CAAC,CAAC;gBAC1D,OAAO,6BAA6B,CAAC;YACvC,CAAC;YAED,OAAO,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC;QAC9B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CACV,sDAAsD,EACtD,KAAK,CACN,CAAC;YACF,OAAO,6BAA6B,CAAC;QACvC,CAAC;IACH,CAAC;IAED;;OAEG;IACH,qBAAqB,CAAC,KAAc;QAClC,MAAM,EAAE,GAAG,eAAe,EAAE,CAAC;QAC7B,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACvB,EAAE,CAAC,OAAO,CACR;;;;;;SAMC,CACF,CAAC,GAAG,CAAC,yBAAyB,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAClE,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CACV,wDAAwD,EACxD,KAAK,CACN,CAAC;QACJ,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,EAAE,CAAC"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import type { GenerationTarget } from './chatGenerationService.js';
|
|
2
|
+
import type { ChatMessage, ChatSession, GenerationOptions, OllamaGenerateRequest, OllamaGenerateResponse, PluginResponse } from '../types/index.js';
|
|
3
|
+
export declare const AUTO_TITLE_CURRENT_MODEL = "__current_running_model__";
|
|
4
|
+
export interface GenerateTitleForSessionOptions {
|
|
5
|
+
sessionId: string;
|
|
6
|
+
requestedModel: string;
|
|
7
|
+
message: string;
|
|
8
|
+
userId?: string;
|
|
9
|
+
}
|
|
10
|
+
export interface GenerateTitleForSessionResult {
|
|
11
|
+
title: string;
|
|
12
|
+
session: ChatSession;
|
|
13
|
+
model: string;
|
|
14
|
+
source: 'plugin' | 'ollama' | 'fallback';
|
|
15
|
+
}
|
|
16
|
+
interface ChatServiceDependency {
|
|
17
|
+
getSession(sessionId: string, userId?: string): ChatSession | undefined;
|
|
18
|
+
updateSession(sessionId: string, updates: Partial<ChatSession>, userId?: string): Promise<ChatSession | null | undefined> | ChatSession | null | undefined;
|
|
19
|
+
}
|
|
20
|
+
interface ChatGenerationServiceDependency {
|
|
21
|
+
resolveActualModelName(sessionModel: string, userId?: string): Promise<string>;
|
|
22
|
+
prepareGenerationTarget(sessionModel: string, userId: string, options?: GenerationOptions): Promise<GenerationTarget>;
|
|
23
|
+
extractPluginAssistantContent(response: PluginResponse): string;
|
|
24
|
+
}
|
|
25
|
+
interface PluginServiceDependency {
|
|
26
|
+
executePluginRequest(model: string, messages: ChatMessage[], options?: GenerationOptions, userId?: string): Promise<PluginResponse>;
|
|
27
|
+
}
|
|
28
|
+
interface OllamaServiceDependency {
|
|
29
|
+
generateResponse(request: OllamaGenerateRequest): Promise<OllamaGenerateResponse>;
|
|
30
|
+
}
|
|
31
|
+
export interface TitleGenerationServiceDependencies {
|
|
32
|
+
chatService: ChatServiceDependency;
|
|
33
|
+
chatGenerationService: ChatGenerationServiceDependency;
|
|
34
|
+
pluginService: PluginServiceDependency;
|
|
35
|
+
ollamaService: OllamaServiceDependency;
|
|
36
|
+
now?: () => number;
|
|
37
|
+
logger?: Pick<Console, 'error'>;
|
|
38
|
+
}
|
|
39
|
+
export declare function buildTitlePrompt(message: string): string;
|
|
40
|
+
export declare function buildFallbackTitle(message: string): string;
|
|
41
|
+
export declare function sanitizeGeneratedTitle(rawTitle: string, sourceMessage: string): string;
|
|
42
|
+
export declare class TitleGenerationService {
|
|
43
|
+
private chatService;
|
|
44
|
+
private chatGenerationService;
|
|
45
|
+
private pluginService;
|
|
46
|
+
private ollamaService;
|
|
47
|
+
private now;
|
|
48
|
+
private logger;
|
|
49
|
+
constructor({ chatService, chatGenerationService, pluginService, ollamaService, now, logger, }: TitleGenerationServiceDependencies);
|
|
50
|
+
resolveTitleGenerationModel(requestedModel: string, session: ChatSession, userId: string): Promise<string>;
|
|
51
|
+
generateTitleForSession({ sessionId, requestedModel, message, userId, }: GenerateTitleForSessionOptions): Promise<GenerateTitleForSessionResult | null>;
|
|
52
|
+
private generateTitleWithModel;
|
|
53
|
+
}
|
|
54
|
+
export {};
|
|
55
|
+
//# sourceMappingURL=titleGenerationService.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"titleGenerationService.d.ts","sourceRoot":"","sources":["../../src/services/titleGenerationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,121 @@
|
|
|
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
|
+
export const AUTO_TITLE_CURRENT_MODEL = '__current_running_model__';
|
|
18
|
+
const TITLE_GENERATION_OPTIONS = {
|
|
19
|
+
temperature: 0.3,
|
|
20
|
+
num_predict: 20,
|
|
21
|
+
};
|
|
22
|
+
const TITLE_STOP_SEQUENCES = ['\n', '.', '!', '?'];
|
|
23
|
+
export function buildTitlePrompt(message) {
|
|
24
|
+
return `Generate a very short, concise title (3-6 words max) for a chat that starts with this message. Only respond with the title, nothing else. No quotes, no punctuation at the end. Do not use any markdown formatting.
|
|
25
|
+
|
|
26
|
+
Message: "${message.substring(0, 500)}"
|
|
27
|
+
|
|
28
|
+
Title:`;
|
|
29
|
+
}
|
|
30
|
+
export function buildFallbackTitle(message) {
|
|
31
|
+
return message.substring(0, 30) + (message.length > 30 ? '...' : '');
|
|
32
|
+
}
|
|
33
|
+
export function sanitizeGeneratedTitle(rawTitle, sourceMessage) {
|
|
34
|
+
const title = rawTitle
|
|
35
|
+
.trim()
|
|
36
|
+
.replace(/^["'`]+|["'`]+$/g, '')
|
|
37
|
+
.replace(/\s+/g, ' ')
|
|
38
|
+
.replace(/[.!?]+$/, '')
|
|
39
|
+
.trim();
|
|
40
|
+
if (!title || title.length > 50) {
|
|
41
|
+
return buildFallbackTitle(sourceMessage);
|
|
42
|
+
}
|
|
43
|
+
return title;
|
|
44
|
+
}
|
|
45
|
+
export class TitleGenerationService {
|
|
46
|
+
constructor({ chatService, chatGenerationService, pluginService, ollamaService, now = Date.now, logger = console, }) {
|
|
47
|
+
this.chatService = chatService;
|
|
48
|
+
this.chatGenerationService = chatGenerationService;
|
|
49
|
+
this.pluginService = pluginService;
|
|
50
|
+
this.ollamaService = ollamaService;
|
|
51
|
+
this.now = now;
|
|
52
|
+
this.logger = logger;
|
|
53
|
+
}
|
|
54
|
+
async resolveTitleGenerationModel(requestedModel, session, userId) {
|
|
55
|
+
if (requestedModel === AUTO_TITLE_CURRENT_MODEL) {
|
|
56
|
+
return this.chatGenerationService.resolveActualModelName(session.model, userId);
|
|
57
|
+
}
|
|
58
|
+
return requestedModel;
|
|
59
|
+
}
|
|
60
|
+
async generateTitleForSession({ sessionId, requestedModel, message, userId = 'default', }) {
|
|
61
|
+
const session = this.chatService.getSession(sessionId, userId);
|
|
62
|
+
if (!session) {
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
const model = await this.resolveTitleGenerationModel(requestedModel, session, userId);
|
|
66
|
+
let title = buildFallbackTitle(message);
|
|
67
|
+
let source = 'fallback';
|
|
68
|
+
try {
|
|
69
|
+
const generation = await this.generateTitleWithModel(sessionId, model, message, userId);
|
|
70
|
+
title = sanitizeGeneratedTitle(generation.title, message);
|
|
71
|
+
source = generation.source;
|
|
72
|
+
}
|
|
73
|
+
catch (error) {
|
|
74
|
+
this.logger.error('Error generating title:', error);
|
|
75
|
+
}
|
|
76
|
+
const updatedSession = await this.chatService.updateSession(sessionId, { title }, userId);
|
|
77
|
+
if (!updatedSession) {
|
|
78
|
+
throw new Error('Failed to update session title');
|
|
79
|
+
}
|
|
80
|
+
return {
|
|
81
|
+
title,
|
|
82
|
+
session: updatedSession,
|
|
83
|
+
model,
|
|
84
|
+
source,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
async generateTitleWithModel(sessionId, model, message, userId) {
|
|
88
|
+
const target = await this.chatGenerationService.prepareGenerationTarget(model, userId, TITLE_GENERATION_OPTIONS);
|
|
89
|
+
const prompt = buildTitlePrompt(message);
|
|
90
|
+
if (target.activePlugin) {
|
|
91
|
+
const pluginResponse = await this.pluginService.executePluginRequest(target.actualModelName, [
|
|
92
|
+
{
|
|
93
|
+
id: `title-${sessionId}`,
|
|
94
|
+
role: 'user',
|
|
95
|
+
content: prompt,
|
|
96
|
+
timestamp: this.now(),
|
|
97
|
+
},
|
|
98
|
+
], target.mergedOptions, userId);
|
|
99
|
+
return {
|
|
100
|
+
title: this.chatGenerationService.extractPluginAssistantContent(pluginResponse),
|
|
101
|
+
source: 'plugin',
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
const response = await this.ollamaService.generateResponse({
|
|
105
|
+
model: target.actualModelName,
|
|
106
|
+
prompt,
|
|
107
|
+
stream: false,
|
|
108
|
+
options: {
|
|
109
|
+
...target.mergedOptions,
|
|
110
|
+
temperature: TITLE_GENERATION_OPTIONS.temperature,
|
|
111
|
+
num_predict: TITLE_GENERATION_OPTIONS.num_predict,
|
|
112
|
+
stop: TITLE_STOP_SEQUENCES,
|
|
113
|
+
},
|
|
114
|
+
});
|
|
115
|
+
return {
|
|
116
|
+
title: response.response,
|
|
117
|
+
source: 'ollama',
|
|
118
|
+
};
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
//# sourceMappingURL=titleGenerationService.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"titleGenerationService.js","sourceRoot":"","sources":["../../src/services/titleGenerationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface TurnstilePublicConfig {
|
|
2
|
+
enabled: boolean;
|
|
3
|
+
siteKey?: string;
|
|
4
|
+
}
|
|
5
|
+
export declare class TurnstileService {
|
|
6
|
+
private get siteKey();
|
|
7
|
+
private get secretKey();
|
|
8
|
+
isConfigured(): boolean;
|
|
9
|
+
getPublicConfig(): TurnstilePublicConfig;
|
|
10
|
+
verify(token: unknown, remoteIp?: string): Promise<boolean>;
|
|
11
|
+
}
|
|
12
|
+
export declare const turnstileService: TurnstileService;
|
|
13
|
+
//# sourceMappingURL=turnstileService.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"turnstileService.d.ts","sourceRoot":"","sources":["../../src/services/turnstileService.ts"],"names":[],"mappings":"AAqBA,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAcD,qBAAa,gBAAgB;IAC3B,OAAO,KAAK,OAAO,GAElB;IAED,OAAO,KAAK,SAAS,GAEpB;IAED,YAAY,IAAI,OAAO;IAIvB,eAAe,IAAI,qBAAqB;IAWlC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAgDlE;AAED,eAAO,MAAM,gBAAgB,kBAAyB,CAAC"}
|