[Google] [Gemini] Support chat

Author: qianmoQ

.gitignore

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

src/main/java/org/devlive/sdk/openai/DefaultApi.java renamed to 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 renamed to 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 renamed to 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 renamed to 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 renamed to 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 renamed to 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 renamed to 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/utils/HttpUrlUtils.java renamed to 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;

src/main/java/org/devlive/sdk/openai/entity/beta/AssistantsEntity.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;
 
 import java.util.Map;

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

@@ -4,7 +4,8 @@
 import okhttp3.HttpUrl;
 import okhttp3.Request;
 import org.apache.commons.lang3.StringUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
+import org.devlive.sdk.common.interceptor.DefaultInterceptor;
 
 import java.util.List;
 

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

@@ -3,7 +3,8 @@
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Request;
 import org.apache.commons.lang3.StringUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
+import org.devlive.sdk.common.interceptor.DefaultInterceptor;
 
 @Slf4j
 public class ClaudeInterceptor

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

@@ -5,13 +5,18 @@
 import okhttp3.HttpUrl;
 import okhttp3.Request;
 import org.apache.commons.lang3.StringUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
+import org.devlive.sdk.common.interceptor.DefaultInterceptor;
 import org.devlive.sdk.openai.model.CompletionModel;
 import org.devlive.sdk.openai.utils.EnumsUtils;
-import org.devlive.sdk.openai.utils.HttpUrlUtils;
+import org.devlive.sdk.common.utils.HttpUrlUtils;
 
 import java.util.List;
 
+/**
+ * Officially obsolete and not recommended for use
+ */
+@Deprecated
 @Slf4j
 public class GooglePaLMInterceptor
         extends DefaultInterceptor

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

@@ -3,7 +3,8 @@
 import lombok.extern.slf4j.Slf4j;
 import okhttp3.Request;
 import org.apache.commons.lang3.StringUtils;
-import org.devlive.sdk.openai.exception.ParamException;
+import org.devlive.sdk.common.exception.ParamException;
+import org.devlive.sdk.common.interceptor.DefaultInterceptor;
 
 @Slf4j
 public class OpenAiInterceptor

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

@@ -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/model/ProviderModel.java

@@ -21,5 +21,7 @@ public enum ProviderModel
      * Google PaLM
      * https://makersuite.google.com
      */
-    GOOGLE_PALM
+    @Deprecated
+    GOOGLE_PALM,
+    GOOGLE_GEMINI
 }

src/main/java/org/devlive/sdk/openai/utils/ProviderUtils.java

@@ -1,6 +1,6 @@
 package org.devlive.sdk.openai.utils;
 
-import org.devlive.sdk.openai.exception.RequestException;
+import org.devlive.sdk.common.exception.RequestException;
 import org.devlive.sdk.openai.model.ProviderModel;
 import org.devlive.sdk.openai.model.UrlModel;
 

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

@@ -0,0 +1,17 @@
+package org.devlive.sdk.platform.google;
+
+import io.reactivex.Single;
+import org.devlive.sdk.common.DefaultApi;
+import org.devlive.sdk.platform.google.entity.ChatEntity;
+import org.devlive.sdk.platform.google.response.ChatResponse;
+import retrofit2.http.Body;
+import retrofit2.http.POST;
+import retrofit2.http.Url;
+
+public interface GoogleApi
+        extends DefaultApi
+{
+    @POST
+    Single<ChatResponse> fetchChatCompletions(@Url String url,
+            @Body ChatEntity configure);
+}