Fix Llamafile compatibility

plugins/tiddlywiki/ai-tools/globals.tid

@@ -7,13 +7,13 @@ tags: $:/tags/Global
 
 <!--
 Action procedure to retrieve an LLM completion, given the following parameters:
-payload - JSON payload to be posted to the LLM
+conversationTitle - Title of the tiddler containing the conversation
 resultTitlePrefix - Prefix of the tiddler to be used for saving the result. If the tiddler already exists then a number will be added repeatedly until the resulting title is unique
 resultTags - Tags to be applied to the result tiddler
 statusTitle - Optional title of a tiddler to which the status of the request will be bound: "pending", "complete", "error"
 completionServer - Optional URL of server
 -->
-\procedure get-llm-completion(payload,resultTitlePrefix,resultTags,statusTitle,completionServer)
+\procedure get-llm-completion(conversationTitle,resultTitlePrefix,resultTags,statusTitle,completionServer)
 	<!--
 	Callback for the HTTP response from the LLM
 	-->
@@ -42,19 +42,21 @@ completionServer - Optional URL of server
 <$let
 	completionServer={{{ [<completionServer>!is[blank]else<default-llm-completion-server>] }}}
 >
-	<$action-log message="get-llm-completion"/>
+	<$wikify name="json" text={{{ [<completionServer>get[text]] }}}>
-	<$action-log/>
+		<$action-log message="get-llm-completion"/>
-	<$action-sendmessage
+		<$action-log/>
-		$message="tm-http-request"
+		<$action-sendmessage
-		url={{{ [<completionServer>get[url]addsuffix[/v1/chat/completions]] }}}
+			$message="tm-http-request"
-		body=<<payload>>
+			url={{{ [<completionServer>get[url]addsuffix[/v1/chat/completions]] }}}
-		header-content-type="application/json"
+			body=<<json>>
-		bearer-auth-token-from-store="openai-secret-key"
+			header-content-type="application/json"
-		method="POST"
+			bearer-auth-token-from-store="openai-secret-key"
-		oncompletion=<<get-llm-completion-callback>>
+			method="POST"
-		bind-status=<<statusTitle>>
+			oncompletion=<<get-llm-completion-callback>>
-		var-resultTitlePrefix=<<resultTitlePrefix>>
+			bind-status=<<statusTitle>>
-		var-resultTags=<<resultTags>>
+			var-resultTitlePrefix=<<resultTitlePrefix>>
-	/>
+			var-resultTags=<<resultTags>>
+		/>
+	</$wikify>
 </$let>
 \end get-llm-completion

plugins/tiddlywiki/ai-tools/page-menu/new-conversation.tid

@@ -6,7 +6,7 @@ tags: $:/tags/AI/PageMenu
 	$basetitle="AI Conversation"
 	tags="$:/tags/AI/Conversation"
 	system-prompt="You are a helpful assistant."
-	current-response-text="Please describe this picture"
+	current-response-text="Please list the 10 most important things that happened in South East Asia in the Twentieth Century"
 >
 <$action-navigate $to=<<createTiddler-title>>/>
 </$action-createtiddler>

plugins/tiddlywiki/ai-tools/servers/local-llamafile.tid

@@ -2,3 +2,23 @@ title: $:/plugins/tiddlywiki/ai-tools/servers/local-llamafile
 tags: $:/tags/AI/CompletionServer
 url: http://127.0.0.1:8080
 caption: Locally running Llamafile server
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html conditional commentblock commentinline
+{
+	"model": "gpt-4o",
+	"messages": [
+		{
+			"role": "system",
+			"content": "<$text text={{{ [<conversationTitle>get[system-prompt]jsonstringify[]] }}}/>"
+		}
+		<!-- Loop through the tiddlers tagged with this one to pick up all the messages in the conversation -->
+		<$list filter="[all[shadows+tiddlers]tag<conversationTitle>!is[draft]sort[created]]">
+			,
+			{
+				<!-- We use JSON stringify to escape the characters that can't be used directly in JSON -->
+				"role": "<$text text={{{ [<currentTiddler>get[role]jsonstringify[]] }}}/>",
+				"content": "<$text text={{{ [<currentTiddler>get[text]jsonstringify[]] }}}/>"
+			}
+		</$list>
+	]
+}

plugins/tiddlywiki/ai-tools/servers/openai.tid

@@ -2,3 +2,38 @@ title: $:/plugins/tiddlywiki/ai-tools/servers/openai
 tags: $:/tags/AI/CompletionServer
 url: https://api.openai.com
 caption: OpenAI Service
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html conditional commentblock commentinline
+{
+	"model": "gpt-4o",
+	"messages": [
+		{
+			"role": "system",
+			"content": "<$text text={{{ [<conversationTitle>get[system-prompt]jsonstringify[]] }}}/>"
+		}
+		<!-- Loop through the tiddlers tagged with this one to pick up all the messages in the conversation -->
+		<$list filter="[all[shadows+tiddlers]tag<conversationTitle>!is[draft]sort[created]]">
+			,
+			{
+				<!-- We use JSON stringify to escape the characters that can't be used directly in JSON -->
+				"role": "<$text text={{{ [<currentTiddler>get[role]jsonstringify[]] }}}/>",
+				"content": [
+					{
+						"type": "text",
+						"text": "<$text text={{{ [<currentTiddler>get[text]jsonstringify[]] }}}/>"
+					}
+					<%if [<currentTiddler>get[image]else[]!match[]] %>
+						,
+						{
+							"type": "image_url",
+							"image_url": {
+								"url": "<$text text={{{ [[data:]] [<currentTiddler>get[image]get[type]] [[;base64,]] [<currentTiddler>get[image]get[text]jsonstringify[]] +[join[]] }}}/>"
+							}
+						}
+					<%endif%>
+				]
+				
+			}
+		</$list>
+	]
+}

plugins/tiddlywiki/ai-tools/view-templates/conversation.tid

@@ -65,46 +65,6 @@ Procedure to display a message from an AI conversation. Current tiddler is the c
 </$qualify>
 \end ai-message
 
-<!--
-Procedure that is wikified to generate the JSON payload for the LLM
--->
-\procedure payload()
-\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html conditional commentblock commentinline
-{
-	"model": "gpt-4o",
-	"messages": [
-		{
-			"role": "system",
-			"content": "<$text text={{{ [<currentTiddler>get[system-prompt]jsonstringify[]] }}}/>"
-		}
-		<!-- Loop through the tiddlers tagged with this one to pick up all the messages in the conversation -->
-		<$list filter="[all[shadows+tiddlers]tag<currentTiddler>!is[draft]sort[created]]">
-			,
-			{
-				<!-- We use JSON stringify to escape the characters that can't be used directly in JSON -->
-				"role": "<$text text={{{ [<currentTiddler>get[role]jsonstringify[]] }}}/>",
-				"content": [
-					{
-						"type": "text",
-						"text": "<$text text={{{ [<currentTiddler>get[text]jsonstringify[]] }}}/>"
-					}
-					<%if [<currentTiddler>get[image]else[]!match[]] %>
-						,
-						{
-							"type": "image_url",
-							"image_url": {
-								"url": "<$text text={{{ [[data:]] [<currentTiddler>get[image]get[type]] [[;base64,]] [<currentTiddler>get[image]get[text]jsonstringify[]] +[join[]] }}}/>"
-							}
-						}
-					<%endif%>
-				]
-				
-			}
-		</$list>
-	]
-}
-\end payload
-
 <!--
 Action procedure to get the next response from the LLM
 -->
@@ -123,16 +83,14 @@ Action procedure to get the next response from the LLM
 	>
 		<$action-deletefield $tiddler=<<currentTiddler>> $field="current-response-text"/>
 		<$action-deletefield $tiddler=<<currentTiddler>> $field="current-response-image"/>
-		<$wikify name="json" text=<<payload>>>
+		<$transclude
-			<$transclude
+			$variable="get-llm-completion"
-				$variable="get-llm-completion"
+			conversationTitle=<<currentTiddler>>
-				payload=<<json>>
+			completionServer={{!!completion-server}}
-				completionServer={{!!completion-server}}
+			resultTitlePrefix=<<resultTitlePrefix>>
-				resultTitlePrefix=<<resultTitlePrefix>>
+			resultTags=<<resultTags>>
-				resultTags=<<resultTags>>
+			statusTitle=<<statusTitle>>
-				statusTitle=<<statusTitle>>
+		/>
-			/>
-		</$wikify>
 	</$action-createtiddler>
 </$let>
 \end action-get-response