From 8efec8920d9e8d0a93720e314d82b78ef4be92a0 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@jermolene.com>
Date: Thu, 10 Oct 2024 13:22:59 +0100
Subject: [PATCH] User messages should be wikified

Makes it possible to include other tiddlers in a prompt
---
 plugins/tiddlywiki/ai-tools/globals.tid            | 14 ++++++++++++++
 .../ai-tools/servers/llamafile-llava.tid           |  2 +-
 plugins/tiddlywiki/ai-tools/servers/openai.tid     |  2 +-
 plugins/tiddlywiki/ai-tools/styles.tid             |  5 +++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/plugins/tiddlywiki/ai-tools/globals.tid b/plugins/tiddlywiki/ai-tools/globals.tid
index e6436913d..7aeabae18 100644
--- a/plugins/tiddlywiki/ai-tools/globals.tid
+++ b/plugins/tiddlywiki/ai-tools/globals.tid
@@ -101,6 +101,17 @@ Procedure to display a message from an AI conversation. Current tiddler is the c
 </$qualify>
 \end ai-tools-message
 
+\procedure ai-tools-get-message()
+\whitespace trim
+<$wikify
+	name="messageText"
+	text={{!!text}}
+	output="text"
+>
+	<$text text={{{ [<messageText>jsonstringify[]] }}}/>
+</$wikify>
+\end
+
 <!--
 Action procedure to get the next response from the LLM
 -->
@@ -199,6 +210,9 @@ Action procedure to get the next response from the LLM
 				</div>
 			</div>
 		</div>
+		<div class="ai-user-prompt-help">
+			Note that your text will be wikified before being sent to the LLM. Use &#x7B;&#x7B;transclusion&#x7D;&#x7D; to include other tiddlers in your messages
+		</div>
 	</div>
 </$let>
 \end ai-tools-conversation
diff --git a/plugins/tiddlywiki/ai-tools/servers/llamafile-llava.tid b/plugins/tiddlywiki/ai-tools/servers/llamafile-llava.tid
index 1334bea86..0ac1d8f33 100644
--- a/plugins/tiddlywiki/ai-tools/servers/llamafile-llava.tid
+++ b/plugins/tiddlywiki/ai-tools/servers/llamafile-llava.tid
@@ -54,7 +54,7 @@ Wikified JSON text to be sent to server
 <%if [<currentTiddler>has[image]] %>
 [img-<$text text=<<counter>>/>]
 <%endif%>
-<$text text={{{ [<currentTiddler>get[text]jsonstringify[]] }}}/>
+<<ai-tools-get-message>>
 </$list>
 \nLlama: 
 \end json-prompt-text
diff --git a/plugins/tiddlywiki/ai-tools/servers/openai.tid b/plugins/tiddlywiki/ai-tools/servers/openai.tid
index 65ee9429a..2d4bacf6e 100644
--- a/plugins/tiddlywiki/ai-tools/servers/openai.tid
+++ b/plugins/tiddlywiki/ai-tools/servers/openai.tid
@@ -24,7 +24,7 @@ Wikified JSON text to be sent to server
 				"content": [
 					{
 						"type": "text",
-						"text": "<$text text={{{ [<currentTiddler>get[text]jsonstringify[]] }}}/>"
+						"text": "<<ai-tools-get-message>>"
 					}
 					<%if [<currentTiddler>get[image]else[]!match[]] %>
 						,
diff --git a/plugins/tiddlywiki/ai-tools/styles.tid b/plugins/tiddlywiki/ai-tools/styles.tid
index a477c4fb1..226f76953 100644
--- a/plugins/tiddlywiki/ai-tools/styles.tid
+++ b/plugins/tiddlywiki/ai-tools/styles.tid
@@ -147,6 +147,11 @@ tags: [[$:/tags/Stylesheet]]
 	fill: #000;
 }
 
+.ai-conversation .ai-user-prompt-help {
+	font-size: 0.8em;
+	line-height: 1.5;
+}
+
 .ai-request-spinner {
 	animation: ai-request-spinner-animation-rotate 1s infinite;
 	height: 50px;