diff --git a/service-ai/database/service_ai_knowledge.sql b/service-ai/database/service_ai_knowledge.sql index d257521..25f7b0a 100644 --- a/service-ai/database/service_ai_knowledge.sql +++ b/service-ai/database/service_ai_knowledge.sql @@ -3,6 +3,7 @@ CREATE TABLE `service_ai_knowledge` `id` bigint NOT NULL, `vector_source_id` varchar(100) NOT NULL, `name` varchar(100) NOT NULL, + `description` longtext NOT NULL, `strategy` varchar(10) NOT NULL, `created_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, `modified_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, diff --git a/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/KnowledgeBaseController.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/KnowledgeBaseController.java index 463d980..337ea15 100644 --- a/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/KnowledgeBaseController.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/controller/knowledge/KnowledgeBaseController.java @@ -37,9 +37,18 @@ public class KnowledgeBaseController { @PostMapping("add") public void add( @RequestParam("name") String name, + @RequestParam("description") String description, @RequestParam("strategy") String strategy ) throws ExecutionException, InterruptedException { - knowledgeBaseService.add(name, strategy); + knowledgeBaseService.add(name, description, strategy); + } + + @PostMapping("update_description") + public void updateDescription( + @RequestParam("id") Long id, + @RequestParam("description") String description + ) { + knowledgeBaseService.updateDescription(id, description); } @GetMapping("name") diff --git a/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Knowledge.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Knowledge.java index 82c0221..608ed82 100644 --- a/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Knowledge.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/Knowledge.java @@ -11,6 +11,7 @@ public class Knowledge { private Long id; private Long vectorSourceId; private String name; + private String description; private String strategy; private Long createdTime; private Long modifiedTime; diff --git a/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/KnowledgeVO.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/KnowledgeVO.java index a7d4bb2..8dc9ac4 100644 --- a/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/KnowledgeVO.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/entity/vo/KnowledgeVO.java @@ -11,6 +11,7 @@ public class KnowledgeVO { private Long id; private Long vectorSourceId; private String name; + private String description; private String strategy; private Long size; private Long points; diff --git a/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/KnowledgeBaseService.java b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/KnowledgeBaseService.java index 30667bf..b363088 100644 --- a/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/KnowledgeBaseService.java +++ b/service-ai/service-ai-web/src/main/java/com/lanyuanxiaoyao/service/ai/web/service/knowledge/KnowledgeBaseService.java @@ -9,7 +9,6 @@ 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; -import java.io.IOException; import java.util.List; import java.util.concurrent.ExecutionException; import java.util.stream.Collectors; @@ -32,14 +31,16 @@ import org.springframework.transaction.annotation.Transactional; @Service public class KnowledgeBaseService { public static final String KNOWLEDGE_TABLE_NAME = Constants.DATABASE_NAME + ".service_ai_knowledge"; + public static final String[] KNOWLEDGE_COLUMNS = new String[]{"id", "vector_source_id", "name", "description", "strategy", "created_time", "modified_time"}; private static final RowMapper knowledgeMapper = (rs, row) -> { Knowledge knowledge = new Knowledge(); knowledge.setId(rs.getLong(1)); knowledge.setVectorSourceId(rs.getLong(2)); knowledge.setName(rs.getString(3)); - knowledge.setStrategy(rs.getString(4)); - knowledge.setCreatedTime(rs.getTimestamp(5).getTime()); - knowledge.setModifiedTime(rs.getTimestamp(6).getTime()); + knowledge.setDescription(rs.getString(4)); + knowledge.setStrategy(rs.getString(5)); + knowledge.setCreatedTime(rs.getTimestamp(6).getTime()); + knowledge.setModifiedTime(rs.getTimestamp(7).getTime()); return knowledge; }; private final JdbcTemplate template; @@ -56,7 +57,7 @@ public class KnowledgeBaseService { public Knowledge get(Long id) { return template.queryForObject( - SqlBuilder.select("id", "vector_source_id", "name", "strategy", "created_time", "modified_time") + SqlBuilder.select(KNOWLEDGE_COLUMNS) .from(KNOWLEDGE_TABLE_NAME) .whereEq("id", "?") .precompileSql(), @@ -66,7 +67,7 @@ public class KnowledgeBaseService { } @Transactional(rollbackFor = Exception.class) - public void add(String name, String strategy) throws ExecutionException, InterruptedException { + public void add(String name, String description, String strategy) throws ExecutionException, InterruptedException { Integer count = template.queryForObject( SqlBuilder.select("count(*)") .from(KNOWLEDGE_TABLE_NAME) @@ -82,13 +83,14 @@ public class KnowledgeBaseService { long id = SnowflakeId.next(); long vectorSourceId = SnowflakeId.next(); template.update( - SqlBuilder.insertInto(KNOWLEDGE_TABLE_NAME, "id", "vector_source_id", "name", "strategy") + SqlBuilder.insertInto(KNOWLEDGE_TABLE_NAME, "id", "vector_source_id", "name", "description", "strategy") .values() - .addValue("?", "?", "?", "?") + .addValue("?", "?", "?", "?", "?") .precompileSql(), id, vectorSourceId, name, + description, strategy ); client.createCollectionAsync( @@ -100,6 +102,18 @@ public class KnowledgeBaseService { ).get(); } + @Transactional(rollbackFor = Exception.class) + public void updateDescription(Long id, String description) { + template.update( + SqlBuilder.update(KNOWLEDGE_TABLE_NAME) + .set("description", "?") + .whereEq("id", "?") + .precompileSql(), + description, + id + ); + } + public String getName(Long id) { return template.queryForObject( SqlBuilder.select("name") @@ -113,7 +127,7 @@ public class KnowledgeBaseService { public ImmutableList list() { return template.query( - SqlBuilder.select("id", "vector_source_id", "name", "strategy", "created_time", "modified_time") + SqlBuilder.select(KNOWLEDGE_COLUMNS) .from(KNOWLEDGE_TABLE_NAME) .orderByDesc("created_time") .build(), @@ -127,6 +141,7 @@ public class KnowledgeBaseService { vo.setId(knowledge.getId()); vo.setVectorSourceId(knowledge.getVectorSourceId()); vo.setName(knowledge.getName()); + vo.setDescription(knowledge.getDescription()); vo.setPoints(info.getPointsCount()); vo.setSegments(info.getSegmentsCount()); vo.setStatus(info.getStatus().name()); @@ -165,7 +180,7 @@ public class KnowledgeBaseService { String text, Integer limit, Double threshold - ) throws ExecutionException, InterruptedException, IOException { + ) throws ExecutionException, InterruptedException { Knowledge knowledge = get(id); Boolean exists = client.collectionExistsAsync(String.valueOf(knowledge.getVectorSourceId())).get(); if (!exists) { @@ -182,13 +197,6 @@ public class KnowledgeBaseService { .similarityThreshold(threshold) .build() ); - // 如果只是一个知识库的话，似乎没有什么rerank的必要... - /* List rerankDocuments = rerankingModel.rerank( - text, - documents.stream() - .map(doc -> new org.noear.solon.ai.rag.Document(doc.getId(), doc.getText(), doc.getMetadata(), doc.getScore())) - .toList() - ); */ return Lists.immutable.ofAll(documents) .collect(Document::getText); } diff --git a/service-web/client/src/pages/ai/knowledge/Knowledge.tsx b/service-web/client/src/pages/ai/knowledge/Knowledge.tsx index a96335b..9873690 100644 --- a/service-web/client/src/pages/ai/knowledge/Knowledge.tsx +++ b/service-web/client/src/pages/ai/knowledge/Knowledge.tsx @@ -50,12 +50,20 @@ const Knowledge: React.FC = () => { type: 'input-text', name: 'name', label: '名称', + required: true, + }, + { + type: 'textarea', + name: 'description', + label: '描述', + required: true, }, { type: 'select', name: 'strategy', label: '类型', value: 'Cosine', + required: true, options: [ { label: '文本', @@ -77,6 +85,11 @@ const Knowledge: React.FC = () => { { name: 'name', label: '名称', + width: 200, + }, + { + name: 'description', + label: '描述', }, { label: '类型', @@ -99,8 +112,41 @@ const Knowledge: React.FC = () => { { type: 'operation', label: '操作', - width: 150, + width: 200, buttons: [ + { + type: 'action', + label: '更新', + level: 'link', + size: 'sm', + actionType: 'dialog', + dialog: { + title: '更新描述', + body: { + debug: commonInfo.debug, + type: 'form', + api: { + method: 'post', + url: `${commonInfo.baseAiUrl}/knowledge/update_description`, + dataType: 'form', + }, + mode: 'normal', + body: [ + { + type: 'hidden', + name: "id", + // value: '${id}', + }, + { + type: 'textarea', + name: 'description', + label: '描述', + required: true, + } + ] + } + } + }, { type: 'action', label: '详情', diff --git a/service-web/client/src/util/amis.tsx b/service-web/client/src/util/amis.tsx index 5b4bbba..b133a22 100644 --- a/service-web/client/src/util/amis.tsx +++ b/service-web/client/src/util/amis.tsx @@ -281,6 +281,7 @@ export function crudCommonOptions() { resizable: false, syncLocation: false, silentPolling: true, + columnsTogglable: false, } }