Skip to content

Commit 25b8ffc

Browse files
ccreutziccreutzi
committed
remove local copies of mustBeNonzeroLengthTextScalar
1 parent b8bfd78 commit 25b8ffc

File tree

4 files changed

+16
-36
lines changed

4 files changed

+16
-36
lines changed

‎azureChat.m‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@
103103
function this = azureChat(systemPrompt, nvp)
104104
arguments
105105
systemPrompt {llms.utils.mustBeTextOrEmpty} = []
106-
nvp.Endpoint (1,1) string {mustBeNonzeroLengthTextScalar}
107-
nvp.DeploymentID (1,1) string {mustBeNonzeroLengthTextScalar}
108-
nvp.APIKey {mustBeNonzeroLengthTextScalar}
106+
nvp.Endpoint (1,1) string {llms.utils.mustBeNonzeroLengthTextScalar}
107+
nvp.DeploymentID (1,1) string {llms.utils.mustBeNonzeroLengthTextScalar}
108+
nvp.APIKey {llms.utils.mustBeNonzeroLengthTextScalar}
109109
nvp.Tools (1,:) {mustBeA(nvp.Tools, "openAIFunction")} = openAIFunction.empty
110110
nvp.APIVersion (1,1) string {mustBeAPIVersion} = "2024-06-01"
111111
nvp.Temperature {llms.utils.mustBeValidTemperature} = 1
@@ -222,7 +222,7 @@
222222
nvp.TopP {llms.utils.mustBeValidProbability} = this.TopP
223223
nvp.StopSequences {llms.utils.mustBeValidStop} = this.StopSequences
224224
nvp.ResponseFormat {llms.utils.mustBeResponseFormat} = this.ResponseFormat
225-
nvp.APIKey {mustBeNonzeroLengthTextScalar} = this.APIKey
225+
nvp.APIKey {llms.utils.mustBeNonzeroLengthTextScalar} = this.APIKey
226226
nvp.PresencePenalty {llms.utils.mustBeValidPenalty} = this.PresencePenalty
227227
nvp.FrequencyPenalty {llms.utils.mustBeValidPenalty} = this.FrequencyPenalty
228228
nvp.TimeOut (1,1) {mustBeReal,mustBePositive} = this.TimeOut
@@ -325,11 +325,6 @@
325325
end
326326
end
327327

328-
function mustBeNonzeroLengthTextScalar(content)
329-
mustBeNonzeroLengthText(content)
330-
mustBeTextScalar(content)
331-
end
332-
333328
function [functionsStruct, functionNames] = functionAsStruct(functions)
334329
numFunctions = numel(functions);
335330
functionsStruct = cell(1, numFunctions);

‎messageHistory.m‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141

4242
arguments
4343
this (1,1) messageHistory
44-
name {mustBeNonzeroLengthTextScalar}
45-
content {mustBeNonzeroLengthTextScalar}
44+
name {llms.utils.mustBeNonzeroLengthTextScalar}
45+
content {llms.utils.mustBeNonzeroLengthTextScalar}
4646
end
4747

4848
newMessage = struct("role", "system", "name", string(name), "content", string(content));
@@ -64,7 +64,7 @@
6464

6565
arguments
6666
this (1,1) messageHistory
67-
content {mustBeNonzeroLengthTextScalar}
67+
content {llms.utils.mustBeNonzeroLengthTextScalar}
6868
end
6969

7070
newMessage = struct("role", "user", "content", string(content));
@@ -106,7 +106,7 @@
106106

107107
arguments
108108
this (1,1) messageHistory
109-
content {mustBeNonzeroLengthTextScalar}
109+
content {llms.utils.mustBeNonzeroLengthTextScalar}
110110
images (1,:) {mustBeNonzeroLengthText}
111111
nvp.Detail string {mustBeMember(nvp.Detail,["low","high","auto"])} = "auto"
112112
end
@@ -133,9 +133,9 @@
133133

134134
arguments
135135
this (1,1) messageHistory
136-
id {mustBeNonzeroLengthTextScalar}
137-
name {mustBeNonzeroLengthTextScalar}
138-
content {mustBeNonzeroLengthTextScalar}
136+
id {llms.utils.mustBeNonzeroLengthTextScalar}
137+
name {llms.utils.mustBeNonzeroLengthTextScalar}
138+
content {llms.utils.mustBeNonzeroLengthTextScalar}
139139

140140
end
141141

@@ -262,11 +262,6 @@
262262
end
263263
end
264264

