Merge branch 'feat/add_thinking' into 'integration_2025-05-15_905315453698'

feat: [development task] ark runtime (1224977)

See merge request iaasng/volcengine-java-sdk!488

Author: BitsAdmin

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

@@ -54,7 +54,7 @@ public Response intercept(Chain chain) throws IOException {
         String requestResourceType = getRequestResourceType(request);
         String requestResourceId = getRequestResourceId(request);
 
-        if (request.url().url().getPath().contains("contents/generations")) {
+        if (request.url().url().getPath().contains("contents/generations") || request.url().url().getPath().contains("images/generations")) {
             throw new ArkException("content generation currently does not support ak&sk authentication, use api_key instead.");
         }
 

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

@@ -158,6 +158,46 @@ public class ChatCompletionRequest {
     @JsonProperty("response_format")
     ChatCompletionRequestResponseFormat responseFormat;
 
+    @JsonProperty("thinking")
+    ChatCompletionRequestThinking thinking;
+
+    @Override
+    public String toString() {
+        return "ChatCompletionRequest{" +
+                "model='" + model + '\'' +
+                ", messages=" + messages +
+                ", temperature=" + temperature +
+                ", topP=" + topP +
+                ", stream=" + stream +
+                ", streamOptions=" + streamOptions +
+                ", serviceTier='" + serviceTier + '\'' +
+                ", stop=" + stop +
+                ", maxTokens=" + maxTokens +
+                ", presencePenalty=" + presencePenalty +
+                ", frequencyPenalty=" + frequencyPenalty +
+                ", logitBias=" + logitBias +
+                ", user='" + user + '\'' +
+                ", tools=" + tools +
+                ", functionCall=" + functionCall +
+                ", logprobs=" + logprobs +
+                ", topLogprobs=" + topLogprobs +
+                ", repetitionPenalty=" + repetitionPenalty +
+                ", n=" + n +
+                ", parallelToolCalls=" + parallelToolCalls +
+                ", toolChoice=" + toolChoice +
+                ", responseFormat=" + responseFormat +
+                ", thinking=" + thinking +
+                '}';
+    }
+
+    public ChatCompletionRequestThinking getThinking() {
+        return thinking;
+    }
+
+    public void setThinking(ChatCompletionRequestThinking thinking) {
+        this.thinking = thinking;
+    }
+
     public String getModel() {
         return model;
     }
@@ -334,34 +374,6 @@ public void setResponseFormat(ChatCompletionRequestResponseFormat responseFormat
         this.responseFormat = responseFormat;
     }
 
-    @Override
-    public String toString() {
-        return "ChatCompletionRequest{" +
-                "model='" + model + '\'' +
-                ", messages=" + messages +
-                ", temperature=" + temperature +
-                ", topP=" + topP +
-                ", stream=" + stream +
-                ", streamOptions=" + streamOptions +
-                ", serviceTier=" + serviceTier +
-                ", stop=" + stop +
-                ", maxTokens=" + maxTokens +
-                ", presencePenalty=" + presencePenalty +
-                ", frequencyPenalty=" + frequencyPenalty +
-                ", logitBias=" + logitBias +
-                ", user='" + user + '\'' +
-                ", tools=" + tools +
-                ", functionCall=" + functionCall +
-                ", logprobs=" + logprobs +
-                ", topLogprobs=" + topLogprobs +
-                ", repetitionPenalty=" + repetitionPenalty +
-                ", n=" + n +
-                ", parallelToolCalls=" + parallelToolCalls +
-                ", toolChoice=" + toolChoice +
-                ", responseFormat=" + responseFormat +
-                '}';
-    }
-
     public static class ChatCompletionRequestFunctionCall {
         String name;
 
@@ -480,6 +492,22 @@ public ChatCompletionRequestToolChoice(String type, ChatCompletionRequestToolCho
 
     }
 
+    public static class ChatCompletionRequestThinking{
+        public ChatCompletionRequestThinking(String type) {
+            this.type = type;
+        }
+
+        public String getType() {
+            return type;
+        }
+
+        public void setType(String type) {
+            this.type = type;
+        }
+
+        String type;
+    }
+
     public static class ChatCompletionRequestToolChoiceFunction {
         String name;
 
@@ -523,6 +551,7 @@ public static class Builder {
         private Boolean parallelToolCalls;
         private Object toolChoice;
         private ChatCompletionRequestResponseFormat responseFormat;
+        private ChatCompletionRequestThinking thinking;
 
         public ChatCompletionRequest.Builder model(String model) {
             this.model = model;
@@ -639,6 +668,10 @@ public ChatCompletionRequest.Builder responseFormat(ChatCompletionRequestRespons
             return this;
         }
 
+        public ChatCompletionRequest.Builder thinking(ChatCompletionRequestThinking thinking) {
+            this.thinking = thinking;
+            return this;
+        }
         public ChatCompletionRequest build() {
             ChatCompletionRequest chatCompletionRequest = new ChatCompletionRequest();
             chatCompletionRequest.setModel(model);
@@ -663,6 +696,7 @@ public ChatCompletionRequest build() {
             chatCompletionRequest.setParallelToolCalls(parallelToolCalls);
             chatCompletionRequest.setToolChoice(toolChoice);
             chatCompletionRequest.setResponseFormat(responseFormat);
+            chatCompletionRequest.setThinking(thinking);
             return chatCompletionRequest;
         }
     }

volcengine-java-sdk-ark-runtime/src/main/java/com/volcengine/ark/runtime/model/images/generation/GenerateImagesRequest.java

@@ -0,0 +1,176 @@
+package com.volcengine.ark.runtime.model.images.generation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.volcengine.ark.runtime.model.content.generation.CreateContentGenerationTaskRequest;
+
+import java.util.List;
+
+public class GenerateImagesRequest {
+
+    @JsonProperty("model")
+    private String model;
+
+    @JsonProperty("prompt")
+    private String prompt;
+
+    @JsonProperty("response_format")
+    private String responseFormat;
+
+    @JsonProperty("seed")
+    private Integer seed;
+
+    @JsonProperty("guidance_scale")
+    private Double guidanceScale;
+
+    @JsonProperty("size")
+    private String size;
+
+    @JsonProperty("watermark")
+    private Boolean watermark;
+
+    public GenerateImagesRequest() {
+    }
+
+    public GenerateImagesRequest(String model, String prompt, String responseFormat, Integer seed, Double guidanceScale, String size) {
+        this.model = model;
+        this.prompt = prompt;
+        this.responseFormat = responseFormat;
+        this.seed = seed;
+        this.guidanceScale = guidanceScale;
+        this.size = size;
+        this.watermark = false;
+    }
+
+    public String getModel() {
+        return this.model;
+    }
+
+    public void setModel(String model) {
+        this.model = model;
+    }
+
+    public String getPrompt() {
+        return this.prompt;
+    }
+
+    public void setPrompt(String prompt) {
+        this.prompt = prompt;
+    }
+
+    public String getResponseFormat() {
+        return this.responseFormat;
+    }
+
+    public void setResponseFormat(String responseFormat) {
+        this.responseFormat = responseFormat;
+    }
+
+    public Integer getSeed() {
+        return this.seed;
+    }
+
+    public void setSeed(Integer seed) {
+        this.seed = seed;
+    }
+
+    public Double getGuidanceScale() {
+        return this.guidanceScale;
+    }
+
+    public void setGuidanceScale(Double guidanceScale) {
+        this.guidanceScale = guidanceScale;
+    }
+
+    public String getSize() {
+        return this.size;
+    }
+
+    public void setSize(String size) {
+        this.size = size;
+    }
+
+    public Boolean getWatermark() {
+        return this.watermark;
+    }
+
+    public void setWatermark(Boolean watermark) {
+        this.watermark = watermark;
+    }
+
+    @Override
+    public String toString() {
+        return "GenerateImagesRequest{" +
+                "model='" + model + '\'' +
+                ", prompt=" + prompt +
+                ", responseFormat=" + responseFormat +
+                ", seed=" + seed +
+                ", guidanceScale=" + guidanceScale +
+                ", size=" + size +
+                ", watermark=" + watermark +
+                '}';
+    }
+
+    public static GenerateImagesRequest.Builder builder() {
+        return new GenerateImagesRequest.Builder();
+    }
+
+    public static class Builder {
+        private String model;
+        private String prompt;
+        private String responseFormat;
+        private Integer seed;
+        private Double guidanceScale;
+        private String size;
+        private Boolean watermark;
+
+        private Builder() {
+        }
+
+        public GenerateImagesRequest.Builder model(String model) {
+            this.model = model;
+            return this;
+        }
+
+        public GenerateImagesRequest.Builder prompt(String prompt) {
+            this.prompt = prompt;
+            return this;
+        }
+
+        public GenerateImagesRequest.Builder responseFormat(String responseFormat) {
+            this.responseFormat = responseFormat;
+            return this;
+        }
+
+        public GenerateImagesRequest.Builder seed(Integer seed) {
+            this.seed = seed;
+            return this;
+        }
+
+        public GenerateImagesRequest.Builder guidanceScale(Double guidanceScale) {
+            this.guidanceScale = guidanceScale;
+            return this;
+        }
+
+        public GenerateImagesRequest.Builder size(String size) {
+            this.size = size;
+            return this;
+        }
+
+        public GenerateImagesRequest.Builder watermark(Boolean watermark) {
+            this.watermark = watermark;
+            return this;
+        }
+
+        public GenerateImagesRequest build() {
+            GenerateImagesRequest generateImagesRequest = new GenerateImagesRequest();
+            generateImagesRequest.setModel(model);
+            generateImagesRequest.setPrompt(prompt);
+            generateImagesRequest.setResponseFormat(responseFormat);
+            generateImagesRequest.setSeed(seed);
+            generateImagesRequest.setGuidanceScale(guidanceScale);
+            generateImagesRequest.setSize(size);
+            generateImagesRequest.setWatermark(watermark);
+            return generateImagesRequest;
+        }
+    }
+}