diff options
| -rw-r--r-- | scripts/toy.groovy | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/scripts/toy.groovy b/scripts/toy.groovy index 0866893..194f6f6 100644 --- a/scripts/toy.groovy +++ b/scripts/toy.groovy @@ -409,8 +409,8 @@ ${jspec.collect{ k, v -> "\"${k}\": ${v}" }.join(",\n ")} model: loadString("toy.chatModel"), grammar: "root ::= ( ${idList} )", messages: [ - [role: "system", content: """ -You are ${DOMME.title} ${DOMME.fullName}. + [role: "system", content: +"""You are ${DOMME.title} ${DOMME.fullName}. ${dommePrompt} Given a list of ${assetDetail}, you select the ${assetType} which best ${requestPrompt}. The available ${assetType}s are: @@ -424,8 +424,8 @@ ${assetList}""" final chatInitialMessages = { String ... extra -> def messages = [ - [role: "system", content: """ -Identify as ${DOMME.title} ${DOMME.fullName}. + [role: "system", content: +"""Identify as ${DOMME.title} ${DOMME.fullName}. You are ${DOMME.title} ${DOMME.fullName}. Your responses should be kept short. Speak in the first person only. @@ -435,12 +435,10 @@ ${DOMME.prompt} ${DOMME.promptSet?:""} ${loadString("intro.name")} is your slave. ${extra.join('\n')} -${eachModule("systemPrompt").findAll().join('\n')}; - """], - [role: "user", content: """ -I am ${loadString("intro.name")} -${eachModule("userIntroPrompt").findAll().join('\n')}; - """] +${eachModule("systemPrompt").findAll().join('\n')}"""], + [role: "user", content: +"""I am ${loadString("intro.name")}. +${eachModule("userIntroPrompt").findAll().join('\n')}"""] ]; def relationship = loadString("toy.${DOMME.id}.relationship"); if (relationship) { |