support GPT-4-Turbo API Test unit

Author: caopengan

src/main/java/dev/ai4j/openai4j/MessageTypeAdapter.java

@@ -5,17 +5,23 @@
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonToken;
 import com.google.gson.stream.JsonWriter;
-import dev.ai4j.openai4j.chat.Content;
-import dev.ai4j.openai4j.chat.FunctionCall;
-import dev.ai4j.openai4j.chat.Message;
-import dev.ai4j.openai4j.chat.ToolCalls;
+import dev.ai4j.openai4j.chat.*;
 
 import java.io.IOException;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
+import static dev.ai4j.openai4j.Json.GSON;
+
 class MessageTypeAdapter extends TypeAdapter<Message> {
 
+
+
  static final TypeAdapterFactory MESSAGE_TYPE_ADAPTER_FACTORY = new TypeAdapterFactory() {
 
  @Override
@@ -50,7 +56,7 @@ public void write(JsonWriter out, Message message) throws IOException {
  out.setSerializeNulls(serializeNulls);
  } else {
  if (message.content().get(0).type() != null){
- TypeAdapter<List> contentTypeAdapter = Json.GSON.getAdapter(List.class);
+ TypeAdapter<List> contentTypeAdapter = GSON.getAdapter(List.class);
  contentTypeAdapter.write(out,message.content());
  }else {
  out.value(message.content().get(0).text());
@@ -64,13 +70,13 @@ public void write(JsonWriter out, Message message) throws IOException {
 
  if (message.functionCall() != null) {
  out.name("function_call");
- TypeAdapter<FunctionCall> functionCallTypeAdapter = Json.GSON.getAdapter(FunctionCall.class);
+ TypeAdapter<FunctionCall> functionCallTypeAdapter = GSON.getAdapter(FunctionCall.class);
  functionCallTypeAdapter.write(out, message.functionCall());
  }
 
  if (message.toolCalls() != null){
  out.name("tool_calls");
- TypeAdapter<List> toolCallsTypeAdapter = Json.GSON.getAdapter(List.class);
+ TypeAdapter<List> toolCallsTypeAdapter = GSON.getAdapter(List.class);
  toolCallsTypeAdapter.write(out, message.toolCalls());
  }
 
@@ -79,6 +85,54 @@ public void write(JsonWriter out, Message message) throws IOException {
 
  @Override
  public Message read(JsonReader in) throws IOException {
- return delegate.read(in);
+// return delegate.read(in);
+ in.beginObject();
+
+ Message.Builder builder = Message.builder();
+
+ while (in.hasNext()) {
+ String name = in.nextName();
+
+ switch (name) {
+ case "role":
+ System.out.println("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^"+in.nextString());
+ if (in.peek() == JsonToken.STRING) {
+ builder.role(Role.valueOf(in.nextString()));
+ } else {
+ // 错误情况：非字符串的 JSON 令牌。可以抛出异常或者跳过这个字段。
+ in.skipValue();
+ // 如果这个字段是必须的，你可能需要抛出异常，例如：
+ // throw new JsonSyntaxException("Expected a string for role field but got: " + in.peek());
+ }
+// builder.role(Role.valueOf(in.nextString())); // 假设 Role 是一个枚举
+ break;
+ case "content":
+ if (in.peek() == JsonToken.STRING) {
+ // 如果 content 是一个字符串，将其转化成 Content 对象
+ String contentString = in.nextString();
+// Content content = //... 创建 Content 对象;
+ Content content = Content.builder().text(contentString).type(ContentType.TEXT.stringValue()).build();
+ builder.content(Collections.singletonList(content));
+ } else if (in.peek() == JsonToken.BEGIN_ARRAY) {
+ // 如果 content 是一个数组，使用标准方法来解析
+ Type listOfContent = new TypeToken<List<Content>>(){}.getType();
+ List<Content> contentList = GSON.fromJson(in, listOfContent);
+ builder.content(contentList);
+ }
+ break;
+ case "name":
+ builder.name(in.nextString());
+ break;
+ case "function_call":
+ // 解析 function_call
+ FunctionCall functionCall = GSON.fromJson(in, FunctionCall.class);
+ builder.functionCall(functionCall);
+ break;
+ // 处理其他字段...
+ }
+ }
+
+ in.endObject();
+ return builder.build();
  }
 }

src/main/java/dev/ai4j/openai4j/chat/Function.java

@@ -12,10 +12,13 @@ public class Function {
  private final String description;
  private final Parameters parameters;
 
+ private final String arguments;
+
  private Function(Builder builder) {
  this.name = builder.name;
  this.description = builder.description;
  this.parameters = builder.parameters;
+ this.arguments = builder.arguments;
  }
 
  public String name() {
@@ -30,6 +33,10 @@ public Parameters parameters() {
  return parameters;
  }
 
+ public String arguments() {
+ return arguments;
+ }
+
  @Override
  public boolean equals(Object another) {
  if (this == another) return true;
@@ -40,7 +47,8 @@ public boolean equals(Object another) {
  private boolean equalTo(Function another) {
  return Objects.equals(name, another.name)
  && Objects.equals(description, another.description)
- && Objects.equals(parameters, another.parameters);
+ && Objects.equals(parameters, another.parameters)
+ && Objects.equals(arguments, another.arguments);
  }
 
  @Override
@@ -49,6 +57,7 @@ public int hashCode() {
  h += (h << 5) + Objects.hashCode(name);
  h += (h << 5) + Objects.hashCode(description);
  h += (h << 5) + Objects.hashCode(parameters);
+ h += (h << 5) + Objects.hashCode(arguments);
  return h;
  }
 
@@ -58,6 +67,7 @@ public String toString() {
  + "name=" + name
  + ", description=" + description
  + ", parameters=" + parameters
+ + ", arguments=" + arguments
  + "}";
  }
 
@@ -71,6 +81,8 @@ public static final class Builder {
  private String description;
  private Parameters parameters;
 
+ private String arguments;
+
  private Builder() {
  }
 
@@ -89,6 +101,11 @@ public Builder parameters(Parameters parameters) {
  return this;
  }
 
+ public Builder arguments(String arguments) {
+ this.arguments = arguments;
+ return this;
+ }
+
  @Experimental
  public Builder addParameter(String name, JsonSchemaProperty... jsonSchemaProperties) {
  addOptionalParameter(name, jsonSchemaProperties);

src/main/java/dev/ai4j/openai4j/chat/Message.java

@@ -2,7 +2,6 @@
 
 import dev.ai4j.openai4j.Experimental;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;

src/main/java/dev/ai4j/openai4j/chat/ToolCalls.java

@@ -8,9 +8,15 @@ public class ToolCalls {
  private final String name;
  private final String arguments;
 
+ private final Integer index;
+
+ private final Function function;
+
  private ToolCalls(ToolCalls.Builder builder) {
  this.name = builder.name;
  this.arguments = builder.arguments;
+ this.index = builder.index;
+ this.function = builder.function;
  }
 
  public String name() {
@@ -21,6 +27,14 @@ public String arguments() {
  return arguments;
  }
 
+ public Integer index(){
+ return index;
+ }
+
+ public Function function(){
+ return function;
+ }
+
  @Override
  public boolean equals(Object another) {
  if (this == another) return true;
@@ -30,14 +44,18 @@ public boolean equals(Object another) {
 
  private boolean equalTo(ToolCalls another) {
  return Objects.equals(name, another.name)
- && Objects.equals(arguments, another.arguments);
+ && Objects.equals(arguments, another.arguments)
+ && Objects.equals(index, another.index)
+ && Objects.equals(function, another.function);
  }
 
  @Override
  public int hashCode() {
  int h = 5381;
  h += (h << 5) + Objects.hashCode(name);
  h += (h << 5) + Objects.hashCode(arguments);
+ h += (h << 5) + Objects.hashCode(index);
+ h += (h << 5) + Objects.hashCode(function);
  return h;
  }
 
@@ -46,6 +64,8 @@ public String toString() {
  return "Function{"
  + "name=" + name
  + ", arguments=" + arguments
+ + ", index=" + index
+ + ", function=" + function
  + "}";
  }
 
@@ -57,6 +77,9 @@ public static final class Builder {
 
  private String name;
  private String arguments;
+ private Integer index;
+
+ private Function function;
 
  private Builder() {
  }
@@ -71,6 +94,16 @@ public ToolCalls.Builder arguments(String arguments) {
  return this;
  }
 
+ public ToolCalls.Builder index(Integer index) {
+ this.index = index;
+ return this;
+ }
+
+ public ToolCalls.Builder function(Function function) {
+ this.function = function;
+ return this;
+ }
+
  public ToolCalls build() {
  return new ToolCalls(this);
  }

src/test/java/dev/ai4j/openai4j/chat/ChatCompletionAsyncTest.java

@@ -8,6 +8,8 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
+import java.net.InetSocketAddress;
+import java.net.Proxy;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
@@ -16,6 +18,7 @@
 import static dev.ai4j.openai4j.chat.JsonSchemaProperty.*;
 import static dev.ai4j.openai4j.chat.Message.userMessage;
 import static dev.ai4j.openai4j.chat.Role.ASSISTANT;
+import static java.net.Proxy.Type.HTTP;
 import static java.util.Collections.singletonList;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -26,6 +29,7 @@ class ChatCompletionAsyncTest extends RateLimitAwareTest {
 
  private final OpenAiClient client = OpenAiClient.builder()
  .openAiApiKey(System.getenv("OPENAI_API_KEY"))
+ .proxy(new Proxy(HTTP, new InetSocketAddress("127.0.0.1",7890)))
  .logRequests()
  .logResponses()
  .build();
@@ -120,11 +124,13 @@ void testFunctions() throws Exception {
  assertThat(assistantMessage.role()).isEqualTo(ASSISTANT);
  assertThat(assistantMessage.content()).isNull();
 
- FunctionCall functionCall = assistantMessage.functionCall();
- assertThat(functionCall.name()).isEqualTo("get_current_weather");
- assertThat(functionCall.arguments()).isNotBlank();
+ Function function = assistantMessage.toolCalls().get(0).function();
 
- Map<String, Object> arguments = FunctionCallUtil.argumentsAsMap(functionCall.arguments());
+// FunctionCall functionCall = assistantMessage.functionCall();
+ assertThat(function.name()).isEqualTo("get_current_weather");
+ assertThat(function.arguments()).isNotBlank();
+
+ Map<String, Object> arguments = FunctionCallUtil.argumentsAsMap(function.arguments());
  assertThat(arguments).hasSize(1);
  assertThat(arguments.get("location").toString()).contains("Boston");
  }

src/test/java/dev/ai4j/openai4j/chat/ChatCompletionStreamingTest.java

@@ -50,15 +50,19 @@ void testSimpleApi() throws Exception {
 
 
  client.chatCompletion(request)
- .onPartialResponse(responseBuilder::append)
+ .onPartialResponse(partialResponse -> {
+ String content = partialResponse.choices().get(0).delta().content();
+ if (content != null) {
+ responseBuilder.append(content);
+ }
+ })
  .onComplete(() -> future.complete(responseBuilder.toString()))
  .onError(future::completeExceptionally)
  .execute();
 
 
  String response = future.get(30, SECONDS);
- System.out.println("-----------------:"+response);
-// assertThat(response).containsIgnoringCase("hello world");
+ assertThat(response).containsIgnoringCase("hello world");
  }
 
  @MethodSource
@@ -130,36 +134,24 @@ void testFunctions() throws Exception {
  client.chatCompletion(request)
  .onPartialResponse(partialResponse -> {
  Delta delta = partialResponse.choices().get(0).delta();
- System.out.println("@@@@@@@@@@@@@@@"+delta.toString());
 
  assertThat(delta.content()).isNull();
 
  List<ToolCalls> toolCalls = delta.toolCalls();
 
  if (partialResponse.choices().get(0).finishReason() == null) {
  toolCalls.stream().forEach(toolCall ->{
- System.out.println("-----------------"+toolCall.name()+"||"+toolCall.arguments());
- if (toolCall.name() != null) {
- responseBuilder.append(toolCall.name());
- } else if (toolCall.arguments() != null) {
- responseBuilder.append(toolCall.arguments());
+ if (toolCall.function().name() != null) {
+ responseBuilder.append(toolCall.function().name());
+ } else if (toolCall.function().arguments() != null) {
+ responseBuilder.append(toolCall.function().arguments());
  }
  });
  }
-
-// FunctionCall functionCall = delta.functionCall();
-// if (partialResponse.choices().get(0).finishReason() == null) {
-// if (functionCall.name() != null) {
-// responseBuilder.append(functionCall.name());
-// } else if (functionCall.arguments() != null) {
-// responseBuilder.append(functionCall.arguments());
-// }
-// }
  })
  .onComplete(() -> future.complete(responseBuilder.toString()))
  .onError(future::completeExceptionally)
  .execute();
-
  String response = future.get(30, SECONDS);
 
  assertThat(response).contains("get_current_weather");