Move Horde status check to respective module

8449b4bb276e1f396df2b068cfadd5b84b7aee4f

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

public/script.js+2 -22 Viewed

     horde_settings,
     loadHordeSettings,
     generateHorde,
     checkHordeStatusgetStatusHorde,
     getHordeModels,
     adjustHordeGenerationParams,
 +    isHordeGenerationNotAllowed,
     MIN_LENGTH,
     initHorde,
 } from './scripts/horde.js';

     if (active_group) active_character = null;
+}
 -async function getStatusHorde() {
 -    try {
 -        const hordeStatus = await checkHordeStatus();
 -        setOnlineStatus(hordeStatus ? t`Connected` : 'no_connection');
 -    }
 -    catch {
 -        setOnlineStatus('no_connection');
 -    }
+-
 -    return resultCheckStatus();
 -}
+-
 export function startStatusLoading() {
     $('.api_loading').show();
     $('.api_button').addClass('disabled');

+    }
+}
 -function isHordeGenerationNotAllowed() {
 -    if (main_api == 'koboldhorde' && kai_settings.preset_settings == 'gui') {
 -        toastr.error(t`GUI Settings preset is not supported for Horde. Please select another preset.`);
 -        return true;
 -    }
+-
 -    return false;
 -}
+-
 export function cancelTtsPlay() {
     if ('speechSynthesis' in window) {
         speechSynthesis.cancel();

public/scripts/horde.js+31 -12 Viewed

 import {
     amount_gen,
     getRequestHeaders,
 +    main_api,
     max_context,
 +    resultCheckStatus,
     saveSettingsDebounced,
     setGenerationProgress,
 +    setOnlineStatus,
 } from '../script.js';
 import { SECRET_KEYS, writeSecret } from './secrets.js';
 import { delay } from './utils.js';

 import { autoSelectInstructPreset } from './instruct-mode.js';
 import { t } from './i18n.js';
 import { callGenericPopup, POPUP_TYPE } from './popup.js';
 +import { kai_settings } from './kai-settings.js';
 export {
 -    horde_settings,
 -    generateHorde,
 -    checkHordeStatus,
 -    loadHordeSettings,
 -    adjustHordeGenerationParams,
 -    getHordeModels,
     MIN_LENGTH,
 };
 let models = [];
 export let horde_settings = {
     models: [],
     auto_adjust_response_length: true,
     auto_adjust_context_length: false,

  * Checks if Horde is online.
  * @returns {Promise<boolean>} True if Horde is online, false otherwise
  */
 export async function checkHordeStatus() {
     try {
         const response = await fetch('/api/horde/status', {
             method: 'POST',

+    }
+}
 +export async function getStatusHorde() {
 +    try {
 +        const hordeStatus = await checkHordeStatus();
 +        setOnlineStatus(hordeStatus ? t`Connected` : 'no_connection');
 +    }
 +    catch {
 +        setOnlineStatus('no_connection');
 +    }
++
 +    return resultCheckStatus();
 +}
++
 function validateHordeModel() {
     let selectedModels = models.filter(m => horde_settings.models.includes(m.name));

     return selectedModels;
+}
 export async function adjustHordeGenerationParams(max_context_length, max_length) {
     console.log(max_context_length, max_length);
     const workers = await getWorkers(false);
     let maxContextLength = max_context_length;

  * @returns {Promise<{text: *, workerName: string}>}
  * @throws {Error}
  */
 export async function generateHorde(prompt, params, signal, reportProgress) {
     validateHordeModel();
     delete params.prompt;

  * Displays the available models in the Horde model selection dropdown.
  * @param {boolean} force Force refresh of the models
  */
 export async function getHordeModels(force) {
     const sortByPerformance = (a, b) => b.performance - a.performance;
     const sortByWhitelisted = (a, b) => b.is_whitelisted - a.is_whitelisted;
     const sortByPopular = (a, b) => b.tags?.includes('popular') - a.tags?.includes('popular');

@@ -305,7 +315,7 @@ async function getHordeModels(force) {
305	315	setContextSizePreview();
306	316	}
307	317
308	318	export function loadHordeSettings(settings) {
309	319	if (settings.horde_settings) {
310	320	Object.assign(horde_settings, settings.horde_settings);
311	321	}

     return `ETA: ${model.eta}s, Speed: ${model.performance}, Queue: ${model.queued}, Workers: ${model.count}`;
+}
 +export function isHordeGenerationNotAllowed() {
 +    if (main_api == 'koboldhorde' && kai_settings.preset_settings == 'gui') {
 +        toastr.error(t`GUI Settings preset is not supported for Horde. Please select another preset.`);
 +        return true;
 +    }
++
 +    return false;
 +}
++
 function getHordeModelTemplate(option) {
     const model = models.find(x => x.name === option?.element?.value);