Skip to content

L
lmp_server
Commit e45383a0 authored by linpeiqin's avatar linpeiqin
Browse files
Options

优化事物

parent b18488c2
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 28 deletions
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/ModelManageServiceImpl.java
View file @ e45383a0
...@@ -176,7 +176,7 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple ...@@ -176,7 +176,7 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple
return resultList; return resultList;
} }
@Transactional @Transactional(rollbackFor = Exception.class)
@Override @Override
public ModelManage saveAndCreateVersion(ModelManage modelManage, ModelVersion modelVersion) { public ModelManage saveAndCreateVersion(ModelManage modelManage, ModelVersion modelVersion) {
ModelManage reModelManage = this.saveNew(modelManage); ModelManage reModelManage = this.saveNew(modelManage);
...@@ -187,7 +187,7 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple ...@@ -187,7 +187,7 @@ public class ModelManageServiceImpl extends BaseService<ModelManage, Long> imple
this.modelVersionService.saveNew(modelVersion); this.modelVersionService.saveNew(modelVersion);
return reModelManage; return reModelManage;
} }
@Transactional @Transactional(rollbackFor = Exception.class)
@Override @Override
public ModelVersion saveAndCreateVersionV(ModelManage modelManage, ModelVersion modelVersion) { public ModelVersion saveAndCreateVersionV(ModelManage modelManage, ModelVersion modelVersion) {
ModelManage reModelManage = this.saveNew(modelManage); ModelManage reModelManage = this.saveNew(modelManage);
......
application-webadmin/src/main/java/com/yice/webadmin/app/service/impl/TuningRunServiceImpl.java
View file @ e45383a0
...@@ -184,34 +184,36 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement ...@@ -184,34 +184,36 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
TuningRun tuningRun = this.getById(runPublishDto.getRunId()); TuningRun tuningRun = this.getById(runPublishDto.getRunId());
ModelVersion modelVersionSource = this.modelVersionService.getById(tuningRun.getModelVersionId()); ModelVersion modelVersionSource = this.modelVersionService.getById(tuningRun.getModelVersionId());
ModelTask modelTask = new ModelTask(); ModelTask modelTask = new ModelTask();
ModelVersion modelVersionTarget = saveAll(tuningRun, runPublishDto, modelVersionSource,modelTask); ModelVersion modelVersionTarget = saveAll(tuningRun, runPublishDto, modelVersionSource, modelTask);
messageWithSocket(tuningRun,modelVersionSource,pythonConfig.getModelOutputFileBaseDir() + modelVersionTarget.getVersionName(),modelVersionTarget,modelTask); messageWithSocket(tuningRun, modelVersionSource, pythonConfig.getModelOutputFileBaseDir() + modelVersionTarget.getVersionName(), modelVersionTarget, modelTask);
return true; return true;
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public ModelManage createToModel(ModelManage modelManage, ModelVersion modelVersion) { public ModelManage createToModel(ModelManage modelManage, ModelVersion modelVersion) {
TuningRun tuningRun = this.getById(modelVersion.getRunId()); TuningRun tuningRun = this.getById(modelVersion.getRunId());
ModelVersion modelVersionSource = this.modelVersionService.getById(tuningRun.getModelVersionId()); ModelVersion modelVersionSource = this.modelVersionService.getById(tuningRun.getModelVersionId());
ModelTask modelTask = new ModelTask(); ModelTask modelTask = new ModelTask();
ModelVersion modelVersionTarget = saveAll(tuningRun, modelManage, modelVersion,modelVersionSource,modelTask); ModelVersion modelVersionTarget = saveAll(tuningRun, modelManage, modelVersion, modelVersionSource, modelTask);
messageWithSocket(tuningRun,modelVersionSource,pythonConfig.getModelOutputFileBaseDir() + modelVersionTarget.getVersionName(),modelVersionTarget,modelTask); messageWithSocket(tuningRun, modelVersionSource, pythonConfig.getModelOutputFileBaseDir() + modelVersionTarget.getVersionName(), modelVersionTarget, modelTask);
return modelManage; return modelManage;
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public ModelVersion createToModelVersion(ModelVersion modelVersion) { public ModelVersion createToModelVersion(ModelVersion modelVersion) {
TuningRun tuningRun = this.getById(modelVersion.getRunId()); TuningRun tuningRun = this.getById(modelVersion.getRunId());
ModelVersion modelVersionSource = this.modelVersionService.getById(tuningRun.getModelVersionId()); ModelVersion modelVersionSource = this.modelVersionService.getById(tuningRun.getModelVersionId());
ModelTask modelTask = new ModelTask(); ModelTask modelTask = new ModelTask();
ModelVersion modelVersionTarget = saveAll(tuningRun, modelVersion,modelVersionSource,modelTask); ModelVersion modelVersionTarget = saveAll(tuningRun, modelVersion, modelVersionSource, modelTask);
messageWithSocket(tuningRun,modelVersionSource,pythonConfig.getModelOutputFileBaseDir() + modelVersionTarget.getVersionName(),modelVersionTarget,modelTask); messageWithSocket(tuningRun, modelVersionSource, pythonConfig.getModelOutputFileBaseDir() + modelVersionTarget.getVersionName(), modelVersionTarget, modelTask);
return modelVersionTarget; return modelVersionTarget;
} }
@SneakyThrows @SneakyThrows
private void messageWithSocket(TuningRun tuningRun,ModelVersion modelVersionSource,String targetModelVersionURl,ModelVersion modelVersionTarget,ModelTask modelTask){ private void messageWithSocket(TuningRun tuningRun, ModelVersion modelVersionSource, String targetModelVersionURl, ModelVersion modelVersionTarget, ModelTask modelTask) {
new WebSocketClient(new URI(this.pythonConfig.getPythonWebsocketUri())) { new WebSocketClient(new URI(this.pythonConfig.getPythonWebsocketUri())) {
@Override @Override
public void onOpen(ServerHandshake serverHandshake) { public void onOpen(ServerHandshake serverHandshake) {
...@@ -254,7 +256,7 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement ...@@ -254,7 +256,7 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
log.info("发送服务端的消息:" + sendJson.toJSONString()); log.info("发送服务端的消息:" + sendJson.toJSONString());
if (receiveMsg.equals("process_completed")) { if (receiveMsg.equals("process_completed")) {
System.out.println("isSuccess4：" + System.currentTimeMillis()); System.out.println("isSuccess4：" + System.currentTimeMillis());
updateStatus(receiveJson.getBoolean("success"), tuningRun, modelVersionTarget, targetModelVersionURl,modelTask); updateStatus(receiveJson.getBoolean("success"), tuningRun, modelVersionTarget, targetModelVersionURl, modelTask);
} }
} }
...@@ -269,48 +271,49 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement ...@@ -269,48 +271,49 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
} }
}.connectBlocking(5000, TimeUnit.MILLISECONDS); }.connectBlocking(5000, TimeUnit.MILLISECONDS);
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ModelVersion saveAll(TuningRun tuningRun, RunPublishDto runPublishDto, ModelVersion modelVersionSource,ModelTask modelTask) { public ModelVersion saveAll(TuningRun tuningRun, RunPublishDto runPublishDto, ModelVersion modelVersionSource, ModelTask modelTask) {
ModelVersion modelVersion = new ModelVersion(); ModelVersion modelVersion = new ModelVersion();
this.initModelVersion(modelVersion,tuningRun,modelVersionSource); this.initModelVersion(modelVersion, tuningRun, modelVersionSource);
ModelManage modelManag = new ModelManage(); ModelManage modelManage = new ModelManage();
if (runPublishDto.getPublishWay() == 0) { if (runPublishDto.getPublishWay() == 0) {
modelManag.setModelDescribe(runPublishDto.getModelDescribe()); modelManage.setModelDescribe(runPublishDto.getModelDescribe());
modelManag.setModelName(runPublishDto.getModelName()); modelManage.setModelName(runPublishDto.getModelName());
modelManag.setModelType(0); modelManage.setModelType(0);
modelManag.setIsBaseModel(0); modelManage.setIsBaseModel(0);
modelManageService.saveAndCreateVersionV(modelManag, modelVersion); modelManageService.saveAndCreateVersionV(modelManage, modelVersion);
} else { } else {
modelVersion.setModelId(runPublishDto.getModelId()); modelVersion.setModelId(runPublishDto.getModelId());
modelVersionService.saveNew(modelVersion); modelVersionService.saveNew(modelVersion);
} }
this.initModelTask(modelTask,tuningRun,modelVersion); this.initModelTask(modelTask, tuningRun, modelVersion);
this.modelTaskService.saveNew(modelTask); this.modelTaskService.saveNew(modelTask);
return modelVersion; return modelVersion;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ModelVersion saveAll(TuningRun tuningRun, ModelManage modelManageS,ModelVersion modelVersion, ModelVersion modelVersionSource,ModelTask modelTask) { public ModelVersion saveAll(TuningRun tuningRun, ModelManage modelManageS, ModelVersion modelVersion, ModelVersion modelVersionSource, ModelTask modelTask) {
this.initModelVersion(modelVersion,tuningRun,modelVersionSource); this.initModelVersion(modelVersion, tuningRun, modelVersionSource);
modelManageS.setModelType(0); modelManageS.setModelType(0);
modelManageS.setIsBaseModel(0); modelManageS.setIsBaseModel(0);
modelManageService.saveAndCreateVersionV(modelManageS, modelVersion); modelManageService.saveAndCreateVersionV(modelManageS, modelVersion);
this.initModelTask(modelTask,tuningRun,modelVersion); this.initModelTask(modelTask, tuningRun, modelVersion);
this.modelTaskService.saveNew(modelTask); this.modelTaskService.saveNew(modelTask);
return modelVersion; return modelVersion;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ModelVersion saveAll(TuningRun tuningRun, ModelVersion modelVersion, ModelVersion modelVersionSource,ModelTask modelTask) { public ModelVersion saveAll(TuningRun tuningRun, ModelVersion modelVersion, ModelVersion modelVersionSource, ModelTask modelTask) {
this.initModelVersion(modelVersion,tuningRun,modelVersionSource); this.initModelVersion(modelVersion, tuningRun, modelVersionSource);
modelVersionService.saveNew(modelVersion); modelVersionService.saveNew(modelVersion);
modelTask.setModelVersion(modelVersion.getModelVersion()); modelTask.setModelVersion(modelVersion.getModelVersion());
this.initModelTask(modelTask,tuningRun,modelVersion); this.initModelTask(modelTask, tuningRun, modelVersion);
this.modelTaskService.saveNew(modelTask); this.modelTaskService.saveNew(modelTask);
return modelVersion; return modelVersion;
} }
private void initModelVersion(ModelVersion modelVersion,TuningRun tuningRun,ModelVersion modelVersionSource){ private void initModelVersion(ModelVersion modelVersion, TuningRun tuningRun, ModelVersion modelVersionSource) {
modelVersion.setRunId(tuningRun.getRunId()); modelVersion.setRunId(tuningRun.getRunId());
modelVersion.setTaskId(tuningRun.getTaskId()); modelVersion.setTaskId(tuningRun.getTaskId());
modelVersion.setBaseModel(modelVersionSource.getVersionName()); modelVersion.setBaseModel(modelVersionSource.getVersionName());
...@@ -323,7 +326,8 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement ...@@ -323,7 +326,8 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
TuningTask tuningTask = this.tuningTaskService.getById(tuningRun.getTaskId()); TuningTask tuningTask = this.tuningTaskService.getById(tuningRun.getTaskId());
modelVersion.setTrainingTask(tuningTask.getTaskName()); modelVersion.setTrainingTask(tuningTask.getTaskName());
} }
private void initModelTask(ModelTask modelTask,TuningRun tuningRun,ModelVersion modelVersion){
private void initModelTask(ModelTask modelTask, TuningRun tuningRun, ModelVersion modelVersion) {
modelTask.setModelVersion(modelVersion.getModelVersion()); modelTask.setModelVersion(modelVersion.getModelVersion());
modelTask.setModelId(modelVersion.getModelId()); modelTask.setModelId(modelVersion.getModelId());
modelTask.setTaskType(0); modelTask.setTaskType(0);
...@@ -332,8 +336,9 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement ...@@ -332,8 +336,9 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
modelTask.setVersionName(modelVersion.getVersionName()); modelTask.setVersionName(modelVersion.getVersionName());
modelTask.setTaskId(tuningRun.getTaskId()); modelTask.setTaskId(tuningRun.getTaskId());
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public Boolean updateStatus(Boolean flag, TuningRun tuningRun, ModelVersion modelVersionTarget, String targetModelVersionURl,ModelTask modelTask) { public Boolean updateStatus(Boolean flag, TuningRun tuningRun, ModelVersion modelVersionTarget, String targetModelVersionURl, ModelTask modelTask) {
if (flag) { if (flag) {
modelVersionTarget.setModelUrl(targetModelVersionURl); modelVersionTarget.setModelUrl(targetModelVersionURl);
modelVersionTarget.setStatus(1); modelVersionTarget.setStatus(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment