Merge pull request #4162 from kingbri1/staging More expression fixes for main API

cb8fd4f66390344eda01cee7cffadbfd0b4b92b9

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

Signed
Parents: 6445c8fec29159356286b5bbe413355fae82dda9 525b46daa0b37c6b08be62902dc3eedc00dabce7
2 files changed, +2 -1Ignore whitespace
public/scripts/extensions/expressions/index.js+1 -0
@@ -978,6 +978,7 @@ function getJsonSchema(emotions) {
978 required: [978 required: [
979 'emotion',979 'emotion',
980 ],980 ],
981 additionalProperties: false,
981 };982 };
982}983}
983984
public/scripts/extensions/expressions/settings.html+1 -1
@@ -40,7 +40,7 @@
40 <i class="fa-solid fa-clock-rotate-left fa-sm"></i>40 <i class="fa-solid fa-clock-rotate-left fa-sm"></i>
41 </div>41 </div>
42 </label>42 </label>
43 <small data-i18n="Will be used if the API doesn't support JSON schemas or function calling.">Will be used if the API doesn't support JSON schemas or function calling.</small>43 <small data-i18n="Used in addition to JSON schemas and function calling.">Used in addition to JSON schemas and function calling.</small>
44 <textarea id="expression_llm_prompt" type="text" class="text_pole textarea_compact autoSetHeight" rows="2" placeholder="Use &lcub;&lcub;labels&rcub;&rcub; special macro."></textarea>44 <textarea id="expression_llm_prompt" type="text" class="text_pole textarea_compact autoSetHeight" rows="2" placeholder="Use &lcub;&lcub;labels&rcub;&rcub; special macro."></textarea>
45 </div>45 </div>
46 <div class="expression_prompt_type_block flex-container flexFlowColumn">46 <div class="expression_prompt_type_block flex-container flexFlowColumn">