[Google] [Gemini] Support google Gemini

.gitignore

@@ -6,3 +6,5 @@ pom.xml.versionsBackup
 
 BaseTest.java
 site/
+
+application.properties

docs/docs/reference/google/gemini/chat/home.md

@@ -0,0 +1,121 @@
+---
+title: Chat
+---
+
+> 支持 Google Gemini，产品地址: https://ai.google.dev/gemini-api
+
+### 简单对话
+
+---
+
+处理纯文字输入。借助此功能，您可以执行自然语言处理 (NLP) 任务，例如文本补全和摘要。
+
+使用示例
+
+```java
+try (GoogleClient client = GoogleClient.builder()
+    .apiKey(token)
+    .build()) {
+    PartEntity part = PartEntity.builder()
+        .text("Hello, Open AI Java SDK!")
+        .build();
+    ObjectEntity object = ObjectEntity.builder()
+        .parts(Lists.newArrayList(part))
+        .build();
+    ChatEntity chat = ChatEntity.builder()
+        .contents(Lists.newArrayList(object))
+        .build();
+
+    ChatResponse response = client.createChatCompletions(chat);
+    response.getCandidates()
+        .forEach(item -> item.getContent()
+            .getParts()
+            .forEach(value -> log.info(value.getText())));
+}
+```
+
+### 多轮对话（聊天）
+
+---
+
+打造互动式聊天体验。 借助此 API 的聊天功能，您可以收集多轮问题和回复，让用户能够逐步找到答案或获得有关多部分问题的帮助。
+
+使用示例
+
+```java
+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);
+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());
+                }));
+
+ObjectEntity newObject = ObjectEntity.builder()
+        .parts(Lists.newArrayList(PartEntity.builder()
+                .text("我刚刚说了什么")
+                .build()))
+        .build();
+contents.add(newObject);
+ChatEntity newChat = ChatEntity.builder()
+        .contents(contents)
+        .build();
+client.createChatCompletions(newChat);
+```
+
+### 流式响应
+
+---
+
+以数据流的形式接收。流式响应会在模型生成增量数据时将这些数据发送回您的应用。
+
+使用示例
+
+```java
+// 构建客户端
+CountDownLatch countDownLatch = new CountDownLatch(1);
+ConsoleEventSourceListener listener = ConsoleEventSourceListener.builder()
+        .countDownLatch(countDownLatch)
+        .build();
+GoogleClient client = GoogleClient.builder()
+        .apiKey(ResourceUtils.getValue("google.token"))
+        .listener(listener)
+        .build();
+
+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();
+client.createChatCompletions(chat);
+try {
+    countDownLatch.await();
+}
+catch (InterruptedException e) {
+    log.error("Interrupted while waiting", e);
+}
+```

docs/mkdocs.yml

@@ -21,7 +21,6 @@ theme:
   name: material
   custom_dir: overrides
 
-  language: en
   features:
     - content.code.annotate
     - content.tabs.link
@@ -64,7 +63,7 @@ markdown_extensions:
 plugins:
   - i18n:
       reconfigure_material: true
-      default_language: en
+      default_language: zh
       languages:
         - locale: zh
           name: Chinese (Simplified)
@@ -111,6 +110,9 @@ nav:
       - Google PaLM:
           - reference/google_palm/completions.md
           - reference/google_palm/chat.md
+      - Google:
+          - Gemini:
+              - reference/google/gemini/chat/home.md
   - NavReleaseNote:
       - release/latest.md
       - release/2024.01.1.md

src/main/java/org/devlive/sdk/openai/DefaultApi.java → src/main/java/org/devlive/sdk/common/DefaultApi.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai;
+package org.devlive.sdk.common;
 
 import io.reactivex.Single;
 import okhttp3.MultipartBody;

src/main/java/org/devlive/sdk/openai/DefaultClient.java → src/main/java/org/devlive/sdk/common/DefaultClient.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai;
+package org.devlive.sdk.common;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.Lists;
@@ -12,6 +12,7 @@
 import okhttp3.sse.EventSourceListener;
 import okhttp3.sse.EventSources;
 import org.apache.commons.lang3.ObjectUtils;
+import org.devlive.sdk.common.exception.RequestException;
 import org.devlive.sdk.openai.entity.AudioEntity;
 import org.devlive.sdk.openai.entity.ChatEntity;
 import org.devlive.sdk.openai.entity.CompletionEntity;
