jhynsoo/worlabel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'be/refactor/model' into 'be/develop'

Browse Source 
Refactor: 모델 학습 진행 해결

See merge request s11-s-project/S11P21S002!244
This commit is contained in:
정현조 2024-09-30 13:23:25 +09:00
commit d9d183b34c
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/main/java/com/worlabel/domain/model/controller/AiModelController.java
View File

@ -29,10 +29,9 @@ import java.util.List;
public class AiModelController {
private final AiModelService aiModelService;
private final ProgressService progressService;
@Operation(summary = "프로젝트 모델 조회", description = "프로젝트에 있는 모델을 조회합니다.")
@SwaggerApiSuccess(description = "프로젝트 멤버를 성공적으로 조회합니다.")
@SwaggerApiSuccess(description = "프로젝트 모델을 성공적으로 조회합니다.")
@SwaggerApiError({ErrorCode.EMPTY_REQUEST_PARAMETER, ErrorCode.SERVER_ERROR})
@GetMapping("/projects/{project_id}/models")
public List<AiModelResponse> getModelList(

28
backend/src/main/java/com/worlabel/domain/progress/repository/ProgressCacheRepository.java
View File

@ -57,11 +57,17 @@ public class ProgressCacheRepository {
return redisTemplate.opsForHash().hasKey(key, String.valueOf(projectId));
}
public void removeTrainProgress(final int projectId){
public void removeTrainProgress(final int projectId) {
String key = CacheKey.trainProgressKey();
redisTemplate.opsForHash().delete(key, String.valueOf(projectId));
}
public int getProgressModelId(final int projectId) {
String key = CacheKey.autoLabelingProgressKey();
Object modelId = redisTemplate.opsForHash().get(key, String.valueOf(projectId));
return modelId == null ? 0 : (int) modelId;
}
/**
* 현재 학습 진행 여부 확인 메서드 (단일 키 사용)
*/
@ -92,26 +98,6 @@ public class ProgressCacheRepository {
.toList();
}
public int getProgressModelByProjectId(final int projectId) {
String key = CacheKey.trainModelKey(projectId);
log.debug("key : {}", key);
// train:<projectId>:* 형태의 첫 번째 키를 가져옴
Set<String> keys = redisTemplate.keys(key);
// 모델 ID를 추출하여 반환
if (keys != null && !keys.isEmpty()) {
String firstKey = keys.iterator().next(); // 첫 번째 키 가져오기
String[] parts = firstKey.split(":");
return Integer.parseInt(parts[2]); // modelId가 세 번째 위치
}
return 0;
}
public void clearProgressModel(final int modelId) {
redisTemplate.delete(CacheKey.progressStatusKey(modelId));
}
private ReportResponse convert(String data) {
return gson.fromJson(data, ReportResponse.class);
}

2
backend/src/main/java/com/worlabel/domain/progress/service/ProgressService.java
View File

@ -53,7 +53,7 @@ public class ProgressService {
}
public int getProgressModelByProjectId(final int projectId) {
return progressCacheRepository.getProgressModelByProjectId(projectId);
return progressCacheRepository.getProgressModelId(projectId);
}
public List<ReportResponse> getProgressResponse(final int projectId, final int modelId) {