Merge pull request #1040 from WolframResearch/999-need-error-handling…

…-in-processdocumentationsnippetresult-for-when-cloud-is-unreachable-no-status-code-returned Bugfix: Add error handling for unreachable cloud in snippet downloading
WolframResearch · Jan 21, 2025 · b8c2f66 · b8c2f66
2 parents 3fc3474 + 25f785e
commit b8c2f66
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Source/Chatbook/Common.wl b/Source/Chatbook/Common.wl
@@ -631,7 +631,7 @@ catchMine // endDefinition;
 (* ::Subsection::Closed:: *)
 (*throwTop*)
 throwTop // beginDefinition;
-throwTop[ expr_ ] /; $catching := Throw[ Unevaluated @ expr, $catchTopTag ];
+throwTop[ expr_ ] := If[ TrueQ @ $catching, Throw[ Unevaluated @ expr, $catchTopTag ], expr ];
 throwTop // endDefinition;
 
 (* ::**************************************************************************************************************:: *)

diff --git a/Source/Chatbook/PromptGenerators/RelatedDocumentation.wl b/Source/Chatbook/PromptGenerators/RelatedDocumentation.wl
@@ -1018,7 +1018,9 @@ processDocumentationSnippetResult[ base_String, as_Association ] :=
 processDocumentationSnippetResult[ base_String, as_, bytes_ByteArray, 200 ] :=
     processDocumentationSnippetResult[ base, as, Quiet @ Developer`ReadWXFByteArray @ bytes ];
 
-processDocumentationSnippetResult[ base_String, as_Association, bytes_, code: Except[ 200, _Integer ] ] :=
+(* A 401/403 means we're missing a file in the snippet deployment or it has the wrong permissions,
+   so it should trigger an internal failure, otherwise just issue a generic cloud download failure. *)
+processDocumentationSnippetResult[ base_String, as_Association, bytes_, code: Except[ 401|403 ] ] :=
     throwFailureToChatOutput @ Failure[
         "CloudDownloadError",
         <|

diff --git a/Source/Chatbook/SendChat.wl b/Source/Chatbook/SendChat.wl
@@ -2594,7 +2594,7 @@ throwFailureToChatOutput[ task_, cell_CellObject, failure_ ] := (
     ]
 );
 
-throwFailureToChatOutput[ task_, None, failure_Failure ] := (
+throwFailureToChatOutput[ task_, _, failure_Failure ] := (
     Quiet @ TaskRemove @ task;
     throwTop @ failure
 );