Merge pull request #1340 from WolframResearch/feature/default-model-update

Update default model

Author: rhennigan

Source/Chatbook/ChatState.wl

@@ -86,6 +86,7 @@ withChatState[ eval_ ] :=
             $includeStackTrace            = True,
             $sources                      = <| |>,
             $excludedBasePrompts          = $excludedBasePrompts,
+            $endToken                     = $endToken,
 
             (* Values used for token budgets during cell serialization: *)
             $cellStringBudget             = $cellStringBudget,

Source/Chatbook/Common.wl

@@ -608,6 +608,7 @@ catchTop[ eval_, sym_Symbol ] :=
             $messageSymbol       = Replace[ $messageSymbol, Chatbook -> sym ],
             $catching            = True,
             $failed              = False,
+            $timeToFirstToken    = None,
             catchTop             = # &,
             catchTopAs           = (#1 &) &
         },

Source/Chatbook/CommonSymbols.wl

@@ -42,6 +42,7 @@ BeginPackage[ "Wolfram`Chatbook`Common`" ];
 `$dynamicText;
 `$dynamicTrigger;
 `$enableLLMServices;
+`$endToken;
 `$evaluationCell;
 `$evaluationNotebook;
 `$excludedBasePrompts;
@@ -96,6 +97,7 @@ BeginPackage[ "Wolfram`Chatbook`Common`" ];
 `$templateBoxOptionsCache;
 `$thinkingEnd;
 `$thinkingStart;
+`$timeToFirstToken;
 `$timingLog;
 `$tinyHashLength;
 `$tokenBudget;

Source/Chatbook/Models.wl

@@ -14,7 +14,7 @@ Needs[ "Wolfram`Chatbook`UI`"      ];
 (* ::Section::Closed:: *)
 (*Configuration*)
 $defaultLLMKitService  := Replace[ $llmKitService, Except[ _String ] :> "AzureOpenAI" ];
-$defaultLLMKitModelName = "gpt-4o-2024-08-06";
+$defaultLLMKitModelName = "gpt-4.1-2025-04-14";
 
 $$modelVersion = DigitCharacter.. ~~ (("." ~~ DigitCharacter...) | "");
 

Source/Chatbook/Prompting.wl

@@ -330,8 +330,11 @@ $basePromptComponents[ "WolframLanguageStyle" ] = "
 $basePromptComponents[ "WolframLanguageEvaluatorTool" ] = "\
 * If the user is asking for a result instead of code to produce that result, use the wolfram_language_evaluator tool";
 
-$basePromptComponents[ "EndTurnToken" ] = "\
-* Always end your turn by writing /end.";
+$basePromptComponents[ "EndTurnToken" ] :=
+    If[ StringQ @ $endToken && $endToken =!= "",
+        "* Always end your turn by writing " <> $endToken <> ".",
+        ""
+    ];
 
 $basePromptComponents[ "ToolCallPreamble" ] = "\
 * **Before** you call a tool, briefly explain why you are calling it.

Source/Chatbook/SendChat.wl

@@ -1110,6 +1110,10 @@ chatHandlers[ container_, cellObject_CellObject, settings_ ] :=
                         $dynamicSplit        = dynamicSplit,
                         $settings            = settings
                     },
