Merge pull request #562 from WolframResearch/main

Release v1.4.1
WolframResearch · Jan 22, 2024 · 99ef68c · 99ef68c
2 parents 00db891 + f978bcc
commit 99ef68c
Show file tree

Hide file tree

Showing 26 changed files with 2,324 additions and 1,226 deletions.
diff --git a/FrontEnd/StyleSheets/Chatbook.nb b/FrontEnd/StyleSheets/Chatbook.nb
@@ -1161,7 +1161,7 @@ Notebook[
   ],
   Cell[
    StyleData["ChatStyleSheetInformation"],
-   TaggingRules -> <|"StyleSheetVersion" -> "1.4.0.3913547000"|>
+   TaggingRules -> <|"StyleSheetVersion" -> "1.4.1.3913792210"|>
   ],
   Cell[
    StyleData["Text"],
@@ -17593,4 +17593,4 @@ Notebook[
   ]
  },
  StyleDefinitions -> "PrivateStylesheetFormatting.nb"
-]
+]
diff --git a/PacletInfo.wl b/PacletInfo.wl
@@ -1,7 +1,7 @@
 PacletObject[ <|
     "Name"           -> "Wolfram/Chatbook",
     "PublisherID"    -> "Wolfram",
-    "Version"        -> "1.4.0",
+    "Version"        -> "1.4.1",
     "WolframVersion" -> "13.3+",
     "Description"    -> "Wolfram Notebooks + LLMs",
     "License"        -> "MIT",

diff --git a/Scripts/Common.wl b/Scripts/Common.wl
@@ -368,6 +368,7 @@ Print[ "ResourceSystemBase: ", $ResourceSystemBase ];
 $defNB = File @ FileNameJoin @ { $pacletDir, "ResourceDefinition.nb" };
 Print[ "Definition Notebook: ", $defNB ];
 
+PacletDirectoryLoad @ $pacletDir;
 
 $loadedDefinitions = True;
 

diff --git a/Source/Chatbook/Actions.wl b/Source/Chatbook/Actions.wl
@@ -20,6 +20,7 @@ BeginPackage[ "Wolfram`Chatbook`Actions`" ];
 `$autoAssistMode;
 `$autoOpen;
 `$finalCell;
+`$lastCellObject;
 `$lastChatString;
 `$lastMessages;
 `$lastSettings;
@@ -406,14 +407,32 @@ EvaluateChatInput[ evalCell_CellObject, nbo_NotebookObject ] :=
     EvaluateChatInput[ evalCell, nbo, currentChatSettings @ nbo ];
 
 EvaluateChatInput[ evalCell_CellObject, nbo_NotebookObject, settings_Association? AssociationQ ] :=
-    withChatState @ Block[ { $autoAssistMode = False },
-        $lastMessages       = None;
+    withChatState @ Block[ { $autoAssistMode = False, $aborted = False },
+        $lastCellObject     = None;
         $lastChatString     = None;
+        $lastMessages       = None;
         $nextTaskEvaluation = None;
-        clearMinimizedChats @ nbo;
         $enableLLMServices  = settings[ "EnableLLMServices" ];
-        sendChat[ evalCell, nbo, settings ];
-        waitForLastTask[ ];
+        clearMinimizedChats @ nbo;
+
+        (* Send chat while listening for an abort: *)
+        CheckAbort[
+            sendChat[ evalCell, nbo, settings ];
+            waitForLastTask[ ]
+            ,
+            (* The user has issued an abort: *)
+            $aborted = True;
+            (* Clean up the current chat evaluation: *)
+            With[ { cell = $lastCellObject },
+                If[ MatchQ[ cell, _CellObject ],
+                    StopChat @ cell,
+                    removeTask @ $lastTask
+                ]
+            ]
+            ,
+            PropagateAborts -> False
+        ];
+
         blockChatObject[
             If[ ListQ @ $lastMessages && StringQ @ $lastChatString,
                 With[
@@ -423,18 +442,31 @@ EvaluateChatInput[ evalCell_CellObject, nbo_NotebookObject, settings_Association
                             <| "Role" -> "Assistant", "Content" -> $lastChatString |>
                         ]
                     },
-                    applyHandlerFunction[ settings, "ChatPost", <| "ChatObject" -> chat, "NotebookObject" -> nbo |> ];
-                    Sow[ chat, $chatObjectTag ]
+                    applyChatPost[ chat, settings, nbo, $aborted ]
                 ],
-                applyHandlerFunction[ settings, "ChatPost", <| "ChatObject" -> None, "NotebookObject" -> nbo |> ];
-                Sow[ None, $chatObjectTag ];
+                applyChatPost[ None, settings, nbo, $aborted ];
                 Null
             ];
         ]
     ];
 
 EvaluateChatInput // endDefinition;
 
+(* ::**************************************************************************************************************:: *)
+(* ::Subsection::Closed:: *)
+(*applyChatPost*)
+applyChatPost // beginDefinition;
+
+applyChatPost[ chat_, settings_, nbo_, aborted: True|False ] := (
+    If[ aborted,
+        applyHandlerFunction[ settings, "ChatAbort", <| "ChatObject" -> chat, "NotebookObject" -> nbo |> ],
+        applyHandlerFunction[ settings, "ChatPost" , <| "ChatObject" -> chat, "NotebookObject" -> nbo |> ]
+    ];
+    Sow[ chat, $chatObjectTag ]
+);
+
+applyChatPost // endDefinition;
+
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
 (*blockChatObject*)
@@ -481,10 +513,23 @@ ensureChatInputCell // endDefinition;
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)
 (*chatOutputCellQ*)
-chatOutputCellQ[ cell_CellObject ] := chatOutputCellQ[ cell ] = chatOutputCellQ[ cell, Developer`CellInformation @ cell ];
-chatOutputCellQ[ cell_, KeyValuePattern[ "Style" -> $$chatOutputStyle ] ] := True;
-chatOutputCellQ[ cell_CellObject, ___ ] := ($badCellObject = cell; $badCell = NotebookRead @ cell; False);
-chatOutputCellQ[ ___ ] := False;
+chatOutputCellQ[ cell_CellObject ] := chatOutputCellQ[ cell ] =
+    chatOutputCellQ[ cell, Developer`CellInformation @ cell ];
+
+chatOutputCellQ[ cell_, KeyValuePattern[ "Style" -> $$chatOutputStyle ] ] :=
+    True;
+
+chatOutputCellQ[ cell_CellObject, KeyValuePattern[ "Style" -> "Output" ] ] /; $cloudNotebooks :=
+    MatchQ[ CurrentValue[ cell, { TaggingRules, "ChatNotebookSettings", "CellObject" } ], _CellObject ];
+
+chatOutputCellQ[ cell_CellObject, ___ ] := (
+    $badCellObject = cell;
+    $badCell = NotebookRead @ cell;
+    False
+);
+
+chatOutputCellQ[ ___ ] :=
+    False;
 
 (* ::**************************************************************************************************************:: *)
 (* ::Subsection::Closed:: *)

diff --git a/Source/Chatbook/ChatHistory.wl b/Source/Chatbook/ChatHistory.wl
@@ -186,6 +186,7 @@ chatExcludedQ[ KeyValuePattern[ "Style" -> $$chatIgnoredStyle ] ] := True;
 chatExcludedQ[ KeyValuePattern[ "ChatNotebookSettings" -> settings_ ] ] := chatExcludedQ @ settings;
 chatExcludedQ[ KeyValuePattern[ "ExcludeFromChat" -> exclude_ ] ] := TrueQ @ exclude;
 chatExcludedQ[ KeyValuePattern[ { } ] ] := False;
+chatExcludedQ[ Inherited ] := False;
 
 chatExcludedQ // endDefinition;
 

diff --git a/Source/Chatbook/ChatMessages.wl b/Source/Chatbook/ChatMessages.wl
@@ -714,6 +714,7 @@ inferMultimodalTypes[ content_List ] := Enclose[
 
 inferMultimodalTypes // endDefinition;
 
+(* TODO: add a way to control image detail and insert "Detail" -> "..." here when appropriate: *)
 inferMultimodalTypes0 // beginDefinition;
 inferMultimodalTypes0[ content_List        ] := inferMultimodalTypes0 /@ content;
 inferMultimodalTypes0[ content_String      ] := <| "Type" -> "Text" , "Data" -> content |>;

diff --git a/Source/Chatbook/Chatbook.wl b/Source/Chatbook/Chatbook.wl
@@ -12,7 +12,15 @@ Quiet[
         Unprotect[ "Wolfram`Chatbook`*" ];
         ClearAll[ "Wolfram`Chatbook`*" ];
         ClearAll[ "Wolfram`Chatbook`*`*" ];
-        Get @ Wolfram`ChatbookLoader`$MXFile
+        Get @ Wolfram`ChatbookLoader`$MXFile;
+        (* Ensure all subcontexts are in $Packages to avoid reloading subcontexts out of order: *)
+        If[ MatchQ[ Wolfram`Chatbook`$ChatbookContexts, { __String } ],
+            WithCleanup[
+                Unprotect @ $Packages,
+                $Packages = DeleteDuplicates @ Join[ $Packages, Wolfram`Chatbook`$ChatbookContexts ],
+                Protect @ $Packages
+            ]
+        ]
         ,
         WithCleanup[
             PreemptProtect[