265-
function mustBeNonzeroLengthTextScalar(content)
266-
mustBeNonzeroLengthText(content)
267-
mustBeTextScalar(content)
268-
end
269-
270265
function validateRegularAssistant(content)
271266
try
272267
mustBeNonzeroLengthText(content)

‎openAIChat.m‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
nvp.TopP {llms.utils.mustBeValidProbability} = 1
9999
nvp.StopSequences {llms.utils.mustBeValidStop} = {}
100100
nvp.ResponseFormat {llms.utils.mustBeResponseFormat} = "text"
101-
nvp.APIKey {mustBeNonzeroLengthTextScalar}
101+
nvp.APIKey {llms.utils.mustBeNonzeroLengthTextScalar}
102102
nvp.PresencePenalty {llms.utils.mustBeValidPenalty} = 0
103103
nvp.FrequencyPenalty {llms.utils.mustBeValidPenalty} = 0
104104
nvp.TimeOut (1,1) {mustBeReal,mustBePositive} = 10
@@ -215,7 +215,7 @@
215215
nvp.TopP {llms.utils.mustBeValidProbability} = this.TopP
216216
nvp.StopSequences {llms.utils.mustBeValidStop} = this.StopSequences
217217
nvp.ResponseFormat {llms.utils.mustBeResponseFormat} = this.ResponseFormat
218-
nvp.APIKey {mustBeNonzeroLengthTextScalar} = this.APIKey
218+
nvp.APIKey {llms.utils.mustBeNonzeroLengthTextScalar} = this.APIKey
219219
nvp.PresencePenalty {llms.utils.mustBeValidPenalty} = this.PresencePenalty
220220
nvp.FrequencyPenalty {llms.utils.mustBeValidPenalty} = this.FrequencyPenalty
221221
nvp.TimeOut (1,1) {mustBeReal,mustBePositive} = this.TimeOut
@@ -306,11 +306,6 @@
306306
end
307307
end
308308

309-
function mustBeNonzeroLengthTextScalar(content)
310-
mustBeNonzeroLengthText(content)
311-
mustBeTextScalar(content)
312-
end
313-
314309
function [functionsStruct, functionNames] = functionAsStruct(functions)
315310
numFunctions = numel(functions);
316311
functionsStruct = cell(1, numFunctions);

‎openAIImages.m‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
function this = openAIImages(nvp)
4343
arguments
4444
nvp.ModelName (1,1) {mustBeMember(nvp.ModelName,["dall-e-2", "dall-e-3"])} = "dall-e-2"
45-
nvp.APIKey {mustBeNonzeroLengthTextScalar}
45+
nvp.APIKey {llms.utils.mustBeNonzeroLengthTextScalar}
4646
nvp.TimeOut (1,1) {mustBeReal,mustBePositive} = 10
4747
end
4848

@@ -82,7 +82,7 @@
8282

8383
arguments
8484
this (1,1) openAIImages
85-
prompt {mustBeNonzeroLengthTextScalar}
85+
prompt {llms.utils.mustBeNonzeroLengthTextScalar}
8686
nvp.NumImages (1,1) {mustBePositive, mustBeInteger,...
8787
mustBeLessThanOrEqual(nvp.NumImages,10)} = 1
8888
nvp.Size (1,1) string {mustBeMember(nvp.Size, ["256x256", "512x512", ...
@@ -172,7 +172,7 @@
172172
arguments
173173
this (1,1) openAIImages
174174
imagePath {mustBeValidFileType(imagePath)}
175-
prompt {mustBeNonzeroLengthTextScalar}
175+
prompt {llms.utils.mustBeNonzeroLengthTextScalar}
176176
nvp.MaskImagePath {mustBeValidFileType(nvp.MaskImagePath)}
177177
nvp.NumImages (1,1) {mustBePositive, mustBeInteger,...
178178
mustBeLessThanOrEqual(nvp.NumImages,10)} = 1
@@ -337,11 +337,6 @@ function mustBeValidFileType(filePath)
337337
mustBeLessThan(s.bytes,4e+6)
338338
end
339339

340-
function mustBeNonzeroLengthTextScalar(content)
341-
mustBeNonzeroLengthText(content)
342-
mustBeTextScalar(content)
343-
end
344-
345340
function data = myImread(URI)
346341
% imread usually, but not always, fails to read from the
347342
% https://oaidalleapiprodscus.blob.core.windows.net URLs returned by

0 commit comments

Comments
 (0)