- {job.uuid}
- ,
+
+
+
+ {job.id}
+
+
,
job.resourcePool,
job.modelName,
{job.modelVersion},
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/JobApi.java b/server/controller/src/main/java/ai/starwhale/mlops/api/JobApi.java
index 21fe77ad23..58f7d07e38 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/api/JobApi.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/api/JobApi.java
@@ -19,6 +19,7 @@
import ai.starwhale.mlops.api.protocol.ResponseMessage;
import ai.starwhale.mlops.api.protocol.job.ExecRequest;
import ai.starwhale.mlops.api.protocol.job.ExecResponse;
+import ai.starwhale.mlops.api.protocol.job.JobModifyPinRequest;
import ai.starwhale.mlops.api.protocol.job.JobModifyRequest;
import ai.starwhale.mlops.api.protocol.job.JobRequest;
import ai.starwhale.mlops.api.protocol.job.JobVo;
@@ -204,7 +205,18 @@ ResponseEntity> modifyJobComment(
schema = @Schema())
@PathVariable("jobUrl")
String jobUrl,
- @Valid @RequestBody JobModifyRequest jobRequest);
+ @Valid @RequestBody JobModifyRequest jobRequest);
+
+ @Operation(summary = "Pin Job")
+ @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "ok") })
+ @PostMapping(value = "/project/{projectUrl}/job/{jobUrl}/pin", produces = MediaType.APPLICATION_JSON_VALUE)
+ @PreAuthorize("hasAnyRole('OWNER', 'MAINTAINER')")
+ ResponseEntity> modifyJobPinStatus(
+ @Parameter(in = ParameterIn.PATH, description = "Project url", schema = @Schema())
+ @PathVariable("projectUrl") String projectUrl,
+ @Parameter(in = ParameterIn.PATH, description = "Job id or uuid", required = true, schema = @Schema())
+ @PathVariable("jobUrl") String jobUrl,
+ @Valid @RequestBody JobModifyPinRequest jobRequest);
@Operation(summary = "DAG of Job")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "ok")})
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/JobController.java b/server/controller/src/main/java/ai/starwhale/mlops/api/JobController.java
index 6f91f48069..3ba976333e 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/api/JobController.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/api/JobController.java
@@ -20,6 +20,7 @@
import ai.starwhale.mlops.api.protocol.ResponseMessage;
import ai.starwhale.mlops.api.protocol.job.ExecRequest;
import ai.starwhale.mlops.api.protocol.job.ExecResponse;
+import ai.starwhale.mlops.api.protocol.job.JobModifyPinRequest;
import ai.starwhale.mlops.api.protocol.job.JobModifyRequest;
import ai.starwhale.mlops.api.protocol.job.JobRequest;
import ai.starwhale.mlops.api.protocol.job.JobVo;
@@ -197,6 +198,21 @@ public ResponseEntity> modifyJobComment(
return ResponseEntity.ok(Code.success.asResponse("success"));
}
+ @Override
+ public ResponseEntity> modifyJobPinStatus(
+ String projectUrl,
+ String jobUrl,
+ JobModifyPinRequest jobRequest
+ ) {
+ Boolean res = jobService.updateJobPinStatus(projectUrl, jobUrl, jobRequest.isPinned());
+
+ if (!res) {
+ throw new StarwhaleApiException(new SwProcessException(ErrorType.DB, "Update job pin status failed."),
+ HttpStatus.INTERNAL_SERVER_ERROR);
+ }
+ return ResponseEntity.ok(Code.success.asResponse("success"));
+ }
+
@Override
public ResponseEntity> getJobDag(String projectUrl, String jobUrl) {
return ResponseEntity.ok(Code.success.asResponse(dagQuerier.dagOfJob(jobUrl)));
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobModifyPinRequest.java b/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobModifyPinRequest.java
new file mode 100644
index 0000000000..8a1dd16f4b
--- /dev/null
+++ b/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobModifyPinRequest.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2022 Starwhale, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package ai.starwhale.mlops.api.protocol.job;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import javax.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.validation.annotation.Validated;
+
+@Data
+@Validated
+public class JobModifyPinRequest {
+
+ @NotNull
+ @JsonProperty("pinned")
+ private boolean pinned;
+}
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobRequest.java b/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobRequest.java
index 629ee73785..34c9833264 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobRequest.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobRequest.java
@@ -65,4 +65,5 @@ public class JobRequest implements Serializable {
private DevWay devWay = DevWay.VS_CODE;
private Long timeToLiveInSec;
+
}
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobVo.java b/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobVo.java
index a823dccd03..404c82d2e7 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobVo.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/api/protocol/job/JobVo.java
@@ -95,4 +95,7 @@ public Long getDuration() {
return stopTime - createdTime;
}
+ @JsonProperty("pinnedTime")
+ private Long pinnedTime;
+
}
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobDao.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobDao.java
index c9da0032c5..3db81a6443 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobDao.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobDao.java
@@ -30,6 +30,7 @@
import ai.starwhale.mlops.domain.job.storage.JobRepo;
import ai.starwhale.mlops.exception.SwValidationException;
import ai.starwhale.mlops.exception.api.StarwhaleApiException;
+import java.time.Instant;
import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -176,6 +177,16 @@ public Job findJob(String jobUrl) {
}
}
+ public boolean updateJobPinStatus(String jobUrl, boolean pinned) {
+ Date pinnedTime = pinned ? Date.from(Instant.now()) : null;
+
+ if (idConvertor.isId(jobUrl)) {
+ return jobMapper.updateJobPinStatus(idConvertor.revert(jobUrl), pinnedTime) > 0;
+ } else {
+ return jobMapper.updateJobPinStatusByUuid(jobUrl, pinnedTime) > 0;
+ }
+ }
+
@Override
public BundleEntity findById(Long id) {
return jobMapper.findJobById(id);
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobService.java
index f2eed13bbf..c0e3d326c9 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobService.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/JobService.java
@@ -165,6 +165,10 @@ public Boolean updateJobComment(String projectUrl, String jobUrl, String comment
return jobDao.updateJobComment(jobUrl, comment);
}
+ public Boolean updateJobPinStatus(String projectUrl, String jobUrl, Boolean pinned) {
+ return jobDao.updateJobPinStatus(jobUrl, pinned);
+ }
+
public Boolean removeJob(String projectUrl, String jobUrl) {
var job = jobDao.findJob(jobUrl);
Trash trash = Trash.builder()
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/bo/Job.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/bo/Job.java
index b1cd7d503f..eb562728fd 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/bo/Job.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/bo/Job.java
@@ -96,6 +96,8 @@ public class Job extends TimeConcern {
String devPassword;
Date autoReleaseTime;
+ Date pinnedTime;
+
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobBoConverter.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobBoConverter.java
index 9de219af06..dfcbba6b2f 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobBoConverter.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobBoConverter.java
@@ -165,6 +165,7 @@ public Job fromEntity(JobEntity jobEntity) {
.devWay(jobEntity.getDevWay())
.devPassword(jobEntity.getDevPassword())
.autoReleaseTime(jobEntity.getAutoReleaseTime())
+ .pinnedTime(jobEntity.getPinnedTime())
.build();
} catch (JsonProcessingException e) {
throw new SwValidationException(ValidSubject.JOB, e.getMessage());
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobConverter.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobConverter.java
index 44f1d4fc49..e264d749a1 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobConverter.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/converter/JobConverter.java
@@ -184,6 +184,7 @@ public JobVo convert(Job job) throws ConvertException {
.duration(job.getDurationMs())
.comment(job.getComment())
.resourcePool(job.getResourcePool().getName())
+ .pinnedTime(job.getPinnedTime().getTime())
.exposedLinks(generateJobExposedLinks(job.getId()))
.build();
}
@@ -191,6 +192,7 @@ public JobVo convert(Job job) throws ConvertException {
public JobVo convert(JobEntity jobEntity) throws ConvertException {
var runtimes = findRuntimeByVersionIds(List.of(jobEntity.getRuntimeVersionId()));
var datasets = findDatasetVersionNamesByJobId(jobEntity.getId());
+ Long pinnedTime = jobEntity.getPinnedTime() != null ? jobEntity.getPinnedTime().getTime() : null;
return JobVo.builder()
.id(idConvertor.convert(jobEntity.getId()))
@@ -207,6 +209,7 @@ public JobVo convert(JobEntity jobEntity) throws ConvertException {
.comment(jobEntity.getComment())
.resourcePool(systemSettingService.queryResourcePool(jobEntity.getResourcePool()).getName())
.exposedLinks(generateJobExposedLinks(jobEntity.getId()))
+ .pinnedTime(pinnedTime)
.build();
}
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/mapper/JobMapper.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/mapper/JobMapper.java
index c98b2da6ca..f235c3fdd7 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/mapper/JobMapper.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/mapper/JobMapper.java
@@ -54,4 +54,10 @@ void updateJobFinishedTime(
int recoverJob(@Param("id") Long id);
int recoverJobByUuid(@Param("uuid") String uuid);
+
+ int updateJobPinStatus(@Param("id") Long id, @Param("pinnedTime") Date pinnedTime);
+
+ int updateJobPinStatusByUuid(
+ @Param("uuid") String uuid,
+ @Param("pinnedTime") Date pinnedTime);
}
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/po/JobEntity.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/po/JobEntity.java
index f21d990613..18f2784775 100644
--- a/server/controller/src/main/java/ai/starwhale/mlops/domain/job/po/JobEntity.java
+++ b/server/controller/src/main/java/ai/starwhale/mlops/domain/job/po/JobEntity.java
@@ -85,6 +85,8 @@ public class JobEntity extends BaseEntity implements BundleEntity {
private String devPassword;
private Date autoReleaseTime;
+ private Date pinnedTime;
+
@Override
public String getName() {
return jobUuid;
diff --git a/server/controller/src/main/resources/db/migration/v0_4_0/V0_4_0_007__add_job_pin.sql b/server/controller/src/main/resources/db/migration/v0_4_0/V0_4_0_007__add_job_pin.sql
new file mode 100644
index 0000000000..3fc3f16122
--- /dev/null
+++ b/server/controller/src/main/resources/db/migration/v0_4_0/V0_4_0_007__add_job_pin.sql
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2022 Starwhale, Inc. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+ALTER TABLE job_info
+ ADD pinned_time DATETIME NULL;
+
+create index pinned_time_index
+ on job_info (pinned_time);
diff --git a/server/controller/src/main/resources/mapper/JobMapper.xml b/server/controller/src/main/resources/mapper/JobMapper.xml
index 096cd2c4a0..3e7a96465b 100644
--- a/server/controller/src/main/resources/mapper/JobMapper.xml
+++ b/server/controller/src/main/resources/mapper/JobMapper.xml
@@ -31,6 +31,7 @@
j.dev_way,
j.dev_password,
j.auto_release_time,
+ j.pinned_time,
p.project_name,
p.is_deleted as project_is_deleted,
p.is_default as project_is_default,
@@ -70,7 +71,7 @@
and model_version_id = #{modelId}
- order by job_id desc
+ order by pinned_time desc, job_id desc