Skip to content

Commit fa8b910

Browse files
committed
fix(core): détection de la présence d'un sélecteur @selector - différenciation du cas d'un message avec ou sans présence d'un bloc prompt
1 parent 71745b8 commit fa8b910

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

app/js/core/messages/createMessage.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ export async function createMessage(chatbot, message, options) {
9191
message = processDynamicVariablesAtDisplayTime(
9292
message,
9393
chatbot.dynamicVariables,
94+
{ useSelectors: message.includes("@SELECTOR[") },
9495
);
9596
}
9697
if (message.trim() !== "") {

app/js/core/messages/helpers/processDynamicVariablesAtDisplayTime.mjs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,10 @@ import { processBlocks } from "../../../markdown/custom/variablesDynamic/process
44
export function processDynamicVariablesAtDisplayTime(
55
message,
66
dynamicVariables,
7-
sequence,
7+
options = {},
88
) {
99
// Détection de la présence de SELECTOR dans le message pour optimisation
10-
// On récupère la séquence complète des contenus pour vérifier la présence de SELECTOR
11-
const contentSequence = sequence.map((section) => section.content);
12-
const combinedSequence = contentSequence.join("\n");
13-
const useSelectors = combinedSequence.includes("@SELECTOR[");
10+
const useSelectors = options.useSelectors || false;
1411

1512
const structureMessage = extractStructureFromMessage(message);
1613
let output = "";

app/js/markdown/custom/directives/useLLM/processMessageWithPrompt.mjs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,13 @@ export async function processMessageWithPrompt(
7979
} else if (type === "markdown") {
8080
// Traitement des variables et blocs conditionnels qui restent à interpréter au moment de l'affichage du message
8181
if (!isUser && content.includes("@")) {
82+
// On récupère la séquence complète
83+
const contentSequence = sequence.map((section) => section.content);
84+
const contentMessage = contentSequence.join("\n");
8285
content = processDynamicVariablesAtDisplayTime(
8386
content,
8487
chatbot.dynamicVariables,
85-
sequence,
88+
{ useSelectors: contentMessage.includes("@SELECTOR[") },
8689
);
8790
}
8891
// Gestion du contenu en Markdown

app/script.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/script.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)