Merge pull request #603 from WolframResearch/main

Release v1.4.4
WolframResearch · Feb 16, 2024 · ce7fb3b · ce7fb3b
2 parents 4abdb41 + c9dbbca
commit ce7fb3b
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 18 deletions.
diff --git a/PacletInfo.wl b/PacletInfo.wl
@@ -1,7 +1,7 @@
 PacletObject[ <|
     "Name"           -> "Wolfram/Chatbook",
     "PublisherID"    -> "Wolfram",
-    "Version"        -> "1.4.3",
+    "Version"        -> "1.4.4",
     "WolframVersion" -> "13.3+",
     "Description"    -> "Wolfram Notebooks + LLMs",
     "License"        -> "MIT",

diff --git a/Source/Chatbook/Formatting.wl b/Source/Chatbook/Formatting.wl
@@ -163,7 +163,7 @@ makeResultCell0[ bulletCell[ whitespace_String, item_String ] ] := Flatten @ {
 
 makeResultCell0[ sectionCell[ n_, section_String ] ] := Flatten @ {
     "\n",
-    StyleBox[ formatTextString @ section, sectionStyle @ n, "InlineSection", FontSize -> .8*Inherited ],
+    styleBox[ formatTextString @ section, sectionStyle @ n, "InlineSection", FontSize -> .8*Inherited ],
     $tinyLineBreak
 };
 

diff --git a/Source/Chatbook/PreferencesContent.wl b/Source/Chatbook/PreferencesContent.wl
@@ -563,6 +563,13 @@ makeModelNameSelector[
             "ServiceModelList"
         ];
 
+        (* TODO:
+               If the underlying ServiceExecute in getServiceModelList fails (e.g. due to API issues), it currently
+               returns Missing["NoModelList"]. It might be better to have it return an appropriate Failure[...] instead.
+               In this case, we would want to indicate to the user that the service is not available, rather than
+               falling back to the input field method.
+        *)
+
         If[ models === Missing[ "NotConnected" ],
             Throw @ serviceConnectButton[
                 Dynamic @ service,

diff --git a/Source/Chatbook/SendChat.wl b/Source/Chatbook/SendChat.wl
@@ -1682,6 +1682,13 @@ prepareChatOutputPage[ target_CellObject, cell_Cell ] := Enclose[
             Throw @ cellPrint @ cell
         ];
 
+        If[ MatchQ[ prevCellExpr, Cell[ BoxData[ TagBox[ _, "DynamicTextDisplay", ___ ], ___ ], ___ ] ],
+            (* The target cell is a left-over dynamic chat output that hasn't been cleaned up properly,
+               so delete it and create a new chat output. *)
+            NotebookDelete @ target;
+            Throw @ cellPrint @ cell
+        ];
+
         prevPage = ConfirmMatch[
             Replace[ First @ prevCellExpr, text_String :> TextData @ { text } ],
             _TextData,

diff --git a/Source/Chatbook/Services.wl b/Source/Chatbook/Services.wl
@@ -124,6 +124,9 @@ getServiceModelList[ service_String, info_, models0_List ] := Enclose[
     throwInternalFailure
 ];
 
+getServiceModelList[ service_String, info_, Missing[ "NoModelList" ] ] :=
+    Missing[ "NoModelList" ];
+
 getServiceModelList // endDefinition;
 
 (* ::**************************************************************************************************************:: *)

diff --git a/Source/Chatbook/Settings.wl b/Source/Chatbook/Settings.wl
@@ -21,7 +21,7 @@ Needs[ "Wolfram`Chatbook`ResourceInstaller`" ];
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Configuration*)
-$cloudInheritanceFix := $cloudNotebooks && ! PacletNewerQ[ $CloudVersionNumber, "1.67.1" ];
+$cloudInheritanceFix := $cloudNotebooks;
 
 (* cSpell: ignore AIAPI *)
 $defaultChatSettings = <|

diff --git a/Source/Chatbook/UI.wl b/Source/Chatbook/UI.wl
@@ -598,29 +598,23 @@ makeChatActionMenu[
 	RaiseConfirmMatch[personas, <| (_String -> _Association)... |>];
 
 	(* initialize PrivateFrontEndOptions if they aren't already present or somehow broke *)
-	If[!MatchQ[CurrentValue[$FrontEnd, {PrivateFrontEndOptions, "InterfaceSettings", "Chatbook", "VisiblePersonas"}], {___String}],
-        CurrentValue[
-			$FrontEnd,
-			{PrivateFrontEndOptions, "InterfaceSettings", "Chatbook", "VisiblePersonas"}
-		] = DeleteCases[Keys[personas], Alternatives["Birdnardo", "RawModel", "Wolfie"]]
+	If[!MatchQ[CurrentChatSettings[$FrontEnd, "VisiblePersonas"], {___String}],
+        CurrentChatSettings[$FrontEnd, "VisiblePersonas"] = DeleteCases[
+			Keys[personas],
+			Alternatives["Birdnardo", "RawModel", "Wolfie"]
+		]
 	];
-	If[!MatchQ[CurrentValue[$FrontEnd, {PrivateFrontEndOptions, "InterfaceSettings", "Chatbook", "PersonaFavorites"}], {___String}],
-        CurrentValue[
-			$FrontEnd,
-			{PrivateFrontEndOptions, "InterfaceSettings", "Chatbook", "PersonaFavorites"}
-		] = {"CodeAssistant", "CodeWriter", "PlainChat"}
+	If[!MatchQ[CurrentChatSettings[$FrontEnd, "PersonaFavorites"], {___String}],
+        CurrentChatSettings[$FrontEnd, "PersonaFavorites"] = {"CodeAssistant", "CodeWriter", "PlainChat"}
 	];
 
 	(* only show visible personas and sort visible personas based on favorites setting *)
 	personas = KeyTake[
 		personas,
-		CurrentValue[$FrontEnd, {PrivateFrontEndOptions, "InterfaceSettings", "Chatbook", "VisiblePersonas"}]
+		CurrentChatSettings[$FrontEnd, "VisiblePersonas"]
 	];
 	personas = With[{
-		favorites = CurrentValue[
-			$FrontEnd,
-			{PrivateFrontEndOptions, "InterfaceSettings", "Chatbook", "PersonaFavorites"}
-		]
+		favorites = CurrentChatSettings[$FrontEnd, "PersonaFavorites"]
 	},
 		Association[
 			(* favorites appear in the exact order provided in the CurrentValue *)