Merge pull request #1035 from WolframResearch/bugfix/more-serializati…

…on-rules More serialization rules
WolframResearch · Jan 21, 2025 · 98ae65e · 98ae65e
2 parents 9ac4277 + ec8e8b5
commit 98ae65e
Show file tree

Hide file tree

Showing 10 changed files with 469 additions and 89 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -20,6 +20,7 @@
         "Deinitialization",
         "Demi",
         "Dirtiable",
+        "Docu",
         "dpkg",
         "EFAIL",
         "ENDARGUMENTS",
@@ -79,6 +80,7 @@
         "Subsubsubsection",
         "Subsubsubsubsection",
         "Subsubtitle",
+        "Subsuperscript",
         "tabletags",
         "tavily",
         "textbf",

diff --git a/Assets/TemplateBoxOptions.wxf b/Assets/TemplateBoxOptions.wxf
diff --git a/PacletInfo.wl b/PacletInfo.wl
@@ -1,7 +1,7 @@
 PacletObject[ <|
     "Name"           -> "Wolfram/Chatbook",
     "PublisherID"    -> "Wolfram",
-    "Version"        -> "2.0.20",
+    "Version"        -> "2.1.0",
     "WolframVersion" -> "14.1+",
     "Description"    -> "Wolfram Notebooks + LLMs",
     "License"        -> "MIT",
@@ -34,11 +34,12 @@ PacletObject[ <|
         { "Asset",
             "Root"    -> "Assets",
             "Assets"  -> {
-                { "AIAssistant"     , "AIAssistant"          },
-                { "DisplayFunctions", "DisplayFunctions.wxf" },
-                { "Icons"           , "Icons.wxf"            },
-                { "SandboxMessages" , "SandboxMessages.wl"   },
-                { "Tokenizers"      , "Tokenizers"           }
+                { "AIAssistant"       , "AIAssistant"            },
+                { "DisplayFunctions"  , "DisplayFunctions.wxf"   },
+                { "Icons"             , "Icons.wxf"              },
+                { "SandboxMessages"   , "SandboxMessages.wl"     },
+                { "TemplateBoxOptions", "TemplateBoxOptions.wxf" },
+                { "Tokenizers"        , "Tokenizers"             }
             }
         },
         { "LLMConfiguration",

diff --git a/Source/Chatbook/CommonSymbols.wl b/Source/Chatbook/CommonSymbols.wl
@@ -81,6 +81,7 @@ BeginPackage[ "Wolfram`Chatbook`Common`" ];
 `$simpleToolMethod;
 `$statelessProgressIndicator;
 `$suppressButtonAppearance;
+`$templateBoxOptionsCache;
 `$timingLog;
 `$tinyHashLength;
 `$tokenBudget;

diff --git a/Source/Chatbook/FrontEnd.wl b/Source/Chatbook/FrontEnd.wl
@@ -1328,7 +1328,7 @@ rasterize // endDefinition;
 (*replaceCellContext*)
 replaceCellContext // beginDefinition;
 
-replaceCellContext[ expr_ ] := replaceCellContext[ expr ] = ReplaceAll[
+replaceCellContext[ expr_ ] := replaceCellContext[ Verbatim[ expr ] ] = ReplaceAll[
     expr,
     s_Symbol /; AtomQ @ Unevaluated @ s && Context @ Unevaluated @ s === "$CellContext`" :>
         With[ { new = ToExpression[ $Context <> SymbolName @ Unevaluated @ s, InputForm, $ConditionHold ] },

diff --git a/Source/Chatbook/Handlers.wl b/Source/Chatbook/Handlers.wl
@@ -67,6 +67,7 @@ applyHandlerFunction[ settings_Association, name_String, args0_ ] := Enclose[
         args = ConfirmBy[
             <|
                 "EventName"            -> name,
+                (* FIXME: Add settings at start of evaluation instead of each function call *)
                 "ChatNotebookSettings" -> KeyDrop[ settings, $settingsDroppedKeys ],
                 args0
             |>,
@@ -178,6 +179,7 @@ applyProcessingFunction[ settings_Association, name_String, args_HoldComplete, p
         addProcessingArguments[
             name,
             <|
+                (* FIXME: Add settings at start of evaluation instead of each function call *)
                 "ChatNotebookSettings"      -> KeyDrop[ settings, $settingsDroppedKeys ],
                 "DefaultProcessingFunction" -> default,
                 params

diff --git a/Source/Chatbook/PromptGenerators/RelatedDocumentation.wl b/Source/Chatbook/PromptGenerators/RelatedDocumentation.wl
@@ -10,11 +10,11 @@ Needs[ "Wolfram`Chatbook`PromptGenerators`Common`" ];
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Configuration*)
-$snippetType                 = "Text";
-$documentationSnippetVersion = "14-1-0-10549042";
-$baseURL                     = "https://www.wolframcloud.com/obj/wolframai-content/DocumentationSnippets";
-$documentationSnippetBaseURL = URLBuild @ { $baseURL, $documentationSnippetVersion, $snippetType };
-$resourceSnippetBaseURL      = URLBuild @ { $baseURL, "Resources", $snippetType };
+$snippetType                  = "Text";
+$documentationSnippetVersion := $snippetVersion;
+$baseURL                      = "https://www.wolframcloud.com/obj/wolframai-content/DocumentationSnippets";
+$documentationSnippetBaseURL := URLBuild @ { $baseURL, $documentationSnippetVersion, $snippetType };
+$resourceSnippetBaseURL       = URLBuild @ { $baseURL, "Resources", $snippetType };
 
 $documentationSnippetsCacheDirectory := $documentationSnippetsCacheDirectory =
     ChatbookFilesDirectory @ { "DocumentationSnippets", "Documentation", $documentationSnippetVersion };
@@ -46,6 +46,11 @@ $unfilteredItemsPerSource = 10;
 
 $filteringLLMConfig = <| "StopTokens" -> { "CasualChat" } |>;
 
+(* ::**************************************************************************************************************:: *)
+(* ::Subsection::Closed:: *)
+(*$snippetVersion*)
+$snippetVersion := $snippetVersion = If[ $VersionNumber >= 14.2, "14-2-0-11168610", "14-1-0-10549042" ];
+
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Messages*)

diff --git a/Source/Chatbook/PromptGenerators/VectorDatabases.wl b/Source/Chatbook/PromptGenerators/VectorDatabases.wl
@@ -15,14 +15,16 @@ HoldComplete[
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Configuration*)
-$vectorDatabases = <|
-    "DataRepositoryURIs"     -> <| "Version" -> "1.0.0", "Bias" -> 1.0, "SnippetFunction" -> getSnippets |>,
-    "DocumentationURIs"      -> <| "Version" -> "1.3.0", "Bias" -> 0.0, "SnippetFunction" -> getSnippets |>,
-    "FunctionRepositoryURIs" -> <| "Version" -> "1.0.0", "Bias" -> 1.0, "SnippetFunction" -> getSnippets |>,
-    "WolframAlphaQueries"    -> <| "Version" -> "1.3.0", "Bias" -> 0.0, "SnippetFunction" -> Identity |>
+$vectorDatabases := $vectorDatabases = <|
+    "DataRepositoryURIs"     -> <| "Version" -> "1.0.0"    , "Bias" -> 1.0, "SnippetFunction" -> getSnippets |>,
+    "DocumentationURIs"      -> <| "Version" -> $docVersion, "Bias" -> 0.0, "SnippetFunction" -> getSnippets |>,
+    "FunctionRepositoryURIs" -> <| "Version" -> "1.0.0"    , "Bias" -> 1.0, "SnippetFunction" -> getSnippets |>,
+    "WolframAlphaQueries"    -> <| "Version" -> "1.3.0"    , "Bias" -> 0.0, "SnippetFunction" -> Identity    |>
 |>;
 
-$vectorDBNames   = Keys @ $vectorDatabases;
+$docVersion := If[ $VersionNumber >= 14.2, "1.4.0", "1.3.0" ];
+
+$vectorDBNames  := $vectorDBNames = Keys @ $vectorDatabases;
 $allowDownload   = True;
 $cacheEmbeddings = True;
 
@@ -48,7 +50,7 @@ $maxExtraFiles     = 20;
 (*Remote Content Locations*)
 $baseVectorDatabasesURL = "https://www.wolframcloud.com/obj/wolframai-content/VectorDatabases";
 
-$vectorDBDownloadURLs = AssociationMap[
+$vectorDBDownloadURLs := $vectorDBDownloadURLs = AssociationMap[
     URLBuild @ { $baseVectorDatabasesURL, #, $vectorDatabases[ #, "Version" ], # <> ".zip" } &,
     $vectorDBNames
 ];