Skip to content

Commit 4d3cd7a

Browse files
volc-sdk-teamvolc-sdk-team
committed
Merge 'integration_2025-02-06_702322982146' into 'master'
merge branch integration_2025-02-06_702322982146 into master See merge request: !375
2 parents 1f4629d + 9f95fa8 commit 4d3cd7a

File tree

221 files changed

+29876
-85
lines changed

Some content is hidden

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

221 files changed

+29876
-85
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>com.volcengine</groupId>
5656
<artifactId>volcengine-java-sdk-bom</artifactId>
57-
<version>0.1.149</version>
57+
<version>0.1.150</version>
5858
<type>pom</type>
5959
<scope>import</scope>
6060
</dependency>
@@ -70,12 +70,12 @@
7070
<dependency>
7171
<groupId>com.volcengine</groupId>
7272
<artifactId>volcengine-java-sdk-vpc</artifactId>
73-
<version>0.1.149</version>
73+
<version>0.1.150</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.volcengine</groupId>
7777
<artifactId>volcengine-java-sdk-ecs</artifactId>
78-
<version>0.1.149</version>
78+
<version>0.1.150</version>
7979
</dependency>
8080
</dependencies>
8181
```

‎meta.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"lasted": "0.1.149",
3-
"meta_commit": "238118f2cccf34d3c4739d31285fd2efe189336d"
2+
"lasted": "0.1.150",
3+
"meta_commit": "5c88dd6780ea42e36e973ab9e13989a24809b18b"
44
}

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
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.1.149</version>
7+
<version>0.1.150</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -266,5 +266,6 @@
266266
<module>volcengine-java-sdk-httpdns</module>
267267
<module>volcengine-java-sdk-cloudtrail20180101</module>
268268
<module>volcengine-java-sdk-seccenter</module>
269+
<module>volcengine-java-sdk-bio</module>
269270
</modules>
270271
</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.1.149</version>
6+
<version>0.1.150</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.1.149</version>
6+
<version>0.1.150</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.1.149</version>
6+
<version>0.1.150</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.1.149</version>
6+
<version>0.1.150</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<build>

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/CompletionTokensDetails.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package com.volcengine.ark.runtime.model;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonProperty;
5+
6+
@JsonIgnoreProperties(ignoreUnknown = true)
7+
public class CompletionTokensDetails {
8+
@JsonProperty("reasoning_tokens")
9+
private Integer reasoningTokens;
10+
11+
public Integer getReasoningTokens() {
12+
return reasoningTokens;
13+
}
14+
15+
public void setReasoningTokens(Integer reasoningTokens) {
16+
this.reasoningTokens = reasoningTokens;
17+
}
18+
19+
@Override
20+
public String toString() {
21+
return "CompletionTokensDetails{" +
22+
"reasoningTokens=" + reasoningTokens +
23+
'}';
24+
}
25+
}

‎volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/Usage.java‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,21 @@ public class Usage {
2626
@JsonProperty("prompt_tokens_details")
2727
private PromptTokensDetails promptTokensDetails;
2828

29+
@JsonProperty("completion_tokens_details")
30+
private CompletionTokensDetails completionTokensDetails;
31+
2932
public Usage(long promptTokens, long completionTokens, long totalTokens) {
3033
this.promptTokens = promptTokens;
3134
this.completionTokens = completionTokens;
3235
this.totalTokens = totalTokens;
3336
}
3437

35-
public Usage(long promptTokens, long completionTokens, long totalTokens, PromptTokensDetails promptTokensDetails) {
38+
public Usage(long promptTokens, long completionTokens, long totalTokens, PromptTokensDetails promptTokensDetails, CompletionTokensDetails completionTokensDetails) {
3639
this.promptTokens = promptTokens;
3740
this.completionTokens = completionTokens;
3841
this.totalTokens = totalTokens;
3942
this.promptTokensDetails = promptTokensDetails;
43+
this.completionTokensDetails = completionTokensDetails;
4044
}
4145

4246
public Usage() {}
@@ -73,13 +77,21 @@ public void setPromptTokensDetails(PromptTokensDetails promptTokensDetails) {
7377
this.promptTokensDetails = promptTokensDetails;
7478
}
7579

80+
public CompletionTokensDetails getCompletionTokensDetails() {
81+
return completionTokensDetails;
82+
}
83+
public void setCompletionTokensDetails(CompletionTokensDetails completionTokensDetails) {
84+
this.completionTokensDetails = completionTokensDetails;
85+
}
86+
7687
@Override
7788
public String toString() {
7889
return "Usage{" +
7990
"promptTokens=" + promptTokens +
8091
", completionTokens=" + completionTokens +
8192
", totalTokens=" + totalTokens +
8293
", promptTokensDetails=" + promptTokensDetails +
94+
", completionTokensDetails=" + completionTokensDetails +
8395
'}';
8496
}
8597
}

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

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.volcengine.ark.runtime.model.completion.chat;
22

3+
import com.fasterxml.jackson.annotation.JsonCreator;
34
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
45
import com.fasterxml.jackson.annotation.JsonProperty;
56
import com.volcengine.ark.runtime.utils.Converter;
@@ -13,6 +14,9 @@ public class ChatMessage {
1314

1415
Object content;
1516

17+
@JsonProperty("reasoning_content")
18+
String reasoningContent;
19+
1620
private String name;
1721
@JsonProperty("function_call")
1822
ChatFunctionCall functionCall;
@@ -47,6 +51,7 @@ public void setContent(Object content) {
4751
this.content = content;
4852
}
4953

54+
5055
public String getName() {
5156
return name;
5257
}
@@ -79,6 +84,14 @@ public void setToolCallId(String toolCallId) {
7984
this.toolCallId = toolCallId;
8085
}
8186

87+
public String getReasoningContent() {
88+
return reasoningContent;
89+
}
90+
91+
public void setReasoningContent(String reasoningContent) {
92+
this.reasoningContent = reasoningContent;
93+
}
94+
8295
public static Builder builder() {
8396
return new Builder();
8497
}
@@ -87,7 +100,8 @@ public static Builder builder() {
87100
public String toString() {
88101
return "ChatMessage{" +
89102
"role=" + role +
90-
", content='" + content + '\'' +
103+
", content=" + content +
104+
", reasoningContent='" + reasoningContent + '\'' +
91105
", name='" + name + '\'' +
92106
", functionCall=" + functionCall +
93107
", toolCalls=" + toolCalls +
@@ -101,6 +115,9 @@ public static class Builder {
101115

102116
private Object content;
103117

118+
@JsonProperty("reasoning_content")
119+
private String reasoningContent;
120+
104121
private String name;
105122
@JsonProperty("function_call")
106123
private ChatFunctionCall functionCall;
@@ -146,10 +163,16 @@ public ChatMessage.Builder toolCallId(String toolCallId) {
146163
return this;
147164
}
148165

166+
public ChatMessage.Builder reasoningContent(String reasoningContent) {
167+
this.reasoningContent = reasoningContent;
168+
return this;
169+
}
170+
149171
public ChatMessage build() {
150172
ChatMessage chatMessage = new ChatMessage();
151173
chatMessage.setRole(role);
152174
chatMessage.setContent(content);
175+
chatMessage.setReasoningContent(reasoningContent);
153176
chatMessage.setName(name);
154177
chatMessage.setFunctionCall(functionCall);
155178
chatMessage.setToolCalls(toolCalls);

0 commit comments

Comments
 (0)