+                    If[ ! NumberQ @ $timeToFirstToken,
+                        $timeToFirstToken = AbsoluteTime[ ] - $chatStartTime;
+                        addHandlerArguments[ "TimeToFirstToken" -> Quantity[ $timeToFirstToken, "Seconds" ] ];
+                    ];
                     With[ { as = <| #, "ExtractedBodyChunks" -> extractBodyChunks @ # |> },
                         bodyChunkHandler[ as ];
                         Internal`StuffBag[ $debugLog, $lastStatus = as ];

Source/Chatbook/Settings.wl

@@ -37,6 +37,7 @@ $defaultChatSettings = <|
     "DynamicAutoFormat"              -> Automatic,
     "EnableChatGroupSettings"        -> False,
     "EnableLLMServices"              -> Automatic,
+    "EndToken"                       -> Automatic,
     "ExcludedBasePrompts"            -> Automatic,
     "ExperimentalFeatures"           -> Automatic,
     "ForceSynchronous"               -> Automatic,
@@ -261,6 +262,7 @@ $modelAutoSettings[ Automatic, "GPT4Omni" ] = <|
 (* ::Subsubsubsection::Closed:: *)
 (*gpt-4.1*)
 $modelAutoSettings[ Automatic, "GPT41" ] = <|
+    "EndToken"                   -> None,
     "HybridToolMethod"           -> True,
     "MaxContextTokens"           -> 1047576,
     "Multimodal"                 -> True,
@@ -376,6 +378,7 @@ $modelAutoSettings[ Automatic, "Mistral" ] = <|
 $modelAutoSettings[ Automatic, Automatic ] = <|
     "AppendCitations"           -> False,
     "ConvertSystemRoleToUser"   -> False,
+    "EndToken"                  -> "/end",
     "ExcludedBasePrompts"       -> { ParentList },
     "PresencePenalty"           -> 0.1,
     "ReplaceUnicodeCharacters"  -> False,
@@ -394,7 +397,13 @@ autoModelSetting[ KeyValuePattern[ "Model" -> model_Association ], key_ ] :=
 
 autoModelSetting[ model0_Association, key_String ] :=
     With[ { model = resolveFullModelSpec @ model0 },
-        autoModelSetting[ model[ "Service" ], model[ "Name" ], model[ "BaseID" ], model[ "Family" ], key ]
+        autoModelSetting[
+            toBaseServiceName @ model[ "Service" ],
+            model[ "Name" ],
+            model[ "BaseID" ],
+            model[ "Family" ],
+            key
+        ]
     ];
 
 autoModelSetting[ service_String, name_String, id_String, family_String, key_String ] :=
@@ -425,6 +434,18 @@ autoModelSetting[ service_String, name_String, id_String, family_String, key_Str
 
 autoModelSetting // endDefinition;
 
+(* ::**************************************************************************************************************:: *)
+(* ::Subsubsection::Closed:: *)
+(*toBaseServiceName*)
+toBaseServiceName // beginDefinition;
+
+toBaseServiceName[ name_String ] :=
+    With[ { base = StringDelete[ name, StartOfString~~("LLMKit"|"WolframAI"|"AITutor") ] },
+        If[ base === "", name, base ]
+    ];
+
+toBaseServiceName // endDefinition;
+
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
 (*dropModelUnsupportedParameters*)
@@ -613,6 +634,7 @@ resolveAutoSettings[ settings0_Association ] := Enclose[
             $openToolCallBoxes       = resolved[ "OpenToolCallBoxes" ];
             $experimentalFeatures    = resolved[ "ExperimentalFeatures" ];
             $excludedBasePrompts     = DeleteDuplicates @ Select[ resolved[ "ExcludedBasePrompts" ], StringQ ];
+            $endToken                = resolved[ "EndToken" ];
 
             If[ resolved[ "ForceSynchronous" ], $showProgressText = True ];
 
@@ -1018,10 +1040,10 @@ autoStopTokens // endDefinition;
 (* ::Subsubsubsection::Closed:: *)
 (*methodStopTokens*)
 methodStopTokens // beginDefinition;
-methodStopTokens[ "Simple"         ] := { "\n/exec", "/end" };
-methodStopTokens[ "Service"        ] := { "/end" };
-methodStopTokens[ "Textual"|"JSON" ] := { "ENDTOOLCALL", "/end" };
-methodStopTokens[ _                ] := { "ENDTOOLCALL", "\n/exec", "/end" };
+methodStopTokens[ "Simple"         ] := Select[ { "\n/exec", $endToken }, StringQ ];
+methodStopTokens[ "Service"        ] := Select[ { $endToken }, StringQ ];
+methodStopTokens[ "Textual"|"JSON" ] := Select[ { "ENDTOOLCALL", $endToken }, StringQ ];
+methodStopTokens[ _                ] := Select[ { "ENDTOOLCALL", "\n/exec", $endToken }, StringQ ];
 methodStopTokens // endDefinition;
 
 (* ::**************************************************************************************************************:: *)

Source/Chatbook/Tools/Examples.wl

@@ -9,6 +9,8 @@ Needs[ "Wolfram`Chatbook`Common`" ];
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Configuration*)
+$endToken = "/end";
+$endTokenString := If[ StringQ @ $endToken && $endToken =!= "", "\n"<>$endToken, "" ];
 
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
@@ -72,100 +74,97 @@ $messageTemplateType  = "Basic";
 (* ::Subsubsubsection::Closed:: *)
 (*Basic*)
 $chatMessageTemplates[ "Basic" ] = <| |>;
-$chatMessageTemplates[ "Basic", "User"      ] = "User: %%1%%";
-$chatMessageTemplates[ "Basic", "Assistant" ] = "Assistant: %%1%%\n/end";
-$chatMessageTemplates[ "Basic", "System"    ] = "System: %%1%%";
+$chatMessageTemplates[ "Basic", "User"      ] = "User: `Content`";
+$chatMessageTemplates[ "Basic", "Assistant" ] = "Assistant: `Content``EndToken`";
+$chatMessageTemplates[ "Basic", "System"    ] = "System: `Content`";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*Instruct*)
 $chatMessageTemplates[ "Instruct" ] = <| |>;
