Remove Window AI from CC sources (#4294)

7429726eb105466f75eadf2c21d01ef80a95b271

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

Signed

Parents: 6217ea988879e53e19cc487802ad79a38dd7601d

default/content/presets/openai/Default.json+0 -1 Viewed

     "chat_completion_source": "openai",
     "openai_model": "gpt-4-turbo",
     "claude_model": "claude-3-5-sonnet-20240620",
-    "windowai_model": "",
     "openrouter_model": "OR_Website",
     "openrouter_use_fallback": false,
     "openrouter_group_models": false,

default/content/settings.json+0 -1 Viewed

         "openai_model": "gpt-4-turbo",
         "claude_model": "claude-3-5-sonnet-20240620",
         "ai21_model": "jamba-large",
-        "windowai_model": "",
         "openrouter_model": "OR_Website",
         "reverse_proxy": "",
         "chat_completion_source": "openai",

public/index.html+1 -22 Viewed

                                         </span>
                                     </div>
                                 </div>
-                                <div class="range-block" data-source="openai,claude,windowai,aimlapi,openrouter,ai21,scale,makersuite,vertexai,mistralai,custom,cohere,perplexity,groq,01ai,nanogpt,deepseek,xai,pollinations">
+                                <div class="range-block" data-source="openai,claude,aimlapi,openrouter,ai21,scale,makersuite,vertexai,mistralai,custom,cohere,perplexity,groq,01ai,nanogpt,deepseek,xai,pollinations">
                                     <div class="range-block-title" data-i18n="Temperature">
                                         Temperature
                                     </div>

                                 <option value="perplexity">Perplexity</option>
                                 <option value="pollinations">Pollinations</option>
                                 <option value="scale">Scale</option>
-                                <option value="windowai">Window AI</option>
                                 <option value="xai">xAI (Grok)</option>
                             </optgroup>
                         </select>

                                 </select>
                             </div>
                         </form>
-                        <form id="windowai_form" data-source="windowai" action="javascript:void(null);" method="post" enctype="multipart/form-data">
-                            <div>
-                                <h4 data-i18n="Window AI Model">Window AI Model</h4>
-                                <select id="model_windowai_select">
-                                    <option data-i18n="Use extension settings" value="">Use extension settings</option>
-                                    <option value="openai/gpt-3.5-turbo">openai/gpt-3.5-turbo</option>
-                                    <option value="openai/gpt-3.5-turbo-16k">openai/gpt-3.5-turbo-16k</option>
-                                    <option value="openai/gpt-4">openai/gpt-4</option>
-                                    <option value="openai/gpt-4-32k">openai/gpt-4-32k</option>
-                                    <option value="anthropic/claude-instant-v1">anthropic/claude-instant-v1</option>
-                                    <option value="anthropic/claude-instant-v1-100k">anthropic/claude-instant-v1-100k</option>
-                                    <option value="anthropic/claude-v1">anthropic/claude-v1</option>
-                                    <option value="anthropic/claude-v1-100k">anthropic/claude-v1-100k</option>
-                                    <option value="google/palm-2-chat-bison">google/palm-2-chat-bison</option>
-                                    <option value="google/palm-2-codechat-bison">google/palm-2-codechat-bison</option>
-                                    <option value="togethercomputer/GPT-NeoXT-Chat-Base-20B">togethercomputer/GPT-NeoXT-Chat-Base-20B</option>
-                                    <option value="cohere/command-nightly">cohere/command-nightly</option>
-                                </select>
-                            </div>
-                        </form>
                         <form id="openrouter_form" data-source="openrouter" action="javascript:void(null);" method="post" enctype="multipart/form-data">
                             <h4 data-i18n="OpenRouter API Key">OpenRouter API Key</h4>
                             <div>

public/locales/ru-ru.json+0 -2 Viewed

     "dot quota_error": "имеется достаточно кредитов.",
     "If you have sufficient credits, please try again later.": "Если кредитов достаточно, то повторите попытку позднее.",
     "Proxy preset '${0}' not found": "Пресет '${0}' не найден",
-    "Window.ai returned an error": "Window.ai ответил ошибкой",
-    "Extension is not installed": "Расширение не установлено",
     "Update or remove your reverse proxy settings.": "Измените или удалите ваши настройки прокси.",
     "An error occurred while importing prompts. More info available in console.": "В процессе импорта произошла ошибка. Подробную информацию см. в консоли.",
     "Could not import prompts. Export failed validation.": "Не удалось импортировать промпты. Не пройдена валидация при экспорте.",

public/script.js+0 -4 Viewed

     main_api = selectedVal;
     setOnlineStatus('no_connection');
-    if (main_api == 'openai' && oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {
-        $('#api_button_openai').trigger('click');
-    }
     if (main_api == 'koboldhorde') {
         getStatusHorde();
         getHordeModels(true);

public/scripts/RossAscends-mods.js+0 -1 Viewed

                 if (((secret_state[SECRET_KEYS.OPENAI] || oai_settings.reverse_proxy) && oai_settings.chat_completion_source == chat_completion_sources.OPENAI)
                     || ((secret_state[SECRET_KEYS.CLAUDE] || oai_settings.reverse_proxy) && oai_settings.chat_completion_source == chat_completion_sources.CLAUDE)
                     || ((secret_state[SECRET_KEYS.SCALE] || secret_state[SECRET_KEYS.SCALE_COOKIE]) && oai_settings.chat_completion_source == chat_completion_sources.SCALE)
-                    || (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI)
                     || (secret_state[SECRET_KEYS.OPENROUTER] && oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER)
                     || (secret_state[SECRET_KEYS.AI21] && oai_settings.chat_completion_source == chat_completion_sources.AI21)
                     || (secret_state[SECRET_KEYS.MAKERSUITE] && oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE)

public/scripts/openai.js+0 -237 Viewed

 export const chat_completion_sources = {
     OPENAI: 'openai',
-    WINDOWAI: 'windowai',
     CLAUDE: 'claude',
     SCALE: 'scale',
     OPENROUTER: 'openrouter',

     max_context_unlocked: ['#oai_max_context_unlocked', 'max_context_unlocked', true, false],
     openai_model: ['#model_openai_select', 'openai_model', false, true],
     claude_model: ['#model_claude_select', 'claude_model', false, true],
-    windowai_model: ['#model_windowai_select', 'windowai_model', false, true],
     openrouter_model: ['#model_openrouter_select', 'openrouter_model', false, true],
     openrouter_use_fallback: ['#openrouter_use_fallback', 'openrouter_use_fallback', true, true],
     openrouter_group_models: ['#openrouter_group_models', 'openrouter_group_models', false, true],

     custom_include_body: '',
     custom_exclude_body: '',
     custom_include_headers: '',
-    windowai_model: '',
     openrouter_model: openrouter_website_model,
     openrouter_use_fallback: false,
     openrouter_group_models: false,

     custom_include_body: '',
     custom_exclude_body: '',
     custom_include_headers: '',
-    windowai_model: '',
     openrouter_model: openrouter_website_model,
     openrouter_use_fallback: false,
     openrouter_group_models: false,

+    }
+}
-async function sendWindowAIRequest(messages, signal, stream) {
-    if (!('ai' in window)) {
-        return showWindowExtensionError();
-    }
-    let content = '';
-    let lastContent = '';
-    let finished = false;
-    const currentModel = await window.ai.getCurrentModel();
-    let temperature = Number(oai_settings.temp_openai);
-    if ((currentModel.includes('claude') || currentModel.includes('palm-2')) && temperature > claude_max_temp) {
-        console.warn(`Claude and PaLM models only supports temperature up to ${claude_max_temp}. Clamping ${temperature} to ${claude_max_temp}.`);
-        temperature = claude_max_temp;
-    }
-    async function* windowStreamingFunction() {
-        while (true) {
-            if (signal.aborted) {
-                return;
-            }
-            // unhang UI thread
-            await delay(1);
-            if (lastContent !== content) {
-                yield { text: content, swipes: [] };
-            }
-            lastContent = content;
-            if (finished) {
-                return;
-            }
-        }
-    }
-    const onStreamResult = (res, err) => {
-        if (err) return;
-        const thisContent = res?.message?.content;
-        if (res?.isPartial) {
-            content += thisContent;
-        }
-        else {
-            content = thisContent;
-        }
-    };
-    const generatePromise = window.ai.generateText(
-        {
-            messages: messages,
-        },
-        {
-            temperature: temperature,
-            maxTokens: oai_settings.openai_max_tokens,
-            model: oai_settings.windowai_model || null,
-            onStreamResult: onStreamResult,
-        },
-    );
-    const handleGeneratePromise = (resolve, reject) => {
-        generatePromise
-            .then((res) => {
-                content = res[0]?.message?.content;
-                finished = true;
-                resolve && resolve(content);
-            })
-            .catch((err) => {
-                finished = true;
-                reject && reject(err);
-                handleWindowError(err);
-            });
-    };
-    if (stream) {
-        handleGeneratePromise();
-        return windowStreamingFunction;
-    } else {
-        return new Promise((resolve, reject) => {
-            signal.addEventListener('abort', (reason) => {
-                reject(reason);
-            });
-            handleGeneratePromise(resolve, reject);
-        });
-    }
-}
 /**
  * Gets the API model for the selected chat completion source.
  * @param {string} source If it's set, ignores active source

             return oai_settings.claude_model;
         case chat_completion_sources.OPENAI:
             return oai_settings.openai_model;
-        case chat_completion_sources.WINDOWAI:
-            return oai_settings.windowai_model;
         case chat_completion_sources.SCALE:
             return '';
         case chat_completion_sources.MAKERSUITE:

     const useLogprobs = !!power_user.request_token_probabilities;
     const canMultiSwipe = oai_settings.n > 1 && !isContinue && !isImpersonate && !isQuiet && (isOAI || isCustom || isXAI || isAimlapi);
-    // If we're using the window.ai extension, use that instead
-    // Doesn't support logit bias yet
-    if (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {
-        return sendWindowAIRequest(messages, signal, stream);
-    }
     const logitBiasSources = [chat_completion_sources.OPENAI, chat_completion_sources.OPENROUTER, chat_completion_sources.SCALE, chat_completion_sources.CUSTOM];
     if (oai_settings.bias_preset_selected
         && logitBiasSources.includes(oai_settings.chat_completion_source)

     });
+}
-function handleWindowError(err) {
-    const text = parseWindowError(err);
-    toastr.error(text, t`Window.ai returned an error`);
-    throw err;
-}
-function parseWindowError(err) {
-    let text = 'Unknown error';
-    switch (err) {
-        case 'NOT_AUTHENTICATED':
-            text = 'Incorrect API key / auth';
-            break;
-        case 'MODEL_REJECTED_REQUEST':
-            text = 'AI model refused to fulfill a request';
-            break;
-        case 'PERMISSION_DENIED':
-            text = 'User denied permission to the app';
-            break;
-        case 'REQUEST_NOT_FOUND':
-            text = 'Permission request popup timed out';
-            break;
-        case 'INVALID_REQUEST':
-            text = 'Malformed request';
-            break;
-    }
-    return text;
-}
 async function calculateLogitBias() {
     const body = JSON.stringify(oai_settings.bias_presets[oai_settings.bias_preset_selected]);
     let result = {};

     oai_settings.personality_format = settings.personality_format ?? default_settings.personality_format;
     oai_settings.group_nudge_prompt = settings.group_nudge_prompt ?? default_settings.group_nudge_prompt;
     oai_settings.claude_model = settings.claude_model ?? default_settings.claude_model;
-    oai_settings.windowai_model = settings.windowai_model ?? default_settings.windowai_model;
     oai_settings.openrouter_model = settings.openrouter_model ?? default_settings.openrouter_model;
     oai_settings.openrouter_group_models = settings.openrouter_group_models ?? default_settings.openrouter_group_models;
     oai_settings.openrouter_sort_models = settings.openrouter_sort_models ?? default_settings.openrouter_sort_models;

     $(`#model_openai_select option[value="${oai_settings.openai_model}"`).prop('selected', true);
     $('#model_claude_select').val(oai_settings.claude_model);
     $(`#model_claude_select option[value="${oai_settings.claude_model}"`).prop('selected', true);
-    $('#model_windowai_select').val(oai_settings.windowai_model);
-    $(`#model_windowai_select option[value="${oai_settings.windowai_model}"`).prop('selected', true);
     $('#model_google_select').val(oai_settings.google_model);
     $(`#model_google_select option[value="${oai_settings.google_model}"`).prop('selected', true);
     $('#model_vertexai_select').val(oai_settings.vertexai_model);

+}
 async function getStatusOpen() {
-    if (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {
-        let status;
-        if ('ai' in window) {
-            status = t`Valid`;
-        }
-        else {
-            showWindowExtensionError();
-            status = 'no_connection';
-        }
-        setOnlineStatus(status);
-        return resultCheckStatus();
-    }
     const noValidateSources = [
         chat_completion_sources.SCALE,
         chat_completion_sources.CLAUDE,

     return resultCheckStatus();
+}
-function showWindowExtensionError() {
-    toastr.error(t`Get it here:` + ' <a href="https://windowai.io/" target="_blank">windowai.io</a>', t`Extension is not installed`, {
-        escapeHtml: false,
-        timeOut: 0,
-        extendedTimeOut: 0,
-        preventDuplicates: true,
-    });
-}
 /**
  * Persist a settings preset with the given name
+ *

         chat_completion_source: settings.chat_completion_source,
         openai_model: settings.openai_model,
         claude_model: settings.claude_model,
-        windowai_model: settings.windowai_model,
         openrouter_model: settings.openrouter_model,
         openrouter_use_fallback: settings.openrouter_use_fallback,
         openrouter_group_models: settings.openrouter_group_models,

+    }
+}
-function getMaxContextWindowAI(value) {
-    if (oai_settings.max_context_unlocked) {
-        return unlocked_max;
-    }
-    else if (value.endsWith('100k')) {
-        return claude_100k_max;
-    }
-    else if (value.includes('claude')) {
-        return claude_max;
-    }
-    else if (value.includes('gpt-3.5-turbo-1106')) {
-        return max_16k;
-    }
-    else if (value.includes('gpt-3.5-turbo-16k')) {
-        return max_16k;
-    }
-    else if (value.includes('gpt-3.5')) {
-        return max_4k;
-    }
-    else if (value.includes('gpt-4-1106')) {
-        return max_128k;
-    }
-    else if (value.includes('gpt-4-vision')) {
-        return max_128k;
-    }
-    else if (value.includes('gpt-4-32k')) {
-        return max_32k;
-    }
-    else if (value.includes('gpt-4')) {
-        return max_8k;
-    }
-    else if (value.includes('palm-2')) {
-        return max_8k;
-    }
-    else if (value.includes('GPT-NeoXT')) {
-        return max_2k;
-    }
-    else {
-        // default to gpt-3 (4095 tokens)
-        return max_4k;
-    }
-}
 /**
  * Get the maximum context size for the Mistral model
  * @param {string} model Model identifier

+    }
-    if ($(this).is('#model_windowai_select')) {
-        console.log('WindowAI model changed to', value);
-        oai_settings.windowai_model = value;
-    }
     if ($(this).is('#model_openai_select')) {
         console.log('OpenAI model changed to', value);
         oai_settings.openai_model = value;

         $('#temp_openai').attr('max', claude_max_temp).val(oai_settings.temp_openai).trigger('input');
+    }
-    if (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {
-        if (value == '' && 'ai' in window) {
-            value = (await window.ai.getCurrentModel()) || '';
-        }
-        $('#openai_max_context').attr('max', getMaxContextWindowAI(value));
-        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');
-        if (value.includes('claude') || value.includes('palm-2')) {
-            oai_settings.temp_openai = Math.min(claude_max_temp, oai_settings.temp_openai);
-            $('#temp_openai').attr('max', claude_max_temp).val(oai_settings.temp_openai).trigger('input');
-        }
-        else {
-            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.OPENAI) {
         $('#openai_max_context').attr('max', getMaxContextOpenAI(value));
         oai_settings.openai_max_context = Math.min(oai_settings.openai_max_context, Number($('#openai_max_context').attr('max')));

 async function onConnectButtonClick(e) {
     e.stopPropagation();
-    if (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {
-        return await getStatusOpen();
-    }
     if (oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER) {
         const api_key_openrouter = String($('#api_key_openrouter').val()).trim();

@@ -5483,9 +5250,6 @@ function toggleChatCompletionForms() {
5483	$('#model_openai_select').trigger('change');	5250	$('#model_openai_select').trigger('change');
5484	}	5251	}
5485	}	5252	}
5486	else if (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI) {
5487	$('#model_windowai_select').trigger('change');
5488	}
5489	else if (oai_settings.chat_completion_source == chat_completion_sources.SCALE) {	5253	else if (oai_settings.chat_completion_source == chat_completion_sources.SCALE) {
5490	$('#model_scale_select').trigger('change');	5254	$('#model_scale_select').trigger('change');
5491	}	5255	}

     $('#openai_reverse_proxy').on('input', onReverseProxyInput);
     $('#model_openai_select').on('change', onModelChange);
     $('#model_claude_select').on('change', onModelChange);
-    $('#model_windowai_select').on('change', onModelChange);
     $('#model_scale_select').on('change', onModelChange);
     $('#model_google_select').on('change', onModelChange);
     $('#model_vertexai_select').on('change', onModelChange);

public/scripts/slash-commands.js+0 -1 Viewed

         { id: 'featherless_model', api: 'textgenerationwebui', type: textgen_types.FEATHERLESS },
         { id: 'model_openai_select', api: 'openai', type: chat_completion_sources.OPENAI },
         { id: 'model_claude_select', api: 'openai', type: chat_completion_sources.CLAUDE },
-        { id: 'model_windowai_select', api: 'openai', type: chat_completion_sources.WINDOWAI },
         { id: 'model_openrouter_select', api: 'openai', type: chat_completion_sources.OPENROUTER },
         { id: 'model_ai21_select', api: 'openai', type: chat_completion_sources.AI21 },
         { id: 'model_google_select', api: 'openai', type: chat_completion_sources.MAKERSUITE },

public/scripts/tokenizers.js+0 -16 Viewed

         return deepseekTokenizer;
+    }
-    // Select correct tokenizer for WindowAI proxies
-    if (oai_settings.chat_completion_source == chat_completion_sources.WINDOWAI && oai_settings.windowai_model) {
-        if (oai_settings.windowai_model.includes('gpt-4')) {
-            return gpt4Tokenizer;
-        }
-        else if (oai_settings.windowai_model.includes('gpt-3.5-turbo')) {
-            return turboTokenizer;
-        }
-        else if (oai_settings.windowai_model.includes('claude')) {
-            return claudeTokenizer;
-        }
-        else if (oai_settings.windowai_model.includes('GPT-NeoXT')) {
-            return gpt2Tokenizer;
-        }
-    }
     // And for OpenRouter (if not a site model, then it's impossible to determine the tokenizer)
     if (main_api == 'openai' && oai_settings.chat_completion_source == chat_completion_sources.OPENROUTER && oai_settings.openrouter_model ||
         main_api == 'textgenerationwebui' && textgen_settings.type === textgen_types.OPENROUTER && textgen_settings.openrouter_model) {

src/constants.js+0 -1 Viewed

 export const CHAT_COMPLETION_SOURCES = {
     OPENAI: 'openai',
-    WINDOWAI: 'windowai',
     CLAUDE: 'claude',
     SCALE: 'scale',
     OPENROUTER: 'openrouter',