remove local copies of mustBeNonzeroLengthTextScalar

ccreutzi · ccreutzi · commit 25b8ffcc3f0d · 2024-12-13T10:54:09.000+01:00
diff --git a/azureChat.m b/azureChat.m
@@ -103,9 +103,9 @@
         function this = azureChat(systemPrompt, nvp)
             arguments
                 systemPrompt                       {llms.utils.mustBeTextOrEmpty} = []
-                nvp.Endpoint                 (1,1) string {mustBeNonzeroLengthTextScalar}
-                nvp.DeploymentID             (1,1) string {mustBeNonzeroLengthTextScalar}
-                nvp.APIKey                         {mustBeNonzeroLengthTextScalar}
+                nvp.Endpoint                 (1,1) string {llms.utils.mustBeNonzeroLengthTextScalar}
+                nvp.DeploymentID             (1,1) string {llms.utils.mustBeNonzeroLengthTextScalar}
+                nvp.APIKey                         {llms.utils.mustBeNonzeroLengthTextScalar}
                 nvp.Tools                    (1,:) {mustBeA(nvp.Tools, "openAIFunction")} = openAIFunction.empty
                 nvp.APIVersion               (1,1) string {mustBeAPIVersion} = "2024-06-01"
                 nvp.Temperature                    {llms.utils.mustBeValidTemperature} = 1
@@ -222,7 +222,7 @@
                 nvp.TopP                      {llms.utils.mustBeValidProbability} = this.TopP
                 nvp.StopSequences             {llms.utils.mustBeValidStop} = this.StopSequences
                 nvp.ResponseFormat            {llms.utils.mustBeResponseFormat} = this.ResponseFormat
-                nvp.APIKey                    {mustBeNonzeroLengthTextScalar} = this.APIKey
+                nvp.APIKey                    {llms.utils.mustBeNonzeroLengthTextScalar} = this.APIKey
                 nvp.PresencePenalty           {llms.utils.mustBeValidPenalty} = this.PresencePenalty
                 nvp.FrequencyPenalty          {llms.utils.mustBeValidPenalty} = this.FrequencyPenalty
                 nvp.TimeOut             (1,1) {mustBeReal,mustBePositive} = this.TimeOut
@@ -325,11 +325,6 @@
     end
 end
 
-function mustBeNonzeroLengthTextScalar(content)
-mustBeNonzeroLengthText(content)
-mustBeTextScalar(content)
-end
-
 function [functionsStruct, functionNames] = functionAsStruct(functions)
 numFunctions = numel(functions);
 functionsStruct = cell(1, numFunctions);
diff --git a/messageHistory.m b/messageHistory.m
@@ -41,8 +41,8 @@
 
             arguments
                 this (1,1) messageHistory 
-                name {mustBeNonzeroLengthTextScalar}
-                content {mustBeNonzeroLengthTextScalar}
+                name {llms.utils.mustBeNonzeroLengthTextScalar}
+                content {llms.utils.mustBeNonzeroLengthTextScalar}
             end
 
             newMessage = struct("role", "system", "name", string(name), "content", string(content));
@@ -64,7 +64,7 @@
 
             arguments
                 this (1,1) messageHistory
-                content {mustBeNonzeroLengthTextScalar}
+                content {llms.utils.mustBeNonzeroLengthTextScalar}
             end
 
             newMessage = struct("role", "user", "content", string(content));
@@ -106,7 +106,7 @@
             
             arguments
                 this (1,1) messageHistory
-                content {mustBeNonzeroLengthTextScalar}
+                content {llms.utils.mustBeNonzeroLengthTextScalar}
                 images (1,:) {mustBeNonzeroLengthText}
                 nvp.Detail string {mustBeMember(nvp.Detail,["low","high","auto"])} = "auto"
             end
@@ -133,9 +133,9 @@
 
             arguments
                 this (1,1) messageHistory
-                id {mustBeNonzeroLengthTextScalar}
-                name {mustBeNonzeroLengthTextScalar}
-                content {mustBeNonzeroLengthTextScalar}
+                id {llms.utils.mustBeNonzeroLengthTextScalar}
+                name {llms.utils.mustBeNonzeroLengthTextScalar}
+                content {llms.utils.mustBeNonzeroLengthTextScalar}
 
             end
 
@@ -262,11 +262,6 @@
     end
 end
 