@@ -28,7 +29,6 @@
 import org.devlive.sdk.openai.entity.beta.QueryEntity;
 import org.devlive.sdk.openai.entity.beta.ThreadEntity;
 import org.devlive.sdk.openai.entity.google.MessageEntity;
-import org.devlive.sdk.openai.exception.RequestException;
 import org.devlive.sdk.openai.mixin.IgnoreUnknownMixin;
 import org.devlive.sdk.openai.model.ProviderModel;
 import org.devlive.sdk.openai.model.UrlModel;

src/main/java/org/devlive/sdk/openai/exception/AuthorizedException.java → src/main/java/org/devlive/sdk/common/exception/AuthorizedException.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.exception;
+package org.devlive.sdk.common.exception;
 
 public class AuthorizedException
         extends DefaultException

src/main/java/org/devlive/sdk/openai/exception/DefaultException.java → src/main/java/org/devlive/sdk/common/exception/DefaultException.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.exception;
+package org.devlive.sdk.common.exception;
 
 import lombok.Getter;
 

src/main/java/org/devlive/sdk/openai/exception/ParamException.java → src/main/java/org/devlive/sdk/common/exception/ParamException.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.exception;
+package org.devlive.sdk.common.exception;
 
 public class ParamException
         extends DefaultException

src/main/java/org/devlive/sdk/openai/exception/RequestException.java → src/main/java/org/devlive/sdk/common/exception/RequestException.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.exception;
+package org.devlive.sdk.common.exception;
 
 public class RequestException
         extends DefaultException

src/main/java/org/devlive/sdk/openai/interceptor/DefaultInterceptor.java → src/main/java/org/devlive/sdk/common/interceptor/DefaultInterceptor.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.interceptor;
+package org.devlive.sdk.common.interceptor;
 
 import com.google.common.base.Preconditions;
 import lombok.Getter;
@@ -11,8 +11,8 @@
 import okhttp3.ResponseBody;
 import okio.Buffer;
 import org.apache.commons.lang3.ObjectUtils;
-import org.devlive.sdk.openai.exception.AuthorizedException;
-import org.devlive.sdk.openai.exception.RequestException;
+import org.devlive.sdk.common.exception.AuthorizedException;
+import org.devlive.sdk.common.exception.RequestException;
 import org.devlive.sdk.openai.response.DefaultResponse;
 import org.devlive.sdk.openai.utils.JsonUtils;
 
@@ -44,7 +44,7 @@ public Response intercept(Chain chain)
         if (ObjectUtils.isNotEmpty(requestBody)) {
             Buffer buffer = new Buffer();
             requestBody.writeTo(buffer);
-            log.debug("Request body {}", buffer.readUtf8());
+            log.info("Request body {}", buffer.readUtf8());
         }
 
         Response response = chain.proceed(request);

src/main/java/org/devlive/sdk/openai/listener/ConsoleEventSourceListener.java → src/main/java/org/devlive/sdk/common/listener/ConsoleEventSourceListener.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.listener;
+package org.devlive.sdk.common.listener;
 
 import lombok.Builder;
 import lombok.extern.slf4j.Slf4j;

src/main/java/org/devlive/sdk/openai/listener/HttpServletEventSourceListener.java → src/main/java/org/devlive/sdk/common/listener/HttpServletEventSourceListener.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.listener;
+package org.devlive.sdk.common.listener;
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -9,7 +9,7 @@
 import okhttp3.sse.EventSource;
 import okhttp3.sse.EventSourceListener;
 import org.apache.commons.lang3.ObjectUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
 import org.devlive.sdk.openai.response.CompleteResponse;
 import org.devlive.sdk.openai.utils.JsonUtils;
 

src/main/java/org/devlive/sdk/openai/utils/HttpUrlUtils.java → src/main/java/org/devlive/sdk/common/utils/HttpUrlUtils.java

@@ -1,4 +1,4 @@
-package org.devlive.sdk.openai.utils;
+package org.devlive.sdk.common.utils;
 
 import okhttp3.HttpUrl;
 

src/main/java/org/devlive/sdk/common/utils/ValidateUtils.java

@@ -0,0 +1,32 @@
+package org.devlive.sdk.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.devlive.sdk.common.exception.ParamException;
+
+public class ValidateUtils
+{
+    private ValidateUtils()
+    {
+    }
+
+    /**
+     * Validate host
+     *
+     * @param host Original host
+     * @param defaultHost Default host
+     * @return host
+     */
+    public static String validateHost(String host, String defaultHost)
+    {
+        if (StringUtils.isEmpty(host)) {
+            return defaultHost;
+        }
+        else {
+            boolean flag = host.startsWith("http") || host.startsWith("https");
+            if (!flag) {
+                throw new ParamException(String.format("Invalid apiHost <%s> must start with http or https", host));
+            }
+        }
+        return host;
+    }
+}

src/main/java/org/devlive/sdk/openai/OpenAiClient.java

@@ -8,10 +8,12 @@
 import okhttp3.sse.EventSourceListener;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.DefaultApi;
+import org.devlive.sdk.common.DefaultClient;
+import org.devlive.sdk.common.exception.ParamException;
+import org.devlive.sdk.common.interceptor.DefaultInterceptor;
 import org.devlive.sdk.openai.interceptor.AzureInterceptor;
 import org.devlive.sdk.openai.interceptor.ClaudeInterceptor;
-import org.devlive.sdk.openai.interceptor.DefaultInterceptor;
 import org.devlive.sdk.openai.interceptor.GooglePaLMInterceptor;
 import org.devlive.sdk.openai.interceptor.OpenAiInterceptor;
 import org.devlive.sdk.openai.model.CompletionModel;

src/main/java/org/devlive/sdk/openai/entity/AudioEntity.java

@@ -12,7 +12,7 @@
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
 import org.devlive.sdk.openai.model.AudioFormatModel;
 import org.devlive.sdk.openai.model.AudioModel;
 import org.devlive.sdk.openai.utils.FileUtils;

src/main/java/org/devlive/sdk/openai/entity/ChatEntity.java

@@ -8,7 +8,7 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.apache.commons.lang3.ObjectUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
 import org.devlive.sdk.openai.model.CompletionModel;
 import org.devlive.sdk.openai.utils.EnumsUtils;
 

src/main/java/org/devlive/sdk/openai/entity/CompletionEntity.java

@@ -9,7 +9,7 @@
 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.common.exception.ParamException;
 import org.devlive.sdk.openai.model.CompletionModel;
 import org.devlive.sdk.openai.utils.EnumsUtils;
 

src/main/java/org/devlive/sdk/openai/entity/EditEntity.java

@@ -9,7 +9,7 @@
 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.common.exception.ParamException;
 import org.devlive.sdk.openai.model.EditModel;
 
 import java.util.Arrays;

src/main/java/org/devlive/sdk/openai/entity/EmbeddingEntity.java

@@ -8,7 +8,7 @@
 import lombok.NoArgsConstructor;
 import lombok.ToString;
 import org.apache.commons.lang3.StringUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
 
 import java.util.List;
 

src/main/java/org/devlive/sdk/openai/entity/FileEntity.java

@@ -11,7 +11,7 @@
 import lombok.ToString;
 import okhttp3.RequestBody;
 import org.apache.commons.lang3.ObjectUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
 import org.devlive.sdk.openai.model.PurposeModel;
 import org.devlive.sdk.openai.utils.MultipartBodyUtils;
 

src/main/java/org/devlive/sdk/openai/entity/FineTuningEntity.java

@@ -8,7 +8,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
 import org.devlive.sdk.openai.model.CompletionModel;
 
 @Data

src/main/java/org/devlive/sdk/openai/entity/ImageEntity.java

@@ -12,7 +12,7 @@
 import org.apache.commons.lang3.EnumUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
 import org.devlive.sdk.openai.model.ImageFormatModel;
 import org.devlive.sdk.openai.model.ImageSizeModel;
 import org.devlive.sdk.openai.utils.MultipartBodyUtils;

src/main/java/org/devlive/sdk/openai/entity/MessageEntity.java

@@ -9,7 +9,7 @@
 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.common.exception.ParamException;
 import org.devlive.sdk.openai.model.MessageModel;
 import org.devlive.sdk.openai.utils.EnumsUtils;
 

src/main/java/org/devlive/sdk/openai/entity/ModerationEntity.java

@@ -9,7 +9,7 @@
 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.common.exception.ParamException;
 import org.devlive.sdk.openai.model.ModerationModel;
 
 import java.util.List;