DATA_MIDDLE_PLATFORM/Data_Middle_Platform_Server
3
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Liuyang 2025-01-24 13:57:41 +08:00
commit 8f5b9cc895
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java
View File

@ -130,7 +130,7 @@ public class AsyncModelServiceService {
try {
ModelServiceDO modelServiceDO = modelServiceMapper.selectById(updateObj.getId());
// Thread.sleep(30000);
AigcRespVO aigcRespVO = trainHttpService.modelUndeploy(new HashMap<>(), modelServiceDO.getJobId());
AigcRespVO aigcRespVO = trainHttpService.modelUndeploy(new HashMap<>(), modelServiceDO.getBaseModelName());
if (aigcRespVO.isSuccess()){
updateObj.setStatus(0);
}else {

5
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/TrainHttpService.java
View File

@ -248,11 +248,10 @@ public class TrainHttpService {
AigcRespVO aigcRespVO = JSON.parseObject(res, AigcRespVO.class);
return aigcRespVO;
}
public AigcRespVO modelUndeploy(Map<String, String> headers, Long modelId) {
public AigcRespVO modelUndeploy(Map<String, String> headers, String baseModelName) {
login(headers);
String modelDeploy = llmBackendProperties.getModelUndeploy();
String url = String.format(modelDeploy,modelId);
String res = HttpUtils.post(url, headers,"");
String res = HttpUtils.post(modelDeploy + baseModelName, headers,"");
log.info(" modelDeploy:{}", res);
AigcRespVO aigcRespVO = JSON.parseObject(res, AigcRespVO.class);
log.info(" modelDeploy:{}", aigcRespVO);

6
yudao-server/src/main/resources/application-dev.yaml
View File

@ -249,10 +249,10 @@ llm:
finetuning_file_list: http://36.103.199.104:9000/api/files?purpose=fine-tune
# 模型创建
model_create: http://36.103.199.104:9000/api/models
# 模型部署
# 开始部署
model_deploy: http://36.103.199.104:5123/llm/deploy
# 取消模型
model_undeploy: http://36.103.199.104:9000/api/models/%s/undeploy
# 取消部署
model_undeploy: http://36.103.199.104:5123/llm/stop_task?model_name=
# 微调文件上传
aigc_file_upload: http://36.103.199.104:9000/api/files
#

6
yudao-server/src/main/resources/application-local.yaml
View File

@ -292,10 +292,10 @@ llm:
finetuning_file_list: http://36.103.199.104:9000/api/files?purpose=fine-tune
# 模型部署
model_create: http://36.103.199.104:9000/api/models
# 模型部署
# 开始部署
model_deploy: http://36.103.199.104:5123/llm/deploy
# 取消模型
model_undeploy: http://36.103.199.104:9000/api/models/%s/undeploy
# 取消部署
model_undeploy: http://36.103.199.104:5123/llm/stop_task?model_name=
#### 大模型对话
# 模型列表 GET
base_model_list: http://36.103.199.104:9997/model/v1/models

6
yudao-server/src/main/resources/application-prod.yaml
View File

@ -292,10 +292,10 @@ llm:
finetuning_file_list: http://36.133.1.230:8080/api/files?purpose=fine-tune
# 模型部署
model_create: http://36.133.1.230:8080/api/models
# 模型部署
# 开始部署
model_deploy: http://36.103.199.104:5123/llm/deploy
# 取消模型
model_undeploy: http://36.133.1.230:8080/api/models/%s/undeploy
# 取消部署
model_undeploy: http://36.103.199.104:5123/llm/stop_task?model_name=
#### 大模型对话
# 模型列表 GET
base_model_list: http://36.103.199.104:9997/model/v1/models