-$chatMessageTemplates[ "Instruct", "User"      ] = "[INST]%%1%%[/INST]";
-$chatMessageTemplates[ "Instruct", "Assistant" ] = "%%1%%\n/end";
-$chatMessageTemplates[ "Instruct", "System"    ] = "[INST]%%1%%[/INST]";
+$chatMessageTemplates[ "Instruct", "User"      ] = "[INST]`Content`[/INST]";
+$chatMessageTemplates[ "Instruct", "Assistant" ] = "`Content``EndToken`";
+$chatMessageTemplates[ "Instruct", "System"    ] = "[INST]`Content`[/INST]";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*Zephyr*)
 $chatMessageTemplates[ "Zephyr" ] = <| |>;
-$chatMessageTemplates[ "Zephyr", "User"      ] = "<|user|>\n%%1%%</s>";
-$chatMessageTemplates[ "Zephyr", "Assistant" ] = "<|assistant|>\n%%1%%\n/end";
-$chatMessageTemplates[ "Zephyr", "System"    ] = "<|system|>\n%%1%%</s>";
+$chatMessageTemplates[ "Zephyr", "User"      ] = "<|user|>\n`Content`</s>";
+$chatMessageTemplates[ "Zephyr", "Assistant" ] = "<|assistant|>\n`Content``EndToken`";
+$chatMessageTemplates[ "Zephyr", "System"    ] = "<|system|>\n`Content`</s>";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*Phi*)
 $chatMessageTemplates[ "Phi" ] = <| |>;
-$chatMessageTemplates[ "Phi", "User"      ] = "<|user|>\n%%1%%<|end|>";
-$chatMessageTemplates[ "Phi", "Assistant" ] = "<|assistant|>\n%%1%%\n/end<|end|>";
-$chatMessageTemplates[ "Phi", "System"    ] = "<|user|>\n%%1%%<|end|>";
+$chatMessageTemplates[ "Phi", "User"      ] = "<|user|>\n`Content`<|end|>";
+$chatMessageTemplates[ "Phi", "Assistant" ] = "<|assistant|>\n`Content``EndToken`<|end|>";
+$chatMessageTemplates[ "Phi", "System"    ] = "<|user|>\n`Content`<|end|>";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*Boxed*)
 $chatMessageTemplates[ "Boxed" ] = <| |>;
-$chatMessageTemplates[ "Boxed", "User"      ] = "[user]\n%%1%%";
-$chatMessageTemplates[ "Boxed", "Assistant" ] = "[assistant]\n%%1%%\n/end";
-$chatMessageTemplates[ "Boxed", "System"    ] = "[system]\n%%1%%";
+$chatMessageTemplates[ "Boxed", "User"      ] = "[user]\n`Content`";
+$chatMessageTemplates[ "Boxed", "Assistant" ] = "[assistant]\n`Content``EndToken`";
+$chatMessageTemplates[ "Boxed", "System"    ] = "[system]\n`Content`";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*ChatML*)
 $chatMessageTemplates[ "ChatML" ] = <| |>;
