Adjust scoped variable naming, format comments

fbb6180bc1b4fa15afc8cd1bfa064851bbe49bff

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

Parents: 1b2976ae1d6eace7785057e00eaa2db8a22b5374

public/scripts/chat-templates.js+22 -21 Viewed

+import { t } from './i18n.js';
 // the hash can be obtained from command line e.g. via: MODEL=path_to_model; python -c "import json, hashlib, sys; print(hashlib.sha256(json.load(open('"$MODEL"/tokenizer_config.json'))['chat_template'].encode()).hexdigest())"
 // note that chat templates must be trimmed to match the llama.cpp metadata value
 const hash_derivations = {

         return false;
+    }
-    const chat_template_hash = power_user.chat_template_hash;
+    const chatTemplateHash = power_user.chat_template_hash;
+    const bindModelTemplates = power_user.model_templates_mappings[online_status]
-    const bind_model_templates = power_user.model_templates_mappings[online_status]
+        ?? power_user.model_templates_mappings[chatTemplateHash]
-        ?? power_user.model_templates_mappings[chat_template_hash]
         ?? {};
-    const bindings_match = bind_model_templates && power_user.context.preset == bind_model_templates['context'] && (!power_user.instruct.enabled || power_user.instruct.preset === bind_model_templates['instruct']);
+    const bindingsMatch = bindModelTemplates
+        && power_user.context.preset == bindModelTemplates['context']
+        && (!power_user.instruct.enabled || power_user.instruct.preset === bindModelTemplates['instruct']);
     const bound = [];
-    if (bindings_match) {
+    if (bindingsMatch) {
         // unmap current preset
-        delete power_user.model_templates_mappings[chat_template_hash];
+        delete power_user.model_templates_mappings[chatTemplateHash];
         delete power_user.model_templates_mappings[online_status];
-        toastr.info(`Context preset for ${online_status} will use defaults when loaded the next time.`);
+        toastr.info(t`Context preset for ${online_status} will use defaults when loaded the next time.`);
     } else {
         if (power_user.context_derived) {
-            if (power_user.context.preset !== bind_model_templates['context']) {
+            if (power_user.context.preset !== bindModelTemplates['context']) {
                 bound.push(`${power_user.context.preset} context preset`);
                 // toastr.info(`Bound ${power_user.context.preset} preset to currently loaded model and all models that share its chat template.`);
                 // map current preset to current chat template hash
-                bind_model_templates['context'] = power_user.context.preset;
+                bindModelTemplates['context'] = power_user.context.preset;
+            }
         } else {
-            toastr.warning('Note: Context derivation is disabled. Not including context preset.');
+            toastr.warning(t`Note: Context derivation is disabled. Not including context preset.`);
+        }
         if (power_user.instruct.enabled) {
             if (power_user.instruct_derived) {
-                if (power_user.instruct.preset !== bind_model_templates['instruct']) {
+                if (power_user.instruct.preset !== bindModelTemplates['instruct']) {
                     bound.push(`${power_user.instruct.preset} instruct preset`);
+                    bindModelTemplates['instruct'] = power_user.instruct.preset;
-                    bind_model_templates['instruct'] = power_user.instruct.preset;
+                }
             } else {
-                toastr.warning('Note: Instruct derivation is disabled. Not including instruct preset.');
+                toastr.warning(t`Note: Instruct derivation is disabled. Not including instruct preset.`);
+            }
+        }
         if (bound.length == 0) {
-            toastr.warning('No applicable presets available.');
+            toastr.warning(t`No applicable presets available.`);
             return false;
+        }
-        toastr.info(`Bound ${online_status} to ${bound.join(', ')}.`);
+        toastr.info(t`Bound ${online_status} to ${bound.join(', ')}.`);
         if (!online_status.startsWith('koboldcpp/ggml-model-')) {
-            power_user.model_templates_mappings[online_status] = bind_model_templates;
+            power_user.model_templates_mappings[online_status] = bindModelTemplates;
+        }
-        if (chat_template_hash !== '') {
+        if (chatTemplateHash !== '') {
-            power_user.model_templates_mappings[chat_template_hash] = bind_model_templates;
+            power_user.model_templates_mappings[chatTemplateHash] = bindModelTemplates;
+        }
+    }

public/scripts/instruct-mode.js+10 -9 Viewed

  * Updates the bind model template state based on the current model, instruct and context preset.
  */
 export function updateBindModelTemplatesState() {
-    const bind_model_templates = power_user.model_templates_mappings[online_status] ?? power_user.model_templates_mappings[power_user.chat_template_hash];
+    const bindModelTemplates = power_user.model_templates_mappings[online_status] ?? power_user.model_templates_mappings[power_user.chat_template_hash];
-    const bindings_match = (bind_model_templates && power_user.context.preset === bind_model_templates['context'] && (!power_user.instruct.enabled || power_user.instruct.preset === bind_model_templates['instruct'])) ?? false;
+    const bindingsMatch = (bindModelTemplates && power_user.context.preset === bindModelTemplates['context'] && (!power_user.instruct.enabled || power_user.instruct.preset === bindModelTemplates['instruct'])) ?? false;
-    const current = $('#bind_model_templates').prop('checked');
+    const currentState = $('#bind_model_templates').prop('checked');
-    if (bindings_match === current) {
+    if (bindingsMatch === currentState) {
-        return; // No change needed
+        // No change needed
+        return;
+    }
-    $('#bind_model_templates').prop('checked', bindings_match);
+    $('#bind_model_templates').prop('checked', bindingsMatch);
+}
 /**

  * @returns {boolean} True if instruct preset was activated by model id, false otherwise.
  */
 export function autoSelectInstructPreset(modelId) {
-    const model_templates_map = power_user.model_templates_mappings[modelId];
+    const modelTemplatesMap = power_user.model_templates_mappings[modelId];
-    if (model_templates_map) {
+    if (modelTemplatesMap) {
-        const { instruct, context } = model_templates_map;
+        const { instruct, context } = modelTemplatesMap;
         if (instruct) {
             selectInstructPreset(instruct, { isAuto: true });
+        }

public/scripts/power-user.js+5 -3 Viewed

         names_as_stop_strings: true,
     },
-    chat_template_hash: '', /** the chat template hash of the currently loaded model, if any; used when deriving mappings */
     instruct_derived: false,
     context_derived: false,
     context_size_derived: false,
-    model_templates_mappings: {}, /** user defined model identifier / chat template hash to instruct/context template mappings */
+    /** User-defined model identifier / chat template hash to instruct/context template mappings */
+    model_templates_mappings: {},
+    /** The chat template hash of the currently loaded model, if any; used when deriving mappings */
+    chat_template_hash: '',
     sysprompt: {
         enabled: true,

         delete power_user.instruct.derived;
+    }
+    // Reset the saved chat template hash
     power_user.chat_template_hash = '';
     $('#single_line').prop('checked', power_user.single_line);