Move gson out of the model

Author: geoand

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

@@ -0,0 +1,22 @@
+package dev.ai4j.openai4j;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+import dev.ai4j.openai4j.chat.FunctionCall;
+import java.lang.reflect.Type;
+import java.util.Map;
+
+public class FunctionCallUtil {
+ public static final Gson GSON = new Gson();
+ public static final Type MAP_TYPE = new TypeToken<Map<String, Object>>() {
+ }.getType();
+
+ public static <T> T argument(FunctionCall functionCall, String name) {
+ Map<String, Object> arguments = argumentsAsMap(functionCall.arguments()); // TODO cache
+ return (T) arguments.get(name);
+ }
+
+ public static Map<String, Object> argumentsAsMap(String arguments) {
+ return GSON.fromJson(arguments, MAP_TYPE);
+ }
+}

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

@@ -2,6 +2,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import dev.ai4j.openai4j.chat.Role;
 
 import static com.google.gson.FieldNamingPolicy.LOWER_CASE_WITH_UNDERSCORES;
 import static dev.ai4j.openai4j.MessageTypeAdapter.MESSAGE_TYPE_ADAPTER_FACTORY;
@@ -11,6 +12,7 @@ class Json {
  static final Gson GSON = new GsonBuilder()
  .setFieldNamingPolicy(LOWER_CASE_WITH_UNDERSCORES)
  .registerTypeAdapterFactory(MESSAGE_TYPE_ADAPTER_FACTORY)
+ .registerTypeAdapter(Role.class, new RoleAdapter())
  .create();
 
  static String toJson(Object o) {

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

@@ -0,0 +1,20 @@
+package dev.ai4j.openai4j;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import dev.ai4j.openai4j.chat.Role;
+import java.io.IOException;
+
+public class RoleAdapter extends TypeAdapter<Role> {
+
+ @Override
+ public void write(final JsonWriter jsonWriter, final Role role) throws IOException {
+ jsonWriter.value(role.toString());
+ }
+
+ @Override
+ public Role read(JsonReader jsonReader) throws IOException {
+ return Role.from(jsonReader.nextString());
+ }
+}

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

@@ -1,18 +1,9 @@
 package dev.ai4j.openai4j.chat;
 
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-
-import java.lang.reflect.Type;
-import java.util.Map;
 import java.util.Objects;
 
 public class FunctionCall {
 
- private static final Gson GSON = new Gson();
- private static final Type MAP_TYPE = new TypeToken<Map<String, Object>>() {
- }.getType();
-
  private final String name;
  private final String arguments;
 
@@ -29,15 +20,6 @@ public String arguments() {
  return arguments;
  }
 
- public Map<String, Object> argumentsAsMap() {
- return GSON.fromJson(arguments, MAP_TYPE);
- }
-
- public <T> T argument(String name) {
- Map<String, Object> arguments = argumentsAsMap(); // TODO cache
- return (T) arguments.get(name);
- }
-
  @Override
  public boolean equals(Object another) {
  if (this == another) return true;

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

@@ -1,13 +1,5 @@
 package dev.ai4j.openai4j.chat;
 
-import com.google.gson.TypeAdapter;
-import com.google.gson.annotations.JsonAdapter;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-
-import java.io.IOException;
-
-@JsonAdapter(Role.RoleAdapter.class)
 public enum Role {
 
  SYSTEM("system"),
@@ -26,7 +18,7 @@ public String toString() {
  return stringValue;
  }
 
- static Role from(String stringValue) {
+ public static Role from(String stringValue) {
  for (Role role : Role.values()) {
  if (role.stringValue.equals(stringValue)) {
  return role;
@@ -35,16 +27,4 @@ static Role from(String stringValue) {
  throw new IllegalArgumentException("Unknown role: '" + stringValue + "'");
  }
 
- static class RoleAdapter extends TypeAdapter<Role> {
-
- @Override
- public void write(final JsonWriter jsonWriter, final Role role) throws IOException {
- jsonWriter.value(role.toString());
- }
-
- @Override
- public Role read(JsonReader jsonReader) throws IOException {
- return Role.from(jsonReader.nextString());
- }
- }
-}
+}

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

@@ -1,5 +1,6 @@
 package dev.ai4j.openai4j.chat;
 
+import dev.ai4j.openai4j.FunctionCallUtil;
 import dev.ai4j.openai4j.OpenAiClient;
 import dev.ai4j.openai4j.RateLimitAwareTest;
 import org.junit.jupiter.api.Test;
@@ -119,8 +120,8 @@ void testFunctions() throws Exception {
  assertThat(functionCall.name()).isEqualTo("get_current_weather");
  assertThat(functionCall.arguments()).isNotBlank();
 
- Map<String, Object> arguments = functionCall.argumentsAsMap();
+ Map<String, Object> arguments = FunctionCallUtil.argumentsAsMap(functionCall.arguments());
  assertThat(arguments).hasSize(1);
  assertThat(arguments.get("location").toString()).contains("Boston");
  }
-}
+}

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

@@ -1,5 +1,6 @@
 package dev.ai4j.openai4j.chat;
 
+import dev.ai4j.openai4j.FunctionCallUtil;
 import dev.ai4j.openai4j.OpenAiClient;
 import dev.ai4j.openai4j.RateLimitAwareTest;
 import org.junit.jupiter.api.Test;
@@ -95,12 +96,12 @@ void testFunctions() {
  assertThat(functionCall.name()).isEqualTo("get_current_weather");
  assertThat(functionCall.arguments()).isNotBlank();
 
- Map<String, Object> arguments = functionCall.argumentsAsMap();
+ Map<String, Object> arguments = FunctionCallUtil.argumentsAsMap(functionCall.arguments());
  assertThat(arguments).hasSize(1);
  assertThat(arguments.get("location").toString()).contains("Boston");
 
- String location = functionCall.argument("location");
- String unit = functionCall.argument("unit");
+ String location = FunctionCallUtil.argument(functionCall, "location");
+ String unit = FunctionCallUtil.argument(functionCall, "unit");
 
  String weatherApiResponse = getCurrentWeather(location, unit == null ? null : Unit.valueOf(unit));