Skip to content

Commit

Permalink
code format
Browse files Browse the repository at this point in the history 
Signed-off-by: PolarishT <[email protected]>
  • Loading branch information
@PolarishT
PolarishT committed Jan 12, 2025
1 parent c961d74 commit 0f26d1b
Show file tree
Hide file tree
Showing 8 changed files with 1,007 additions and 820 deletions.
458 changes: 258 additions & 200 deletions ...rc/main/java/com/alibaba/cloud/ai/autoconfigure/dashscope/DashScopeAutoConfiguration.java
View file

Large diffs are not rendered by default.

215 changes: 117 additions & 98 deletions ...g-ai-alibaba-core/src/main/java/com/alibaba/cloud/ai/dashscope/api/DashScopeImageApi.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,103 +33,122 @@
*/
public class DashScopeImageApi {

// public static final String DEFAULT_IMAGE_MODEL = ImageModel.WANX_V1.getValue();
public static final String DEFAULT_IMAGE_MODEL = ImageModel.WANX_V1.getValue();

private final RestClient restClient;

public DashScopeImageApi (String apiKey) {
this(DEFAULT_BASE_URL, apiKey, RestClient.builder(), WebClient.builder(), RetryUtils.DEFAULT_RESPONSE_ERROR_HANDLER);
}

public DashScopeImageApi (String apiKey, String workSpaceId) {
this(DEFAULT_BASE_URL, apiKey, workSpaceId, RestClient.builder(), WebClient.builder(), RetryUtils.DEFAULT_RESPONSE_ERROR_HANDLER);
}

public DashScopeImageApi (String baseUrl, String apiKey, String workSpaceId) {
this(baseUrl, apiKey, workSpaceId, RestClient.builder(), WebClient.builder(), RetryUtils.DEFAULT_RESPONSE_ERROR_HANDLER);
}

public DashScopeImageApi (String baseUrl, String apiKey, RestClient.Builder restClientBuilder, WebClient.Builder webClientBuilder, ResponseErrorHandler responseErrorHandler) {
this.restClient = restClientBuilder.baseUrl(baseUrl).defaultHeaders(ApiUtils.getJsonContentHeaders(apiKey)).defaultStatusHandler(responseErrorHandler).build();
}

public DashScopeImageApi (String baseUrl, String apiKey, String workSpaceId, RestClient.Builder restClientBuilder, WebClient.Builder webClientBuilder, ResponseErrorHandler responseErrorHandler) {
this.restClient = restClientBuilder.baseUrl(baseUrl).defaultHeaders(ApiUtils.getJsonContentHeaders(apiKey, workSpaceId)).defaultStatusHandler(responseErrorHandler).build();
}

public ResponseEntity<DashScopeImageAsyncReponse> submitImageGenTask (DashScopeImageRequest request) {
return this.restClient.post().uri("/api/v1/services/aigc/text2image/image-synthesis")
// issue: https://github.com/alibaba/spring-ai-alibaba/issues/29
.header("X-DashScope-Async", "enable").body(request).retrieve().toEntity(DashScopeImageAsyncReponse.class);
}

public ResponseEntity<DashScopeImageAsyncReponse> getImageGenTaskResult (String taskId) {
return this.restClient.get().uri("/api/v1/tasks/{task_id}", taskId).retrieve().toEntity(DashScopeImageAsyncReponse.class);
}

/*******************************************
* Embedding相关
**********************************************/

public enum ImageModel {

WANX_V1("wanx-v1");

public final String value;

ImageModel (String value) {
this.value = value;
}

public String getValue () {
return value;
}

}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageRequest(@JsonProperty("model") String model,
@JsonProperty("input") DashScopeImageRequestInput input,
@JsonProperty("parameters") DashScopeImageRequestParameter parameters

) {
@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageRequestInput(@JsonProperty("prompt") String prompt,
@JsonProperty("negative_prompt") String negativePrompt,
@JsonProperty("ref_img") String refImg) {}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageRequestParameter(@JsonProperty("style") String style,
@JsonProperty("size") String size, @JsonProperty("n") Integer n,
@JsonProperty("seed") Integer seed,
@JsonProperty("ref_strength") Float refStrength,
@JsonProperty("ref_mode") String refMode) {}
}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponse(@JsonProperty("request_id") String requestId,
@JsonProperty("output") DashScopeImageAsyncReponseOutput output,
@JsonProperty("usage") DashScopeImageAsyncReponseUsage usage) {

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponseOutput(@JsonProperty("task_id") String taskId,
@JsonProperty("task_status") String taskStatus,
@JsonProperty("results") List<DashScopeImageAsyncReponseResult> results,
@JsonProperty("task_metrics") DashScopeImageAsyncReponseTaskMetrics taskMetrics,
@JsonProperty("code") String code,
@JsonProperty("message") String message) {}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponseTaskMetrics(@JsonProperty("TOTAL") Integer total,
@JsonProperty("SUCCEEDED") Integer SUCCEEDED,
@JsonProperty("FAILED") Integer FAILED) {}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponseUsage(@JsonProperty("image_count") Integer imageCount) {}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponseResult(@JsonProperty("url") String url) {}
}
// public static final String DEFAULT_IMAGE_MODEL = ImageModel.WANX_V1.getValue();
public static final String DEFAULT_IMAGE_MODEL = ImageModel.WANX_V1.getValue();

private final RestClient restClient;

public DashScopeImageApi(String apiKey) {
this(DEFAULT_BASE_URL, apiKey, RestClient.builder(), WebClient.builder(),
RetryUtils.DEFAULT_RESPONSE_ERROR_HANDLER);
}

public DashScopeImageApi(String apiKey, String workSpaceId) {
this(DEFAULT_BASE_URL, apiKey, workSpaceId, RestClient.builder(), WebClient.builder(),
RetryUtils.DEFAULT_RESPONSE_ERROR_HANDLER);
}

public DashScopeImageApi(String baseUrl, String apiKey, String workSpaceId) {
this(baseUrl, apiKey, workSpaceId, RestClient.builder(), WebClient.builder(),
RetryUtils.DEFAULT_RESPONSE_ERROR_HANDLER);
}

public DashScopeImageApi(String baseUrl, String apiKey, RestClient.Builder restClientBuilder,
WebClient.Builder webClientBuilder, ResponseErrorHandler responseErrorHandler) {
this.restClient = restClientBuilder.baseUrl(baseUrl)
.defaultHeaders(ApiUtils.getJsonContentHeaders(apiKey))
.defaultStatusHandler(responseErrorHandler)
.build();
}

public DashScopeImageApi(String baseUrl, String apiKey, String workSpaceId, RestClient.Builder restClientBuilder,
WebClient.Builder webClientBuilder, ResponseErrorHandler responseErrorHandler) {
this.restClient = restClientBuilder.baseUrl(baseUrl)
.defaultHeaders(ApiUtils.getJsonContentHeaders(apiKey, workSpaceId))
.defaultStatusHandler(responseErrorHandler)
.build();
}

public ResponseEntity<DashScopeImageAsyncReponse> submitImageGenTask(DashScopeImageRequest request) {
return this.restClient.post()
.uri("/api/v1/services/aigc/text2image/image-synthesis")
// issue: https://github.com/alibaba/spring-ai-alibaba/issues/29
.header("X-DashScope-Async", "enable")
.body(request)
.retrieve()
.toEntity(DashScopeImageAsyncReponse.class);
}

public ResponseEntity<DashScopeImageAsyncReponse> getImageGenTaskResult(String taskId) {
return this.restClient.get()
.uri("/api/v1/tasks/{task_id}", taskId)
.retrieve()
.toEntity(DashScopeImageAsyncReponse.class);
}

/*******************************************
* Embedding相关
**********************************************/

public enum ImageModel {

WANX_V1("wanx-v1");

public final String value;

ImageModel(String value) {
this.value = value;
}

public String getValue() {
return value;
}

}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageRequest(@JsonProperty("model") String model,
@JsonProperty("input") DashScopeImageRequestInput input,
@JsonProperty("parameters") DashScopeImageRequestParameter parameters

) {
@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageRequestInput(@JsonProperty("prompt") String prompt,
@JsonProperty("negative_prompt") String negativePrompt, @JsonProperty("ref_img") String refImg) {
}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageRequestParameter(@JsonProperty("style") String style,
@JsonProperty("size") String size, @JsonProperty("n") Integer n, @JsonProperty("seed") Integer seed,
@JsonProperty("ref_strength") Float refStrength, @JsonProperty("ref_mode") String refMode) {
}
}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponse(@JsonProperty("request_id") String requestId,
@JsonProperty("output") DashScopeImageAsyncReponseOutput output,
@JsonProperty("usage") DashScopeImageAsyncReponseUsage usage) {

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponseOutput(@JsonProperty("task_id") String taskId,
@JsonProperty("task_status") String taskStatus,
@JsonProperty("results") List<DashScopeImageAsyncReponseResult> results,
@JsonProperty("task_metrics") DashScopeImageAsyncReponseTaskMetrics taskMetrics,
@JsonProperty("code") String code, @JsonProperty("message") String message) {
}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponseTaskMetrics(@JsonProperty("TOTAL") Integer total,
@JsonProperty("SUCCEEDED") Integer SUCCEEDED, @JsonProperty("FAILED") Integer FAILED) {
}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponseUsage(@JsonProperty("image_count") Integer imageCount) {
}

@JsonInclude(JsonInclude.Include.NON_NULL)
public record DashScopeImageAsyncReponseResult(@JsonProperty("url") String url) {
}
}

}
Loading

0 comments on commit 0f26d1b

Please sign in to comment.