refactor(llm): 重构获取基座模型列表接口

- 在 BaseModelService 中添加 listBaseModels 方法
- 实现 listBaseModels 方法,查询基座模型及其关联的微调任务名称
- 优化 ModelServiceController 中的 getAllPedestalModels 接口调用
This commit is contained in:
Liuyang 2025-03-21 15:17:03 +08:00
parent 645244a2cb
commit fbca4192f0
3 changed files with 37 additions and 7 deletions

View File

@ -141,9 +141,8 @@ public class ModelServiceController {
@GetMapping("/get-all-pedestal-models")
@Operation(summary = "获得模型服务")
public CommonResult<List<BaseModelDO>> getAllPedestalModels() {
LambdaQueryWrapper<BaseModelDO> select = new LambdaQueryWrapper<BaseModelDO>()
.select(BaseModelDO::getId, BaseModelDO::getModelName);
List<BaseModelDO> baseModelDOS = baseModelService.selectList(select);
List<BaseModelDO> baseModelDOS = baseModelService.listBaseModels();
// List<String> differentModelNames = baseModelDOS.stream()
// .map(BaseModelDO::getModelName)
// .collect(Collectors.toList());

View File

@ -86,4 +86,10 @@ public interface BaseModelService {
BaseModelDO getById(Long fineTuningTask);
void deleteTheModel(Long id);
/**
* 获取所有基座模型及其关联的微调任务名称列表
* @return 基座模型
*/
List<BaseModelDO> listBaseModels();
}

View File

@ -31,16 +31,14 @@ import okhttp3.OkHttpClient;
import okhttp3.Request;
import okhttp3.RequestBody;
import okhttp3.Response;
import org.apache.commons.lang3.StringUtils;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.*;
import java.util.concurrent.TimeUnit;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@ -294,6 +292,33 @@ public class BaseModelServiceImpl implements BaseModelService {
}
}
/**
* 获取所有基座模型及其关联的微调任务名称列表
*
* @return 基座模型
*/
@Override
public List<BaseModelDO> listBaseModels() {
LambdaQueryWrapper<BaseModelDO> select = new LambdaQueryWrapper<BaseModelDO>()
.select(BaseModelDO::getId, BaseModelDO::getModelName, BaseModelDO::getTheTuningName);
List<BaseModelDO> selects = baseModelMapper.selectList(select);
// 如果查询结果不为空处理调优任务名称
if (CollectionUtils.isNotEmpty(selects)) {
selects.forEach(model -> {
// 如果调优任务名称不为空赋值到模型名称上并清空调优任务名称
if (StringUtils.isNotBlank(model.getTheTuningName())) {
model.setModelName(model.getTheTuningName());
model.setTheTuningName(null);
}
// 如果调优任务名称为空模型名称保持不变
});
}
return selects;
}
/**
* 校验模型使用情况