diff --git a/.github/workflows/pr-auto-manager.yml b/.github/workflows/pr-auto-manager.yml index 65314f94b..261c5b069 100644 --- a/.github/workflows/pr-auto-manager.yml +++ b/.github/workflows/pr-auto-manager.yml @@ -13,9 +13,11 @@ permissions: jobs: label-by-size: name: 🏷️ Label PR by Size + # This job should run after all others, to prevent possible concurrency issues + needs: [label-by-branches, label-by-files, remove-stale-label, check-merge-blocking-labels, write-auto-comments] runs-on: ubuntu-latest # Only needs to run when code is changed - if: github.event.action == 'opened' || github.event.action == 'synchronize' + if: always() && (github.event.action == 'opened' || github.event.action == 'synchronize') # Override permissions, the labeler needs issues write access permissions: @@ -159,7 +161,7 @@ jobs: write-auto-comments: name: 💬 Post PR Comments Based on Labels - needs: [label-by-size, label-by-branches, label-by-files] + needs: [label-by-branches, label-by-files] runs-on: ubuntu-latest # Run, even if the previous jobs were skipped/failed if: always() @@ -184,6 +186,12 @@ jobs: runs-on: ubuntu-latest if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'staging' + # Override permissions, We need to be able to write to issues + permissions: + contents: read + issues: write + pull-requests: write + steps: - name: Extract Linked Issues From PR Description id: extract_issues diff --git a/public/script.js b/public/script.js index fefe91fd1..f53965eb3 100644 --- a/public/script.js +++ b/public/script.js @@ -495,6 +495,8 @@ export const event_types = { GENERATE_AFTER_COMBINE_PROMPTS: 'generate_after_combine_prompts', GENERATE_AFTER_DATA: 'generate_after_data', GROUP_MEMBER_DRAFTED: 'group_member_drafted', + GROUP_WRAPPER_STARTED: 'group_wrapper_started', + GROUP_WRAPPER_FINISHED: 'group_wrapper_finished', WORLD_INFO_ACTIVATED: 'world_info_activated', TEXT_COMPLETION_SETTINGS_READY: 'text_completion_settings_ready', CHAT_COMPLETION_SETTINGS_READY: 'chat_completion_settings_ready', @@ -3098,6 +3100,9 @@ export function baseChatReplace(value, name1, name2) { /** * Returns the character card fields for the current character. + * @param {object} [options] + * @param {number} [options.chid] Optional character index + * * @typedef {object} CharacterCardFields * @property {string} system System prompt * @property {string} mesExamples Message examples @@ -3110,7 +3115,9 @@ export function baseChatReplace(value, name1, name2) { * @property {string} charDepthPrompt Character depth note * @returns {CharacterCardFields} Character card fields */ -export function getCharacterCardFields() { +export function getCharacterCardFields({ chid = null } = {}) { + const currentChid = chid ?? this_chid; + const result = { system: '', mesExamples: '', @@ -3124,7 +3131,7 @@ export function getCharacterCardFields() { }; result.persona = baseChatReplace(power_user.persona_description?.trim(), name1, name2); - const character = characters[this_chid]; + const character = characters[currentChid]; if (!character) { return result; @@ -3141,7 +3148,7 @@ export function getCharacterCardFields() { result.charDepthPrompt = baseChatReplace(character.data?.extensions?.depth_prompt?.prompt?.trim(), name1, name2); if (selected_group) { - const groupCards = getGroupCharacterCards(selected_group, Number(this_chid)); + const groupCards = getGroupCharacterCards(selected_group, Number(currentChid)); if (groupCards) { result.description = groupCards.description; diff --git a/public/scripts/extensions/expressions/index.js b/public/scripts/extensions/expressions/index.js index aa592cfd7..aa98e3770 100644 --- a/public/scripts/extensions/expressions/index.js +++ b/public/scripts/extensions/expressions/index.js @@ -4,7 +4,7 @@ import { characters, eventSource, event_types, generateRaw, getRequestHeaders, m import { dragElement, isMobile } from '../../RossAscends-mods.js'; import { getContext, getApiUrl, modules, extension_settings, ModuleWorkerWrapper, doExtrasFetch, renderExtensionTemplateAsync } from '../../extensions.js'; import { loadMovingUIState, performFuzzySearch, power_user } from '../../power-user.js'; -import { onlyUnique, debounce, getCharaFilename, trimToEndSentence, trimToStartSentence, waitUntilCondition, findChar } from '../../utils.js'; +import { onlyUnique, debounce, getCharaFilename, trimToEndSentence, trimToStartSentence, waitUntilCondition, findChar, isFalseBoolean } from '../../utils.js'; import { hideMutedSprites, selected_group } from '../../group-chats.js'; import { isJsonSchemaSupported } from '../../textgen-settings.js'; import { debounce_timeout } from '../../constants.js'; @@ -17,6 +17,7 @@ import { slashCommandReturnHelper } from '../../slash-commands/SlashCommandRetur import { generateWebLlmChatPrompt, isWebLlmSupported } from '../shared.js'; import { Popup, POPUP_RESULT } from '../../popup.js'; import { t } from '../../i18n.js'; +import { removeReasoningFromString } from '../../reasoning.js'; export { MODULE_NAME }; /** @@ -678,7 +679,7 @@ async function setSpriteFolderCommand(_, folder) { return ''; } -async function classifyCallback(/** @type {{api: string?, prompt: string?}} */ { api = null, prompt = null }, text) { +async function classifyCallback(/** @type {{api: string?, filter: string?, prompt: string?}} */ { api = null, filter = null, prompt = null }, text) { if (!text) { toastr.error('No text provided'); return ''; @@ -689,13 +690,14 @@ async function classifyCallback(/** @type {{api: string?, prompt: string?}} */ { } const expressionApi = EXPRESSION_API[api] || extension_settings.expressions.api; + const filterAvailable = !isFalseBoolean(filter); if (!modules.includes('classify') && expressionApi == EXPRESSION_API.extras) { toastr.warning('Text classification is disabled or not available'); return ''; } - const label = await getExpressionLabel(text, expressionApi, { customPrompt: prompt }); + const label = await getExpressionLabel(text, expressionApi, { filterAvailable: filterAvailable, customPrompt: prompt }); console.debug(`Classification result for "${text}": ${label}`); return label; } @@ -928,6 +930,9 @@ function parseLlmResponse(emotionResponse, labels) { return response; } catch { + // Clean possible reasoning from response + emotionResponse = removeReasoningFromString(emotionResponse); + const fuse = new Fuse(labels, { includeScore: true }); console.debug('Using fuzzy search in labels:', labels); const result = fuse.search(emotionResponse); @@ -988,10 +993,11 @@ function onTextGenSettingsReady(args) { * @param {string} text - The text to classify and retrieve the expression label for. * @param {EXPRESSION_API} [expressionsApi=extension_settings.expressions.api] - The expressions API to use for classification. * @param {object} [options={}] - Optional arguments. + * @param {boolean?} [options.filterAvailable=null] - Whether to filter available expressions. If not specified, uses the extension setting. * @param {string?} [options.customPrompt=null] - The custom prompt to use for classification. * @returns {Promise} - The label of the expression. */ -export async function getExpressionLabel(text, expressionsApi = extension_settings.expressions.api, { customPrompt = null } = {}) { +export async function getExpressionLabel(text, expressionsApi = extension_settings.expressions.api, { filterAvailable = null, customPrompt = null } = {}) { // Return if text is undefined, saving a costly fetch request if ((!modules.includes('classify') && expressionsApi == EXPRESSION_API.extras) || !text) { return extension_settings.expressions.fallback_expression; @@ -1003,6 +1009,11 @@ export async function getExpressionLabel(text, expressionsApi = extension_settin text = sampleClassifyText(text); + filterAvailable ??= extension_settings.expressions.filterAvailable; + if (filterAvailable && ![EXPRESSION_API.llm, EXPRESSION_API.webllm].includes(expressionsApi)) { + console.debug('Filter available is only supported for LLM and WebLLM expressions'); + } + try { switch (expressionsApi) { // Local BERT pipeline @@ -1027,7 +1038,7 @@ export async function getExpressionLabel(text, expressionsApi = extension_settin return extension_settings.expressions.fallback_expression; } - const expressionsList = await getExpressionsList(); + const expressionsList = await getExpressionsList({ filterAvailable: filterAvailable }); const prompt = substituteParamsExtended(customPrompt, { labels: expressionsList }) || await getLlmPrompt(expressionsList); eventSource.once(event_types.TEXT_COMPLETION_SETTINGS_READY, onTextGenSettingsReady); const emotionResponse = await generateRaw(text, main_api, false, false, prompt); @@ -1040,7 +1051,7 @@ export async function getExpressionLabel(text, expressionsApi = extension_settin return extension_settings.expressions.fallback_expression; } - const expressionsList = await getExpressionsList(); + const expressionsList = await getExpressionsList({ filterAvailable: filterAvailable }); const prompt = substituteParamsExtended(customPrompt, { labels: expressionsList }) || await getLlmPrompt(expressionsList); const messages = [ { role: 'user', content: text + '\n\n' + prompt }, @@ -1320,12 +1331,28 @@ function getCachedExpressions() { return [...expressionsList, ...extension_settings.expressions.custom].filter(onlyUnique); } -export async function getExpressionsList() { - // Return cached list if available - if (Array.isArray(expressionsList)) { - return getCachedExpressions(); +export async function getExpressionsList({ filterAvailable = false } = {}) { + // If there is no cached list, load and cache it + if (!Array.isArray(expressionsList)) { + expressionsList = await resolveExpressionsList(); } + const expressions = getCachedExpressions(); + + // Filtering is only available for llm and webllm APIs + if (!filterAvailable || ![EXPRESSION_API.llm, EXPRESSION_API.webllm].includes(extension_settings.expressions.api)) { + return expressions; + } + + // Get expressions with available sprites + const currentLastMessage = selected_group ? getLastCharacterMessage() : null; + const spriteFolderName = getSpriteFolderName(currentLastMessage, currentLastMessage?.name); + + return expressions.filter(label => { + const expression = spriteCache[spriteFolderName]?.find(x => x.label === label); + return (expression?.files.length ?? 0) > 0; + }); + /** * Returns the list of expressions from the API or fallback in offline mode. * @returns {Promise} @@ -1372,9 +1399,6 @@ export async function getExpressionsList() { expressionsList = DEFAULT_EXPRESSIONS.slice(); return expressionsList; } - - const result = await resolveExpressionsList(); - return [...result, ...extension_settings.expressions.custom].filter(onlyUnique); } /** @@ -1810,7 +1834,7 @@ async function onClickExpressionUpload(event) { } } } else { - spriteName = withoutExtension(clickedFileName); + spriteName = withoutExtension(expression); } if (!spriteName) { @@ -2102,6 +2126,10 @@ function migrateSettings() { extension_settings.expressions.rerollIfSame = !!$(this).prop('checked'); saveSettingsDebounced(); }); + $('#expressions_filter_available').prop('checked', extension_settings.expressions.filterAvailable).on('input', function () { + extension_settings.expressions.filterAvailable = !!$(this).prop('checked'); + saveSettingsDebounced(); + }); $('#expression_override_cleanup_button').on('click', onClickExpressionOverrideRemoveAllButton); $(document).on('dragstart', '.expression', (e) => { e.preventDefault(); @@ -2279,13 +2307,13 @@ function migrateSettings() { SlashCommandParser.addCommandObject(SlashCommand.fromProps({ name: 'expression-list', aliases: ['expressions'], - /** @type {(args: {return: string}) => Promise} */ + /** @type {(args: {return: string, filter: string}) => Promise} */ callback: async (args) => { let returnType = /** @type {import('../../slash-commands/SlashCommandReturnHelper.js').SlashCommandReturnType} */ (args.return); - const list = await getExpressionsList(); + const list = await getExpressionsList({ filterAvailable: !isFalseBoolean(args.filter) }); return await slashCommandReturnHelper.doReturn(returnType ?? 'pipe', list, { objectToStringFunc: list => list.join(', ') }); }, @@ -2298,6 +2326,13 @@ function migrateSettings() { enumList: slashCommandReturnHelper.enumList({ allowObject: true }), forceEnum: true, }), + SlashCommandNamedArgument.fromProps({ + name: 'filter', + description: 'Filter the list to only include expressions that have available sprites for the current character.', + typeList: [ARGUMENT_TYPE.BOOLEAN], + enumList: commonEnumProviders.boolean('trueFalse')(), + defaultValue: 'true', + }), ], returns: 'The comma-separated list of available expressions, including custom expressions.', helpString: 'Returns a list of available expressions, including custom expressions.', @@ -2313,6 +2348,13 @@ function migrateSettings() { typeList: [ARGUMENT_TYPE.STRING], enumList: Object.keys(EXPRESSION_API).map(api => new SlashCommandEnumValue(api, null, enumTypes.enum)), }), + SlashCommandNamedArgument.fromProps({ + name: 'filter', + description: 'Filter the list to only include expressions that have available sprites for the current character.', + typeList: [ARGUMENT_TYPE.BOOLEAN], + enumList: commonEnumProviders.boolean('trueFalse')(), + defaultValue: 'true', + }), SlashCommandNamedArgument.fromProps({ name: 'prompt', description: 'Custom prompt for classification. Only relevant if Classifier API is set to LLM.', diff --git a/public/scripts/extensions/expressions/settings.html b/public/scripts/extensions/expressions/settings.html index 06e407d7d..98938cf4d 100644 --- a/public/scripts/extensions/expressions/settings.html +++ b/public/scripts/extensions/expressions/settings.html @@ -29,7 +29,11 @@
-