Skip to content

Commit f999da4

Browse files
volc-sdk-teamvolc-sdk-team
committed
Merge 'integration_2025-04-17_864613236738' into 'master'
merge branch integration_2025-04-17_864613236738 into master See merge request: !446
2 parents 98ab3d6 + f1173ce commit f999da4

File tree

100 files changed

+2878
-166
lines changed

Some content is hidden

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

100 files changed

+2878
-166
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.2.3</version>
57+
<version>0.2.4</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.2.3</version>
73+
<version>0.2.4</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.volcengine</groupId>
7777
<artifactId>volcengine-java-sdk-ecs</artifactId>
78-
<version>0.2.3</version>
78+
<version>0.2.4</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.2.3",
3-
"meta_commit": "639d57252cfdb60084c4f129dea04ab101a27e95"
2+
"lasted": "0.2.4",
3+
"meta_commit": "b192f0522b722cbf25c0ac72943ff44004d8245c"
44
}

‎pom.xml‎

Lines changed: 1 addition & 4 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.3</version>
7+
<version>0.2.4</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -273,8 +273,5 @@
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>
277-
<module>volcengine-java-sdk-edx</module>
278-
<module>volcengine-java-sdk-wafruntime</module>
279276
</modules>
280277
</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.3</version>
6+
<version>0.2.4</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.3</version>
6+
<version>0.2.4</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.3</version>
6+
<version>0.2.4</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.3</version>
6+
<version>0.2.4</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<build>

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ public class TruncationStrategy {
1515
@JsonProperty("rolling_tokens")
1616
private Boolean rollingTokens;
1717

18+
@JsonProperty("max_window_tokens")
19+
private Integer maxWindowTokens;
20+
21+
@JsonProperty("rolling_window_tokens")
22+
private Integer rollingWindowTokens;
23+
1824
public TruncationStrategy() {
1925
}
2026

@@ -47,6 +53,22 @@ public void setRollingTokens(Boolean rollingTokens) {
4753
this.rollingTokens = rollingTokens;
4854
}
4955

56+
public Integer getMaxWindowTokens() {
57+
return maxWindowTokens;
58+
}
59+
60+
public void setMaxWindowTokens(Integer maxWindowTokens) {
61+
this.maxWindowTokens = maxWindowTokens;
62+
}
63+
64+
public Integer getRollingWindowTokens() {
65+
return rollingWindowTokens;
66+
}
67+
68+
public void setRollingWindowTokens(Integer rollingWindowTokens) {
69+
this.rollingWindowTokens = rollingWindowTokens;
70+
}
71+
5072
@Override
5173
public String toString() {
5274
return "TruncationStrategy{" +
@@ -64,6 +86,8 @@ public static class Builder {
6486
private Integer lastHistoryTokens;
6587
private String type;
6688
private Boolean rollingTokens;
89+
private Integer maxWindowTokens;
90+
private Integer rollingWindowTokens;
6791

6892
private Builder() {
6993
}
@@ -83,11 +107,23 @@ public Builder rollingTokens(Boolean RollingTokens) {
83107
return this;
84108
}
85109

110+
public Builder maxWindowTokens(Integer MaxWindowTokens) {
111+
this.maxWindowTokens = MaxWindowTokens;
112+
return this;
113+
}
114+
115+
public Builder rollingWindowTokens(Integer RollingWindowTokens) {
116+
this.rollingWindowTokens = RollingWindowTokens;
117+
return this;
118+
}
119+
86120
public TruncationStrategy build() {
87121
TruncationStrategy truncationStrategy = new TruncationStrategy();
88122
truncationStrategy.setLastHistoryTokens(lastHistoryTokens);
89123
truncationStrategy.setType(type);
90124
truncationStrategy.setRollingTokens(rollingTokens);
125+
truncationStrategy.setMaxWindowTokens(maxWindowTokens);
126+
truncationStrategy.setRollingWindowTokens(rollingWindowTokens);
91127
return truncationStrategy;
92128
}
93129
}

‎volcengine-java-sdk-ark/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.3</version>
6+
<version>0.2.4</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎volcengine-java-sdk-autoscaling/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.3</version>
6+
<version>0.2.4</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

0 commit comments

Comments
 (0)