提交swagger 对象接口补充
This commit is contained in:
@@ -4,11 +4,14 @@ import com.label.annotation.RequireRole;
|
||||
import com.label.common.auth.TokenPrincipal;
|
||||
import com.label.common.result.PageResult;
|
||||
import com.label.common.result.Result;
|
||||
import com.label.dto.ExportBatchCreateRequest;
|
||||
import com.label.dto.FinetuneJobResponse;
|
||||
import com.label.entity.TrainingDataset;
|
||||
import com.label.entity.ExportBatch;
|
||||
import com.label.service.ExportService;
|
||||
import com.label.service.FinetuneService;
|
||||
import io.swagger.v3.oas.annotations.Operation;
|
||||
import io.swagger.v3.oas.annotations.Parameter;
|
||||
import io.swagger.v3.oas.annotations.tags.Tag;
|
||||
import jakarta.servlet.http.HttpServletRequest;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -34,9 +37,13 @@ public class ExportController {
|
||||
@GetMapping("/api/training/samples")
|
||||
@RequireRole("ADMIN")
|
||||
public Result<PageResult<TrainingDataset>> listSamples(
|
||||
@Parameter(description = "页码,从 1 开始", example = "1")
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@Parameter(description = "每页条数", example = "20")
|
||||
@RequestParam(defaultValue = "20") int pageSize,
|
||||
@Parameter(description = "样本类型过滤,可选值:EXTRACTION、QA_GENERATION", example = "EXTRACTION")
|
||||
@RequestParam(required = false) String sampleType,
|
||||
@Parameter(description = "是否已导出过滤", example = "false")
|
||||
@RequestParam(required = false) Boolean exported,
|
||||
HttpServletRequest request) {
|
||||
return Result.success(exportService.listSamples(page, pageSize, sampleType, exported, principal(request)));
|
||||
@@ -47,32 +54,35 @@ public class ExportController {
|
||||
@PostMapping("/api/export/batch")
|
||||
@RequireRole("ADMIN")
|
||||
@ResponseStatus(HttpStatus.CREATED)
|
||||
public Result<ExportBatch> createBatch(@RequestBody Map<String, Object> body,
|
||||
public Result<ExportBatch> createBatch(
|
||||
@io.swagger.v3.oas.annotations.parameters.RequestBody(
|
||||
description = "创建训练数据导出批次请求体",
|
||||
required = true)
|
||||
@RequestBody ExportBatchCreateRequest body,
|
||||
HttpServletRequest request) {
|
||||
@SuppressWarnings("unchecked")
|
||||
List<Object> rawIds = (List<Object>) body.get("sampleIds");
|
||||
List<Long> sampleIds = rawIds.stream()
|
||||
.map(id -> Long.parseLong(id.toString()))
|
||||
.toList();
|
||||
return Result.success(exportService.createBatch(sampleIds, principal(request)));
|
||||
return Result.success(exportService.createBatch(body.getSampleIds(), principal(request)));
|
||||
}
|
||||
|
||||
/** POST /api/export/{batchId}/finetune — 提交微调任务 */
|
||||
@Operation(summary = "提交微调任务")
|
||||
@PostMapping("/api/export/{batchId}/finetune")
|
||||
@RequireRole("ADMIN")
|
||||
public Result<Map<String, Object>> triggerFinetune(@PathVariable Long batchId,
|
||||
HttpServletRequest request) {
|
||||
return Result.success(finetuneService.trigger(batchId, principal(request)));
|
||||
public Result<FinetuneJobResponse> triggerFinetune(
|
||||
@Parameter(description = "导出批次 ID", example = "501")
|
||||
@PathVariable Long batchId,
|
||||
HttpServletRequest request) {
|
||||
return Result.success(toFinetuneJobResponse(finetuneService.trigger(batchId, principal(request))));
|
||||
}
|
||||
|
||||
/** GET /api/export/{batchId}/status — 查询微调状态 */
|
||||
@Operation(summary = "查询微调状态")
|
||||
@GetMapping("/api/export/{batchId}/status")
|
||||
@RequireRole("ADMIN")
|
||||
public Result<Map<String, Object>> getFinetuneStatus(@PathVariable Long batchId,
|
||||
HttpServletRequest request) {
|
||||
return Result.success(finetuneService.getStatus(batchId, principal(request)));
|
||||
public Result<FinetuneJobResponse> getFinetuneStatus(
|
||||
@Parameter(description = "导出批次 ID", example = "501")
|
||||
@PathVariable Long batchId,
|
||||
HttpServletRequest request) {
|
||||
return Result.success(toFinetuneJobResponse(finetuneService.getStatus(batchId, principal(request))));
|
||||
}
|
||||
|
||||
/** GET /api/export/list — 分页查询导出批次列表 */
|
||||
@@ -80,12 +90,36 @@ public class ExportController {
|
||||
@GetMapping("/api/export/list")
|
||||
@RequireRole("ADMIN")
|
||||
public Result<PageResult<ExportBatch>> listBatches(
|
||||
@Parameter(description = "页码,从 1 开始", example = "1")
|
||||
@RequestParam(defaultValue = "1") int page,
|
||||
@Parameter(description = "每页条数", example = "20")
|
||||
@RequestParam(defaultValue = "20") int pageSize,
|
||||
HttpServletRequest request) {
|
||||
return Result.success(exportService.listBatches(page, pageSize, principal(request)));
|
||||
}
|
||||
|
||||
private FinetuneJobResponse toFinetuneJobResponse(Map<String, Object> values) {
|
||||
FinetuneJobResponse response = new FinetuneJobResponse();
|
||||
response.setBatchId(asLong(values.get("batchId")));
|
||||
response.setGlmJobId(asString(values.get("glmJobId")));
|
||||
response.setFinetuneStatus(asString(values.get("finetuneStatus")));
|
||||
response.setProgress(asInteger(values.get("progress")));
|
||||
response.setErrorMessage(asString(values.get("errorMessage")));
|
||||
return response;
|
||||
}
|
||||
|
||||
private Long asLong(Object value) {
|
||||
return value == null ? null : Long.parseLong(value.toString());
|
||||
}
|
||||
|
||||
private Integer asInteger(Object value) {
|
||||
return value == null ? null : Integer.parseInt(value.toString());
|
||||
}
|
||||
|
||||
private String asString(Object value) {
|
||||
return value == null ? null : value.toString();
|
||||
}
|
||||
|
||||
private TokenPrincipal principal(HttpServletRequest request) {
|
||||
return (TokenPrincipal) request.getAttribute("__token_principal__");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user