Merge pull request #3554 from bmen25124/new_exports Exported getTextGenServer, extractMessageFromData methods. added opti…

20a982491ac3e20b3186839ee92f096260d34d64

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

public/script.js+4 -3 Viewed

 /**
  * Extracts the message from the response data.
  * @param {object} data Response data
+ * @param {string} activeApi If it's set, ignores active API
  * @returns {string} Extracted message
  */
-function extractMessageFromData(data) {
+export function extractMessageFromData(data, activeApi = null) {
     if (typeof data === 'string') {
         return data;
+    }
-    switch (main_api) {
+    switch (activeApi ?? main_api) {
         case 'kobold':
             return data.results[0].text;
         case 'koboldhorde':

+    }
 };
-const CONNECT_API_MAP = {
+export const CONNECT_API_MAP = {
     // Default APIs not contined inside text gen / chat gen
     'kobold': {
         selected: 'kobold',

public/scripts/st-context.js+8 -1 Viewed

     characters,
     chat,
     chat_metadata,
+    CONNECT_API_MAP,
     create_save,
     deactivateSendButtons,
     event_types,
     eventSource,
     extension_prompts,
+    extractMessageFromData,
     Generate,
     generateQuietPrompt,
     getCharacters,

 import { oai_settings } from './openai.js';
 import { callGenericPopup, Popup, POPUP_RESULT, POPUP_TYPE } from './popup.js';
 import { power_user, registerDebugFunction } from './power-user.js';
+import { getPresetManager } from './preset-manager.js';
 import { humanizedDateTime, isMobile, shouldSendOnEnter } from './RossAscends-mods.js';
 import { ScraperManager } from './scrapers.js';
 import { executeSlashCommands, executeSlashCommandsWithOptions, registerSlashCommand } from './slash-commands.js';

 import { ARGUMENT_TYPE, SlashCommandArgument, SlashCommandNamedArgument } from './slash-commands/SlashCommandArgument.js';
 import { SlashCommandParser } from './slash-commands/SlashCommandParser.js';
 import { tag_map, tags } from './tags.js';
-import { textgenerationwebui_settings } from './textgen-settings.js';
+import { getTextGenServer, textgenerationwebui_settings } from './textgen-settings.js';
 import { tokenizers, getTextTokens, getTokenCount, getTokenCountAsync, getTokenizerModel } from './tokenizers.js';
 import { ToolManager } from './tool-calling.js';
 import { accountStorage } from './util/AccountStorage.js';

         saveWorldInfo,
         updateWorldInfoList,
         convertCharacterBook,
+        CONNECT_API_MAP,
+        getTextGenServer,
+        extractMessageFromData,
+        getPresetManager,
     };
+}

public/scripts/textgen-settings.js+18 -6 Viewed

     control.val(formattedUrl);
+}
-export function getTextGenServer() {
+/**
-    switch (settings.type) {
+ * Gets the API URL for the selected text generation type.
+ * @param {string} type If it's set, ignores active type
+ * @returns {string} API URL
+ */
+export function getTextGenServer(type = null) {
+    const selectedType = type ?? settings.type;
+    switch (selectedType) {
         case FEATHERLESS:
             return FEATHERLESS_SERVER;
         case MANCER:

@@ -333,7 +339,7 @@ export function getTextGenServer() {
333	case OPENROUTER:	339	case OPENROUTER:
334	return OPENROUTER_SERVER;	340	return OPENROUTER_SERVER;
335	default:	341	default:
336	return settings.server_urls[settings.type] ?? '';	342	return settings.server_urls[selectedType] ?? '';
337	}	343	}
338	}	344	}
339		345

     return settings.dynatemp && DYNATEMP_BLOCK?.dataset?.tgType?.includes(settings.type);
+}
-function getLogprobsNumber() {
+/**
-    if (settings.type === VLLM || settings.type === INFERMATICAI) {
+ * Gets the number of logprobs to request based on the selected type.
+ * @param {string} type If it's set, ignores active type
+ * @returns {number} Number of logprobs to request
+ */
+export function getLogprobsNumber(type = null) {
+    const selectedType = type ?? settings.type;
+    if (selectedType === VLLM || selectedType === INFERMATICAI) {
         return 5;
+    }

  * @param {string} str Input string
  * @returns {string} Output string
  */
-function replaceMacrosInList(str) {
+export function replaceMacrosInList(str) {
     if (!str || typeof str !== 'string') {
         return str;
+    }