-$chatMessageTemplates[ "ChatML", "User"      ] = "<|im_start|>user\n%%1%%<|im_end|>";
-$chatMessageTemplates[ "ChatML", "Assistant" ] = "<|im_start|>assistant\n%%1%%\n/end<|im_end|>";
-$chatMessageTemplates[ "ChatML", "System"    ] = "<|im_start|>system\n%%1%%<|im_end|>";
+$chatMessageTemplates[ "ChatML", "User"      ] = "<|im_start|>user\n`Content`<|im_end|>";
+$chatMessageTemplates[ "ChatML", "Assistant" ] = "<|im_start|>assistant\n`Content``EndToken`<|im_end|>";
+$chatMessageTemplates[ "ChatML", "System"    ] = "<|im_start|>system\n`Content`<|im_end|>";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*XML*)
 $chatMessageTemplates[ "XML" ] = <| |>;
-$chatMessageTemplates[ "XML", "User"      ] = "<user>%%1%%</user>";
-$chatMessageTemplates[ "XML", "Assistant" ] = "<assistant>%%1%%\n/end</assistant>";
-$chatMessageTemplates[ "XML", "System"    ] = "<system>%%1%%</system>";
+$chatMessageTemplates[ "XML", "User"      ] = "<user>`Content`</user>";
+$chatMessageTemplates[ "XML", "Assistant" ] = "<assistant>`Content``EndToken`</assistant>";
+$chatMessageTemplates[ "XML", "System"    ] = "<system>`Content`</system>";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*DeepSeekCoder*)
 $chatMessageTemplates[ "DeepSeekCoder" ] = <| |>;
-$chatMessageTemplates[ "DeepSeekCoder", "User"      ] = "User: %%1%%";
-$chatMessageTemplates[ "DeepSeekCoder", "Assistant" ] = "Assistant: %%1%%\n/end<\:ff5cend\:2581of\:2581sentence\:ff5c>";
-$chatMessageTemplates[ "DeepSeekCoder", "System"    ] = "System: %%1%%";
+$chatMessageTemplates[ "DeepSeekCoder", "User"      ] = "User: `Content`";
+$chatMessageTemplates[ "DeepSeekCoder", "Assistant" ] = "Assistant: `Content``EndToken`<\:ff5cend\:2581of\:2581sentence\:ff5c>";
+$chatMessageTemplates[ "DeepSeekCoder", "System"    ] = "System: `Content`";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*Llama*)
 $chatMessageTemplates[ "Llama" ] = <| |>;
-$chatMessageTemplates[ "Llama", "User"      ] = "<|start_header_id|>user<|end_header_id|>\n%%1%%<|eot_id|>";
-$chatMessageTemplates[ "Llama", "Assistant" ] = "<|start_header_id|>assistant<|end_header_id|>\n%%1%%\n/end<|eot_id|>";
-$chatMessageTemplates[ "Llama", "System"    ] = "<|start_header_id|>system<|end_header_id|>\n%%1%%<|eot_id|>";
+$chatMessageTemplates[ "Llama", "User"      ] = "<|start_header_id|>user<|end_header_id|>\n`Content`<|eot_id|>";
+$chatMessageTemplates[ "Llama", "Assistant" ] = "<|start_header_id|>assistant<|end_header_id|>\n`Content``EndToken`<|eot_id|>";
+$chatMessageTemplates[ "Llama", "System"    ] = "<|start_header_id|>system<|end_header_id|>\n`Content`<|eot_id|>";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*Gemma*)
 $chatMessageTemplates[ "Gemma" ] = <| |>;
