Skip to content

Commit 13ad821

Browse files
qianmoQqianmoQ
committed
[Google] [Gemini] Support chat
1 parent e359d1d commit 13ad821

64 files changed

Lines changed: 886 additions & 47 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ pom.xml.versionsBackup
66

77
BaseTest.java
88
site/
9+
10+
application.properties

src/main/java/org/devlive/sdk/openai/DefaultApi.java renamed to src/main/java/org/devlive/sdk/common/DefaultApi.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.devlive.sdk.openai;
1+
package org.devlive.sdk.common;
22

33
import io.reactivex.Single;
44
import okhttp3.MultipartBody;

src/main/java/org/devlive/sdk/openai/DefaultClient.java renamed to src/main/java/org/devlive/sdk/common/DefaultClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.devlive.sdk.openai;
1+
package org.devlive.sdk.common;
22

33
import com.fasterxml.jackson.databind.ObjectMapper;
44
import com.google.common.collect.Lists;
@@ -12,6 +12,7 @@
1212
import okhttp3.sse.EventSourceListener;
1313
import okhttp3.sse.EventSources;
1414
import org.apache.commons.lang3.ObjectUtils;
15+
import org.devlive.sdk.common.exception.RequestException;
1516
import org.devlive.sdk.openai.entity.AudioEntity;
1617
import org.devlive.sdk.openai.entity.ChatEntity;
1718
import org.devlive.sdk.openai.entity.CompletionEntity;
@@ -28,7 +29,6 @@
2829
import org.devlive.sdk.openai.entity.beta.QueryEntity;
2930
import org.devlive.sdk.openai.entity.beta.ThreadEntity;
3031
import org.devlive.sdk.openai.entity.google.MessageEntity;
31-
import org.devlive.sdk.openai.exception.RequestException;
3232
import org.devlive.sdk.openai.mixin.IgnoreUnknownMixin;
3333
import org.devlive.sdk.openai.model.ProviderModel;
3434
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.devlive.sdk.openai.exception;
1+
package org.devlive.sdk.common.exception;
22

33
public class AuthorizedException
44
extends DefaultException

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.devlive.sdk.openai.exception;
1+
package org.devlive.sdk.common.exception;
22

33
import lombok.Getter;
44

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.devlive.sdk.openai.exception;
1+
package org.devlive.sdk.common.exception;
22

33
public class ParamException
44
extends DefaultException

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.devlive.sdk.openai.exception;
1+
package org.devlive.sdk.common.exception;
22

33
public class RequestException
44
extends DefaultException

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.devlive.sdk.openai.interceptor;
1+
package org.devlive.sdk.common.interceptor;
22

33
import com.google.common.base.Preconditions;
44
import lombok.Getter;
@@ -11,8 +11,8 @@
1111
import okhttp3.ResponseBody;
1212
import okio.Buffer;
1313
import org.apache.commons.lang3.ObjectUtils;
14-
import org.devlive.sdk.openai.exception.AuthorizedException;
15-
import org.devlive.sdk.openai.exception.RequestException;
14+
import org.devlive.sdk.common.exception.AuthorizedException;
15+
import org.devlive.sdk.common.exception.RequestException;
1616
import org.devlive.sdk.openai.response.DefaultResponse;
1717
import org.devlive.sdk.openai.utils.JsonUtils;
1818

@@ -44,7 +44,7 @@ public Response intercept(Chain chain)
4444
if (ObjectUtils.isNotEmpty(requestBody)) {
4545
Buffer buffer = new Buffer();
4646
requestBody.writeTo(buffer);
47-
log.debug("Request body {}", buffer.readUtf8());
47+
log.info("Request body {}", buffer.readUtf8());
4848
}
4949

5050
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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.devlive.sdk.openai.utils;
1+
package org.devlive.sdk.common.utils;
22

33
import okhttp3.HttpUrl;
44

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package org.devlive.sdk.common.utils;
2+
3+
import org.apache.commons.lang3.StringUtils;
4+
import org.devlive.sdk.common.exception.ParamException;
5+
6+
public class ValidateUtils
7+
{
8+
private ValidateUtils()
9+
{
10+
}
11+
12+
/**
13+
* Validate host
14+
*
15+
* @param host Original host
16+
* @param defaultHost Default host
17+
* @return host
18+
*/
19+
public static String validateHost(String host, String defaultHost)
20+
{
21+
if (StringUtils.isEmpty(host)) {
22+
return defaultHost;
23+
}
24+
else {
25+
boolean flag = host.startsWith("http") || host.startsWith("https");
26+
if (!flag) {
27+
throw new ParamException(String.format("Invalid apiHost <%s> must start with http or https", host));
28+
}
29+
}
30+
return host;
31+
}
32+
}

0 commit comments

Comments
 (0)