Replace the input model name for the system definition composition

qianmoQ · qianmoQ · commit 7acbe49edf1d · 2023-08-16T15:10:59.000+08:00
diff --git a/.java-version b/.java-version
@@ -0,0 +1 @@
+11.0
diff --git a/pom.xml b/pom.xml
@@ -5,11 +5,11 @@
 
     <groupId>org.devlive.sdk</groupId>
     <artifactId>openai-java-sdk</artifactId>
-    <version>1.8.0</version>
+    <version>1.9.0-SNAPSHOT</version>
 
     <name>openai-java-sdk</name>
     <description>
-        Provides Java developers with a convenient, easy-to-use SDK to interact with OpenAI's apis.
+        Provides an easy-to-use SDK for Java developers to interact with the APIs of open AI models.
     </description>
     <url>https://openai-java-sdk.devlive.org</url>
 
diff --git a/src/main/java/org/devlive/sdk/openai/entity/ChatEntity.java b/src/main/java/org/devlive/sdk/openai/entity/ChatEntity.java
@@ -8,7 +8,6 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.devlive.sdk.openai.exception.ParamException;
 import org.devlive.sdk.openai.model.CompletionModel;
 import org.devlive.sdk.openai.utils.EnumsUtils;
@@ -48,7 +47,7 @@ public class ChatEntity
     private ChatEntity(ChatEntityBuilder builder)
     {
         if (ObjectUtils.isEmpty(builder.model)) {
-            builder.model(CompletionModel.GPT_35_TURBO.getName());
+            builder.model(CompletionModel.GPT_35_TURBO);
         }
         this.model = builder.model;
         this.messages = builder.messages;
@@ -71,33 +70,28 @@ private ChatEntity(ChatEntityBuilder builder)
 
     public static class ChatEntityBuilder
     {
-        public ChatEntityBuilder model(String model)
+        public ChatEntityBuilder model(CompletionModel model)
         {
-            if (StringUtils.isEmpty(model)) {
-                model = CompletionModel.GPT_35_TURBO.getName();
+            if (ObjectUtils.isEmpty(model)) {
+                model = CompletionModel.GPT_35_TURBO;
             }
-
-            CompletionModel completionModel = EnumsUtils.getCompleteModel(model);
-            if (ObjectUtils.isNotEmpty(completionModel)) {
-                switch (completionModel) {
-                    case GPT_35_TURBO:
-                    case GPT_35_TURBO_16K:
-                    case GPT_35_TURBO_0613:
-                    case GPT_35_TURBO_16K_0613:
-                    case GPT_4:
-                    case GPT_4_32K:
-                    case GPT_4_0613:
-                    case GPT_4_32K_0613:
-                    case TEXT_DAVINCI_002:
-                    case TEXT_DAVINCI_003:
-                    case CODE_DAVINCI_002:
-                        model = completionModel.getName();
-                        break;
-                    default:
-                        throw new ParamException(String.format("Not support completion model %s", model));
-                }
+            switch (model) {
+                case GPT_35_TURBO:
+                case GPT_35_TURBO_16K:
+                case GPT_35_TURBO_0613:
+                case GPT_35_TURBO_16K_0613:
+                case GPT_4:
+                case GPT_4_32K:
+                case GPT_4_0613:
+                case GPT_4_32K_0613:
+                case TEXT_DAVINCI_002:
+                case TEXT_DAVINCI_003:
+                case CODE_DAVINCI_002:
+                    this.model = model.getName();
+                    break;
+                default:
+                    throw new ParamException(String.format("Not support completion model %s", model));
             }
-            this.model = model;
             return this;
         }
 
diff --git a/src/main/java/org/devlive/sdk/openai/entity/CompletionEntity.java b/src/main/java/org/devlive/sdk/openai/entity/CompletionEntity.java
@@ -60,7 +60,7 @@ public class CompletionEntity
     private CompletionEntity(CompletionEntityBuilder builder)
     {
         if (ObjectUtils.isEmpty(builder.model)) {
-            builder.model(CompletionModel.TEXT_DAVINCI_003.getName());
+            builder.model(CompletionModel.TEXT_DAVINCI_003);
         }
         this.model = builder.model;
 
@@ -103,12 +103,12 @@ private CompletionEntity(CompletionEntityBuilder builder)
 
     public static class CompletionEntityBuilder
     {
-        public CompletionEntityBuilder model(String model)
+        public CompletionEntityBuilder model(CompletionModel model)
         {
-            if (StringUtils.isEmpty(model)) {
-                model = CompletionModel.TEXT_DAVINCI_003.getName();
+            if (ObjectUtils.isEmpty(model)) {
+                model = CompletionModel.TEXT_DAVINCI_003;
             }
-            this.model = model;
+            this.model = model.getName();
             return this;
         }
 
diff --git a/src/test/java/org/devlive/sdk/openai/AzureOpenAiClientTest.java b/src/test/java/org/devlive/sdk/openai/AzureOpenAiClientTest.java
@@ -40,7 +40,7 @@ public void testGetModels()
     public void testCreateCompletion()
     {
         CompletionEntity configure = CompletionEntity.builder()
-                .model(CompletionModel.TEXT_DAVINCI_003.getName())
+                .model(CompletionModel.TEXT_DAVINCI_003)
                 .prompt("How to create a completion")
                 .temperature(2D)
                 .build();
diff --git a/src/test/java/org/devlive/sdk/openai/ClaudeClientTest.java b/src/test/java/org/devlive/sdk/openai/ClaudeClientTest.java
@@ -24,7 +24,7 @@ public void before()
     public void testCompletion()
     {
         CompletionEntity configure = CompletionEntity.builder()
-                .model(CompletionModel.CLAUDE_2.getName())
+                .model(CompletionModel.CLAUDE_2)
                 .prompt("How to create a completion")
                 .build();
         Assert.assertThrows(RuntimeException.class, () -> client.createCompletion(configure));
diff --git a/src/test/java/org/devlive/sdk/openai/OpenAiClientTest.java b/src/test/java/org/devlive/sdk/openai/OpenAiClientTest.java
@@ -87,7 +87,7 @@ public void testGetModel()
     public void testCreateCompletion()
     {
         CompletionEntity configure = CompletionEntity.builder()
-                .model(CompletionModel.TEXT_DAVINCI_003.getName())
+                .model(CompletionModel.TEXT_DAVINCI_003)
                 .prompt("How to create a completion")
                 .temperature(2D)
                 .build();
diff --git a/src/test/java/org/devlive/sdk/openai/entity/ChatEntityTest.java b/src/test/java/org/devlive/sdk/openai/entity/ChatEntityTest.java
@@ -1,6 +1,5 @@
 package org.devlive.sdk.openai.entity;
 
-
 import org.devlive.sdk.openai.exception.ParamException;
 import org.devlive.sdk.openai.model.CompletionModel;
 import org.junit.Assert;
@@ -16,12 +15,12 @@ public void testModel()
         Assert.assertTrue(entity.getModel().equals(CompletionModel.GPT_35_TURBO.getName()));
 
         entity = ChatEntity.builder()
-                .model(CompletionModel.GPT_4.getName())
+                .model(CompletionModel.GPT_4)
                 .build();
         Assert.assertTrue(entity.getModel().equals(CompletionModel.GPT_4.getName()));
 
         Assert.assertThrows(ParamException.class, () -> ChatEntity.builder()
-                .model(CompletionModel.TEXT_ADA_001.getName())
+                .model(CompletionModel.TEXT_ADA_001)
                 .build());
     }
 }
diff --git a/src/test/java/org/devlive/sdk/openai/entity/CompletionEntityTest.java b/src/test/java/org/devlive/sdk/openai/entity/CompletionEntityTest.java
@@ -31,7 +31,7 @@ public void testModel()
 
         entity = CompletionEntity.builder()
                 .prompt(prompt)
-                .model(CompletionModel.TEXT_CURIE_001.getName())
+                .model(CompletionModel.TEXT_CURIE_001)
                 .build();
         Assert.assertEquals(entity.getModel(), CompletionModel.TEXT_CURIE_001.getName());
     }
@@ -64,7 +64,7 @@ public void testMaxTokens()
         Assert.assertTrue(entity.getMaxTokens() == 16);
 
         Assert.assertThrows(ParamException.class, () -> CompletionEntity.builder()
-                .model(CompletionModel.TEXT_DAVINCI_003.getName())
+                .model(CompletionModel.TEXT_DAVINCI_003)
                 .prompt(prompt)
                 .maxTokens(4097)
                 .build());

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public class CompletionEntity`
`60`	`60`	`private CompletionEntity(CompletionEntityBuilder builder)`
`61`	`61`	`{`
`62`	`62`	`if (ObjectUtils.isEmpty(builder.model)) {`
`63`		`- builder.model(CompletionModel.TEXT_DAVINCI_003.getName());`
	`63`	`+ builder.model(CompletionModel.TEXT_DAVINCI_003);`
`64`	`64`	`}`
`65`	`65`	`this.model = builder.model;`
`66`	`66`
`@@ -103,12 +103,12 @@ private CompletionEntity(CompletionEntityBuilder builder)`
`103`	`103`
`104`	`104`	`public static class CompletionEntityBuilder`
`105`	`105`	`{`
`106`		`- public CompletionEntityBuilder model(String model)`
	`106`	`+ public CompletionEntityBuilder model(CompletionModel model)`
`107`	`107`	`{`
`108`		`- if (StringUtils.isEmpty(model)) {`
`109`		`- model = CompletionModel.TEXT_DAVINCI_003.getName();`
	`108`	`+ if (ObjectUtils.isEmpty(model)) {`
	`109`	`+ model = CompletionModel.TEXT_DAVINCI_003;`
`110`	`110`	`}`
`111`		`- this.model = model;`
	`111`	`+ this.model = model.getName();`
`112`	`112`	`return this;`
`113`	`113`	`}`
`114`	`114`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ public void testGetModels()`
`40`	`40`	`public void testCreateCompletion()`
`41`	`41`	`{`
`42`	`42`	`CompletionEntity configure = CompletionEntity.builder()`
`43`		`- .model(CompletionModel.TEXT_DAVINCI_003.getName())`
	`43`	`+ .model(CompletionModel.TEXT_DAVINCI_003)`
`44`	`44`	`.prompt("How to create a completion")`
`45`	`45`	`.temperature(2D)`
`46`	`46`	`.build();`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public void before()`
`24`	`24`	`public void testCompletion()`
`25`	`25`	`{`
`26`	`26`	`CompletionEntity configure = CompletionEntity.builder()`
`27`		`- .model(CompletionModel.CLAUDE_2.getName())`
	`27`	`+ .model(CompletionModel.CLAUDE_2)`
`28`	`28`	`.prompt("How to create a completion")`
`29`	`29`	`.build();`
`30`	`30`	`Assert.assertThrows(RuntimeException.class, () -> client.createCompletion(configure));`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ public void testGetModel()`
`87`	`87`	`public void testCreateCompletion()`
`88`	`88`	`{`
`89`	`89`	`CompletionEntity configure = CompletionEntity.builder()`
`90`		`- .model(CompletionModel.TEXT_DAVINCI_003.getName())`
	`90`	`+ .model(CompletionModel.TEXT_DAVINCI_003)`
`91`	`91`	`.prompt("How to create a completion")`
`92`	`92`	`.temperature(2D)`
`93`	`93`	`.build();`