Skip to content

Commit 1f4629d

Browse files
Merge 'integration_2025-01-23_701095353346' into 'master'
merge branch integration_2025-01-23_701095353346 into master See merge request: !369
2 parents c6b132f + 10276f4 commit 1f4629d

File tree

192 files changed

+21229
-108
lines changed

Some content is hidden

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

192 files changed

+21229
-108
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.148</version>
57+
<version>0.1.149</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.148</version>
73+
<version>0.1.149</version>
7474
</dependency>
7575
<dependency>
7676
<groupId>com.volcengine</groupId>
7777
<artifactId>volcengine-java-sdk-ecs</artifactId>
78-
<version>0.1.148</version>
78+
<version>0.1.149</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.148",
3-
"meta_commit": "fed66b9de234a6d3a58c55d4568adb6fc4ee5b11"
2+
"lasted": "0.1.149",
3+
"meta_commit": "238118f2cccf34d3c4739d31285fd2efe189336d"
44
}

pom.xml

Lines changed: 1 addition & 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.148</version>
7+
<version>0.1.149</version>
88
<name>volcengine-java-sdk</name>
99
<url>https://open.volcengineapi.com</url>
1010
<description>The Java SDK For Volcengine</description>

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

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

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public class GetContentGenerationTaskResponse {
1818
@JsonProperty("status")
1919
private String status;
2020

21-
@JsonProperty("failure_reason")
22-
private String failureReason;
21+
@JsonProperty("error")
22+
private ContentGenerationError error;
2323

2424
@JsonProperty("content")
2525
private Content content;
@@ -57,14 +57,6 @@ public void setStatus(String status) {
5757
this.status = status;
5858
}
5959

60-
public String getFailureReason() {
61-
return failureReason;
62-
}
63-
64-
public void setFailureReason(String failureReason) {
65-
this.failureReason = failureReason;
66-
}
67-
6860
public Content getContent() {
6961
return content;
7062
}
@@ -141,13 +133,39 @@ public String toString() {
141133
}
142134
}
143135

136+
@JsonIgnoreProperties(ignoreUnknown = true)
137+
public static class ContentGenerationError {
138+
139+
@JsonProperty("message")
140+
private String message;
141+
142+
@JsonProperty("code")
143+
private String code;
144+
145+
public String getMessage() { return message;}
146+
147+
public void setMessage(String message) { this.message = message; }
148+
149+
public String getCode() { return code;}
150+
151+
public void setCode(String code) { this.code = code; }
152+
153+
@Override
154+
public String toString() {
155+
return "Error{" +
156+
"message='" + message + '\'' +
157+
", code='" + code + '\'' +
158+
"}";
159+
}
160+
}
161+
144162
@Override
145163
public String toString() {
146164
return "GetContentGenerationTaskResponse{" +
147165
"id='" + id + '\'' +
148166
", model='" + model + '\'' +
149167
", status='" + status + '\'' +
150-
", failureReason='" + failureReason + '\'' +
168+
", error='" + error + '\'' +
151169
", content=" + (content != null ? content.toString() : "null") +
152170
", usage=" + usage +
153171
", createdAt=" + createdAt +

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

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ public static class Item {
4343
@JsonProperty("status")
4444
private String status;
4545

46-
@JsonProperty("failure_reason")
47-
private String failureReason;
46+
@JsonProperty("error")
47+
private ContentGenerationError error;
4848

4949
@JsonProperty("content")
5050
private Content content;
@@ -82,14 +82,6 @@ public void setStatus(String status) {
8282
this.status = status;
8383
}
8484

85-
public String getFailureReason() {
86-
return failureReason;
87-
}
88-
89-
public void setFailureReason(String failureReason) {
90-
this.failureReason = failureReason;
91-
}
92-
9385
public Content getContent() {
9486
return content;
9587
}
@@ -166,13 +158,39 @@ public String toString() {
166158
}
167159
}
168160

161+
@JsonIgnoreProperties(ignoreUnknown = true)
162+
public static class ContentGenerationError {
163+
164+
@JsonProperty("message")
165+
private String message;
166+
167+
@JsonProperty("code")
168+
private String code;
169+
170+
public String getMessage() { return message;}
171+
172+
public void setMessage(String message) { this.message = message; }
173+
174+
public String getCode() { return code;}
175+
176+
public void setCode(String code) { this.code = code; }
177+
178+
@Override
179+
public String toString() {
180+
return "Error{" +
181+
"message='" + message + '\'' +
182+
", code='" + code + '\'' +
183+
"}";
184+
}
185+
}
186+
169187
@Override
170188
public String toString() {
171189
return "Item{" +
172190
"id='" + id + '\'' +
173191
", model='" + model + '\'' +
174192
", status='" + status + '\'' +
175-
", failureReason='" + failureReason + '\'' +
193+
", error='" + error + '\'' +
176194
", content=" + (content != null ? content.toString() : "null") +
177195
", usage=" + usage +
178196
", createdAt=" + createdAt +
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package com.volcengine.ark.runtime.model.multimodalembeddings;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
5+
import java.util.List;
6+
7+
@JsonIgnoreProperties(ignoreUnknown = true)
8+
public class MultimodalEmbedding {
9+
/**
10+
* The type of object returned, should be "embedding"
11+
*/
12+
private String object;
13+
14+
/**
15+
* The embedding vector
16+
*/
17+
private List<Double> embedding;
18+
19+
20+
public String getObject() {
21+
return object;
22+
}
23+
24+
public void setObject(String object) {
25+
this.object = object;
26+
}
27+
28+
public List<Double> getEmbedding() {
29+
return embedding;
30+
}
31+
32+
public void setEmbedding(List<Double> embedding) {
33+
this.embedding = embedding;
34+
}
35+
36+
@Override
37+
public String toString() {
38+
return "Embedding{" +
39+
"object='" + object + '\'' +
40+
", embedding=" + embedding +
41+
'}';
42+
}
43+
}

0 commit comments

Comments
 (0)