Fix redundancy in getContext. Add power user settings
| @@ -54,7 +54,7 @@ import { hideLoader, showLoader } from './loader.js'; | |||
| 54 | import { MacrosParser } from './macros.js'; | 54 | import { MacrosParser } from './macros.js'; |
| 55 | import { oai_settings } from './openai.js'; | 55 | import { oai_settings } from './openai.js'; |
| 56 | import { callGenericPopup, Popup, POPUP_RESULT, POPUP_TYPE } from './popup.js'; | 56 | import { callGenericPopup, Popup, POPUP_RESULT, POPUP_TYPE } from './popup.js'; |
| 57 | import { registerDebugFunction } from './power-user.js'; | 57 | import { power_user, registerDebugFunction } from './power-user.js'; |
| 58 | import { isMobile, shouldSendOnEnter } from './RossAscends-mods.js'; | 58 | import { isMobile, shouldSendOnEnter } from './RossAscends-mods.js'; |
| 59 | import { ScraperManager } from './scrapers.js'; | 59 | import { ScraperManager } from './scrapers.js'; |
| 60 | import { executeSlashCommands, executeSlashCommandsWithOptions, registerSlashCommand } from './slash-commands.js'; | 60 | import { executeSlashCommands, executeSlashCommandsWithOptions, registerSlashCommand } from './slash-commands.js'; |
| @@ -69,8 +69,6 @@ import { timestampToMoment } from './utils.js'; | |||
| 69 | 69 | ||
| 70 | export function getContext() { | 70 | export function getContext() { |
| 71 | return { | 71 | return { |
| 72 | chatCompletionSettings: oai_settings, | ||
| 73 | textCompletionSettings: textgenerationwebui_settings, | ||
| 74 | chat, | 72 | chat, |
| 75 | characters, | 73 | characters, |
| 76 | groups, | 74 | groups, |
| @@ -101,8 +99,8 @@ export function getContext() { | |||
| 101 | getTokenCount, | 99 | getTokenCount, |
| 102 | getTokenCountAsync, | 100 | getTokenCountAsync, |
| 103 | extensionPrompts: extension_prompts, | 101 | extensionPrompts: extension_prompts, |
| 104 | setExtensionPrompt: setExtensionPrompt, | 102 | setExtensionPrompt, |
| 105 | updateChatMetadata: updateChatMetadata, | 103 | updateChatMetadata, |
| 106 | saveChat: saveChatConditional, | 104 | saveChat: saveChatConditional, |
| 107 | openCharacterChat, | 105 | openCharacterChat, |
| 108 | openGroupChat, | 106 | openGroupChat, |
| @@ -132,11 +130,11 @@ export function getContext() { | |||
| 132 | unregisterFunctionTool: ToolManager.unregisterFunctionTool.bind(ToolManager), | 130 | unregisterFunctionTool: ToolManager.unregisterFunctionTool.bind(ToolManager), |
| 133 | isToolCallingSupported: ToolManager.isToolCallingSupported.bind(ToolManager), | 131 | isToolCallingSupported: ToolManager.isToolCallingSupported.bind(ToolManager), |
| 134 | canPerformToolCalls: ToolManager.canPerformToolCalls.bind(ToolManager), | 132 | canPerformToolCalls: ToolManager.canPerformToolCalls.bind(ToolManager), |
| 135 | registerDebugFunction: registerDebugFunction, | 133 | registerDebugFunction, |
| 136 | /** @deprecated Use renderExtensionTemplateAsync instead. */ | 134 | /** @deprecated Use renderExtensionTemplateAsync instead. */ |
| 137 | renderExtensionTemplate: renderExtensionTemplate, | 135 | renderExtensionTemplate, |
| 138 | renderExtensionTemplateAsync: renderExtensionTemplateAsync, | 136 | renderExtensionTemplateAsync, |
| 139 | registerDataBankScraper: ScraperManager.registerDataBankScraper, | 137 | registerDataBankScraper: ScraperManager.registerDataBankScraper.bind(ScraperManager), |
| 140 | /** @deprecated Use callGenericPopup or Popup instead. */ | 138 | /** @deprecated Use callGenericPopup or Popup instead. */ |
| 141 | callPopup, | 139 | callPopup, |
| 142 | callGenericPopup, | 140 | callGenericPopup, |
| @@ -161,9 +159,12 @@ export function getContext() { | |||
| 161 | createCharacterData: create_save, | 159 | createCharacterData: create_save, |
| 162 | /** @deprecated Legacy snake-case naming, compatibility with old extensions */ | 160 | /** @deprecated Legacy snake-case naming, compatibility with old extensions */ |
| 163 | event_types: event_types, | 161 | event_types: event_types, |
| 164 | Popup: Popup, | 162 | Popup, |
| 165 | POPUP_TYPE, | 163 | POPUP_TYPE, |
| 166 | POPUP_RESULT, | 164 | POPUP_RESULT, |
| 165 | chatCompletionSettings: oai_settings, | ||
| 166 | textCompletionSettings: textgenerationwebui_settings, | ||
| 167 | powerUserSettings: power_user, | ||
| 167 | }; | 168 | }; |
| 168 | } | 169 | } |
| 169 | 170 | ||