diff --git a/.eslintrc.js b/.eslintrc.js index 6aef11686..6e926dee9 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -12,7 +12,7 @@ module.exports = { overrides: [ { // Server-side files (plus this configuration file) - files: ['src/**/*.js', './*.js'], + files: ['src/**/*.js', './*.js', 'plugins/**/*.js'], env: { node: true, }, diff --git a/.gitignore b/.gitignore index de17c931f..d82301d8f 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ access.log /vectors/ /cache/ public/css/user.css +/plugins/ diff --git a/default/config.yaml b/default/config.yaml index b6e52f834..fd0be655c 100644 --- a/default/config.yaml +++ b/default/config.yaml @@ -58,3 +58,5 @@ openai: deepl: # Available options: default, more, less, prefer_more, prefer_less formality: default +# -- SERVER PLUGIN CONFIGURATION -- +enableServerPlugins: false diff --git a/plugins/.gitkeep b/plugins/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/public/scripts/extensions/memory/index.js b/public/scripts/extensions/memory/index.js index 8ebeb2380..f3373ddad 100644 --- a/public/scripts/extensions/memory/index.js +++ b/public/scripts/extensions/memory/index.js @@ -322,6 +322,11 @@ async function onChatEvent() { } async function forceSummarizeChat() { + if (extension_settings.memory.source === summary_sources.extras) { + toastr.warning('Force summarization is not supported for Extras API'); + return; + } + const context = getContext(); const skipWIAN = extension_settings.memory.SkipWIAN; @@ -664,7 +669,7 @@ jQuery(function () {