accept char and cellstr input for generate

Author: ccreutzi

+llms/+utils/mustBeNonzeroLengthTextScalar.m

@@ -5,5 +5,8 @@ function mustBeNonzeroLengthTextScalar(content)
 
 %   Copyright 2024 The MathWorks, Inc.
 mustBeNonzeroLengthText(content)
+if iscellstr(content)
+    content = string(content);
+end
 mustBeTextScalar(content)
 end

azureChat.m

@@ -171,13 +171,14 @@
 
             arguments
                 this                    (1,1) azureChat
-                messages                (1,1) {mustBeValidMsgs}
+                messages                {mustBeValidMsgs}
                 nvp.NumCompletions      (1,1) {mustBePositive, mustBeInteger} = 1
                 nvp.MaxNumTokens        (1,1) {mustBePositive} = inf
                 nvp.ToolChoice          {mustBeValidFunctionCall(this, nvp.ToolChoice)} = []
                 nvp.Seed                {mustBeIntegerOrEmpty(nvp.Seed)} = []
             end
 
+            messages = convertCharsToStrings(messages);
             if isstring(messages) && isscalar(messages)
                 messagesStruct = {struct("role", "user", "content", messages)};
             else

ollamaChat.m

@@ -135,12 +135,13 @@
 
             arguments
                 this                    (1,1) ollamaChat
-                messages                (1,1) {mustBeValidMsgs}
+                messages                {mustBeValidMsgs}
                 nvp.NumCompletions      (1,1) {mustBePositive, mustBeInteger} = 1
                 nvp.MaxNumTokens        (1,1) {mustBePositive} = inf
                 nvp.Seed                {mustBeIntegerOrEmpty(nvp.Seed)} = []
             end
 
+            messages = convertCharsToStrings(messages);
             if isstring(messages) && isscalar(messages)
                 messagesStruct = {struct("role", "user", "content", messages)};
             else

openAIChat.m

@@ -168,7 +168,7 @@
 
             arguments
                 this                    (1,1) openAIChat
-                messages                (1,1) {mustBeValidMsgs}
+                messages                {mustBeValidMsgs}
                 nvp.NumCompletions      (1,1) {mustBePositive, mustBeInteger} = 1
                 nvp.MaxNumTokens        (1,1) {mustBePositive} = inf
                 nvp.ToolChoice          {mustBeValidFunctionCall(this, nvp.ToolChoice)} = []
@@ -177,6 +177,7 @@
 
             toolChoice = convertToolChoice(this, nvp.ToolChoice);
 
+            messages = convertCharsToStrings(messages);
             if isstring(messages) && isscalar(messages)
                 messagesStruct = {struct("role", "user", "content", messages)};
             else

tests/tazureChat.m

@@ -7,6 +7,7 @@
         InvalidConstructorInput = iGetInvalidConstructorInput;
         InvalidGenerateInput = iGetInvalidGenerateInput;
         InvalidValuesSetters = iGetInvalidValuesSetters;
+        StringInputs = struct('string',{"hi"},'char',{'hi'},'cellstr',{{'hi'}});
     end
 
     methods(Test)
@@ -32,10 +33,10 @@ function constructChatWithAllNVP(testCase)
             testCase.verifyEqual(chat.PresencePenalty, presenceP);
         end
 
-        function doGenerate(testCase)
+        function doGenerate(testCase,StringInputs)
             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"));
-            response = testCase.verifyWarningFree(@() generate(chat,"hi"));
+            response = testCase.verifyWarningFree(@() generate(chat,StringInputs));
             testCase.verifyClass(response,'string');
             testCase.verifyGreaterThan(strlength(response),0);
         end

tests/tollamaChat.m

@@ -8,6 +8,7 @@
         InvalidGenerateInput = iGetInvalidGenerateInput;
         InvalidValuesSetters = iGetInvalidValuesSetters;
         ValidValuesSetters = iGetValidValuesSetters;
+        StringInputs = struct('string',{"hi"},'char',{'hi'},'cellstr',{{'hi'}});
     end
 
     methods(Test)
@@ -31,9 +32,9 @@ function constructChatWithAllNVP(testCase)
             testCase.verifyEqual(chat.StopSequences, stop);
         end
 
-        function doGenerate(testCase)
+        function doGenerate(testCase,StringInputs)
             chat = ollamaChat("mistral");
-            response = testCase.verifyWarningFree(@() generate(chat,"hi"));
+            response = testCase.verifyWarningFree(@() generate(chat,StringInputs));
             testCase.verifyClass(response,'string');
             testCase.verifyGreaterThan(strlength(response),0);
         end
@@ -290,7 +291,7 @@ function queryModels(testCase)
 invalidGenerateInput = struct( ...
         "EmptyInput",struct( ...
             "Input",{{ [] }},...
-            "Error","MATLAB:validation:IncompatibleSize"),...
+            "Error","llms:mustBeMessagesOrTxt"),...
         ...
         "InvalidInputType",struct( ...
             "Input",{{ 123 }},...

tests/topenAIChat.m

@@ -6,15 +6,16 @@
     properties(TestParameter)
         ValidConstructorInput = iGetValidConstructorInput();
         InvalidConstructorInput = iGetInvalidConstructorInput();
-        InvalidGenerateInput = iGetInvalidGenerateInput();  
-        InvalidValuesSetters = iGetInvalidValuesSetters();  
+        InvalidGenerateInput = iGetInvalidGenerateInput();
+        InvalidValuesSetters = iGetInvalidValuesSetters();
+        StringInputs = struct('string',{"hi"},'char',{'hi'},'cellstr',{{'hi'}});
     end
 
     methods(Test)
         % Test methods
-        function generateAcceptsSingleStringAsInput(testCase)
+        function generateAcceptsSingleStringAsInput(testCase,StringInputs)
             chat = openAIChat;
-            testCase.verifyWarningFree(@()generate(chat,"This is okay"));
+            testCase.verifyWarningFree(@()generate(chat,StringInputs));
         end
 
         function generateAcceptsMessagesAsInput(testCase)