From a6ba4e481517589ef3d5ebd1a242282d815070c1 Mon Sep 17 00:00:00 2001 From: Toshiaki Takeuchi Date: Sun, 14 Apr 2024 09:56:44 -0400 Subject: [PATCH] removed extra text from merge --- openAIChat.m | 7 ------- 1 file changed, 7 deletions(-) diff --git a/openAIChat.m b/openAIChat.m index 0601f37..488c1f9 100644 --- a/openAIChat.m +++ b/openAIChat.m @@ -114,17 +114,10 @@ arguments systemPrompt {llms.utils.mustBeTextOrEmpty} = [] nvp.Tools (1,:) {mustBeA(nvp.Tools, "openAIFunction")} = openAIFunction.empty -<<<<<<< HEAD - nvp.ModelName (1,1) {mustBeMember(nvp.ModelName,["gpt-4", "gpt-4-0613", "gpt-4-32k", ... - "gpt-3.5-turbo", "gpt-4-1106-preview", ... - "gpt-3.5-turbo-1106", "gpt-4-vision-preview", ... - "gpt-4-turbo-preview"])} = "gpt-3.5-turbo" -======= nvp.ModelName (1,1) {mustBeMember(nvp.ModelName,["gpt-4-turbo", ... "gpt-4-turbo-2024-04-09","gpt-4","gpt-4-0613", ... "gpt-3.5-turbo","gpt-3.5-turbo-0125", ... "gpt-3.5-turbo-1106"])} = "gpt-3.5-turbo" ->>>>>>> dev-update-040924models nvp.Temperature {mustBeValidTemperature} = 1 nvp.TopProbabilityMass {mustBeValidTopP} = 1 nvp.StopSequences {mustBeValidStop} = {}