Skip to content

Commit d61b891

Browse files
committed
Merge 'integration_2025-06-05_933333271298' into 'master'
merge branch integration_2025-06-05_933333271298 into master See merge request: !520
2 parents 6d29cd5 + 65dc04f commit d61b891

File tree

120 files changed

+4379
-217
lines changed

Some content is hidden

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

120 files changed

+4379
-217
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.13</version>
65+
<version>0.2.14</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.13</version>
81+
<version>0.2.14</version>
8282
</dependency>
8383
<dependency>
8484
<groupId>com.volcengine</groupId>
8585
<artifactId>volcengine-java-sdk-ecs</artifactId>
86-
<version>0.2.13</version>
86+
<version>0.2.14</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.13",
3-
"meta_commit": "0a7eab276d71477fe3dd973c76da1efdaa4b1f69"
2+
"lasted": "0.2.14",
3+
"meta_commit": "74961888a3b2d0e8ddb6062f30c474efb1613c25"
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.2.13</version>
7+
<version>0.2.14</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>
@@ -285,5 +285,6 @@
285285
<module>volcengine-java-sdk-privatezone</module>
286286
<module>volcengine-java-sdk-acep</module>
287287
<module>volcengine-java-sdk-resourcecenter</module>
288+
<module>volcengine-java-sdk-sqs</module>
288289
</modules>
289290
</project>

volcengine-java-sdk-acep/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.13</version>
6+
<version>0.2.14</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

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.13</version>
6+
<version>0.2.14</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.13</version>
6+
<version>0.2.14</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.13</version>
6+
<version>0.2.14</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.13</version>
6+
<version>0.2.14</version>
77
<relativePath>../pom.xml</relativePath>
88
</parent>
99
<build>

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/bot/completion/chat/usage/BotActionUsage.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ public class BotActionUsage {
2626
@JsonProperty("search_count")
2727
private Integer searchCount;
2828

29+
@JsonProperty("action_name")
30+
private String actionName;
31+
32+
@JsonProperty("count")
33+
private Integer count;
34+
2935
public String getName() {
3036
return name;
3137
}
@@ -66,6 +72,22 @@ public void setSearchCount(Integer searchCount) {
6672
this.searchCount = searchCount;
6773
}
6874

75+
public String getActionName() {
76+
return actionName;
77+
}
78+
79+
public void setActionName(String actionName) {
80+
this.actionName = actionName;
81+
}
82+
83+
public Integer getCount() {
84+
return count;
85+
}
86+
87+
public void setCount(Integer count) {
88+
this.count = count;
89+
}
90+
6991
@Override
7092
public String toString() {
7193
return "BotActionUsage{" +
@@ -74,6 +96,8 @@ public String toString() {
7496
", completionTokens=" + completionTokens +
7597
", totalTokens=" + totalTokens +
7698
", searchCount=" + searchCount +
99+
", actionName='" + actionName + '\'' +
100+
", count=" + count +
77101
'}';
78102
}
79103
}

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/content/generation/CreateContentGenerationTaskRequest.java

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ public class CreateContentGenerationTaskRequest {
1414
@JsonProperty("content")
1515
private List<Content> content;
1616

17+
@JsonProperty("callback_url")
18+
private String callbackUrl;
19+
1720
public CreateContentGenerationTaskRequest() {
1821
}
1922

@@ -22,6 +25,12 @@ public CreateContentGenerationTaskRequest(String model, List<Content> content) {
2225
this.content = content;
2326
}
2427

28+
public CreateContentGenerationTaskRequest(String model, List<Content> content, String callbackUrl) {
29+
this.model = model;
30+
this.content = content;
31+
this.callbackUrl = callbackUrl;
32+
}
33+
2534
public String getModel() {
2635
return model;
2736
}
@@ -38,11 +47,20 @@ public void setContent(List<Content> content) {
3847
this.content = content;
3948
}
4049

50+
public String getCallbackUrl() {
51+
return callbackUrl;
52+
}
53+
54+
public void setCallbackUrl(String callbackUrl) {
55+
this.callbackUrl = callbackUrl;
56+
}
57+
4158
@Override
4259
public String toString() {
4360
return "CreateContentGenerationTaskRequest{" +
4461
"model='" + model + '\'' +
4562
", content=" + content +
63+
", callbackUrl='" + callbackUrl + '\'' +
4664
'}';
4765
}
4866

@@ -53,6 +71,7 @@ public static CreateContentGenerationTaskRequest.Builder builder() {
5371
public static class Builder {
5472
private String model;
5573
private List<Content> content;
74+
private String callbackUrl;
5675

5776
private Builder() {
5877
}
@@ -67,10 +86,16 @@ public Builder content(List<Content> content) {
6786
return this;
6887
}
6988

89+
public Builder callbackUrl(String callbackUrl) {
90+
this.callbackUrl = callbackUrl;
91+
return this;
92+
}
93+
7094
public CreateContentGenerationTaskRequest build() {
7195
CreateContentGenerationTaskRequest createContentGenerationTaskRequest = new CreateContentGenerationTaskRequest();
7296
createContentGenerationTaskRequest.setModel(model);
7397
createContentGenerationTaskRequest.setContent(content);
98+
createContentGenerationTaskRequest.setCallbackUrl(callbackUrl);
7499
return createContentGenerationTaskRequest;
75100
}
76101
}

0 commit comments

Comments
 (0)