Merge branch 'release' into staging

ce2fd8800dfdeae64d6488f09786de82597605d6

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

.github/readme.md+1 -1 Viewed

 ##### Additional Settings
-* `SILLYTAVERN_VERSION` - On the right-hand side of this GitHub page, you'll see "Packages". Select the "sillytavern" package and you'll see the image versions. The image tag "latest" will keep you up-to-date with the current release. You can also utilize "staging" that points to the nightly image the respective branch.
+* `SILLYTAVERN_VERSION` - On the right-hand side of this GitHub page, you'll see "Packages". Select the "sillytavern" package and you'll see the image versions. The image tag "latest" will keep you up-to-date with the current release. You can also utilize "staging" that points to the nightly image of the respective branch.
 #### Running the container

public/scripts/textgen-models.js+8 -8 Viewed

@@ -130,11 +130,11 @@ export async function loadTogetherAIModels(data) {
130	return;	130	return;
131	}	131	}
132		132
133	data.sort((a, b) => a.name.localeCompare(b.name));	133	data.sort((a, b) => a.id.localeCompare(b.id));
134	togetherModels = data;	134	togetherModels = data;
135		135
136	if (!data.find(x => x.name === textgen_settings.togetherai_model)) {	136	if (!data.find(x => x.id === textgen_settings.togetherai_model)) {
137	textgen_settings.togetherai_model = data[0]?.name \|\| '';	137	textgen_settings.togetherai_model = data[0]?.id \|\| '';
138	}	138	}
139		139
140	$('#model_togetherai_select').empty();	140	$('#model_togetherai_select').empty();

@@ -145,9 +145,9 @@ export async function loadTogetherAIModels(data) {
145	}	145	}
146		146
147	const option = document.createElement('option');	147	const option = document.createElement('option');
148	option.value = model.name;	148	option.value = model.id;
149	option.text = model.display_name;	149	option.text = model.display_name;
150	option.selected = model.name === textgen_settings.togetherai_model;	150	option.selected = model.id === textgen_settings.togetherai_model;
151	$('#model_togetherai_select').append(option);	151	$('#model_togetherai_select').append(option);
152	}	152	}
153	}	153	}

     const modelName = String($('#model_togetherai_select').val());
     textgen_settings.togetherai_model = modelName;
     $('#api_button_textgenerationwebui').trigger('click');
-    const model = togetherModels.find(x => x.name === modelName);
+    const model = togetherModels.find(x => x.id === modelName);
     setGenerationParamsFromPreset({ max_length: model.context_length });
+}

+}
 function getTogetherModelTemplate(option) {
-    const model = togetherModels.find(x => x.name === option?.element?.value);
+    const model = togetherModels.find(x => x.id === option?.element?.value);
     if (!option.id || !model) {
         return option.text;

     return $((`
         <div class="flex-container flexFlowColumn">
-            <div><strong>${DOMPurify.sanitize(model.name)}</strong> | <span>${model.context_length || '???'} tokens</span></div>
+            <div><strong>${DOMPurify.sanitize(model.id)}</strong> | <span>${model.context_length || '???'} tokens</span></div>
             <div><small>${DOMPurify.sanitize(model.description)}</small></div>
         </div>
     `));