-$chatMessageTemplates[ "Gemma", "User"      ] = "<start_of_turn>user\n%%1%%<end_of_turn>";
-$chatMessageTemplates[ "Gemma", "Assistant" ] = "<start_of_turn>model\n%%1%%\n/end<end_of_turn>";
-$chatMessageTemplates[ "Gemma", "System"    ] = "<start_of_turn>user\n%%1%%<end_of_turn>";
+$chatMessageTemplates[ "Gemma", "User"      ] = "<start_of_turn>user\n`Content`<end_of_turn>";
+$chatMessageTemplates[ "Gemma", "Assistant" ] = "<start_of_turn>model\n`Content``EndToken`<end_of_turn>";
+$chatMessageTemplates[ "Gemma", "System"    ] = "<start_of_turn>user\n`Content`<end_of_turn>";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*Nemotron*)
 $chatMessageTemplates[ "Nemotron" ] = <| |>;
-$chatMessageTemplates[ "Nemotron", "User"      ] = "<extra_id_1>User\n%%1%%";
-$chatMessageTemplates[ "Nemotron", "Assistant" ] = "<extra_id_1>Assistant\n%%1%%\n/end";
-$chatMessageTemplates[ "Nemotron", "System"    ] = "<extra_id_0>System\n%%1%%";
+$chatMessageTemplates[ "Nemotron", "User"      ] = "<extra_id_1>User\n`Content`";
+$chatMessageTemplates[ "Nemotron", "Assistant" ] = "<extra_id_1>Assistant\n`Content``EndToken`";
+$chatMessageTemplates[ "Nemotron", "System"    ] = "<extra_id_0>System\n`Content`";
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*messageTemplate*)
 messageTemplate // beginDefinition;
 
 messageTemplate[ id_String ] := Enclose[
-    StringTemplate[
-        ConfirmBy[ $chatMessageTemplates[ $messageTemplateType, id ], StringQ, "TemplateString" ],
-        Delimiters -> "%%"
-    ],
+    StringTemplate @ ConfirmBy[ $chatMessageTemplates[ $messageTemplateType, id ], StringQ, "TemplateString" ],
     throwInternalFailure
 ];
 
@@ -175,25 +174,57 @@ messageTemplate // endDefinition;
 (* ::Subsubsubsection::Closed:: *)
 (*user*)
 user // beginDefinition;
-user[ a_List ] := TemplateApply[ messageTemplate[ "User" ], StringRiffle[ TextString /@ Flatten @ a, "\n" ] ];
-user[ a_String ] := user @ { a };
+
+user[ a_List ] := TemplateApply[
+    messageTemplate[ "User" ],
+    <|
+        "Content"  -> StringRiffle[ TextString /@ Flatten @ a, "\n" ],
+        "EndToken" -> $endTokenString
+    |>
+];
+
+user[ a_String ] :=
+    user @ { a };
+
 user // endDefinition;
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*assistant*)
 assistant // beginDefinition;
-assistant[ { a___, "tool"|"Tool" -> { name_, as_ }, b___ } ] := assistant @ { a, toolCall[ name, as ], b };
-assistant[ a_List ] := TemplateApply[ messageTemplate[ "Assistant" ], StringRiffle[ TextString /@ Flatten @ a, "\n" ] ];
-assistant[ a_String ] := assistant @ { a };
+
+assistant[ { a___, "tool"|"Tool" -> { name_, as_ }, b___ } ] :=
+    assistant @ { a, toolCall[ name, as ], b };
+
+assistant[ a_List ] := TemplateApply[
+    messageTemplate[ "Assistant" ],
+    <|
+        "Content"  -> StringRiffle[ TextString /@ Flatten @ a, "\n" ],
+        "EndToken" -> $endTokenString
+    |>
+];
+
+assistant[ a_String ] :=
+    assistant @ { a };
+
 assistant // endDefinition;
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsubsubsection::Closed:: *)
 (*system*)
 system // beginDefinition;
-system[ a_List ] := TemplateApply[ messageTemplate[ "System" ], StringRiffle[ TextString /@ Flatten @ a, "\n" ] ];
-system[ a_String ] := system @ { a };
+
+system[ a_List ] := TemplateApply[
+    messageTemplate[ "System" ],
+    <|
+        "Content"  -> StringRiffle[ TextString /@ Flatten @ a, "\n" ],
+        "EndToken" -> $endTokenString
+    |>
+];
+
+system[ a_String ] :=
+    system @ { a };
+
 system // endDefinition;
 
 (* ::**************************************************************************************************************:: *)