Split choice

qianmoQ · qianmoQ · commit 0136545a46da · 2023-07-18T11:26:09.000+08:00
diff --git a/src/main/java/org/devlive/sdk/openai/DefaultApi.java b/src/main/java/org/devlive/sdk/openai/DefaultApi.java
@@ -11,7 +11,7 @@
 import org.devlive.sdk.openai.entity.ModerationEntity;
 import org.devlive.sdk.openai.entity.UserKeyEntity;
 import org.devlive.sdk.openai.response.AudioResponse;
-import org.devlive.sdk.openai.response.CompleteChatResponse;
+import org.devlive.sdk.openai.response.ChatResponse;
 import org.devlive.sdk.openai.response.CompleteResponse;
 import org.devlive.sdk.openai.response.EmbeddingResponse;
 import org.devlive.sdk.openai.response.ImageResponse;
@@ -56,8 +56,8 @@ Single<CompleteResponse> fetchCompletions(@Url String url,
      * Creates a model response for the given chat conversation.
      */
     @POST
-    Single<CompleteChatResponse> fetchChatCompletions(@Url String url,
-                                                      @Body ChatEntity configure);
+    Single<ChatResponse> fetchChatCompletions(@Url String url,
+                                              @Body ChatEntity configure);
 
     /**
      * Get all keys
diff --git a/src/main/java/org/devlive/sdk/openai/DefaultClient.java b/src/main/java/org/devlive/sdk/openai/DefaultClient.java
@@ -15,7 +15,7 @@
 import org.devlive.sdk.openai.model.ProviderModel;
 import org.devlive.sdk.openai.model.UrlModel;
 import org.devlive.sdk.openai.response.AudioResponse;
-import org.devlive.sdk.openai.response.CompleteChatResponse;
+import org.devlive.sdk.openai.response.ChatResponse;
 import org.devlive.sdk.openai.response.CompleteResponse;
 import org.devlive.sdk.openai.response.EmbeddingResponse;
 import org.devlive.sdk.openai.response.ImageResponse;
@@ -50,7 +50,7 @@ public CompleteResponse createCompletion(CompletionEntity configure)
                 .blockingGet();
     }
 
-    public CompleteChatResponse createChatCompletion(ChatEntity configure)
+    public ChatResponse createChatCompletion(ChatEntity configure)
     {
         return this.api.fetchChatCompletions(ProviderUtils.getUrl(provider, UrlModel.FETCH_CHAT_COMPLETIONS), configure)
                 .blockingGet();
diff --git a/src/main/java/org/devlive/sdk/openai/choice/BasicChoice.java b/src/main/java/org/devlive/sdk/openai/choice/BasicChoice.java
@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.entity;
+package org.devlive.sdk.openai.choice;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -14,7 +14,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ChoiceEntity
+public class BasicChoice
 {
     @JsonProperty(value = "text")
     private String content;
diff --git a/src/main/java/org/devlive/sdk/openai/choice/ChatChoice.java b/src/main/java/org/devlive/sdk/openai/choice/ChatChoice.java
@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.entity;
+package org.devlive.sdk.openai.choice;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -7,14 +7,15 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import org.devlive.sdk.openai.entity.MessageEntity;
 
 @Data
 @Builder
 @ToString
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class ChoiceChatEntity
+public class ChatChoice
 {
     @JsonProperty(value = "index")
     private String index;
diff --git a/src/main/java/org/devlive/sdk/openai/entity/MessageEntity.java b/src/main/java/org/devlive/sdk/openai/entity/MessageEntity.java
@@ -10,7 +10,7 @@
 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.CompletionMessageModel;
+import org.devlive.sdk.openai.model.MessageModel;
 import org.devlive.sdk.openai.utils.EnumsUtils;
 
 @Data
@@ -33,7 +33,7 @@ public class MessageEntity
     private MessageEntity(MessageEntityBuilder builder)
     {
         if (StringUtils.isEmpty(builder.role)) {
-            builder.role(CompletionMessageModel.USER.getName());
+            builder.role(MessageModel.USER.getName());
         }
         this.role = builder.role;
 
@@ -52,8 +52,8 @@ public static class MessageEntityBuilder
     {
         public MessageEntityBuilder role(String role)
         {
-            CompletionMessageModel completionMessageModel = EnumsUtils.getCompleteMessageModel(role);
-            if (ObjectUtils.isEmpty(completionMessageModel)) {
+            MessageModel messageModel = EnumsUtils.getCompleteMessageModel(role);
+            if (ObjectUtils.isEmpty(messageModel)) {
                 throw new ParamException(String.format("Not support completion role %s", role));
             }
             this.role = role;
diff --git a/src/main/java/org/devlive/sdk/openai/model/MessageModel.java b/src/main/java/org/devlive/sdk/openai/model/MessageModel.java
@@ -1,6 +1,6 @@
 package org.devlive.sdk.openai.model;
 
-public enum CompletionMessageModel
+public enum MessageModel
 {
     SYSTEM("system"),
     USER("user"),
@@ -14,7 +14,7 @@ public String getName()
         return name;
     }
 
-    CompletionMessageModel(String name)
+    MessageModel(String name)
     {
         this.name = name;
     }
diff --git a/src/main/java/org/devlive/sdk/openai/response/ChatResponse.java b/src/main/java/org/devlive/sdk/openai/response/ChatResponse.java
@@ -8,7 +8,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.devlive.sdk.openai.entity.ChoiceChatEntity;
+import org.devlive.sdk.openai.choice.ChatChoice;
 import org.devlive.sdk.openai.entity.UsageEntity;
 
 import java.util.List;
@@ -19,7 +19,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
-public class CompleteChatResponse
+public class ChatResponse
 {
     @JsonProperty(value = "id")
     private String name;
@@ -35,7 +35,7 @@ public class CompleteChatResponse
     private String model;
 
     @JsonProperty(value = "choices")
-    private List<ChoiceChatEntity> choices;
+    private List<ChatChoice> choices;
 
     @JsonProperty(value = "usage")
     private UsageEntity usage;
diff --git a/src/main/java/org/devlive/sdk/openai/response/CompleteResponse.java b/src/main/java/org/devlive/sdk/openai/response/CompleteResponse.java
@@ -8,7 +8,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.devlive.sdk.openai.entity.ChoiceEntity;
+import org.devlive.sdk.openai.choice.BasicChoice;
 import org.devlive.sdk.openai.entity.UsageEntity;
 
 import java.util.List;
@@ -35,7 +35,7 @@ public class CompleteResponse
     private String model;
 
     @JsonProperty(value = "choices")
-    private List<ChoiceEntity> choices;
+    private List<BasicChoice> choices;
 
     @JsonProperty(value = "usage")
     private UsageEntity usage;
diff --git a/src/main/java/org/devlive/sdk/openai/utils/EnumsUtils.java b/src/main/java/org/devlive/sdk/openai/utils/EnumsUtils.java
@@ -1,6 +1,6 @@
 package org.devlive.sdk.openai.utils;
 
-import org.devlive.sdk.openai.model.CompletionMessageModel;
+import org.devlive.sdk.openai.model.MessageModel;
 import org.devlive.sdk.openai.model.CompletionModel;
 
 import java.util.Arrays;
@@ -20,9 +20,9 @@ public static CompletionModel getCompleteModel(final String name)
         return optional.isPresent() ? optional.get() : null;
     }
 
-    public static CompletionMessageModel getCompleteMessageModel(final String name)
+    public static MessageModel getCompleteMessageModel(final String name)
     {
-        Optional<CompletionMessageModel> optional = Arrays.stream(CompletionMessageModel.values())
+        Optional<MessageModel> optional = Arrays.stream(MessageModel.values())
                 .filter(item -> item.getName().equals(name))
                 .findFirst();
         return optional.isPresent() ? optional.get() : null;
diff --git a/src/test/java/org/devlive/sdk/openai/OpenAiClientTest.java b/src/test/java/org/devlive/sdk/openai/OpenAiClientTest.java
@@ -33,6 +33,7 @@ public void before()
     {
         client = OpenAiClient.builder()
                 .apiKey(System.getProperty("openai.token"))
+                .apiKey("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")
                 .build();
     }
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`import org.apache.commons.lang3.ObjectUtils;`
`11`	`11`	`import org.apache.commons.lang3.StringUtils;`
`12`	`12`	`import org.devlive.sdk.openai.exception.ParamException;`
`13`		`-import org.devlive.sdk.openai.model.CompletionMessageModel;`
	`13`	`+import org.devlive.sdk.openai.model.MessageModel;`
`14`	`14`	`import org.devlive.sdk.openai.utils.EnumsUtils;`
`15`	`15`
`16`	`16`	`@Data`
`@@ -33,7 +33,7 @@ public class MessageEntity`
`33`	`33`	`private MessageEntity(MessageEntityBuilder builder)`
`34`	`34`	`{`
`35`	`35`	`if (StringUtils.isEmpty(builder.role)) {`
`36`		`- builder.role(CompletionMessageModel.USER.getName());`
	`36`	`+ builder.role(MessageModel.USER.getName());`
`37`	`37`	`}`
`38`	`38`	`this.role = builder.role;`
`39`	`39`
`@@ -52,8 +52,8 @@ public static class MessageEntityBuilder`
`52`	`52`	`{`
`53`	`53`	`public MessageEntityBuilder role(String role)`
`54`	`54`	`{`
`55`		`- CompletionMessageModel completionMessageModel = EnumsUtils.getCompleteMessageModel(role);`
`56`		`- if (ObjectUtils.isEmpty(completionMessageModel)) {`
	`55`	`+ MessageModel messageModel = EnumsUtils.getCompleteMessageModel(role);`
	`56`	`+ if (ObjectUtils.isEmpty(messageModel)) {`
`57`	`57`	`throw new ParamException(String.format("Not support completion role %s", role));`
`58`	`58`	`}`
`59`	`59`	`this.role = role;`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`package org.devlive.sdk.openai.model;`
`2`	`2`
`3`		`-public enum CompletionMessageModel`
	`3`	`+public enum MessageModel`
`4`	`4`	`{`
`5`	`5`	`SYSTEM("system"),`
`6`	`6`	`USER("user"),`
`@@ -14,7 +14,7 @@ public String getName()`
`14`	`14`	`return name;`
`15`	`15`	`}`
`16`	`16`
`17`		`- CompletionMessageModel(String name)`
	`17`	`+ MessageModel(String name)`
`18`	`18`	`{`
`19`	`19`	`this.name = name;`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public void before()`
`33`	`33`	`{`
`34`	`34`	`client = OpenAiClient.builder()`
`35`	`35`	`.apiKey(System.getProperty("openai.token"))`
	`36`	`+ .apiKey("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")`
`36`	`37`	`.build();`
`37`	`38`	`}`
`38`	`39`