-function mustBeNonzeroLengthTextScalar(content)
-mustBeNonzeroLengthText(content)
-mustBeTextScalar(content)
-end
-
 function validateRegularAssistant(content)
 try
     mustBeNonzeroLengthText(content)
diff --git a/openAIChat.m b/openAIChat.m
@@ -98,7 +98,7 @@
                 nvp.TopP                           {llms.utils.mustBeValidProbability} = 1
                 nvp.StopSequences                  {llms.utils.mustBeValidStop} = {}
                 nvp.ResponseFormat                 {llms.utils.mustBeResponseFormat} = "text"
-                nvp.APIKey                         {mustBeNonzeroLengthTextScalar}
+                nvp.APIKey                         {llms.utils.mustBeNonzeroLengthTextScalar}
                 nvp.PresencePenalty                {llms.utils.mustBeValidPenalty} = 0
                 nvp.FrequencyPenalty               {llms.utils.mustBeValidPenalty} = 0
                 nvp.TimeOut                  (1,1) {mustBeReal,mustBePositive} = 10
@@ -215,7 +215,7 @@
                 nvp.TopP                      {llms.utils.mustBeValidProbability} = this.TopP
                 nvp.StopSequences             {llms.utils.mustBeValidStop} = this.StopSequences
                 nvp.ResponseFormat            {llms.utils.mustBeResponseFormat} = this.ResponseFormat
-                nvp.APIKey                    {mustBeNonzeroLengthTextScalar} = this.APIKey
+                nvp.APIKey                    {llms.utils.mustBeNonzeroLengthTextScalar} = this.APIKey
                 nvp.PresencePenalty           {llms.utils.mustBeValidPenalty} = this.PresencePenalty
                 nvp.FrequencyPenalty          {llms.utils.mustBeValidPenalty} = this.FrequencyPenalty
                 nvp.TimeOut             (1,1) {mustBeReal,mustBePositive} = this.TimeOut
@@ -306,11 +306,6 @@
     end
 end
 
-function mustBeNonzeroLengthTextScalar(content)
-mustBeNonzeroLengthText(content)
-mustBeTextScalar(content)
-end
-
 function [functionsStruct, functionNames] = functionAsStruct(functions)
 numFunctions = numel(functions);
 functionsStruct = cell(1, numFunctions);
diff --git a/openAIImages.m b/openAIImages.m
@@ -42,7 +42,7 @@
         function this = openAIImages(nvp)
             arguments
                 nvp.ModelName   (1,1) {mustBeMember(nvp.ModelName,["dall-e-2", "dall-e-3"])} = "dall-e-2"
-                nvp.APIKey            {mustBeNonzeroLengthTextScalar}
+                nvp.APIKey            {llms.utils.mustBeNonzeroLengthTextScalar}
                 nvp.TimeOut     (1,1) {mustBeReal,mustBePositive} = 10
             end
 
@@ -82,7 +82,7 @@
 
             arguments
                 this                    (1,1) openAIImages
-                prompt                        {mustBeNonzeroLengthTextScalar}
+                prompt                        {llms.utils.mustBeNonzeroLengthTextScalar}
                 nvp.NumImages           (1,1) {mustBePositive, mustBeInteger,...
                                                 mustBeLessThanOrEqual(nvp.NumImages,10)} = 1
                 nvp.Size                (1,1) string {mustBeMember(nvp.Size, ["256x256", "512x512", ...
@@ -172,7 +172,7 @@
             arguments
                 this                    (1,1)  openAIImages
                 imagePath                     {mustBeValidFileType(imagePath)}
-                prompt                        {mustBeNonzeroLengthTextScalar}
+                prompt                        {llms.utils.mustBeNonzeroLengthTextScalar}
                 nvp.MaskImagePath             {mustBeValidFileType(nvp.MaskImagePath)}
                 nvp.NumImages           (1,1) {mustBePositive, mustBeInteger,...
                                                 mustBeLessThanOrEqual(nvp.NumImages,10)} = 1
@@ -337,11 +337,6 @@ function mustBeValidFileType(filePath)
     mustBeLessThan(s.bytes,4e+6)
 end
 
-function mustBeNonzeroLengthTextScalar(content)
-mustBeNonzeroLengthText(content)
-mustBeTextScalar(content)
-end
-
 function data = myImread(URI)
     % imread usually, but not always, fails to read from the
     % https://oaidalleapiprodscus.blob.core.windows.net URLs returned by
