diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java index b029650c3..abb61c923 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java @@ -58,9 +58,8 @@ public class SearchService { return new HanlpMapResult(name, entry.getValue(), key, similarity); }).sorted((a, b) -> -(b.getName().length() - a.getName().length())) .collect(Collectors.toList()); - hanlpMapResults = transformAndFilterByDataSet(hanlpMapResults, modelIdToDataSetIds, - detectDataSetIds, limit); - return hanlpMapResults; + return transformAndFilterByDataSet(hanlpMapResults, modelIdToDataSetIds, detectDataSetIds, + limit); } /** @@ -71,15 +70,14 @@ public class SearchService { */ public static List suffixSearch(String key, int limit, Map> modelIdToDataSetIds, Set detectDataSetIds) { - String reverseDetectSegment = StringUtils.reverse(key); - return suffixSearch(reverseDetectSegment, limit, suffixTrie, modelIdToDataSetIds, - detectDataSetIds); + return suffixSearch(key, limit, suffixTrie, modelIdToDataSetIds, detectDataSetIds); } public static List suffixSearch(String key, int limit, BinTrie> binTrie, Map> modelIdToDataSetIds, Set detectDataSetIds) { - Set>> result = search(key, binTrie); + String reverseDetectSegment = StringUtils.reverse(key); + Set>> result = search(reverseDetectSegment, binTrie); List hanlpMapResults = result.stream().map(entry -> { String name = entry.getKey().replace("#", " "); List natures = entry.getValue().stream() diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapFilter.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapFilter.java index cf388622a..dc02fbccf 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapFilter.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapFilter.java @@ -77,9 +77,9 @@ public class MapFilter { for (Map.Entry> entry : dataSetElementMatches.entrySet()) { List value = entry.getValue(); if (!CollectionUtils.isEmpty(value)) { - value.removeIf(schemaElementMatch -> StringUtils - .length(schemaElementMatch.getDetectWord()) <= 2 - && schemaElementMatch.getSimilarity() < 1); + value.removeIf( + schemaElementMatch -> StringUtils.length(schemaElementMatch.getWord()) <= 2 + && schemaElementMatch.getSimilarity() < 1); } } } diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapperConfig.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapperConfig.java index bbcaecdb8..acf007bca 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapperConfig.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/MapperConfig.java @@ -15,7 +15,7 @@ public class MapperConfig extends ParameterConfig { "number", "Mapper相关配置"); public static final Parameter MAPPER_NAME_THRESHOLD = - new Parameter("s2.mapper.name.threshold", "0.5", "指标名、维度名文本相似度阈值", + new Parameter("s2.mapper.name.threshold", "0.3", "指标名、维度名文本相似度阈值", "文本片段和匹配到的指标、维度名计算出来的编辑距离阈值, 若超出该阈值, 则舍弃", "number", "Mapper相关配置"); public static final Parameter MAPPER_NAME_THRESHOLD_MIN = diff --git a/launchers/standalone/src/main/resources/config.update/sql-update.sql b/launchers/standalone/src/main/resources/config.update/sql-update.sql index 47555be9d..0cefd0fb6 100644 --- a/launchers/standalone/src/main/resources/config.update/sql-update.sql +++ b/launchers/standalone/src/main/resources/config.update/sql-update.sql @@ -385,13 +385,12 @@ CREATE TABLE IF NOT EXISTS `s2_chat_model` ( `viewer` varchar(500) DEFAULT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='对话大模型实例表'; -ALTER TABLE s2_agent RENAME COLUMN config TO tool_config; -ALTER TABLE s2_agent RENAME COLUMN model_config TO chat_model_config; - +ALTER TABLE s2_agent CHANGE COLUMN config tool_config text; +ALTER TABLE s2_agent CHANGE COLUMN model_config chat_model_config text; --20241011 -ALTER TABLE s2_agent DROP COLUMN IF EXISTS `prompt_config`; -ALTER TABLE s2_agent DROP COLUMN IF EXISTS `multi_turn_config`; -ALTER TABLE s2_agent DROP COLUMN IF EXISTS `enable_memory_review`; +ALTER TABLE s2_agent DROP COLUMN `prompt_config`; +ALTER TABLE s2_agent DROP COLUMN `multi_turn_config`; +ALTER TABLE s2_agent DROP COLUMN `enable_memory_review`; --20241012 alter table s2_agent add column `enable_feedback` tinyint DEFAULT 1; \ No newline at end of file diff --git a/launchers/standalone/src/main/resources/s2-config.yaml b/launchers/standalone/src/main/resources/s2-config.yaml index 6bdcb4594..6a0e8fee1 100644 --- a/launchers/standalone/src/main/resources/s2-config.yaml +++ b/launchers/standalone/src/main/resources/s2-config.yaml @@ -31,4 +31,14 @@ s2: token: http: header: - key: Authorization \ No newline at end of file + key: Authorization + + mapper: + name: + threshold: 0.30 + min: + threshold:value: 0.25 + value: + threshold: 0.5 + min: + threshold: 0.3 \ No newline at end of file