Throw server errors as errors

Author: ccreutzi

+llms/+utils/errorMessageCatalog.m

@@ -55,6 +55,6 @@
 catalog("llms:pngExpected") = "Argument must be a PNG image.";
 catalog("llms:warningJsonInstruction") = "When using JSON mode, you must also prompt the model to produce JSON yourself via a system or user message.";
 catalog("llms:invalidOptionsForAzureBackEnd") = "The parameter Model Name is not compatible with Azure.";
-catalog("llms:apiReturnedError") = "OpenAI API Error: {1}";
+catalog("llms:apiReturnedError") = "Server error: ""{1}""";
 catalog("llms:dimensionsMustBeSmallerThan") = "Dimensions must be less than or equal to {1}.";
 end

azureChat.m

@@ -186,6 +186,11 @@
                 PresencePenalty=this.PresencePenalty, FrequencyPenalty=this.FrequencyPenalty, ...
                 ResponseFormat=this.ResponseFormat,Seed=nvp.Seed, ...
                 APIKey=this.APIKey,TimeOut=this.TimeOut, StreamFun=this.StreamFun);
+
+            if isfield(response.Body.Data,"error")
+                err = response.Body.Data.error.message;
+                error("llms:apiReturnedError",llms.utils.errorMessageCatalog.getMessage("llms:apiReturnedError",err));
+            end
         end
     end
 

ollamaChat.m

@@ -149,6 +149,11 @@
                 StopSequences=this.StopSequences, MaxNumTokens=nvp.MaxNumTokens, ...
                 ResponseFormat=this.ResponseFormat,Seed=nvp.Seed, ...
                 TimeOut=this.TimeOut, StreamFun=this.StreamFun);
+
+            if isfield(response.Body.Data,"error")
+                err = response.Body.Data.error;
+                error("llms:apiReturnedError",llms.utils.errorMessageCatalog.getMessage("llms:apiReturnedError",err));
+            end
         end
     end
 

openAIChat.m

@@ -186,10 +186,8 @@
 
             if isfield(response.Body.Data,"error")
                 err = response.Body.Data.error.message;
-                text = llms.utils.errorMessageCatalog.getMessage("llms:apiReturnedError",err);
-                message = struct("role","assistant","content",text);
+                error("llms:apiReturnedError",llms.utils.errorMessageCatalog.getMessage("llms:apiReturnedError",err));
             end
-
         end
     end
 

tests/tazureChat.m

@@ -40,6 +40,15 @@ function doGenerate(testCase)
             testCase.verifyGreaterThan(strlength(response),0);
         end
 
+        function doReturnErrors(testCase)
+            testCase.assumeTrue(isenv("AZURE_OPENAI_API_KEY"),"end-to-end test requires environment variables AZURE_OPENAI_API_KEY, AZURE_OPENAI_ENDPOINT, and AZURE_OPENAI_DEPLOYMENT.");
+            chat = azureChat(getenv("AZURE_OPENAI_ENDPOINT"), getenv("AZURE_OPENAI_DEPLOYMENT"));
+            % This input is considerably longer than accepted as input for
+            % GPT-3.5 (16385 tokens)
+            wayTooLong = string(repmat('a ',1,20000));
+            testCase.verifyError(@() generate(chat,wayTooLong), "llms:apiReturnedError");
+        end
+
         function seedFixesResult(testCase)
             testCase.assumeTrue(isenv("AZURE_OPENAI_API_KEY"),"end-to-end test requires environment variables AZURE_OPENAI_API_KEY, AZURE_OPENAI_ENDPOINT, and AZURE_OPENAI_DEPLOYMENT.");
             chat = azureChat(getenv("AZURE_OPENAI_ENDPOINT"), getenv("AZURE_OPENAI_DEPLOYMENT"));

tests/tollamaChat.m

@@ -87,6 +87,15 @@ function streamFunc(testCase)
             testCase.verifyGreaterThan(numel(sf("")), 1);
         end
 
+        function doReturnErrors(testCase)
+            testCase.assumeFalse( ...
+                any(startsWith(ollamaChat.models,"abcdefghijklmnop")), ...
+                "We want a model name that does not exist on this server");
+            chat = ollamaChat("abcdefghijklmnop");
+            testCase.verifyError(@() generate(chat,"hi!"), "llms:apiReturnedError");
+        end
+
+
         function invalidInputsConstructor(testCase, InvalidConstructorInput)
             testCase.verifyError(@() ollamaChat("mistral", InvalidConstructorInput.Input{:}), InvalidConstructorInput.Error);
         end

tests/topenAIChat.m

@@ -13,14 +13,12 @@
     methods(Test)
         % Test methods
         function generateAcceptsSingleStringAsInput(testCase)
-            chat = openAIChat(APIKey="this-is-not-a-real-key");
-            testCase.verifyWarningFree(@()generate(chat,"This is okay"));
-            chat = openAIChat(APIKey='this-is-not-a-real-key');
+            chat = openAIChat;
             testCase.verifyWarningFree(@()generate(chat,"This is okay"));
         end
 
         function generateAcceptsMessagesAsInput(testCase)
-            chat = openAIChat(APIKey="this-is-not-a-real-key");
+            chat = openAIChat;
             messages = openAIMessages;
             messages = addUserMessage(messages, "This should be okay.");
 
@@ -73,15 +71,17 @@ function errorsWhenPassingToolChoiceWithEmptyTools(testCase)
 
         function settingToolChoiceWithNone(testCase)
             functions = openAIFunction("funName");
-            chat = openAIChat(APIKey="this-is-not-a-real-key",Tools=functions);
+            chat = openAIChat(Tools=functions);
 
             testCase.verifyWarningFree(@()generate(chat,"This is okay","ToolChoice","none"));
         end
 
-        function settingSeedToInteger(testCase)
-            chat = openAIChat(APIKey="this-is-not-a-real-key");
+        function fixedSeedFixesResult(testCase)
+            chat = openAIChat;
 
-            testCase.verifyWarningFree(@()generate(chat,"This is okay", "Seed", 2));
+            result1 = generate(chat,"This is okay", "Seed", 2);
+            result2 = generate(chat,"This is okay", "Seed", 2);
+            testCase.verifyEqual(result1,result2);
         end
 
         function invalidInputsConstructor(testCase, InvalidConstructorInput)
@@ -189,10 +189,12 @@ function invalidGenerateInputforModel(testCase)
             testCase.verifyError(@()generate(chat,inValidMessages), "llms:invalidContentTypeForModel")
         end
 
-        function noStopSequencesNoMaxNumTokens(testCase)
-            chat = openAIChat(APIKey="this-is-not-a-real-key");
-
-            testCase.verifyWarningFree(@()generate(chat,"This is okay"));
+        function doReturnErrors(testCase)
+            chat = openAIChat;
+            % This input is considerably longer than accepted as input for
+            % GPT-3.5 (16385 tokens)
+            wayTooLong = string(repmat('a ',1,20000));
+            testCase.verifyError(@() generate(chat,wayTooLong), "llms:apiReturnedError");
         end
 
         function createOpenAIChatWithStreamFunc(testCase)