[Google] [Gemini] 添加连续对话示例

Author: qianmoQ

src/main/java/org/devlive/sdk/openai/interceptor/GooglePaLMInterceptor.java

@@ -7,9 +7,9 @@
 import org.apache.commons.lang3.StringUtils;
 import org.devlive.sdk.common.exception.ParamException;
 import org.devlive.sdk.common.interceptor.DefaultInterceptor;
+import org.devlive.sdk.common.utils.HttpUrlUtils;
 import org.devlive.sdk.openai.model.CompletionModel;
 import org.devlive.sdk.openai.utils.EnumsUtils;
-import org.devlive.sdk.common.utils.HttpUrlUtils;
 
 import java.util.List;
 

src/main/java/org/devlive/sdk/platform/google/GoogleClient.java

@@ -17,6 +17,7 @@
 import org.devlive.sdk.platform.google.interceptor.GoogleInterceptor;
 import org.devlive.sdk.platform.google.model.GenerativeModel;
 import org.devlive.sdk.platform.google.model.VersionModel;
+import org.devlive.sdk.platform.google.response.ChatResponse;
 import retrofit2.Retrofit;
 import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
 import retrofit2.converter.jackson.JacksonConverterFactory;
@@ -85,7 +86,7 @@ private GoogleClient(GoogleClientBuilder builder)
                 .create(GoogleApi.class);
     }
 
-    public Object createChatCompletions(ChatEntity configure)
+    public ChatResponse createChatCompletions(ChatEntity configure)
     {
         String url = ProviderUtils.getUrl(provider, UrlModel.FETCH_CHAT_COMPLETIONS);
         return this.api.fetchChatCompletions(url, configure)

src/main/java/org/devlive/sdk/platform/google/entity/ObjectEntity.java

@@ -7,7 +7,9 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import org.apache.commons.lang3.ObjectUtils;
 import org.devlive.sdk.common.exception.ParamException;
+import org.devlive.sdk.platform.google.model.RoleModel;
 
 import java.util.List;
 
@@ -19,16 +21,30 @@
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class ObjectEntity
 {
+    @JsonProperty(value = "role")
+    private String role;
+
     @JsonProperty(value = "parts")
     private List<PartEntity> parts;
 
     private ObjectEntity(ObjectEntityBuilder builder)
     {
+        if (ObjectUtils.isEmpty(builder.role)) {
+            builder.role(RoleModel.USER);
+        }
+        this.role = builder.role;
+
         this.parts = builder.parts;
     }
 
     public static class ObjectEntityBuilder
     {
+        public ObjectEntityBuilder role(RoleModel model)
+        {
+            this.role = model.getValue();
+            return this;
+        }
+
         public ObjectEntityBuilder parts(List<PartEntity> parts)
         {
             if (parts == null || parts.isEmpty()) {

src/main/java/org/devlive/sdk/platform/google/model/RoleModel.java

@@ -0,0 +1,17 @@
+package org.devlive.sdk.platform.google.model;
+
+import lombok.Getter;
+
+public enum RoleModel
+{
+    USER("user"),
+    MODEL("model");
+
+    @Getter
+    private final String value;
+
+    RoleModel(String value)
+    {
+        this.value = value;
+    }
+}

src/test/java/org/devlive/sdk/platform/google/GoogleClientTest.java

@@ -1,14 +1,20 @@
 package org.devlive.sdk.platform.google;
 
 import com.google.common.collect.Lists;
+import lombok.extern.slf4j.Slf4j;
 import org.devlive.sdk.ResourceUtils;
 import org.devlive.sdk.platform.google.entity.ChatEntity;
 import org.devlive.sdk.platform.google.entity.ObjectEntity;
 import org.devlive.sdk.platform.google.entity.PartEntity;
+import org.devlive.sdk.platform.google.model.RoleModel;
+import org.devlive.sdk.platform.google.response.ChatResponse;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.List;
+
+@Slf4j
 public class GoogleClientTest
 {
     private GoogleClient client;
@@ -44,4 +50,52 @@ public void testCreateChat()
 
         Assert.assertNotNull(client.createChatCompletions(chat));
     }
+
+    @Test
+    public void testContinuousChat()
+    {
+        List<ObjectEntity> contents = Lists.newArrayList();
+        PartEntity part = PartEntity.builder()
+                .text("你好，我叫小明")
+                .build();
+        ObjectEntity object = ObjectEntity.builder()
+                .parts(Lists.newArrayList(part))
+                .build();
+        contents.add(object);
+        ChatEntity chat = ChatEntity.builder()
+                .contents(contents)
+                .build();
+        ChatResponse response = client.createChatCompletions(chat);
+        print(response, contents);
+
+        ObjectEntity newObject = ObjectEntity.builder()
+                .parts(Lists.newArrayList(PartEntity.builder()
+                        .text("我刚刚说了什么")
+                        .build()))
+                .build();
+        contents.add(newObject);
+        ChatEntity newChat = ChatEntity.builder()
+                .contents(contents)
+                .build();
+        ChatResponse newResponse = client.createChatCompletions(newChat);
+        print(response, contents);
+        Assert.assertNotNull(newResponse.getCandidates());
+    }
+
+    private void print(ChatResponse response, List<ObjectEntity> contents)
+    {
+        response.getCandidates()
+                .forEach(item -> item.getContent()
+                        .getParts()
+                        .forEach(value -> {
+                            log.info(value.getText());
+
+                            contents.add(ObjectEntity.builder()
+                                    .role(RoleModel.MODEL)
+                                    .parts(Lists.newArrayList(PartEntity.builder()
+                                            .text(value.getText())
+                                            .build()))
+                                    .build());
+                        }));
+    }
 }