Commit 2437e182 authored by linpeiqin's avatar linpeiqin

小bug

parent 39cf978d
...@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -33,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.io.File;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;
...@@ -59,7 +60,7 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement ...@@ -59,7 +60,7 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
private IdGeneratorWrapper idGenerator; private IdGeneratorWrapper idGenerator;
@Autowired @Autowired
private PythonConfig pythonConfig; private PythonConfig pythonConfig;
private String modelName; private String modelVersionURl;
/** /**
* 返回当前Service的主表Mapper对象。 * 返回当前Service的主表Mapper对象。
...@@ -197,14 +198,18 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement ...@@ -197,14 +198,18 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
modelManageS.setModelDescribe(runPublishDto.getModelDescribe()); modelManageS.setModelDescribe(runPublishDto.getModelDescribe());
modelManageS.setModelName(runPublishDto.getModelName()); modelManageS.setModelName(runPublishDto.getModelName());
modelManageS.setModelType(runPublishDto.getModelType()); modelManageS.setModelType(runPublishDto.getModelType());
modelVersionURl = pythonConfig.getModelOutputFileBaseDir() + runPublishDto.getModelName() + "_V1";
modelVersionS.setModelUrl(modelVersionURl);
this.modelManageService.saveAndCreateVersion(modelManageS, modelVersionS); this.modelManageService.saveAndCreateVersion(modelManageS, modelVersionS);
modelName = runPublishDto.getModelName() + "_V1";
} else { } else {
modelVersionS.setModelId(runPublishDto.getModelId()); modelVersionS.setModelId(runPublishDto.getModelId());
ModelManage modelManageS = this.modelManageService.getById(runPublishDto.getModelId()); ModelManage modelManageS = this.modelManageService.getById(runPublishDto.getModelId());
modelManageS.setModelDescribe(runPublishDto.getModelDescribe()); modelManageS.setModelDescribe(runPublishDto.getModelDescribe());
this.modelManageService.updateById(modelManageS); this.modelManageService.updateById(modelManageS);
modelName = this.modelVersionService.saveNew(modelVersionS).getVersionName(); ModelVersion modelVersionR = this.modelVersionService.saveNew(modelVersionS);
modelVersionURl = pythonConfig.getModelOutputFileBaseDir() + modelVersionR.getVersionName();
modelVersionR.setModelUrl(modelVersionURl);
this.modelVersionService.updateById(modelVersionR);
} }
new WebSocketClient(new URI(this.pythonConfig.getPythonWebsocketUri()), new Draft_6455()) { new WebSocketClient(new URI(this.pythonConfig.getPythonWebsocketUri()), new Draft_6455()) {
@Override @Override
...@@ -237,7 +242,7 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement ...@@ -237,7 +242,7 @@ public class TuningRunServiceImpl extends BaseService<TuningRun, Long> implement
array.add(tuningRun.getTrainMethod()); array.add(tuningRun.getTrainMethod());
array.add(jsonObject.get("promptTemplate")); array.add(jsonObject.get("promptTemplate"));
array.add(2); array.add(2);
String newModelUrl = pythonConfig.getModelOutputFileBaseDir() + modelName; String newModelUrl = modelVersionURl;
array.add(newModelUrl); array.add(newModelUrl);
array.add("none"); array.add("none");
sendJson.put("data", array); sendJson.put("data", array);
......
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