lanyuanxiaoyao/hudi-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(ai): 移除chat，合并chat和knowledge为web

Browse Source 
以后有需要再拆分
This commit is contained in:
兰缘小妖
2025-06-15 20:08:51 +08:00
parent 9c658afbd7
commit 44d1473c6b
46 changed files with 108 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
service-ai/bin/build-ai-chat.js
View File

@@ -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)
}

14
service-ai/bin/build-ai-knowledge.js
View File

@@ -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)
}

21
service-ai/bin/build-ai-web.js Normal file
View File

@@ -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)
}

2
service-ai/pom.xml
View File

@@ -11,7 +11,7 @@
<description>Hudi AI服务集合</description>
<modules>
<module>service-ai-core</module>
<module>service-ai-knowledge</module>
<module>service-ai-web</module>
<module>service-ai-cli</module>
</modules>

2
service-ai/service-ai-knowledge/pom.xml → service-ai/service-ai-web/pom.xml
View File

@@ -9,7 +9,7 @@
<version>1.0.0-SNAPSHOT</version>
</parent>
<artifactId>service-ai-knowledge</artifactId>
<artifactId>service-ai-web</artifactId>
<dependencies>
<dependency>

8
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/KnowledgeApplication.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/WebApplication.java
View File

@@ -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> T getBean(Class<T> 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;
}
}

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/FileStoreConfiguration.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/FileStoreConfiguration.java
View File

@@ -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;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/LlmConfiguration.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/LlmConfiguration.java
View File

@@ -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;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/LlmProperties.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/LlmProperties.java
View File

@@ -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;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/configuration/Prompts.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/configuration/Prompts.java
View File

@@ -1,4 +1,4 @@
package com.lanyuanxiaoyao.service.ai.knowledge.configuration;
package com.lanyuanxiaoyao.service.ai.web.configuration;
import cn.hutool.core.util.StrUtil;

10
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/DataFileController.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/DataFileController.java
View File

@@ -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;

15
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/caht/ChatController.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/caht/ChatController.java
View File

@@ -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;

6
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/GroupController.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/GroupController.java
View File

@@ -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;

10
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/KnowledgeBaseController.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/KnowledgeBaseController.java
View File

@@ -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;

6
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/controller/knowledge/SegmentController.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/SegmentController.java
View File

@@ -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;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/EmbeddingContext.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/EmbeddingContext.java
View File

@@ -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;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/Group.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Group.java
View File

@@ -1,4 +1,4 @@
package com.lanyuanxiaoyao.service.ai.knowledge.entity;
package com.lanyuanxiaoyao.service.ai.web.entity;
import lombok.Data;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/Knowledge.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Knowledge.java
View File

@@ -1,4 +1,4 @@
package com.lanyuanxiaoyao.service.ai.knowledge.entity;
package com.lanyuanxiaoyao.service.ai.web.entity;
import lombok.Data;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/DataFileVO.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/DataFileVO.java
View File

@@ -1,4 +1,4 @@
package com.lanyuanxiaoyao.service.ai.knowledge.entity.vo;
package com.lanyuanxiaoyao.service.ai.web.entity.vo;
import lombok.Data;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/KnowledgeVO.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/KnowledgeVO.java
View File

@@ -1,4 +1,4 @@
package com.lanyuanxiaoyao.service.ai.knowledge.entity.vo;
package com.lanyuanxiaoyao.service.ai.web.entity.vo;
import lombok.Data;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/MessageVO.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/MessageVO.java
View File

@@ -1,4 +1,4 @@
package com.lanyuanxiaoyao.service.ai.knowledge.entity.vo;
package com.lanyuanxiaoyao.service.ai.web.entity.vo;
import lombok.Data;

2
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/entity/vo/SegmentVO.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/SegmentVO.java
View File

@@ -1,4 +1,4 @@
package com.lanyuanxiaoyao.service.ai.knowledge.entity.vo;
package com.lanyuanxiaoyao.service.ai.web.entity.vo;
import lombok.Data;

6
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/DataFileService.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/DataFileService.java
View File

@@ -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;

14
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/EmbeddingService.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/EmbeddingService.java
View File

@@ -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;

6
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/GroupService.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/GroupService.java
View File

@@ -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;

8
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/KnowledgeBaseService.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/KnowledgeBaseService.java
View File

@@ -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;

8
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/knowledge/SegmentService.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/SegmentService.java
View File

@@ -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;

4
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/service/node/EmbeddingNodes.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/node/EmbeddingNodes.java
View File

@@ -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;

6
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/ChartTool.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/ChartTool.java
View File

@@ -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

6
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/KnowledgeTool.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/KnowledgeTool.java
View File

@@ -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("""

12
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/TableTool.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/TableTool.java
View File

@@ -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);

12
service-ai/service-ai-knowledge/src/main/java/com/lanyuanxiaoyao/service/ai/knowledge/tools/YarnTool.java → service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/tools/YarnTool.java
View File

@@ -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<YarnApplication> applications = yarnService.jobList(cluster).select(app -> StrUtil.isNotBlank(type) && StrUtil.contains(app.getName(), type));
return StrUtil.format(
"""

0
service-ai/service-ai-knowledge/src/main/resources/application-build.yml → service-ai/service-ai-web/src/main/resources/application-build.yml
View File

0
service-ai/service-ai-knowledge/src/main/resources/application-local.yml → service-ai/service-ai-web/src/main/resources/application-local.yml
View File

2
service-ai/service-ai-knowledge/src/main/resources/application.yml → service-ai/service-ai-web/src/main/resources/application.yml
View File

@@ -1,6 +1,6 @@
spring:
application:
name: service-ai-knowledge
name: service-ai-web
mvc:
async:
request-timeout: 3600000

0
service-ai/service-ai-knowledge/src/main/resources/liteflow.xml → service-ai/service-ai-web/src/main/resources/liteflow.xml
View File

0
service-ai/service-ai-knowledge/src/main/resources/logback-spring.xml → service-ai/service-ai-web/src/main/resources/logback-spring.xml
View File

2
service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/TestEmbedding.java → service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestEmbedding.java
View File

@@ -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;

2
service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/TestLlm.java → service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/TestLlm.java
View File

@@ -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;

2
service-ai/service-ai-knowledge/src/test/java/com/lanyuanxiaoyao/service/ai/knowledge/UploadDirectly.java → service-ai/service-ai-web/src/test/java/com/lanyuanxiaoyao/service/ai/web/UploadDirectly.java
View File

@@ -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;

2
service-web/client/src/pages/ai/Conversation.tsx
View File

@@ -42,7 +42,7 @@ function Conversation() {
const [agent] = useXAgent<ChatMessage>({
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),

6
service-web/client/src/pages/ai/knowledge/DataDetail.tsx
View File

@@ -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: '删除',
},

8
service-web/client/src/pages/ai/knowledge/DataImport.tsx
View File

@@ -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,

4
service-web/client/src/pages/ai/knowledge/DataSegment.tsx
View File

@@ -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',

6
service-web/client/src/pages/ai/knowledge/Knowledge.tsx
View File

@@ -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==',
},

3
service-web/client/src/util/amis.tsx
View File

@@ -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==',