Merge pull request #1296 from WolframResearch/feature/attachments

Added `LoadAttachments`

Author: rhennigan

Source/Chatbook/Main.wl

@@ -79,15 +79,16 @@ BeginPackage[ "Wolfram`Chatbook`" ];
 `InstallVectorDatabases;
 `InvalidateServiceCache;
 `ListSavedChats;
+`LoadAttachments;
 `LoadChat;
 `LogChatTiming;
 `MakeExpressionURI;
 `ProcessNotebookForRAG;
 `RebuildChatSearchIndex;
 `RegisterVectorDatabase;
 `RelatedDocumentation;
-`RelatedWolframAlphaResults;
 `RelatedWolframAlphaQueries;
+`RelatedWolframAlphaResults;
 `RemoveChatFromSearchIndex;
 `SandboxLinguisticAssistantData;
 `SaveAsChatNotebook;
@@ -264,6 +265,7 @@ $ChatbookProtectedNames = "Wolfram`Chatbook`" <> # & /@ {
     "InlineTemplateBoxes",
     "InstallVectorDatabases",
     "ListSavedChats",
+    "LoadAttachments",
     "LoadChat",
     "LogChatTiming",
     "MakeExpressionURI",
@@ -272,6 +274,7 @@ $ChatbookProtectedNames = "Wolfram`Chatbook`" <> # & /@ {
     "RegisterVectorDatabase",
     "RelatedDocumentation",
     "RelatedWolframAlphaQueries",
+    "RelatedWolframAlphaResults",
     "RemoveChatFromSearchIndex",
     "SandboxLinguisticAssistantData",
     "SaveAsChatNotebook",

Source/Chatbook/Storage.wl

@@ -222,13 +222,8 @@ restoreAttachments // beginDefinition;
 restoreAttachments[ KeyValuePattern[ "Attachments" -> attachments_Association ] ] :=
     Association @ KeyValueMap[ # -> restoreAttachments @ ## &, attachments ];
 
-restoreAttachments[ "Expressions", expressions_Association ] := Enclose[
-    $attachments = ConfirmBy[ <| $attachments, expressions |>, AssociationQ, "Attachments" ],
-    throwInternalFailure
-];
-
-restoreAttachments[ "ToolCalls", toolCalls_Association ] := Enclose[
-    $toolEvaluationResults = ConfirmBy[ <| $toolEvaluationResults, toolCalls |>, AssociationQ, "ToolCalls" ],
+restoreAttachments[ type: "Expressions"|"ToolCalls", as_Association ] := Enclose[
+    ConfirmBy[ LoadAttachments[ type, as ], AssociationQ, "LoadAttachments" ],
     throwInternalFailure
 ];
 

Source/Chatbook/Tools/ExpressionURIs.wl

@@ -340,6 +340,9 @@ GetAttachments[ messages_ ] :=
 GetAttachments[ messages: $$chatMessages|None, prop: $$attachmentProperty|All ] :=
     catchMine @ getAttachments[ messages, prop ];
 
+GetAttachments[ content_, prop: $$attachmentProperty|All ] :=
+    catchMine @ getAttachments[ ensureChatMessages @ content, prop ];
+
 GetAttachments // endExportedDefinition;
 
 (* TODO: this should identify expression and tool call keys from earlier sessions and give Missing[...] for those *)
@@ -378,6 +381,31 @@ getAttachments[ messages_, prop: $$attachmentProperty ] := Enclose[
 
 getAttachments // endDefinition;
 
+(* ::**************************************************************************************************************:: *)
+(* ::Section::Closed:: *)
+(*LoadAttachments*)
+LoadAttachments // beginDefinition;
+LoadAttachments[ as_Association ] := catchMine @ LoadAttachments[ "Expressions", as ];
+LoadAttachments[ type: "Expressions"|"ToolCalls", as_Association ] := catchMine @ loadAttachments[ type, as ];
+LoadAttachments // endExportedDefinition;
+
+(* ::**************************************************************************************************************:: *)
+(* ::Subsection::Closed:: *)
+(*loadAttachments*)
+loadAttachments // beginDefinition;
+
+loadAttachments[ "Expressions", expressions_Association ] := Enclose[
+    $attachments = ConfirmBy[ <| $attachments, expressions |>, AssociationQ, "Attachments" ],
+    throwInternalFailure
+];
+
+loadAttachments[ "ToolCalls", toolCalls_Association ] := Enclose[
+    $toolEvaluationResults = ConfirmBy[ <| $toolEvaluationResults, toolCalls |>, AssociationQ, "ToolCalls" ],
+    throwInternalFailure
+];
+
+loadAttachments // endDefinition;
+
 (* ::**************************************************************************************************************:: *)
 (* ::Section::Closed:: *)
 (*Package Footer*)