diff --git a/service-ai/bin/build-ai-chat.js b/service-ai/bin/build-ai-chat.js deleted file mode 100644 index 9e0ee92..0000000 --- a/service-ai/bin/build-ai-chat.js +++ /dev/null @@ -1,14 +0,0 @@ -import {cd, path} from 'zx' -import {trim} from "licia"; -import {run_deploy, run_package, run_upload_normal} from '../../bin/library.js' - -// 切换目录 -cd(trim(path.dirname(import.meta.dirname))) -// 执行流程 -try { - await run_deploy('service-ai-core') - await run_package('service-ai-chat') - await run_upload_normal('service-ai-chat') -} catch (e) { - console.error(e) -} \ No newline at end of file diff --git a/service-ai/bin/build-ai-knowledge.js b/service-ai/bin/build-ai-knowledge.js deleted file mode 100644 index 9363436..0000000 --- a/service-ai/bin/build-ai-knowledge.js +++ /dev/null @@ -1,14 +0,0 @@ -import {cd, path} from 'zx' -import {trim} from "licia"; -import {run_deploy, run_package, run_upload_normal} from '../../bin/library.js' - -// 切换目录 -cd(trim(path.dirname(import.meta.dirname))) -// 执行流程 -try { - await run_deploy('service-ai-core') - await run_package('service-ai-knowledge') - await run_upload_normal('service-ai-knowledge') -} catch (e) { - console.error(e) -} \ No newline at end of file diff --git a/service-ai/bin/build-ai-web.js b/service-ai/bin/build-ai-web.js new file mode 100644 index 0000000..0687e00 --- /dev/null +++ b/service-ai/bin/build-ai-web.js @@ -0,0 +1,21 @@ +import { + cd, + path, +} from 'zx' +import {trim} from "licia"; +import { + run_deploy, + run_package, + run_upload_normal, +} from '../../bin/library.js' + +// 切换目录 +cd(trim(path.dirname(import.meta.dirname))) +// 执行流程 +try { + await run_deploy('service-ai-core') + await run_package('service-ai-web') + await run_upload_normal('service-ai-web') +} catch (e) { + console.error(e) +} \ No newline at end of file diff --git a/service-ai/pom.xml b/service-ai/pom.xml index b9366c1..7ddfff1 100644 --- a/service-ai/pom.xml +++ b/service-ai/pom.xml @@ -11,7 +11,7 @@ Hudi AI服务集合 service-ai-core - service-ai-knowledge + service-ai-web service-ai-cli diff --git a/service-ai/service-ai-knowledge/pom.xml b/service-ai/service-ai-web/pom.xml similarity index 98% rename from service-ai/service-ai-knowledge/pom.xml rename to service-ai/service-ai-web/pom.xml index 2b4992d..fa7095c 100644 --- a/service-ai/service-ai-knowledge/pom.xml +++ b/service-ai/service-ai-web/pom.xml @@ -9,7 +9,7 @@ 1.0.0-SNAPSHOT - service-ai-knowledge + service-ai-web diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/KnowledgeApplication.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/WebApplication.java similarity index 84% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/KnowledgeApplication.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/WebApplication.java index 3e492d7..90348c8 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/KnowledgeApplication.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/WebApplication.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge; +package com.lanyuanxiaoyao.service.ai.web; import com.ulisesbocchio.jasyptspringboot.annotation.EnableEncryptableProperties; import org.springframework.beans.BeansException; @@ -23,11 +23,11 @@ import org.springframework.scheduling.annotation.EnableScheduling; @EnableEncryptableProperties @EnableRetry @EnableScheduling -public class KnowledgeApplication implements ApplicationRunner, ApplicationContextAware { +public class WebApplication implements ApplicationRunner, ApplicationContextAware { private static ApplicationContext context; public static void main(String[] args) { - SpringApplication.run(KnowledgeApplication.class, args); + SpringApplication.run(WebApplication.class, args); } public static T getBean(Class clazz) { @@ -40,6 +40,6 @@ public class KnowledgeApplication implements ApplicationRunner, ApplicationConte @Override public void setApplicationContext(ApplicationContext context) throws BeansException { - KnowledgeApplication.context = context; + WebApplication.context = context; } } diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/FileStoreConfiguration.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/FileStoreConfiguration.java similarity index 85% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/FileStoreConfiguration.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/FileStoreConfiguration.java index 14e4b6c..b29e48a 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/FileStoreConfiguration.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/FileStoreConfiguration.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.configuration; +package com.lanyuanxiaoyao.service.ai.web.configuration; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/LlmConfiguration.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/LlmConfiguration.java similarity index 98% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/LlmConfiguration.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/LlmConfiguration.java index 6da85c8..adbe1a9 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/LlmConfiguration.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/LlmConfiguration.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.configuration; +package com.lanyuanxiaoyao.service.ai.web.configuration; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.StrUtil; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/LlmProperties.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/LlmProperties.java similarity index 90% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/LlmProperties.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/LlmProperties.java index 22de8b1..9ee0bbd 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/LlmProperties.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/LlmProperties.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.configuration; +package com.lanyuanxiaoyao.service.ai.web.configuration; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/Prompts.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/Prompts.java similarity index 99% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/Prompts.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/Prompts.java index 355e3d5..ea11f18 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/Prompts.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/Prompts.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.configuration; +package com.lanyuanxiaoyao.service.ai.web.configuration; import cn.hutool.core.util.StrUtil; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/DataFileController.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/DataFileController.java similarity index 96% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/DataFileController.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/DataFileController.java index 7306b62..f3b4876 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/DataFileController.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/DataFileController.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.controller; +package com.lanyuanxiaoyao.service.ai.web.controller; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; @@ -7,9 +7,9 @@ import cn.hutool.core.util.URLUtil; import cn.hutool.crypto.SecureUtil; import com.fasterxml.jackson.annotation.JsonProperty; import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse; -import com.lanyuanxiaoyao.service.ai.knowledge.configuration.FileStoreConfiguration; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.DataFileVO; -import com.lanyuanxiaoyao.service.ai.knowledge.service.DataFileService; +import com.lanyuanxiaoyao.service.ai.web.configuration.FileStoreConfiguration; +import com.lanyuanxiaoyao.service.ai.web.entity.vo.DataFileVO; +import com.lanyuanxiaoyao.service.ai.web.service.DataFileService; import jakarta.servlet.http.HttpServletResponse; import java.io.ByteArrayInputStream; import java.io.File; @@ -22,8 +22,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.eclipse.collections.api.list.ImmutableList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/caht/ChatController.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/caht/ChatController.java similarity index 89% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/caht/ChatController.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/caht/ChatController.java index fc6173b..b63b859 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/caht/ChatController.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/caht/ChatController.java @@ -1,13 +1,11 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.controller.caht; +package com.lanyuanxiaoyao.service.ai.web.controller.caht; -import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.lanyuanxiaoyao.service.ai.knowledge.configuration.Prompts; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.MessageVO; -import com.lanyuanxiaoyao.service.ai.knowledge.tools.ChartTool; -import com.lanyuanxiaoyao.service.ai.knowledge.tools.KnowledgeTool; -import com.lanyuanxiaoyao.service.ai.knowledge.tools.TableTool; -import com.lanyuanxiaoyao.service.ai.knowledge.tools.YarnTool; +import com.lanyuanxiaoyao.service.ai.web.configuration.Prompts; +import com.lanyuanxiaoyao.service.ai.web.entity.vo.MessageVO; +import com.lanyuanxiaoyao.service.ai.web.tools.ChartTool; +import com.lanyuanxiaoyao.service.ai.web.tools.TableTool; +import com.lanyuanxiaoyao.service.ai.web.tools.YarnTool; import java.io.IOException; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -27,7 +25,6 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/GroupController.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/GroupController.java similarity index 83% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/GroupController.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/GroupController.java index 98e36df..78ab472 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/GroupController.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/GroupController.java @@ -1,11 +1,9 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.controller.knowledge; +package com.lanyuanxiaoyao.service.ai.web.controller.knowledge; import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse; -import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.GroupService; +import com.lanyuanxiaoyao.service.ai.web.service.knowledge.GroupService; import java.util.concurrent.ExecutionException; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/KnowledgeBaseController.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/KnowledgeBaseController.java similarity index 92% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/KnowledgeBaseController.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/KnowledgeBaseController.java index e560add..463d980 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/KnowledgeBaseController.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/KnowledgeBaseController.java @@ -1,18 +1,16 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.controller.knowledge; +package com.lanyuanxiaoyao.service.ai.web.controller.knowledge; import cn.hutool.core.util.StrUtil; import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisMapResponse; import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.SegmentVO; -import com.lanyuanxiaoyao.service.ai.knowledge.service.EmbeddingService; -import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.KnowledgeBaseService; +import com.lanyuanxiaoyao.service.ai.web.entity.vo.SegmentVO; +import com.lanyuanxiaoyao.service.ai.web.service.EmbeddingService; +import com.lanyuanxiaoyao.service.ai.web.service.knowledge.KnowledgeBaseService; import java.io.IOException; import java.util.concurrent.ExecutionException; import lombok.extern.slf4j.Slf4j; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/SegmentController.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/SegmentController.java similarity index 86% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/SegmentController.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/SegmentController.java index 56bfa51..e4855f5 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/SegmentController.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/SegmentController.java @@ -1,11 +1,9 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.controller.knowledge; +package com.lanyuanxiaoyao.service.ai.web.controller.knowledge; import com.lanyuanxiaoyao.service.ai.core.entity.amis.AmisResponse; -import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.SegmentService; +import com.lanyuanxiaoyao.service.ai.web.service.knowledge.SegmentService; import java.util.concurrent.ExecutionException; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/EmbeddingContext.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/EmbeddingContext.java similarity index 93% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/EmbeddingContext.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/EmbeddingContext.java index 0a5633d..b85f588 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/EmbeddingContext.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/EmbeddingContext.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.entity; +package com.lanyuanxiaoyao.service.ai.web.entity; import java.util.List; import java.util.Map; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/Group.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Group.java similarity index 80% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/Group.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Group.java index 50dea91..9540aeb 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/Group.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Group.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.entity; +package com.lanyuanxiaoyao.service.ai.web.entity; import lombok.Data; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/Knowledge.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Knowledge.java similarity index 82% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/Knowledge.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Knowledge.java index 64f8f05..82c0221 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/Knowledge.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Knowledge.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.entity; +package com.lanyuanxiaoyao.service.ai.web.entity; import lombok.Data; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/DataFileVO.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/DataFileVO.java similarity index 80% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/DataFileVO.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/DataFileVO.java index ae2769a..07e130a 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/DataFileVO.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/DataFileVO.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.entity.vo; +package com.lanyuanxiaoyao.service.ai.web.entity.vo; import lombok.Data; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/KnowledgeVO.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/KnowledgeVO.java similarity index 86% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/KnowledgeVO.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/KnowledgeVO.java index 108b6d2..699b0c0 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/KnowledgeVO.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/KnowledgeVO.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.entity.vo; +package com.lanyuanxiaoyao.service.ai.web.entity.vo; import lombok.Data; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/MessageVO.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/MessageVO.java similarity index 75% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/MessageVO.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/MessageVO.java index a5d6288..7a83309 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/MessageVO.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/MessageVO.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.entity.vo; +package com.lanyuanxiaoyao.service.ai.web.entity.vo; import lombok.Data; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/SegmentVO.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/SegmentVO.java similarity index 72% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/SegmentVO.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/SegmentVO.java index 2fa0d82..d49f5b2 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/SegmentVO.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/SegmentVO.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.entity.vo; +package com.lanyuanxiaoyao.service.ai.web.entity.vo; import lombok.Data; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/DataFileService.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/DataFileService.java similarity index 91% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/DataFileService.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/DataFileService.java index cdc3f00..8856a2b 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/DataFileService.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/DataFileService.java @@ -1,11 +1,9 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.service; +package com.lanyuanxiaoyao.service.ai.web.service; import club.kingon.sql.builder.SqlBuilder; import cn.hutool.core.util.IdUtil; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.DataFileVO; +import com.lanyuanxiaoyao.service.ai.web.entity.vo.DataFileVO; import com.lanyuanxiaoyao.service.common.Constants; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/EmbeddingService.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/EmbeddingService.java similarity index 91% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/EmbeddingService.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/EmbeddingService.java index 49b75da..6cdd3fa 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/EmbeddingService.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/EmbeddingService.java @@ -1,14 +1,14 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.service; +package com.lanyuanxiaoyao.service.ai.web.service; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Pair; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.EmbeddingContext; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.Knowledge; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.DataFileVO; -import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.GroupService; -import com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge.KnowledgeBaseService; +import com.lanyuanxiaoyao.service.ai.web.entity.EmbeddingContext; +import com.lanyuanxiaoyao.service.ai.web.entity.Knowledge; +import com.lanyuanxiaoyao.service.ai.web.entity.vo.DataFileVO; +import com.lanyuanxiaoyao.service.ai.web.service.knowledge.GroupService; +import com.lanyuanxiaoyao.service.ai.web.service.knowledge.KnowledgeBaseService; import com.yomahub.liteflow.core.FlowExecutor; import java.nio.charset.StandardCharsets; import java.util.HashMap; @@ -17,8 +17,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.ai.document.Document; import org.springframework.stereotype.Service; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/GroupService.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/GroupService.java similarity index 95% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/GroupService.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/GroupService.java index 54af2d5..444bd86 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/GroupService.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/GroupService.java @@ -1,10 +1,10 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge; +package com.lanyuanxiaoyao.service.ai.web.service.knowledge; import club.kingon.sql.builder.SqlBuilder; import club.kingon.sql.builder.entry.Alias; import club.kingon.sql.builder.entry.Column; import cn.hutool.core.util.IdUtil; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.Group; +import com.lanyuanxiaoyao.service.ai.web.entity.Group; import com.lanyuanxiaoyao.service.common.Constants; import io.qdrant.client.ConditionFactory; import io.qdrant.client.QdrantClient; @@ -13,8 +13,6 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/KnowledgeBaseService.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/KnowledgeBaseService.java similarity index 96% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/KnowledgeBaseService.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/KnowledgeBaseService.java index 23ea5dc..7a4f5be 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/KnowledgeBaseService.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/KnowledgeBaseService.java @@ -1,11 +1,11 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge; +package com.lanyuanxiaoyao.service.ai.web.service.knowledge; import club.kingon.sql.builder.SqlBuilder; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.Knowledge; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.KnowledgeVO; +import com.lanyuanxiaoyao.service.ai.web.entity.Knowledge; +import com.lanyuanxiaoyao.service.ai.web.entity.vo.KnowledgeVO; import com.lanyuanxiaoyao.service.common.Constants; import io.qdrant.client.QdrantClient; import io.qdrant.client.grpc.Collections; @@ -15,8 +15,6 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.ai.document.Document; import org.springframework.ai.embedding.EmbeddingModel; import org.springframework.ai.vectorstore.SearchRequest; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/SegmentService.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/SegmentService.java similarity index 90% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/SegmentService.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/SegmentService.java index 11e3cc9..a5f9e77 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/SegmentService.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/SegmentService.java @@ -1,7 +1,7 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.service.knowledge; +package com.lanyuanxiaoyao.service.ai.web.service.knowledge; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.Knowledge; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.vo.SegmentVO; +import com.lanyuanxiaoyao.service.ai.web.entity.Knowledge; +import com.lanyuanxiaoyao.service.ai.web.entity.vo.SegmentVO; import io.qdrant.client.ConditionFactory; import io.qdrant.client.QdrantClient; import io.qdrant.client.grpc.Points; @@ -10,8 +10,6 @@ import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; import org.eclipse.collections.api.factory.Lists; import org.eclipse.collections.api.list.ImmutableList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.ai.vectorstore.VectorStore; import org.springframework.stereotype.Service; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/node/EmbeddingNodes.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/node/EmbeddingNodes.java similarity index 98% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/node/EmbeddingNodes.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/node/EmbeddingNodes.java index 35be9cf..8c02fd0 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/node/EmbeddingNodes.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/node/EmbeddingNodes.java @@ -1,10 +1,10 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.service.node; +package com.lanyuanxiaoyao.service.ai.web.service.node; import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.lanyuanxiaoyao.service.ai.knowledge.entity.EmbeddingContext; +import com.lanyuanxiaoyao.service.ai.web.entity.EmbeddingContext; import com.yomahub.liteflow.annotation.LiteflowComponent; import com.yomahub.liteflow.annotation.LiteflowMethod; import com.yomahub.liteflow.core.NodeComponent; diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/ChartTool.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/ChartTool.java similarity index 95% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/ChartTool.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/ChartTool.java index fd1d5bc..ae5bad8 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/ChartTool.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/ChartTool.java @@ -1,6 +1,6 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.tools; +package com.lanyuanxiaoyao.service.ai.web.tools; -import com.lanyuanxiaoyao.service.ai.knowledge.KnowledgeApplication; +import com.lanyuanxiaoyao.service.ai.web.WebApplication; import lombok.extern.slf4j.Slf4j; import org.springframework.ai.chat.client.ChatClient; import org.springframework.ai.tool.annotation.Tool; @@ -44,7 +44,7 @@ public class ChartTool { """) String request ) { log.info("Enter method: mermaid[request]. request:{}", request); - ChatClient.Builder builder = KnowledgeApplication.getBean(ChatClient.Builder.class); + ChatClient.Builder builder = WebApplication.getBean(ChatClient.Builder.class); ChatClient client = builder.build(); return client.prompt() // language=TEXT diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/KnowledgeTool.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/KnowledgeTool.java similarity index 83% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/KnowledgeTool.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/KnowledgeTool.java index 063900a..e22509a 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/KnowledgeTool.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/KnowledgeTool.java @@ -1,8 +1,8 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.tools; +package com.lanyuanxiaoyao.service.ai.web.tools; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import com.lanyuanxiaoyao.service.ai.knowledge.KnowledgeApplication; +import com.lanyuanxiaoyao.service.ai.web.WebApplication; import com.lanyuanxiaoyao.service.forest.service.KnowledgeService; import org.springframework.ai.tool.annotation.Tool; import org.springframework.ai.tool.annotation.ToolParam; @@ -27,7 +27,7 @@ public class KnowledgeTool { """) String query ) { - KnowledgeService knowledgeService = KnowledgeApplication.getBean(KnowledgeService.class); + KnowledgeService knowledgeService = WebApplication.getBean(KnowledgeService.class); var documents = knowledgeService.query(knowledgeId, query, 10, 0.5); if (ObjectUtil.isNotEmpty(documents)) { return StrUtil.format(""" diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/TableTool.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/TableTool.java similarity index 90% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/TableTool.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/TableTool.java index 10122d7..7ec632f 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/TableTool.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/TableTool.java @@ -1,14 +1,12 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.tools; +package com.lanyuanxiaoyao.service.ai.web.tools; import cn.hutool.core.util.StrUtil; -import com.lanyuanxiaoyao.service.ai.knowledge.KnowledgeApplication; +import com.lanyuanxiaoyao.service.ai.web.WebApplication; import com.lanyuanxiaoyao.service.forest.service.InfoService; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import lombok.extern.slf4j.Slf4j; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.ai.tool.annotation.Tool; import org.springframework.ai.tool.annotation.ToolParam; @@ -29,7 +27,7 @@ public class TableTool { """) String sql ) { log.info("Enter method: executeJdbc[sql]. sql:{}", sql); - InfoService infoService = KnowledgeApplication.getBean(InfoService.class); + InfoService infoService = WebApplication.getBean(InfoService.class); String result = infoService.jdbc(sql) .collect(map -> map.valuesView().makeString(",")) .makeString("\n"); @@ -50,7 +48,7 @@ public class TableTool { """) String type ) { log.info("Enter method: tableCount[type]. type:{}", type); - var infoService = KnowledgeApplication.getBean(InfoService.class); + var infoService = WebApplication.getBean(InfoService.class); return switch (type) { case "logic" -> StrUtil.format(""" 逻辑表共{}张，其中重点表{}张 @@ -85,7 +83,7 @@ public class TableTool { String type ) { log.info("Enter method: version[date, type]. date:{},type:{}", date, type); - InfoService infoService = KnowledgeApplication.getBean(InfoService.class); + InfoService infoService = WebApplication.getBean(InfoService.class); String version = date; if (StrUtil.isBlank(version)) { version = LocalDateTime.now().minusDays(1).format(FORMATTER); diff --git a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/YarnTool.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/YarnTool.java similarity index 87% rename from service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/YarnTool.java rename to service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/YarnTool.java index 72d1f62..45f9bba 100644 --- a/service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/YarnTool.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/YarnTool.java @@ -1,15 +1,13 @@ -package com.lanyuanxiaoyao.service.ai.knowledge.tools; +package com.lanyuanxiaoyao.service.ai.web.tools; import cn.hutool.core.util.StrUtil; -import com.lanyuanxiaoyao.service.ai.knowledge.KnowledgeApplication; +import com.lanyuanxiaoyao.service.ai.web.WebApplication; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnApplication; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnQueue; import com.lanyuanxiaoyao.service.configuration.entity.yarn.YarnRootQueue; import com.lanyuanxiaoyao.service.forest.service.YarnService; import lombok.extern.slf4j.Slf4j; import org.eclipse.collections.api.list.ImmutableList; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.ai.tool.annotation.Tool; import org.springframework.ai.tool.annotation.ToolParam; @@ -29,7 +27,7 @@ public class YarnTool { """) String cluster ) { log.info("Enter method: yarnStatus[cluster]. cluster:{}", cluster); - YarnService yarnService = KnowledgeApplication.getBean(YarnService.class); + YarnService yarnService = WebApplication.getBean(YarnService.class); YarnRootQueue status = yarnService.cluster(cluster); return (status.getUsedCapacity() * 100.0) / status.getCapacity(); } @@ -47,7 +45,7 @@ public class YarnTool { """) String queue ) { log.info("Enter method: yarnQueueStatus[cluster, queue]. cluster:{},queue:{}", cluster, queue); - YarnService yarnService = KnowledgeApplication.getBean(YarnService.class); + YarnService yarnService = WebApplication.getBean(YarnService.class); YarnQueue status = yarnService.queueDetail(cluster, queue); return (status.getAbsoluteCapacity() * 100.0) / status.getAbsoluteMaxCapacity(); } @@ -68,7 +66,7 @@ public class YarnTool { """) String type ) { log.info("Enter method: yarnTaskStatus[cluster, type]. cluster:{},type:{}", cluster, type); - YarnService yarnService = KnowledgeApplication.getBean(YarnService.class); + YarnService yarnService = WebApplication.getBean(YarnService.class); ImmutableList applications = yarnService.jobList(cluster).select(app -> StrUtil.isNotBlank(type) && StrUtil.contains(app.getName(), type)); return StrUtil.format( """ diff --git a/service-ai/service-ai-knowledge/src/main/resources/application-build.yml b/service-ai/service-ai-web/src/main/resources/application-build.yml similarity index 100% rename from service-ai/service-ai-knowledge/src/main/resources/application-build.yml rename to service-ai/service-ai-web/src/main/resources/application-build.yml diff --git a/service-ai/service-ai-knowledge/src/main/resources/application-local.yml b/service-ai/service-ai-web/src/main/resources/application-local.yml similarity index 100% rename from service-ai/service-ai-knowledge/src/main/resources/application-local.yml rename to service-ai/service-ai-web/src/main/resources/application-local.yml diff --git a/service-ai/service-ai-knowledge/src/main/resources/application.yml b/service-ai/service-ai-web/src/main/resources/application.yml similarity index 96% rename from service-ai/service-ai-knowledge/src/main/resources/application.yml rename to service-ai/service-ai-web/src/main/resources/application.yml index 3e0f15b..ef8a48e 100644 --- a/service-ai/service-ai-knowledge/src/main/resources/application.yml +++ b/service-ai/service-ai-web/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: application: - name: service-ai-knowledge + name: service-ai-web mvc: async: request-timeout: 3600000 diff --git a/service-ai/service-ai-knowledge/src/main/resources/liteflow.xml b/service-ai/service-ai-web/src/main/resources/liteflow.xml similarity index 100% rename from service-ai/service-ai-knowledge/src/main/resources/liteflow.xml rename to service-ai/service-ai-web/src/main/resources/liteflow.xml diff --git a/service-ai/service-ai-knowledge/src/main/resources/logback-spring.xml b/service-ai/service-ai-web/src/main/resources/logback-spring.xml similarity index 100% rename from service-ai/service-ai-knowledge/src/main/resources/logback-spring.xml rename to service-ai/service-ai-web/src/main/resources/logback-spring.xml diff --git a/service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/TestEmbedding.java b/service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestEmbedding.java similarity index 98% rename from service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/TestEmbedding.java rename to service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestEmbedding.java index 6df4f85..29dd0d6 100644 --- a/service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/TestEmbedding.java +++ b/service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestEmbedding.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge; +package com.lanyuanxiaoyao.service.ai.web; import io.qdrant.client.QdrantClient; import io.qdrant.client.QdrantGrpcClient; diff --git a/service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/TestLlm.java b/service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestLlm.java similarity index 99% rename from service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/TestLlm.java rename to service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestLlm.java index 758577b..0eafd79 100644 --- a/service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/TestLlm.java +++ b/service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestLlm.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge; +package com.lanyuanxiaoyao.service.ai.web; import java.net.http.HttpClient; import org.slf4j.Logger; diff --git a/service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/UploadDirectly.java b/service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/UploadDirectly.java similarity index 99% rename from service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/UploadDirectly.java rename to service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/UploadDirectly.java index 9b362f1..f60ee92 100644 --- a/service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/UploadDirectly.java +++ b/service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/UploadDirectly.java @@ -1,4 +1,4 @@ -package com.lanyuanxiaoyao.service.ai.knowledge; +package com.lanyuanxiaoyao.service.ai.web; import cn.hutool.http.HttpResponse; import cn.hutool.http.HttpUtil; diff --git a/service-web/client/src/pages/ai/Conversation.tsx b/service-web/client/src/pages/ai/Conversation.tsx index a7a6e59..adb4710 100644 --- a/service-web/client/src/pages/ai/Conversation.tsx +++ b/service-web/client/src/pages/ai/Conversation.tsx @@ -42,7 +42,7 @@ function Conversation() { const [agent] = useXAgent({ request: async (info, callbacks) => { - await fetchEventSource(`${commonInfo.baseAiChatUrl}/chat/async`, { + await fetchEventSource(`${commonInfo.baseAiUrl}/chat/async`, { method: 'POST', headers: commonInfo.authorizationHeaders, body: JSON.stringify(info.messages), diff --git a/service-web/client/src/pages/ai/knowledge/DataDetail.tsx b/service-web/client/src/pages/ai/knowledge/DataDetail.tsx index 8b0d65f..c5354ad 100644 --- a/service-web/client/src/pages/ai/knowledge/DataDetail.tsx +++ b/service-web/client/src/pages/ai/knowledge/DataDetail.tsx @@ -24,7 +24,7 @@ const DataDetail: React.FC = () => { { type: 'service', className: 'inline', - api: `${commonInfo.baseAiKnowledgeUrl}/knowledge/name?id=${knowledge_id}`, + api: `${commonInfo.baseAiUrl}/knowledge/name?id=${knowledge_id}`, body: { type: 'tpl', tpl: '${name}', @@ -38,7 +38,7 @@ const DataDetail: React.FC = () => { body: [ { type: 'crud', - api: `${commonInfo.baseAiKnowledgeUrl}/knowledge/group/list?knowledge_id=${knowledge_id}`, + api: `${commonInfo.baseAiUrl}/knowledge/group/list?knowledge_id=${knowledge_id}`, ...crudCommonOptions(), headerToolbar: [ 'reload', @@ -146,7 +146,7 @@ const DataDetail: React.FC = () => { level: 'link', size: 'sm', actionType: 'ajax', - api: `get:${commonInfo.baseAiKnowledgeUrl}/knowledge/group/delete?id=\${id}`, + api: `get:${commonInfo.baseAiUrl}/knowledge/group/delete?id=\${id}`, confirmText: '确认删除', confirmTitle: '删除', }, diff --git a/service-web/client/src/pages/ai/knowledge/DataImport.tsx b/service-web/client/src/pages/ai/knowledge/DataImport.tsx index a6b436d..7f2d8cf 100644 --- a/service-web/client/src/pages/ai/knowledge/DataImport.tsx +++ b/service-web/client/src/pages/ai/knowledge/DataImport.tsx @@ -23,7 +23,7 @@ const DataImport: React.FC = () => { { type: 'service', className: 'inline', - api: `${commonInfo.baseAiKnowledgeUrl}/knowledge/name?id=${knowledge_id}`, + api: `${commonInfo.baseAiUrl}/knowledge/name?id=${knowledge_id}`, body: { type: 'tpl', tpl: '${name}', @@ -109,7 +109,7 @@ const DataImport: React.FC = () => { // 500MB 524288000 // 1GB 1073741824 maxSize: 104857600, - receiver: `${commonInfo.baseAiKnowledgeUrl}/upload` + receiver: `${commonInfo.baseAiUrl}/upload` // useChunk: true, // startChunkApi: `post:${commonInfo.baseAiKnowledgeUrl}/upload/start`, // chunkApi: `post:${commonInfo.baseAiKnowledgeUrl}/upload/slice`, @@ -130,7 +130,7 @@ const DataImport: React.FC = () => { level: 'secondary', api: { method: 'post', - url: `${commonInfo.baseAiKnowledgeUrl}/knowledge/preview_text`, + url: `${commonInfo.baseAiUrl}/knowledge/preview_text`, dataType: 'form', data: { mode: '${mode|default:undefined}', @@ -148,7 +148,7 @@ const DataImport: React.FC = () => { actionType: 'ajax', api: { method: 'post', - url: `${commonInfo.baseAiKnowledgeUrl}/knowledge/submit_text`, + url: `${commonInfo.baseAiUrl}/knowledge/submit_text`, dataType: 'form', data: { id: knowledge_id, diff --git a/service-web/client/src/pages/ai/knowledge/DataSegment.tsx b/service-web/client/src/pages/ai/knowledge/DataSegment.tsx index f1d3888..67b3e41 100644 --- a/service-web/client/src/pages/ai/knowledge/DataSegment.tsx +++ b/service-web/client/src/pages/ai/knowledge/DataSegment.tsx @@ -18,7 +18,7 @@ const DataDetail: React.FC = () => { { type: 'service', className: 'inline', - api: `${commonInfo.baseAiKnowledgeUrl}/knowledge/name?id=${knowledge_id}`, + api: `${commonInfo.baseAiUrl}/knowledge/name?id=${knowledge_id}`, body: { type: 'tpl', tpl: '${name}', @@ -32,7 +32,7 @@ const DataDetail: React.FC = () => { body: [ { type: 'crud', - api: `${commonInfo.baseAiKnowledgeUrl}/knowledge/segment/list?knowledge_id=${knowledge_id}&group_id=${group_id}`, + api: `${commonInfo.baseAiUrl}/knowledge/segment/list?knowledge_id=${knowledge_id}&group_id=${group_id}`, ...crudCommonOptions(), headerToolbar: [ 'reload', diff --git a/service-web/client/src/pages/ai/knowledge/Knowledge.tsx b/service-web/client/src/pages/ai/knowledge/Knowledge.tsx index f503daf..a96335b 100644 --- a/service-web/client/src/pages/ai/knowledge/Knowledge.tsx +++ b/service-web/client/src/pages/ai/knowledge/Knowledge.tsx @@ -25,7 +25,7 @@ const Knowledge: React.FC = () => { body: [ { type: 'crud', - api: `${commonInfo.baseAiKnowledgeUrl}/knowledge/list`, + api: `${commonInfo.baseAiUrl}/knowledge/list`, ...crudCommonOptions(), headerToolbar: [ 'reload', @@ -42,7 +42,7 @@ const Knowledge: React.FC = () => { body: { type: 'form', api: { - url: `${commonInfo.baseAiKnowledgeUrl}/knowledge/add`, + url: `${commonInfo.baseAiUrl}/knowledge/add`, dataType: 'form', }, body: [ @@ -148,7 +148,7 @@ const Knowledge: React.FC = () => { actionType: 'ajax', api: { method: 'get', - url: `${commonInfo.baseAiKnowledgeUrl}/knowledge/delete`, + url: `${commonInfo.baseAiUrl}/knowledge/delete`, headers: { 'Authorization': 'Basic QXhoRWJzY3dzSkRiWU1IMjpjWXhnM2I0UHRXb1ZENVNqRmF5V3h0blNWc2p6UnNnNA==', }, diff --git a/service-web/client/src/util/amis.tsx b/service-web/client/src/util/amis.tsx index abd4385..13bc0a3 100644 --- a/service-web/client/src/util/amis.tsx +++ b/service-web/client/src/util/amis.tsx @@ -10,9 +10,8 @@ import {isEqual} from 'licia' export const commonInfo = { debug: isEqual(import.meta.env.MODE, 'development'), baseUrl: 'http://132.126.207.130:35690/hudi_services/service_web', - baseAiChatUrl: 'http://localhost:8080', // baseAiKnowledgeUrl: 'http://132.126.207.130:35690/hudi_services/ai_knowledge', - baseAiKnowledgeUrl: 'http://localhost:8080', + baseAiUrl: 'http://localhost:8080', // baseUrl: '/hudi_services/service_web', authorizationHeaders: { 'Authorization': 'Basic QXhoRWJzY3dzSkRiWU1IMjpjWXhnM2I0UHRXb1ZENVNqRmF5V3h0blNWc2p6UnNnNA==',