Merge remote-tracking branch 'origin/main' into 531-generated-cells-a…

…ppearing-below-a-chatinput-cell-are-incorrectly-included-in-the-chat-context
WolframResearch · Jan 8, 2024 · fd701ee · fd701ee
2 parents 4e416f2 + 2f85da8
commit fd701ee
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 14 deletions.
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/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*)

diff --git a/Source/Chatbook/Main.wl b/Source/Chatbook/Main.wl
@@ -7,6 +7,7 @@ BeginPackage[ "Wolfram`Chatbook`" ];
 (* ::Subsection::Closed:: *)
 (*Declare Symbols*)
 `$AvailableTools;
+`$ChatAbort;
 `$ChatHandlerData;
 `$ChatPost;
 `$ChatPre;

diff --git a/Source/Chatbook/SendChat.wl b/Source/Chatbook/SendChat.wl
@@ -1750,7 +1750,7 @@ activeAIAssistantCell[
                 Editable        -> False,
                 CellDingbat     -> Cell[ BoxData @ makeActiveOutputDingbat @ settings, Background -> None ],
                 CellTrayWidgets -> <| "ChatFeedback" -> <| "Visible" -> False |> |>,
-                TaggingRules    -> <| "ChatNotebookSettings" -> settings |>
+                TaggingRules    -> <| "ChatNotebookSettings" -> smallSettings @ settings |>
             ]
         ]
     ];
@@ -1803,7 +1803,7 @@ activeAIAssistantCell[
             Selectable         -> True,
             ShowAutoSpellCheck -> False,
             ShowCursorTracker  -> False,
-            TaggingRules       -> <| "ChatNotebookSettings" -> settings |>,
+            TaggingRules       -> <| "ChatNotebookSettings" -> smallSettings @ settings |>,
             If[ scrollOutputQ @ settings,
                 PrivateCellOptions -> { "TrackScrollingWhenPlaced" -> True },
                 Sequence @@ { }
@@ -1897,8 +1897,10 @@ makeActiveOutputDingbat // endDefinition;
 (* ::Subsubsection::Closed:: *)
 (*makeOutputDingbat*)
 makeOutputDingbat // beginDefinition;
+makeOutputDingbat[ as: KeyValuePattern[ "LLMEvaluator" -> name_String ] ] := makeOutputDingbat[ as, name ];
 makeOutputDingbat[ as: KeyValuePattern[ "LLMEvaluator" -> config_Association ] ] := makeOutputDingbat[ as, config ];
 makeOutputDingbat[ as_Association ] := makeOutputDingbat[ as, as ];
+makeOutputDingbat[ as_, name_String ] := makeOutputDingbat[ as, GetCachedPersonaData @ name ];
 makeOutputDingbat[ as_, KeyValuePattern[ "PersonaIcon" -> icon_ ] ] := makeOutputDingbat[ as, icon ];
 makeOutputDingbat[ as_, KeyValuePattern[ "Icon" -> icon_ ] ] := makeOutputDingbat[ as, icon ];
 makeOutputDingbat[ as_, KeyValuePattern[ "Default" -> icon_ ] ] := makeOutputDingbat[ as, icon ];

diff --git a/Source/Chatbook/Settings.wl b/Source/Chatbook/Settings.wl
@@ -71,6 +71,7 @@ $$validRootSettingValue = Inherited | _? (AssociationQ@*Association);
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Defaults*)
+$ChatAbort    = None;
 $ChatPost     = None;
 $ChatPre      = None;
 $DefaultModel = <| "Service" -> "OpenAI", "Name" -> "gpt-4" |>;
@@ -79,8 +80,9 @@ $DefaultModel = <| "Service" -> "OpenAI", "Name" -> "gpt-4" |>;
 (* ::Subsection::Closed:: *)
 (*Handler Functions*)
 $DefaultChatHandlerFunctions = <|
-    "ChatPost" :> $ChatPost,
-    "ChatPre"  :> $ChatPre
+    "ChatAbort" :> $ChatAbort,
+    "ChatPost"  :> $ChatPost,
+    "ChatPre"   :> $ChatPre
 |>;
 
 (* ::**************************************************************************************************************:: *)