From c8a0e2805f9e338b8c28ec1f15a242b6cc8b0e94 Mon Sep 17 00:00:00 2001 From: wangxiang <1827945911@qq.com> Date: Mon, 18 Dec 2023 16:01:42 +0800 Subject: [PATCH] feat: ai --- .../com/cloud/kicc/system/config/OpenAiConfigProperties.java | 3 --- .../com/cloud/kicc/system/controller/ChatGptController.java | 2 +- .../cloud/kicc/system/service/impl/ImContentServiceImpl.java | 3 ++- .../src/main/java/com/cloud/kicc/system/util/AiUtil.java | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/config/OpenAiConfigProperties.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/config/OpenAiConfigProperties.java index 8489afa2..dff86329 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/config/OpenAiConfigProperties.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/config/OpenAiConfigProperties.java @@ -57,7 +57,4 @@ public class OpenAiConfigProperties { /** Context Window Max */ private String contextMessageMaxCount = "14"; - /** The maximum number of tokens allowed for the generated answer. By default, the number of tokens the model can return will be (4096 - prompt tokens). */ - private Integer completionMaxTokens = 300; - } diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ChatGptController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ChatGptController.java index 7629a883..14ab796f 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ChatGptController.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ChatGptController.java @@ -46,7 +46,7 @@ public class ChatGptController { @Inner(false) @PostMapping("/chat/completions") - public R chatCompletions(@Valid @RequestBody ImContent imContent, @RequestParam boolean contextEnable) { + public R chatCompletions(@Valid @RequestBody ImContent imContent, @RequestParam(required = false) boolean contextEnable) { SecurityUtils.openInterfaceTemporaryLoginSession(imContent.getSendUserId()); iImContentService.rateLimitRequestHandler(); return R.ok(iImContentService.chatCompletions(imContent, contextEnable)); diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java index 29caf1aa..4c374ffe 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/service/impl/ImContentServiceImpl.java @@ -1,6 +1,7 @@ package com.cloud.kicc.system.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.util.BooleanUtil; @@ -81,7 +82,7 @@ public class ImContentServiceImpl extends ServiceImpl imContents = super.list(Wrappers.lambdaQuery().eq(ImContent::getSessionId, imContent.getSessionId()) .last(String.format("LIMIT %s", openAiConfigProperties.getContextMessageMaxCount())) .orderByDesc(ImContent::getSendTime)); - List completionMessages = ListUtil.empty(); + List completionMessages = CollectionUtil.newArrayList(); if (BooleanUtil.isTrue(contextEnable)) { // 历史上下文消息 diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/AiUtil.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/AiUtil.java index 5195e0e5..7a0456ab 100644 --- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/AiUtil.java +++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/util/AiUtil.java @@ -66,7 +66,6 @@ public class AiUtil { .n(1) .frequencyPenalty(1.0) .presencePenalty(1.0) - .maxTokens(openAiConfigProperties.getCompletionMaxTokens()) .topP(0.8) .user(SecurityUtils.getCasUser().getId()) .build();