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:
ire 2025-01-17 11:36:12 +08:00
commit a86a3485f7
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java
View File

@ -36,6 +36,7 @@ import cn.iocoder.yudao.module.llm.dal.mysql.conversation.ConversationMapper;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.llm.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.module.llm.service.http.ModelService.DEFAULT_MODEL_ID;
import static cn.iocoder.yudao.module.llm.service.http.ModelService.PRIVATE_MODEL_ID;
/**
@ -182,7 +183,8 @@ public class ConversationServiceImpl implements ConversationService {
messages.add(message);
ModelCompletionsReqVO modelCompletionsReqVO = new ModelCompletionsReqVO();
modelCompletionsReqVO.setMessages(messages);
modelCompletionsReqVO.setModel(model);
// TODO 默认模型 官方 现在写死 后期修改
modelCompletionsReqVO.setModel(DEFAULT_MODEL_ID);
ModelCompletionsRespVO modelCompletionsRespVO = modelService.modelCompletions(modelCompletionsReqVO);
if (modelCompletionsRespVO == null) {
throw exception(MODEL_COMPLETIONS_ERROR);
@ -217,7 +219,7 @@ public class ConversationServiceImpl implements ConversationService {
if (modelServiceDO == null) {
throw exception(MODEL_SERVICE_NOT_EXISTS);
}
model = modelServiceDO.getServiceName();
model = modelServiceDO.getBaseModelName();
}
ModelCompletionsReqVO.ModelCompletionsMessage message = new ModelCompletionsReqVO.ModelCompletionsMessage();
message.setRole("user");

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

@ -264,9 +264,9 @@ llm:
# aigc模型推理
aigc_model_completions: http://36.133.1.230:8080/api/channels/chat/completions
application_api: http://xhllm.xinnuojinzhi.com/admin-app/llm/application/api/apiKey/chat
application_api: http://xhllm.xinnuojinzhi.com/admin-api/llm/application/api/apiKey/chat
model_service_api: http://xhllm.xinnuojinzhi.com/admin-app/llm/model-service/api/apiKey/chat
model_service_api: http://xhllm.xinnuojinzhi.com/admin-api/llm/model-service/api/apiKey/chat
model_file_list: http://36.133.1.230:5123/models/?path=

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

@ -306,9 +306,9 @@ llm:
# 微调文件上传
aigc_file_upload: http://36.133.1.230:8080/api/files
application_api: http://localhost:48080/admin-app/llm/application/api/apiKey/chat
application_api: http://localhost:48080/admin-api/llm/application/api/apiKey/chat
model_service_api : http://localhost:48080/admin-app/llm/model-service/api/apiKey/chat
model_service_api : http://localhost:48080/admin-api/llm/model-service/api/apiKey/chat
model_file_list: http://36.133.1.230:5123/models/?path=