Merge 182ebed1c1 into afc3071576

Add name argument for /send.
Tech debt: move to new STscript branch
2024-05-05 22:19:31 +00:00 · 2024-05-06 01:18:59 +03:00 · 2024-05-06 00:49:00 +03:00 · 2024-05-05 22:26:13 +03:00 · 2024-05-05 18:53:12 +03:00 · 2024-05-05 18:21:58 +03:00
15 changed files with 407 additions and 16 deletions
--- a/package.json
+++ b/package.json
@ -71,10 +71,11 @@
    "version": "1.12.0-preview",
    "scripts": {
        "start": "node server.js",
-        "start-multi": "node server.js --disableCsrf",
+        "start:no-csrf": "node server.js --disableCsrf",
        "postinstall": "node post-install.js",
        "lint": "eslint \"src/**/*.js\" \"public/**/*.js\" ./*.js",
-        "lint-fix": "eslint \"src/**/*.js\" \"public/**/*.js\" ./*.js --fix"
+        "lint:fix": "eslint \"src/**/*.js\" \"public/**/*.js\" ./*.js --fix",
+        "plugins:update": "node plugins update"
    },
    "bin": {
        "sillytavern": "./server.js"
--- a/plugins.js
+++ b/plugins.js
@ -0,0 +1,53 @@
+// Plugin manager script.
+// Usage: node plugins.js update
+// More operations coming soon.
+const { default: git } = require('simple-git');
+const fs = require('fs');
+const path = require('path');
+const { color } = require('./src/util');
+
+const pluginsPath = './plugins';
+
+const command = process.argv[2];
+
+if (command === 'update') {
+    console.log(color.magenta('Updating all plugins'));
+    updatePlugins();
+}
+
+async function updatePlugins() {
+    const directories = fs.readdirSync(pluginsPath)
+        .filter(file => !file.startsWith('.'))
+        .filter(file => fs.statSync(path.join(pluginsPath, file)).isDirectory());
+
+    console.log(`Found ${color.cyan(directories.length)} directories in ./plugins`);
+
+    for (const directory of directories) {
+        try {
+            console.log(`Updating plugin ${color.green(directory)}...`);
+            const pluginPath = path.join(pluginsPath, directory);
+            const pluginRepo = git(pluginPath);
+            await pluginRepo.fetch();
+            const commitHash = await pluginRepo.revparse(['HEAD']);
+            const trackingBranch = await pluginRepo.revparse(['--abbrev-ref', '@{u}']);
+            const log = await pluginRepo.log({
+                from: commitHash,
+                to: trackingBranch,
+            });
+
+            if (log.total === 0) {
+                console.log(`Plugin ${color.blue(directory)} is already up to date`);
+                continue;
+            }
+
+            await pluginRepo.pull();
+            const latestCommit = await pluginRepo.revparse(['HEAD']);
+            console.log(`Plugin ${color.green(directory)} updated to commit ${color.cyan(latestCommit)}`);
+        } catch (error) {
+            console.error(color.red(`Failed to update plugin ${directory}: ${error.message}`));
+        }
+    }
+
+    console.log(color.magenta('All plugins updated!'));
+
+}
--- a/public/img/groq.svg
+++ b/public/img/groq.svg
@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="107.644"
+   height="156.436"
+   viewBox="0 0 107.644 156.436"
+   fill="none"
+   version="1.1"
+   id="svg9"
+   sodipodi:docname="groqcloud_dark_v2.svg"
+   inkscape:version="1.3 (0e150ed, 2023-07-21)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview9"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="0.667"
+     inkscape:cx="499.25037"
+     inkscape:cy="56.971514"
+     inkscape:window-width="1312"
+     inkscape:window-height="449"
+     inkscape:window-x="0"
+     inkscape:window-y="38"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg9" />
+  <defs
+     id="defs9">
+    <clipPath
+       id="clip0_872_2594">
+      <rect
+         width="1000"
+         height="200.345"
+         id="rect9"
+         x="0"
+         y="0" />
+    </clipPath>
+  </defs>
+  <path
+     d="M 54.0487,0.00281139 C 24.4736,-0.29748861 0.303066,23.497811 0.00281057,53.072911 -0.297445,82.648011 23.4978,106.89401 53.0729,107.11901 c 0.3003,0 0.6756,0 0.9758,0 H 71.6888 V 87.077011 H 54.0487 c -18.4656,0.225 -33.6285,-14.563 -33.8537,-33.1033 -0.2252,-18.4657 14.5624,-33.6286 33.1031,-33.8538 0.2252,0 0.5255,0 0.7506,0 18.4657,0 33.5536,15.0128 33.5536,33.4784 v 49.316699 c 0,18.316 -14.9377,33.254 -33.2533,33.479 -8.7825,0 -17.1145,-3.603 -23.2698,-9.834 l -14.187,14.187 c 9.8333,9.909 23.1947,15.539 37.1565,15.689 h 0.7507 c 29.1998,-0.451 52.6946,-24.096 52.8446,-53.296 V 52.247211 C 106.894,23.197511 83.1735,0.00281139 54.1238,0.00281139 Z"
+     id="path7" />
+</svg>
--- a/public/index.html
+++ b/public/index.html
@ -423,7 +423,7 @@
                                        </span>
                                    </div>
                                </div>
-                                <div class="range-block" data-source="openai,claude,windowai,openrouter,ai21,scale,makersuite,mistralai,custom,cohere,perplexity">
+                                <div class="range-block" data-source="openai,claude,windowai,openrouter,ai21,scale,makersuite,mistralai,custom,cohere,perplexity,groq">
                                    <div class="range-block-title" data-i18n="Temperature">
                                        Temperature
                                    </div>
@ -436,7 +436,7 @@
                                        </div>
                                    </div>
                                </div>
-                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,ai21,custom,cohere,perplexity">
+                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,ai21,custom,cohere,perplexity,groq">
                                    <div class="range-block-title" data-i18n="Frequency Penalty">
                                        Frequency Penalty
                                    </div>
@ -449,7 +449,7 @@
                                        </div>
                                    </div>
                                </div>
-                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,ai21,custom,cohere,perplexity">
+                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,ai21,custom,cohere,perplexity,groq">
                                    <div class="range-block-title" data-i18n="Presence Penalty">
                                        Presence Penalty
                                    </div>
@ -488,7 +488,7 @@
                                        </div>
                                    </div>
                                </div>
-                                <div data-newbie-hidden class="range-block" data-source="openai,claude,openrouter,ai21,scale,makersuite,mistralai,custom,cohere,perplexity">
+                                <div data-newbie-hidden class="range-block" data-source="openai,claude,openrouter,ai21,scale,makersuite,mistralai,custom,cohere,perplexity,groq">
                                    <div class="range-block-title" data-i18n="Top-p">
                                        Top P
                                    </div>
@ -724,7 +724,7 @@
                                        </div>
                                    </div>
                                </div>
-                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,mistralai,custom,cohere">
+                                <div data-newbie-hidden class="range-block" data-source="openai,openrouter,mistralai,custom,cohere,groq">
                                    <div class="range-block-title justifyLeft" data-i18n="Seed">
                                        Seed
                                    </div>
@ -1249,7 +1249,7 @@
                                        <input class="neo-range-slider" type="range" id="max_tokens_second_textgenerationwebui" name="volume" min="0" max="20" step="1" />
                                        <input class="neo-range-input" type="number" min="0" max="20" step="1" data-for="max_tokens_second_textgenerationwebui" id="max_tokens_second_counter_textgenerationwebui">
                                    </div>
-                                    <div data-newbie-hidden data-tg-type="mancer, ooba, koboldcpp, aphrodite, tabby" name="smoothingBlock" class="wide100p">
+                                    <div data-newbie-hidden data-tg-type="mancer, ooba, koboldcpp, aphrodite, tabby, llamacpp" name="smoothingBlock" class="wide100p">
                                        <h4 class="wide100p textAlignCenter">
                                            <label data-i18n="Smooth Sampling">Smooth Sampling</label>
                                            <div class=" fa-solid fa-circle-info opacity50p " data-i18n="[title]Smooth Sampling" title="Allows you to use quadratic/cubic transformations to adjust the distribution. Lower Smoothing Factor values will be more creative, usually between 0.2-0.3 is the sweetspot (assuming the curve = 1). Higher Smoothing Curve values will make the curve steeper, which will punish low probability choices more aggressively. 1.0 curve is equivalent to only using Smoothing Factor."></div>
@ -2266,6 +2266,7 @@
                                <option value="ai21">AI21</option>
                                <option value="claude">Claude</option>
                                <option value="cohere">Cohere</option>
+                                <option value="groq">Groq</option>
                                <option value="makersuite">Google MakerSuite</option>
                                <option value="mistralai">MistralAI</option>
                                <option value="openrouter">OpenRouter</option>
@ -2670,6 +2671,23 @@
                                </select>
                            </div>
                        </form>
+                        <div id="groq_form" data-source="groq">
+                            <h4 data-i18n="Groq API Key">Groq API Key</h4>
+                            <div class="flex-container">
+                                <input id="api_key_groq" name="api_key_groq" class="text_pole flex1" maxlength="500" value="" type="text" autocomplete="off">
+                                <div title="Clear your API key" data-i18n="[title]Clear your API key" class="menu_button fa-solid fa-circle-xmark clear-api-key" data-key="api_key_groq"></div>
+                            </div>
+                            <div data-for="api_key_groq" class="neutral_warning">
+                                For privacy reasons, your API key will be hidden after you reload the page.
+                            </div>
+                            <h4 data-i18n="Groq Model">Groq Model</h4>
+                            <select id="model_groq_select">
+                                <option value="llama3-8b-8192">llama3-8b-8192</option>
+                                <option value="llama3-70b-8192">llama3-70b-8192</option>
+                                <option value="mixtral-8x7b-32768">mixtral-8x7b-32768</option>
+                                <option value="gemma-7b-it">gemma-7b-it</option>
+                            </select>
+                        </div>
                        <div id="perplexity_form" data-source="perplexity">
                            <h4 data-i18n="Perplexity API Key">Perplexity API Key</h4>
                            <div class="flex-container">
@ -2682,6 +2700,10 @@
                            <h4 data-i18n="Perplexity Model">Perplexity Model</h4>
                            <select id="model_perplexity_select">
                                <optgroup label="Perplexity Models">
+                                    <option value="llama-3-sonar-small-32k-chat">llama-3-sonar-small-32k-chat</option>
+                                    <option value="llama-3-sonar-small-32k-online">llama-3-sonar-small-32k-online</option>
+                                    <option value="llama-3-sonar-large-32k-chat">llama-3-sonar-large-32k-chat</option>
+                                    <option value="llama-3-sonar-large-32k-online">llama-3-sonar-large-32k-online</option>
                                    <option value="sonar-small-chat">sonar-small-chat</option>
                                    <option value="sonar-small-online">sonar-small-online</option>
                                    <option value="sonar-medium-chat">sonar-medium-chat</option>
--- a/public/script.js
+++ b/public/script.js
@ -4410,14 +4410,16 @@ export function removeMacros(str) {
 * @param {string} messageText Message text.
 * @param {string} messageBias Message bias.
 * @param {number} [insertAt] Optional index to insert the message at.
- * @params {boolean} [compact] Send as a compact display message.
+ * @param {boolean} [compact] Send as a compact display message.
+ * @param {string} [name] Name of the user sending the message. Defaults to name1.
+ * @param {string} [avatar] Avatar of the user sending the message. Defaults to user_avatar.
 * @returns {Promise<void>} A promise that resolves when the message is inserted.
 */
-export async function sendMessageAsUser(messageText, messageBias, insertAt = null, compact = false) {
+export async function sendMessageAsUser(messageText, messageBias, insertAt = null, compact = false, name = name1, avatar = user_avatar) {
    messageText = getRegexedString(messageText, regex_placement.USER_INPUT);

    const message = {
-        name: name1,
+        name: name,
        is_user: true,
        is_system: false,
        send_date: getMessageTimeStamp(),
@ -4432,8 +4434,8 @@ export async function sendMessageAsUser(messageText, messageBias, insertAt = nul
    }

    // Lock user avatar to a persona.
-    if (user_avatar in power_user.personas) {
-        message.force_avatar = getUserAvatar(user_avatar);
+    if (avatar in power_user.personas) {
+        message.force_avatar = getUserAvatar(avatar);
    }

    if (messageBias) {
@ -8002,6 +8004,11 @@ const CONNECT_API_MAP = {
        button: '#api_button_openai',
        source: chat_completion_sources.PERPLEXITY,
    },
+    'groq': {
+        selected: 'openai',
+        button: '#api_button_openai',
+        source: chat_completion_sources.GROQ,
+    },
    'infermaticai': {
        selected: 'textgenerationwebui',
        button: '#api_button_textgenerationwebui',
--- a/public/scripts/RossAscends-mods.js
+++ b/public/scripts/RossAscends-mods.js
@ -378,6 +378,7 @@ function RA_autoconnect(PrevApi) {
                    || (secret_state[SECRET_KEYS.MISTRALAI] && oai_settings.chat_completion_source == chat_completion_sources.MISTRALAI)
                    || (secret_state[SECRET_KEYS.COHERE] && oai_settings.chat_completion_source == chat_completion_sources.COHERE)
                    || (secret_state[SECRET_KEYS.PERPLEXITY] && oai_settings.chat_completion_source == chat_completion_sources.PERPLEXITY)
+                    || (secret_state[SECRET_KEYS.GROQ] && oai_settings.chat_completion_source == chat_completion_sources.GROQ)
                    || (isValidUrl(oai_settings.custom_url) && oai_settings.chat_completion_source == chat_completion_sources.CUSTOM)
                ) {
                    $('#api_button_openai').trigger('click');
--- a/public/scripts/extensions/attachments/mediawiki-scrape.html
+++ b/public/scripts/extensions/attachments/mediawiki-scrape.html
@ -0,0 +1,54 @@
+<div>
+    <div class="flex-container flexFlowColumn">
+        <label for="scrapeInput" data-i18n="Enter a base URL of the MediaWiki to scrape.">
+            Enter a <strong>base URL</strong> of the MediaWiki to scrape.
+        </label>
+        <i data-i18n="Don't include the page name!">
+            Don't include the page name!
+        </i>
+        <small>
+            <span data-i18n=Examples:">Examples:</span>
+            <code>https://streetcat.wiki/index.php</code>
+            <span data-i18n="or">or</span>
+            <code>https://tcrf.net</code>
+        </small>
+        <input type="text" id="scrapeInput" name="scrapeInput" class="text_pole" placeholder="">
+    </div>
+    <div class="flex-container flexFlowColumn">
+        <label for="scrapeFilter">
+            Optional regex to pick the content by its title:
+        </label>
+        <small>
+            <span data-i18n="Example:">Example:</span>
+            <code>/Mr. (Fresh|Snack)/gi</code>
+        </small>
+        <input type="text" id="scrapeFilter" name="scrapeFilter" class="text_pole" placeholder="">
+    </div>
+    <div class="flex-container flexFlowColumn">
+        <label>
+            Output format:
+        </label>
+        <label class="checkbox_label justifyLeft" for="scrapeOutputSingle">
+            <input id="scrapeOutputSingle" type="radio" name="scrapeOutput" value="single" checked>
+            <div class="flex-container flexFlowColumn flexNoGap">
+                <span data-i18n="Single file">
+                    Single file
+                </span>
+                <small data-i18n="All articles will be concatenated into a single file.">
+                    All articles will be concatenated into a single file.
+                </small>
+            </div>
+        </label>
+        <label class="checkbox_label justifyLeft" for="scrapeOutputMulti">
+            <input id="scrapeOutputMulti" type="radio" name="scrapeOutput" value="multi">
+            <div class="flex-container flexFlowColumn flexNoGap">
+                <span data-i18n="File per article">
+                    File per article
+                </span>
+                <small data-i18n="Each article will be saved as a separate file.">
+                    Not recommended. Each article will be saved as a separate file.
+                </small>
+            </div>
+        </label>
+    </div>
+</div>
--- a/public/scripts/openai.js
+++ b/public/scripts/openai.js
@ -174,6 +174,7 @@ export const chat_completion_sources = {
    CUSTOM: 'custom',
    COHERE: 'cohere',
    PERPLEXITY: 'perplexity',
+    GROQ: 'groq',
 };

 const character_names_behavior = {
@ -241,6 +242,7 @@ const default_settings = {
    mistralai_model: 'mistral-medium-latest',
    cohere_model: 'command-r',
    perplexity_model: 'llama-3-70b-instruct',
+    groq_model: 'llama3-70b-8192',
    custom_model: '',
    custom_url: '',
    custom_include_body: '',
@ -314,6 +316,7 @@ const oai_settings = {
    mistralai_model: 'mistral-medium-latest',
    cohere_model: 'command-r',
    perplexity_model: 'llama-3-70b-instruct',
+    groq_model: 'llama3-70b-8192',
    custom_model: '',
    custom_url: '',
    custom_include_body: '',
@ -1438,6 +1441,8 @@ function getChatCompletionModel() {
            return oai_settings.cohere_model;
        case chat_completion_sources.PERPLEXITY:
            return oai_settings.perplexity_model;
+        case chat_completion_sources.GROQ:
+            return oai_settings.groq_model;
        default:
            throw new Error(`Unknown chat completion source: ${oai_settings.chat_completion_source}`);
    }
@ -1664,6 +1669,7 @@ async function sendOpenAIRequest(type, messages, signal) {
    const isCustom = oai_settings.chat_completion_source == chat_completion_sources.CUSTOM;
    const isCohere = oai_settings.chat_completion_source == chat_completion_sources.COHERE;
    const isPerplexity = oai_settings.chat_completion_source == chat_completion_sources.PERPLEXITY;
+    const isGroq = oai_settings.chat_completion_source == chat_completion_sources.GROQ;
    const isTextCompletion = (isOAI && textCompletionModels.includes(oai_settings.openai_model)) || (isOpenRouter && oai_settings.openrouter_force_instruct && power_user.instruct.enabled);
    const isQuiet = type === 'quiet';
    const isImpersonate = type === 'impersonate';
@ -1821,6 +1827,14 @@ async function sendOpenAIRequest(type, messages, signal) {
        delete generate_data['stop'];
    }

+    // https://console.groq.com/docs/openai
+    if (isGroq) {
+        delete generate_data.logprobs;
+        delete generate_data.logit_bias;
+        delete generate_data.top_logprobs;
+        delete generate_data.n;
+    }
+
    if ((isOAI || isOpenRouter || isMistral || isCustom || isCohere) && oai_settings.seed >= 0) {
        generate_data['seed'] = oai_settings.seed;
    }
@ -2688,6 +2702,7 @@ function loadOpenAISettings(data, settings) {
    oai_settings.mistralai_model = settings.mistralai_model ?? default_settings.mistralai_model;
    oai_settings.cohere_model = settings.cohere_model ?? default_settings.cohere_model;
    oai_settings.perplexity_model = settings.perplexity_model ?? default_settings.perplexity_model;
+    oai_settings.groq_model = settings.groq_model ?? default_settings.groq_model;
    oai_settings.custom_model = settings.custom_model ?? default_settings.custom_model;
    oai_settings.custom_url = settings.custom_url ?? default_settings.custom_url;
    oai_settings.custom_include_body = settings.custom_include_body ?? default_settings.custom_include_body;
@ -2755,6 +2770,8 @@ function loadOpenAISettings(data, settings) {
    $(`#model_cohere_select option[value="${oai_settings.cohere_model}"`).attr('selected', true);
    $('#model_perplexity_select').val(oai_settings.perplexity_model);
    $(`#model_perplexity_select option[value="${oai_settings.perplexity_model}"`).attr('selected', true);
+    $('#model_groq_select').val(oai_settings.groq_model);
+    $(`#model_groq_select option[value="${oai_settings.groq_model}"`).attr('selected', true);
    $('#custom_model_id').val(oai_settings.custom_model);
    $('#custom_api_url_text').val(oai_settings.custom_url);
    $('#openai_max_context').val(oai_settings.openai_max_context);
@ -2904,7 +2921,14 @@ async function getStatusOpen() {
        return resultCheckStatus();
    }

-    const noValidateSources = [chat_completion_sources.SCALE, chat_completion_sources.CLAUDE, chat_completion_sources.AI21, chat_completion_sources.MAKERSUITE, chat_completion_sources.PERPLEXITY];
+    const noValidateSources = [
+        chat_completion_sources.SCALE,
+        chat_completion_sources.CLAUDE,
+        chat_completion_sources.AI21,
+        chat_completion_sources.MAKERSUITE,
+        chat_completion_sources.PERPLEXITY,
+        chat_completion_sources.GROQ,
+    ];
    if (noValidateSources.includes(oai_settings.chat_completion_source)) {
        let status = 'Unable to verify key; press "Test Message" to validate.';
        setOnlineStatus(status);
@ -2996,6 +3020,7 @@ async function saveOpenAIPreset(name, settings, triggerUi = true) {
        mistralai_model: settings.mistralai_model,
        cohere_model: settings.cohere_model,
        perplexity_model: settings.perplexity_model,
+        groq_model: settings.groq_model,
        custom_model: settings.custom_model,
        custom_url: settings.custom_url,
        custom_include_body: settings.custom_include_body,
@ -3391,6 +3416,7 @@ function onSettingsPresetChange() {
        mistralai_model: ['#model_mistralai_select', 'mistralai_model', false],
        cohere_model: ['#model_cohere_select', 'cohere_model', false],
        perplexity_model: ['#model_perplexity_select', 'perplexity_model', false],
+        groq_model: ['#model_groq_select', 'groq_model', false],
        custom_model: ['#custom_model_id', 'custom_model', false],
        custom_url: ['#custom_api_url_text', 'custom_url', false],
        custom_include_body: ['#custom_include_body', 'custom_include_body', false],
@ -3619,6 +3645,11 @@ async function onModelChange() {
        oai_settings.perplexity_model = value;
    }

+    if ($(this).is('#model_groq_select')) {
+        console.log('Groq model changed to', value);
+        oai_settings.groq_model = value;
+    }
+
    if (value && $(this).is('#model_custom_select')) {
        console.log('Custom model changed to', value);
        oai_settings.custom_model = value;
@ -3772,6 +3803,12 @@ async function onModelChange() {
        if (oai_settings.max_context_unlocked) {
            $('#openai_max_context').attr('max', unlocked_max);
        }
+        else if (['llama-3-sonar-small-32k-chat', 'llama-3-sonar-large-32k-chat'].includes(oai_settings.perplexity_model)) {
+            $('#openai_max_context').attr('max', max_32k);
+        }
+        else if (['llama-3-sonar-small-32k-online', 'llama-3-sonar-large-32k-online'].includes(oai_settings.perplexity_model)) {
+            $('#openai_max_context').attr('max', 28000);
+        }
        else if (['sonar-small-chat', 'sonar-medium-chat', 'codellama-70b-instruct', 'mistral-7b-instruct', 'mixtral-8x7b-instruct', 'mixtral-8x22b-instruct'].includes(oai_settings.perplexity_model)) {
            $('#openai_max_context').attr('max', max_16k);
        }
@ -3790,6 +3827,25 @@ async function onModelChange() {
        $('#temp_openai').attr('max', oai_max_temp).val(oai_settings.temp_openai).trigger('input');
    }

+    if (oai_settings.chat_completion_source == chat_completion_sources.GROQ) {
+        if (oai_settings.max_context_unlocked) {
+            $('#openai_max_context').attr('max', unlocked_max);
+        }
+        else if (['llama3-8b-8192', 'llama3-70b-8192', 'gemma-7b-it'].includes(oai_settings.groq_model)) {
+            $('#openai_max_context').attr('max', max_8k);
+        }
+        else if (['mixtral-8x7b-32768'].includes(oai_settings.groq_model)) {
+            $('#openai_max_context').attr('max', max_32k);
+        }
+        else {
+            $('#openai_max_context').attr('max', max_4k);
+        }
+        oai_settings.openai_max_context = Math.min(Number($('#openai_max_context').attr('max')), oai_settings.openai_max_context);
+        $('#openai_max_context').val(oai_settings.openai_max_context).trigger('input');
+        oai_settings.temp_openai = Math.min(oai_max_temp, oai_settings.temp_openai);
+        $('#temp_openai').attr('max', oai_max_temp).val(oai_settings.temp_openai).trigger('input');
+    }
+
    if (oai_settings.chat_completion_source == chat_completion_sources.AI21) {
        if (oai_settings.max_context_unlocked) {
            $('#openai_max_context').attr('max', unlocked_max);
@ -4010,6 +4066,19 @@ async function onConnectButtonClick(e) {
        }
    }

+    if (oai_settings.chat_completion_source == chat_completion_sources.GROQ) {
+        const api_key_groq = String($('#api_key_groq').val()).trim();
+
+        if (api_key_groq.length) {
+            await writeSecret(SECRET_KEYS.GROQ, api_key_groq);
+        }
+
+        if (!secret_state[SECRET_KEYS.GROQ]) {
+            console.log('No secret key saved for Groq');
+            return;
+        }
+    }
+
    startStatusLoading();
    saveSettingsDebounced();
    await getStatusOpen();
@ -4051,6 +4120,9 @@ function toggleChatCompletionForms() {
    else if (oai_settings.chat_completion_source == chat_completion_sources.PERPLEXITY) {
        $('#model_perplexity_select').trigger('change');
    }
+    else if (oai_settings.chat_completion_source == chat_completion_sources.GROQ) {
+        $('#model_groq_select').trigger('change');
+    }
    else if (oai_settings.chat_completion_source == chat_completion_sources.CUSTOM) {
        $('#model_custom_select').trigger('change');
    }
@ -4721,6 +4793,7 @@ $(document).ready(async function () {
    $('#model_mistralai_select').on('change', onModelChange);
    $('#model_cohere_select').on('change', onModelChange);
    $('#model_perplexity_select').on('change', onModelChange);
+    $('#model_groq_select').on('change', onModelChange);
    $('#model_custom_select').on('change', onModelChange);
    $('#settings_preset_openai').on('change', onSettingsPresetChange);
    $('#new_oai_preset').on('click', onNewPresetClick);
--- a/public/scripts/scrapers.js
+++ b/public/scripts/scrapers.js
@ -238,6 +238,91 @@ class FileScraper {
    }
 }

+class MediaWikiScraper {
+    constructor() {
+        this.id = 'mediawiki';
+        this.name = 'MediaWiki';
+        this.description = 'Download a page from a MediaWiki wiki.';
+        this.iconClass = 'fa-brands fa-wikipedia-w';
+        this.iconAvailable = true;
+    }
+
+    async isAvailable() {
+        try {
+            const result = await fetch('/api/plugins/fandom/probe-mediawiki', {
+                method: 'POST',
+                headers: getRequestHeaders(),
+            });
+
+            return result.ok;
+        } catch (error) {
+            console.debug('Could not probe Fandom/MediaWiki plugin', error);
+            return false;
+        }
+    }
+
+    async scrape() {
+        let url = '';
+        let filter = '';
+        let output = 'single';
+
+        const template = $(await renderExtensionTemplateAsync('attachments', 'mediawiki-scrape', {}));
+        template.find('input[name="scrapeInput"]').on('input', function () {
+            url = String($(this).val()).trim();
+        });
+        template.find('input[name="scrapeFilter"]').on('input', function () {
+            filter = String($(this).val());
+        });
+        template.find('input[name="scrapeOutput"]').on('input', function () {
+            output = String($(this).val());
+        });
+
+        const confirm = await callGenericPopup(template, POPUP_TYPE.CONFIRM, '', { wide: false, large: false, okButton: 'Scrape', cancelButton: 'Cancel' });
+
+        if (confirm !== POPUP_RESULT.AFFIRMATIVE) {
+            return;
+        }
+
+        if (!url) {
+            toastr.error('URL name is required');
+            return;
+        }
+
+        const toast = toastr.info('Working, please wait...');
+
+        const result = await fetch('/api/plugins/fandom/scrape-mediawiki', {
+            method: 'POST',
+            headers: getRequestHeaders(),
+            body: JSON.stringify({ url, filter }),
+        });
+
+        if (!result.ok) {
+            const error = await result.text();
+            throw new Error(error);
+        }
+
+        const data = await result.json();
+        toastr.clear(toast);
+
+        if (output === 'multi') {
+            const files = [];
+            for (const attachment of data) {
+                const file = new File([String(attachment.content).trim()], `${String(attachment.title).trim()}.txt`, { type: 'text/plain' });
+                files.push(file);
+            }
+            return files;
+        }
+
+        if (output === 'single') {
+            const combinedContent = data.map((a) => String(a.title).trim() + '\n\n' + String(a.content).trim()).join('\n\n\n\n');
+            const file = new File([combinedContent], `${url}.txt`, { type: 'text/plain' });
+            return [file];
+        }
+
+        return [];
+    }
+}
+
 /**
 * Scrape data from a Fandom wiki.
 * @implements {Scraper}
@ -419,5 +504,6 @@ class YouTubeScraper {
 ScraperManager.registerDataBankScraper(new FileScraper());
 ScraperManager.registerDataBankScraper(new Notepad());
 ScraperManager.registerDataBankScraper(new WebScraper());
+ScraperManager.registerDataBankScraper(new MediaWikiScraper());
 ScraperManager.registerDataBankScraper(new FandomScraper());
 ScraperManager.registerDataBankScraper(new YouTubeScraper());
--- a/public/scripts/secrets.js
+++ b/public/scripts/secrets.js
@ -26,6 +26,7 @@ export const SECRET_KEYS = {
    LLAMACPP: 'api_key_llamacpp',
    COHERE: 'api_key_cohere',
    PERPLEXITY: 'api_key_perplexity',
+    GROQ: 'api_key_groq',
 };

 const INPUT_MAP = {
@ -53,6 +54,7 @@ const INPUT_MAP = {
    [SECRET_KEYS.LLAMACPP]: '#api_key_llamacpp',
    [SECRET_KEYS.COHERE]: '#api_key_cohere',
    [SECRET_KEYS.PERPLEXITY]: '#api_key_perplexity',
+    [SECRET_KEYS.GROQ]: '#api_key_groq',
 };

 async function clearSecret() {
--- a/public/scripts/slash-commands.js
+++ b/public/scripts/slash-commands.js
@ -43,7 +43,7 @@ import { getContext, saveMetadataDebounced } from './extensions.js';
 import { getRegexedString, regex_placement } from './extensions/regex/engine.js';
 import { findGroupMemberId, groups, is_group_generating, openGroupById, resetSelectedGroup, saveGroupChat, selected_group } from './group-chats.js';
 import { chat_completion_sources, oai_settings } from './openai.js';
-import { autoSelectPersona, retriggerFirstMessageOnEmptyChat } from './personas.js';
+import { autoSelectPersona, retriggerFirstMessageOnEmptyChat, user_avatar } from './personas.js';
 import { addEphemeralStoppingString, chat_styles, flushEphemeralStoppingStrings, power_user } from './power-user.js';
 import { textgen_types, textgenerationwebui_settings } from './textgen-settings.js';
 import { decodeTextTokens, getFriendlyTokenizerName, getTextTokens, getTokenCountAsync } from './tokenizers.js';
@ -1196,6 +1196,23 @@ async function triggerGenerationCallback(args, value) {

    return '';
 }
+/**
+ * Find persona by name.
+ * @param {string} name Name to search for
+ * @returns {string} Persona name
+ */
+function findPersonaByName(name) {
+    if (!name) {
+        return null;
+    }
+
+    for (const persona of Object.entries(power_user.personas)) {
+        if (persona[1].toLowerCase() === name.toLowerCase()) {
+            return persona[0];
+        }
+    }
+    return null;
+}

 async function sendUserMessageCallback(args, text) {
    if (!text) {
@ -1207,7 +1224,16 @@ async function sendUserMessageCallback(args, text) {
    const compact = isTrueBoolean(args?.compact);
    const bias = extractMessageBias(text);
    const insertAt = Number(resolveVariable(args?.at));
-    await sendMessageAsUser(text, bias, insertAt, compact);
+
+    if ('name' in args) {
+        const name = resolveVariable(args.name) || '';
+        const avatar = findPersonaByName(name) || user_avatar;
+        await sendMessageAsUser(text, bias, insertAt, compact, name, avatar);
+    }
+    else {
+        await sendMessageAsUser(text, bias, insertAt, compact);
+    }
+
    return '';
 }

@ -1678,6 +1704,7 @@ function modelCallback(_, model) {
        { id: 'model_custom_select', api: 'openai', type: chat_completion_sources.CUSTOM },
        { id: 'model_cohere_select', api: 'openai', type: chat_completion_sources.COHERE },
        { id: 'model_perplexity_select', api: 'openai', type: chat_completion_sources.PERPLEXITY },
+        { id: 'model_groq_select', api: 'openai', type: chat_completion_sources.GROQ },
        { id: 'model_novel_select', api: 'novel', type: null },
        { id: 'horde_model', api: 'koboldhorde', type: null },
    ];
--- a/public/scripts/tokenizers.js
+++ b/public/scripts/tokenizers.js
@ -536,6 +536,15 @@ export function getTokenizerModel() {
        }
    }

+    if (oai_settings.chat_completion_source === chat_completion_sources.GROQ) {
+        if (oai_settings.groq_model.includes('llama-3') || oai_settings.groq_model.includes('llama3')) {
+            return llama3Tokenizer;
+        }
+        if (oai_settings.groq_model.includes('mistral') || oai_settings.groq_model.includes('mixtral')) {
+            return mistralTokenizer;
+        }
+    }
+
    // Default to Turbo 3.5
    return turboTokenizer;
 }
--- a/src/constants.js
+++ b/src/constants.js
@ -192,6 +192,7 @@ const CHAT_COMPLETION_SOURCES = {
    CUSTOM: 'custom',
    COHERE: 'cohere',
    PERPLEXITY: 'perplexity',
+    GROQ: 'groq',
 };

 const UPLOADS_PATH = './uploads';
--- a/src/endpoints/backends/chat-completions.js
+++ b/src/endpoints/backends/chat-completions.js
@ -15,6 +15,7 @@ const API_CLAUDE = 'https://api.anthropic.com/v1';
 const API_MISTRAL = 'https://api.mistral.ai/v1';
 const API_COHERE = 'https://api.cohere.ai/v1';
 const API_PERPLEXITY = 'https://api.perplexity.ai';
+const API_GROQ = 'https://api.groq.com/openai/v1';

 /**
 * Applies a post-processing step to the generated messages.
@ -879,6 +880,11 @@ router.post('/generate', jsonParser, function (request, response) {
        headers = {};
        bodyParams = {};
        request.body.messages = postProcessPrompt(request.body.messages, 'claude', request.body.char_name, request.body.user_name);
+    } else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.GROQ) {
+        apiUrl = API_GROQ;
+        apiKey = readSecret(request.user.directories, SECRET_KEYS.GROQ);
+        headers = {};
+        bodyParams = {};
    } else {
        console.log('This chat completion source is not supported yet.');
        return response.status(400).send({ error: true });
--- a/src/endpoints/secrets.js
+++ b/src/endpoints/secrets.js
@ -38,6 +38,7 @@ const SECRET_KEYS = {
    LLAMACPP: 'api_key_llamacpp',
    COHERE: 'api_key_cohere',
    PERPLEXITY: 'api_key_perplexity',
+    GROQ: 'api_key_groq',
 };

 // These are the keys that are safe to expose, even if allowKeysExposure is false
Author	SHA1	Message	Date
kalomaze	de05380a7b	Merge `182ebed1c1` into `afc3071576`	2024-05-05 22:19:31 +00:00
Cohee	afc3071576	Add name argument for /send. Tech debt: move to new STscript branch	2024-05-06 01:18:59 +03:00
Cohee	10727d9a02	Add plugins update script	2024-05-06 00:49:00 +03:00
Cohee	55d31a976f	Add generic mediawiki downloader	2024-05-05 22:26:13 +03:00
Cohee	181b5aff97	Add Groq as chat completion source	2024-05-05 18:53:12 +03:00
Cohee	31f1b34911	Add Perplexity L3-sonar models	2024-05-05 18:21:58 +03:00
kalomaze	182ebed1c1	Merge branch 'SillyTavern:release' into enable-lcpp-smooth	2024-04-09 19:31:46 -05:00
kalomaze	29fce4b419	Enable smooth sampling for llamacpp server	2024-04-02 22:34:02 -05:00