From bce978afd91e260b6b92949b8112b6523c1fb1dc Mon Sep 17 00:00:00 2001 From: ire <931903008@qq.com> Date: Fri, 10 Jan 2025 10:42:15 +0800 Subject: [PATCH] bug --- .../application/ApplicationController.java | 9 +++++-- .../admin/conversation/vo/ChatApiReqVO.java | 24 +++++++++++++++++++ .../application/ApplicationServiceImpl.java | 3 ++- .../conversation/ConversationServiceImpl.java | 2 +- .../service/user/AdminUserServiceImpl.java | 2 +- .../src/main/resources/application-dev.yaml | 2 +- .../src/main/resources/application-local.yaml | 2 +- 7 files changed, 37 insertions(+), 7 deletions(-) create mode 100644 yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/conversation/vo/ChatApiReqVO.java diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/ApplicationController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/ApplicationController.java index 398eea376..49c59977f 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/ApplicationController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/application/ApplicationController.java @@ -4,12 +4,15 @@ import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; import cn.iocoder.yudao.module.llm.controller.admin.application.vo.ApplicationPageReqVO; import cn.iocoder.yudao.module.llm.controller.admin.application.vo.ApplicationRespVO; import cn.iocoder.yudao.module.llm.controller.admin.application.vo.ApplicationSaveReqVO; +import cn.iocoder.yudao.module.llm.controller.admin.conversation.vo.ChatApiReqVO; import cn.iocoder.yudao.module.llm.controller.admin.conversation.vo.ChatReqVO; import cn.iocoder.yudao.module.llm.controller.admin.conversation.vo.ChatRespVO; +import cn.iocoder.yudao.module.llm.controller.admin.datarefluxconfig.vo.DataRefluxConfigRespVO; import cn.iocoder.yudao.module.llm.dal.dataobject.application.ApplicationDO; import cn.iocoder.yudao.module.llm.service.application.ApplicationService; import cn.iocoder.yudao.module.llm.service.conversation.ConversationService; @@ -106,12 +109,14 @@ public class ApplicationController { @PermitAll @PostMapping("/api/{apiKey}/chat") @Operation(summary = "api对话接口") - public CommonResult apiChat(@PathVariable("apiKey") String apiKey,@RequestBody ChatReqVO chatReqVO){ + public CommonResult apiChat(@PathVariable("apiKey") String apiKey,@RequestBody ChatApiReqVO chatReqVO){ ApplicationDO applicationDO = applicationService.getByApiKey(apiKey); chatReqVO.setApplicationId(applicationDO.getId()); chatReqVO.setModelId(applicationDO.getModelServiceId()); chatReqVO.setModelType(chatReqVO.getModelType()); - ChatRespVO chat = conversationService.chat(chatReqVO); + + ChatReqVO bean = BeanUtils.toBean(chatReqVO, ChatReqVO.class); + ChatRespVO chat = conversationService.chat(bean); return success(chat); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/conversation/vo/ChatApiReqVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/conversation/vo/ChatApiReqVO.java new file mode 100644 index 000000000..276fd7592 --- /dev/null +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/conversation/vo/ChatApiReqVO.java @@ -0,0 +1,24 @@ +package cn.iocoder.yudao.module.llm.controller.admin.conversation.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; + +@Schema(description = "管理后台 - 大模型对话推理聊天 Request VO") +@Data +public class ChatApiReqVO { + + @Schema(description = "模型类型", requiredMode = Schema.RequiredMode.REQUIRED) + private Integer modelType; + @Schema(description = "模型ID", requiredMode = Schema.RequiredMode.REQUIRED) + private Long modelId; + @Schema(description = "应用ID", requiredMode = Schema.RequiredMode.REQUIRED) + private Long applicationId; + @Schema(description = "对话的内容", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "对话的内容不能为空") + private String prompt; + @Schema(description = "对话ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String uuid; +} diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java index 6e26f1e38..3105c37e5 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/application/ApplicationServiceImpl.java @@ -62,7 +62,8 @@ public class ApplicationServiceImpl implements ApplicationService { ApplicationDO application = BeanUtils.toBean(createReqVO, ApplicationDO.class); String apikey = getApikey(); application.setApiKey(apikey); - application.setApiUrl(String.format(llmBackendProperties.getApplicationApi(), apikey)); + String replace = llmBackendProperties.getApplicationApi().replace("apiKey", apikey); + application.setApiUrl(replace); applicationMapper.insert(application); //prompt使用量+1 diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java index 0769f114a..c8d99b27c 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/conversation/ConversationServiceImpl.java @@ -143,4 +143,4 @@ public class ConversationServiceImpl implements ConversationService { dataRefluxDataService.saveDataRefluxData(dataRefluxDataSaveReqVO); return chatRespVO; } -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java index b239e690c..d86a29506 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java @@ -365,7 +365,7 @@ public class AdminUserServiceImpl implements AdminUserService { // 校验手机号唯一 validateMobileUnique(id, mobile); // 校验邮箱唯一 - validateEmailUnique(id, email); +// validateEmailUnique(id, email); // 校验部门处于开启状态 deptService.validateDeptList(CollectionUtils.singleton(deptId)); // 校验岗位处于开启状态 diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml index 44c5064d5..78c12d609 100644 --- a/yudao-server/src/main/resources/application-dev.yaml +++ b/yudao-server/src/main/resources/application-dev.yaml @@ -253,7 +253,7 @@ llm: model_completions: http://api.xhllm.xinnuojinzhi.com/model/v1/chat/completions - application_api: http://localhost:48100/admin-app/llm/application/api/{apiKey}/chat + application_api: http://localhost:48100/admin-app/llm/application/api/apiKey/chat --- #################### iot相关配置 TODO 芋艿：再瞅瞅 #################### iot: diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index ba913e041..18ae3e534 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -296,7 +296,7 @@ llm: model_completions: http://api.xhllm.xinnuojinzhi.com/model/v1/chat/completions - application_api: http://localhost:48100/admin-app/llm/application/api/{apiKey}/chat + application_api: http://localhost:48080/admin-app/llm/application/api/apiKey/chat --- #################### iot相关配置 TODO 芋艿：再瞅瞅 #################### iot: