Skip to content

Commit 1bcb624

Browse files
volc-sdk-teamvolc-sdk-team
committed
Merge 'integration_2025-05-15_905315453698' into 'master'
merge branch integration_2025-05-15_905315453698 into master See merge request: !489
2 parents e419f5c + c0f9562 commit 1bcb624

File tree

283 files changed

+33859
-865
lines changed

Some content is hidden

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

283 files changed

+33859
-865
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
<dependency>
6363
<groupId>com.volcengine</groupId>
6464
<artifactId>volcengine-java-sdk-bom</artifactId>
65-
<version>0.2.8</version>
65+
<version>0.2.9</version>
6666
<type>pom</type>
6767
<scope>import</scope>
6868
</dependency>
@@ -78,12 +78,12 @@
7878
<dependency>
7979
<groupId>com.volcengine</groupId>
8080
<artifactId>volcengine-java-sdk-vpc</artifactId>
81-
<version>0.2.8</version>
81+
<version>0.2.9</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>com.volcengine</groupId>
8585
<artifactId>volcengine-java-sdk-ecs</artifactId>
86-
<version>0.2.8</version>
86+
<version>0.2.9</version>
8787
</dependency>
8888
</dependencies>
8989
```

‎meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "0.2.8",
3-
"meta_commit": "522daa337d9ca7d5b3d4d88080517ce2d9e8c147"
2+
"lasted": "0.2.9",
3+
"meta_commit": "7d13ab9de1e106b4ad23e83ec04c38780361700f"
44
}

‎pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>com.volcengine</groupId>
55
<artifactId>volcengine-java-sdk</artifactId>
66
<packaging>pom</packaging>
7-
<version>0.2.8</version>
7+
<version>0.2.9</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -273,12 +273,13 @@
273273
<module>volcengine-java-sdk-rdspostgresql</module>
274274
<module>volcengine-java-sdk-clouddetect</module>
275275
<module>volcengine-java-sdk-translate20250301</module>
276+
<module>volcengine-java-sdk-volccontentplatform</module>
276277
<module>volcengine-java-sdk-edx</module>
277278
<module>volcengine-java-sdk-wafruntime</module>
278-
<module>volcengine-java-sdk-volccontentplatform</module>
279279
<module>volcengine-java-sdk-mlplatform20240701</module>
280280
<module>volcengine-java-sdk-vod20250101</module>
281281
<module>volcengine-java-sdk-tag</module>
282282
<module>volcengine-java-sdk-bmq20240901</module>
283+
<module>volcengine-java-sdk-quota</module>
283284
</modules>
284285
</project>

‎volcengine-java-sdk-advdefence/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.2.8</version>
6+
<version>0.2.9</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-advdefence20230308/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.2.8</version>
6+
<version>0.2.9</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-alb/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.2.8</version>
6+
<version>0.2.9</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-ark-runtime/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<artifactId>volcengine-java-sdk</artifactId>
55
<groupId>com.volcengine</groupId>
6-
<version>0.2.8</version>
6+
<version>0.2.9</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<build>

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/interceptor/ArkResourceStsAuthenticationInterceptor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public Response intercept(Chain chain) throws IOException {
5454
String requestResourceType = getRequestResourceType(request);
5555
String requestResourceId = getRequestResourceId(request);
5656

57-
if (request.url().url().getPath().contains("contents/generations")) {
57+
if (request.url().url().getPath().contains("contents/generations") || request.url().url().getPath().contains("images/generations")) {
5858
throw new ArkException("content generation currently does not support ak&sk authentication, use api_key instead.");
5959
}
6060

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/completion/chat/ChatCompletionRequest.java‎

Lines changed: 62 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,46 @@ public class ChatCompletionRequest {
158158
@JsonProperty("response_format")
159159
ChatCompletionRequestResponseFormat responseFormat;
160160

161+
@JsonProperty("thinking")
162+
ChatCompletionRequestThinking thinking;
163+
164+
@Override
165+
public String toString() {
166+
return "ChatCompletionRequest{" +
167+
"model='" + model + '\'' +
168+
", messages=" + messages +
169+
", temperature=" + temperature +
170+
", topP=" + topP +
171+
", stream=" + stream +
172+
", streamOptions=" + streamOptions +
173+
", serviceTier='" + serviceTier + '\'' +
174+
", stop=" + stop +
175+
", maxTokens=" + maxTokens +
176+
", presencePenalty=" + presencePenalty +
177+
", frequencyPenalty=" + frequencyPenalty +
178+
", logitBias=" + logitBias +
179+
", user='" + user + '\'' +
180+
", tools=" + tools +
181+
", functionCall=" + functionCall +
182+
", logprobs=" + logprobs +
183+
", topLogprobs=" + topLogprobs +
184+
", repetitionPenalty=" + repetitionPenalty +
185+
", n=" + n +
186+
", parallelToolCalls=" + parallelToolCalls +
187+
", toolChoice=" + toolChoice +
188+
", responseFormat=" + responseFormat +
189+
", thinking=" + thinking +
190+
'}';
191+
}
192+
193+
public ChatCompletionRequestThinking getThinking() {
194+
return thinking;
195+
}
196+
197+
public void setThinking(ChatCompletionRequestThinking thinking) {
198+
this.thinking = thinking;
199+
}
200+
161201
public String getModel() {
162202
return model;
163203
}
@@ -334,34 +374,6 @@ public void setResponseFormat(ChatCompletionRequestResponseFormat responseFormat
334374
this.responseFormat = responseFormat;
335375
}
336376

337-
@Override
338-
public String toString() {
339-
return "ChatCompletionRequest{" +
340-
"model='" + model + '\'' +
341-
", messages=" + messages +
342-
", temperature=" + temperature +
343-
", topP=" + topP +
344-
", stream=" + stream +
345-
", streamOptions=" + streamOptions +
346-
", serviceTier=" + serviceTier +
347-
", stop=" + stop +
348-
", maxTokens=" + maxTokens +
349-
", presencePenalty=" + presencePenalty +
350-
", frequencyPenalty=" + frequencyPenalty +
351-
", logitBias=" + logitBias +
352-
", user='" + user + '\'' +
353-
", tools=" + tools +
354-
", functionCall=" + functionCall +
355-
", logprobs=" + logprobs +
356-
", topLogprobs=" + topLogprobs +
357-
", repetitionPenalty=" + repetitionPenalty +
358-
", n=" + n +
359-
", parallelToolCalls=" + parallelToolCalls +
360-
", toolChoice=" + toolChoice +
361-
", responseFormat=" + responseFormat +
362-
'}';
363-
}
364-
365377
public static class ChatCompletionRequestFunctionCall {
366378
String name;
367379

@@ -480,6 +492,22 @@ public ChatCompletionRequestToolChoice(String type, ChatCompletionRequestToolCho
480492

481493
}
482494

495+
public static class ChatCompletionRequestThinking{
496+
public ChatCompletionRequestThinking(String type) {
497+
this.type = type;
498+
}
499+
500+
public String getType() {
501+
return type;
502+
}
503+
504+
public void setType(String type) {
505+
this.type = type;
506+
}
507+
508+
String type;
509+
}
510+
483511
public static class ChatCompletionRequestToolChoiceFunction {
484512
String name;
485513

@@ -523,6 +551,7 @@ public static class Builder {
523551
private Boolean parallelToolCalls;
524552
private Object toolChoice;
525553
private ChatCompletionRequestResponseFormat responseFormat;
554+
private ChatCompletionRequestThinking thinking;
526555

527556
public ChatCompletionRequest.Builder model(String model) {
528557
this.model = model;
@@ -639,6 +668,10 @@ public ChatCompletionRequest.Builder responseFormat(ChatCompletionRequestRespons
639668
return this;
640669
}
641670

671+
public ChatCompletionRequest.Builder thinking(ChatCompletionRequestThinking thinking) {
672+
this.thinking = thinking;
673+
return this;
674+
}
642675
public ChatCompletionRequest build() {
643676
ChatCompletionRequest chatCompletionRequest = new ChatCompletionRequest();
644677
chatCompletionRequest.setModel(model);
@@ -663,6 +696,7 @@ public ChatCompletionRequest build() {
663696
chatCompletionRequest.setParallelToolCalls(parallelToolCalls);
664697
chatCompletionRequest.setToolChoice(toolChoice);
665698
chatCompletionRequest.setResponseFormat(responseFormat);
699+
chatCompletionRequest.setThinking(thinking);
666700
return chatCompletionRequest;
667701
}
668702
}

0 commit comments

Comments
 (0)