Skip to content

Commit 34a84c2

Browse files
authored
feat(http): support proxy through connection options (#164)
1 parent f3274ff commit 34a84c2

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

samples/MultiModalConversationQwenVL.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@ public static void imageSample() throws ApiException, NoApiKeyException, UploadF
6464
List<MultiModalConversationMessage> messages = Arrays.asList(systemMessage, userMessage);
6565
MultiModalConversationParam param = MultiModalConversationParam.builder()
6666
.messages(messages)
67-
.model("qvq-max").build(); //qwen3-vl-plus
67+
.model("qwen3-vl-plus").build(); //qwen3-vl-plus
6868
Flowable<MultiModalConversationResult> flowable = conversation.streamCall(param);
69-
flowable.forEach(result -> {
69+
flowable.blockingForEach(result -> {
7070
System.out.println(JsonUtils.toJson(result));
7171
});
7272
}
@@ -155,8 +155,8 @@ public static void streamCallWithToolCalls()
155155

156156
public static void main(String[] args) {
157157
try {
158-
// imageSample();
159-
videoSample();
158+
imageSample();
159+
// videoSample();
160160
// streamCallWithToolCalls();
161161
} catch (ApiException | NoApiKeyException | UploadFileException e) {
162162
System.out.println(e.getMessage());

src/main/java/com/alibaba/dashscope/protocol/okhttp/OkHttpClientFactory.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,22 @@ public static OkHttpClient getOkHttpClient() {
7575
}
7676

7777
public static OkHttpClient getNewOkHttpClient(ConnectionOptions connectionOptions) {
78-
return Holder.INSTANCE
78+
Builder builder = Holder.INSTANCE
7979
.newBuilder()
8080
.connectTimeout(connectionOptions.getConnectTimeout())
8181
.readTimeout(connectionOptions.getReadTimeout())
82-
.writeTimeout(connectionOptions.getWriteTimeout())
83-
.build();
82+
.writeTimeout(connectionOptions.getWriteTimeout());
83+
84+
// Configure proxy if available
85+
if (connectionOptions.getProxy() != null) {
86+
builder.proxy(connectionOptions.getProxy());
87+
}
88+
89+
// Configure proxy authenticator if available
90+
if (connectionOptions.getProxyAuthenticator() != null) {
91+
builder.proxyAuthenticator(connectionOptions.getProxyAuthenticator());
92+
}
93+
94+
return builder.build();
8495
}
8596
}

0 commit comments

Comments
 (0)