[improvement][project] supersonic 0.7.2 version backend update (#28)

Co-authored-by: jipengli <jipengli@tencent.com>
2026-04-20 21:54:19 +08:00 · 2023-08-15 08:56:18 +08:00
parent 27283001a8
commit b1952d64ab
461 changed files with 18548 additions and 11939 deletions
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/BaseQueryTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/BaseQueryTest.java
@@ -1,5 +1,7 @@
 package com.tencent.supersonic.integration;

+import static org.junit.Assert.assertEquals;
+
 import com.tencent.supersonic.StandaloneLauncher;
 import com.tencent.supersonic.chat.api.pojo.ChatContext;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
@@ -13,6 +15,9 @@ import com.tencent.supersonic.chat.service.ChatService;
 import com.tencent.supersonic.chat.service.ConfigService;
 import com.tencent.supersonic.chat.service.QueryService;
 import com.tencent.supersonic.util.DataUtils;
+import java.time.LocalDate;
+import java.util.Set;
+import java.util.stream.Collectors;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -20,12 +25,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;

-import java.time.LocalDate;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import static org.junit.Assert.assertEquals;
-
@RunWith(SpringRunner.class)
@SpringBootTest(classes = StandaloneLauncher.class)
@ActiveProfiles("local")
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/EntityQueryTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/EntityQueryTest.java
@@ -1,5 +1,7 @@
 package com.tencent.supersonic.integration;

+import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.NONE;
+
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
@@ -9,10 +11,9 @@ import com.tencent.supersonic.chat.query.rule.metric.MetricEntityQuery;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
 import com.tencent.supersonic.util.DataUtils;
-import org.junit.Test;
 import java.util.ArrayList;
 import java.util.List;
-import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.NONE;
+import org.junit.Test;

 public class EntityQueryTest extends BaseQueryTest {

--- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MetricQueryTest.java
@@ -1,27 +1,29 @@
 package com.tencent.supersonic.integration;

+import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.NONE;
+import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.SUM;
+
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
-import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
-import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.api.pojo.request.ChatConfigEditReqReq;
-import com.tencent.supersonic.chat.api.pojo.response.ChatConfigResp;
 import com.tencent.supersonic.chat.api.pojo.request.ItemVisibility;
-import com.tencent.supersonic.chat.query.rule.metric.MetricDomainQuery;
+import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
+import com.tencent.supersonic.chat.api.pojo.response.ChatConfigResp;
+import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.query.rule.metric.MetricFilterQuery;
 import com.tencent.supersonic.chat.query.rule.metric.MetricGroupByQuery;
+import com.tencent.supersonic.chat.query.rule.metric.MetricModelQuery;
 import com.tencent.supersonic.chat.query.rule.metric.MetricTopNQuery;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
 import com.tencent.supersonic.util.DataUtils;
-import org.junit.Test;
-import org.springframework.beans.BeanUtils;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-import java.util.*;
-
-import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.junit.Test;
+import org.springframework.beans.BeanUtils;


 public class MetricQueryTest extends BaseQueryTest {
@@ -56,7 +58,7 @@ public class MetricQueryTest extends BaseQueryTest {
        SemanticParseInfo expectedParseInfo = new SemanticParseInfo();
        expectedResult.setChatContext(expectedParseInfo);

-        expectedResult.setQueryMode(MetricDomainQuery.QUERY_MODE);
+        expectedResult.setQueryMode(MetricModelQuery.QUERY_MODE);
        expectedParseInfo.setAggType(NONE);

        expectedParseInfo.getMetrics().add(DataUtils.getSchemaElement("访问次数"));
@@ -180,7 +182,7 @@ public class MetricQueryTest extends BaseQueryTest {
    @Test
    public void queryTest_CONFIG_VISIBILITY() throws Exception {
        // 1. round_1 use blacklist
-        ChatConfigResp chatConfig = configService.fetchConfigByDomainId(1L);
+        ChatConfigResp chatConfig = configService.fetchConfigByModelId(1L);
        ChatConfigEditReqReq extendEditCmd = new ChatConfigEditReqReq();
        BeanUtils.copyProperties(chatConfig, extendEditCmd);
        // add blacklist
@@ -193,7 +195,7 @@ public class MetricQueryTest extends BaseQueryTest {
        SemanticParseInfo expectedParseInfo = new SemanticParseInfo();
        expectedResult.setChatContext(expectedParseInfo);

-        expectedResult.setQueryMode(MetricDomainQuery.QUERY_MODE);
+        expectedResult.setQueryMode(MetricModelQuery.QUERY_MODE);
        expectedParseInfo.setAggType(NONE);

        expectedParseInfo.getMetrics().add(DataUtils.getSchemaElement("访问次数"));
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MultiTurnsTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/MultiTurnsTest.java
@@ -1,5 +1,7 @@
 package com.tencent.supersonic.integration;

+import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.NONE;
+
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.query.rule.metric.MetricFilterQuery;
@@ -7,13 +9,10 @@ import com.tencent.supersonic.chat.query.rule.metric.MetricGroupByQuery;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
 import com.tencent.supersonic.util.DataUtils;
-import org.junit.Test;
-import org.junit.jupiter.api.Order;
-
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
-
-import static com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum.NONE;
+import org.junit.Test;
+import org.junit.jupiter.api.Order;

 public class MultiTurnsTest extends BaseQueryTest {

--- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/BasePluginTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/BasePluginTest.java
@@ -13,8 +13,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;

-import java.util.Map;
-
@RunWith(SpringRunner.class)
@SpringBootTest(classes = StandaloneLauncher.class)
@ActiveProfiles("local")
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/PluginMockConfiguration.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/PluginMockConfiguration.java
@@ -1,6 +1,10 @@
 package com.tencent.supersonic.integration.plugin;


+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.notNull;
+import static org.mockito.Mockito.when;
+
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.chat.parser.embedding.EmbeddingConfig;
 import com.tencent.supersonic.chat.parser.embedding.EmbeddingResp;
@@ -8,7 +12,7 @@ import com.tencent.supersonic.chat.parser.embedding.RecallRetrieval;
 import com.tencent.supersonic.chat.plugin.PluginManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
-import static org.mockito.Mockito.when;
+import org.springframework.http.ResponseEntity;

@Configuration
@Slf4j
@@ -29,4 +33,9 @@ public class PluginMockConfiguration {
        when(embeddingConfig.getUrl()).thenReturn("test");
    }

+    public static void mockPluginManagerDoRequest(PluginManager pluginManager, String path,
+            ResponseEntity<String> responseEntity) {
+        when(pluginManager.doRequest(eq(path), notNull(String.class))).thenReturn(responseEntity);
+    }
+
 }
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/PluginRecognizeTest.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/integration/plugin/PluginRecognizeTest.java
@@ -1,19 +1,23 @@
 package com.tencent.supersonic.integration.plugin;

+import com.alibaba.fastjson.JSONObject;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
 import com.tencent.supersonic.chat.api.pojo.request.QueryFilters;
 import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.parser.embedding.EmbeddingConfig;
 import com.tencent.supersonic.chat.plugin.PluginManager;
+import com.tencent.supersonic.chat.query.ContentInterpret.LLmAnswerResp;
 import com.tencent.supersonic.chat.service.QueryService;
 import com.tencent.supersonic.util.DataUtils;
+import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.ResponseEntity;

-public class PluginRecognizeTest extends BasePluginTest{
+public class PluginRecognizeTest extends BasePluginTest {

    @MockBean
    private EmbeddingConfig embeddingConfig;
@@ -27,7 +31,7 @@ public class PluginRecognizeTest extends BasePluginTest{

    @Test
    public void webPageRecognize() throws Exception {
-        PluginMockConfiguration.mockEmbeddingRecognize(pluginManager, "最近的访问情况怎么样","1");
+        PluginMockConfiguration.mockEmbeddingRecognize(pluginManager, "alice最近的访问情况怎么样", "1");
        PluginMockConfiguration.mockEmbeddingUrl(embeddingConfig);
        QueryReq queryContextReq = DataUtils.getQueryContextReq(1000, "alice最近的访问情况怎么样");
        QueryResult queryResult = queryService.executeQuery(queryContextReq);
@@ -36,18 +40,32 @@ public class PluginRecognizeTest extends BasePluginTest{

    @Test
    public void webPageRecognizeWithQueryFilter() throws Exception {
-        PluginMockConfiguration.mockEmbeddingRecognize(pluginManager, "在超音数最近的情况怎么样","1");
+        PluginMockConfiguration.mockEmbeddingRecognize(pluginManager, "在超音数最近的情况怎么样", "1");
        PluginMockConfiguration.mockEmbeddingUrl(embeddingConfig);
        QueryReq queryRequest = DataUtils.getQueryContextReq(1000, "在超音数最近的情况怎么样");
        QueryFilters queryFilters = new QueryFilters();
        QueryFilter queryFilter = new QueryFilter();
        queryFilter.setElementID(2L);
        queryFilter.setValue("alice");
-        queryRequest.setDomainId(1L);
+        queryRequest.setModelId(1L);
        queryFilters.getFilters().add(queryFilter);
        queryRequest.setQueryFilters(queryFilters);
        QueryResult queryResult = queryService.executeQuery(queryRequest);
        assertPluginRecognizeResult(queryResult);
    }

+    @Test
+    public void contentInterpretRecognize() throws Exception {
+        PluginMockConfiguration.mockEmbeddingRecognize(pluginManager, "超音数最近访问情况怎么样", "3");
+        PluginMockConfiguration.mockEmbeddingUrl(embeddingConfig);
+        LLmAnswerResp lLmAnswerResp = new LLmAnswerResp();
+        lLmAnswerResp.setAssistant_message("超音数最近访问情况不错");
+        PluginMockConfiguration.mockPluginManagerDoRequest(pluginManager, "answer_with_plugin_call",
+                ResponseEntity.ok(JSONObject.toJSONString(lLmAnswerResp)));
+        QueryReq queryRequest = DataUtils.getQueryContextReq(1000, "超音数最近访问情况怎么样");
+        QueryResult queryResult = queryService.executeQuery(queryRequest);
+        Assert.assertEquals(queryResult.getResponse(), lLmAnswerResp.getAssistant_message());
+        System.out.println();
+    }
+
 }
--- a/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java
+++ b/launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java
@@ -1,5 +1,7 @@
 package com.tencent.supersonic.util;

+import static java.time.LocalDate.now;
+
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.SchemaElement;
 import com.tencent.supersonic.chat.api.pojo.SchemaElementType;
@@ -7,11 +9,8 @@ import com.tencent.supersonic.chat.api.pojo.request.QueryFilter;
 import com.tencent.supersonic.chat.api.pojo.request.QueryReq;
 import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
-
 import java.util.Set;

-import static java.time.LocalDate.now;
-
 public class DataUtils {

    private static final User user_test = new User(1L, "admin", "admin", "admin@email");
@@ -34,9 +33,9 @@ public class DataUtils {
                .build();
    }

-    public static SchemaElement getMetric(Long domainId, Long id, String name, String bizName) {
+    public static SchemaElement getMetric(Long modelId, Long id, String name, String bizName) {
        return SchemaElement.builder()
-                .domain(domainId)
+                .model(modelId)
                .id(id)
                .name(name)
                .bizName(bizName)
@@ -45,9 +44,9 @@ public class DataUtils {
                .build();
    }

-    public static SchemaElement getDimension(Long domainId, Long id, String name, String bizName) {
+    public static SchemaElement getDimension(Long modelId, Long id, String name, String bizName) {
        return SchemaElement.builder()
-                .domain(domainId)
+                .model(modelId)
                .id(id)
                .name(name)
                .bizName(bizName)
@@ -56,8 +55,9 @@ public class DataUtils {
                .build();
    }

-    public static QueryFilter getFilter(String bizName, FilterOperatorEnum filterOperatorEnum, Object value, String name,
-                                        Long elementId) {
+    public static QueryFilter getFilter(String bizName, FilterOperatorEnum filterOperatorEnum, Object value,
+            String name,
+            Long elementId) {
        QueryFilter filter = new QueryFilter();
        filter.setBizName(bizName);
        filter.setOperator(filterOperatorEnum);
@@ -77,7 +77,8 @@ public class DataUtils {
        return dateInfo;
    }

-    public static DateConf getDateConf(DateConf.DateMode dateMode, Integer unit, String period, String startDate, String endDate) {
+    public static DateConf getDateConf(DateConf.DateMode dateMode, Integer unit, String period, String startDate,
+            String endDate) {
        DateConf dateInfo = new DateConf();
        dateInfo.setUnit(unit);
        dateInfo.setDateMode(dateMode);
--- a/launchers/standalone/src/test/resources/META-INF/spring.factories
+++ b/launchers/standalone/src/test/resources/META-INF/spring.factories
@@ -1,24 +1,18 @@
 com.tencent.supersonic.chat.api.component.SchemaMapper=\
    com.tencent.supersonic.chat.mapper.HanlpDictMapper
-
 com.tencent.supersonic.chat.api.component.SemanticParser=\
    com.tencent.supersonic.chat.parser.rule.QueryModeParser, \
    com.tencent.supersonic.chat.parser.rule.ContextInheritParser, \
    com.tencent.supersonic.chat.parser.rule.TimeRangeParser, \
    com.tencent.supersonic.chat.parser.rule.AggregateTypeParser
 #    com.tencent.supersonic.chat.parser.llm.DSLQueryFunction
-
 com.tencent.supersonic.chat.api.component.QueryProcessor=\
    com.tencent.supersonic.chat.application.processor.SemanticQueryProcessor
-
 com.tencent.supersonic.chat.api.component.SemanticLayer=\
    com.tencent.supersonic.knowledge.semantic.LocalSemanticLayer
-
 com.tencent.supersonic.chat.query.QuerySelector=\
   com.tencent.supersonic.chat.query.HeuristicQuerySelector
-
 com.tencent.supersonic.chat.application.query.DomainResolver=\
  com.tencent.supersonic.chat.application.query.HeuristicDomainResolver
-
 com.tencent.supersonic.auth.authentication.interceptor.AuthenticationInterceptor=\
    com.tencent.supersonic.auth.authentication.interceptor.DefaultAuthenticationInterceptor
--- a/launchers/standalone/src/test/resources/db/data-h2.sql
+++ b/launchers/standalone/src/test/resources/db/data-h2.sql
--- a/launchers/standalone/src/test/resources/db/schema-h2.sql
+++ b/launchers/standalone/src/test/resources/db/schema-h2.sql
--- a/launchers/standalone/src/test/resources/logback-spring.xml
+++ b/launchers/standalone/src/test/resources/logback-spring.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true">
    <contextName>logback</contextName>
-<!--    <property name="LOG_PATH" value="${logback.logdir:-logs}"/>-->
+    <!--    <property name="LOG_PATH" value="${logback.logdir:-logs}"/>-->
    <property name="LOG_PATH" value="${LOG_PATH:-logs}"/>
    <property name="LOG_APPNAME" value="chat"/>
    <!--输出到控制台-->
    <appender name="consoleLog" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
-            <pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} %line  - %msg%n</pattern>
+            <pattern>%d{HH:mm:ss} [%thread] %-5level %logger{36} %line - %msg%n</pattern>
        </encoder>
    </appender>

@@ -46,7 +46,8 @@
        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
-            <FileNamePattern>${LOG_PATH}/error.${LOG_APPNAME}.%d{yyyy-MM-dd}.log.gz</FileNamePattern>
+            <FileNamePattern>${LOG_PATH}/error.${LOG_APPNAME}.%d{yyyy-MM-dd}.log.gz
+            </FileNamePattern>
            <!--只保留最近90天的日志-->
            <maxHistory>90</maxHistory>
            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->
@@ -74,7 +75,8 @@
        <!--滚动策略，按照时间滚动 TimeBasedRollingPolicy-->
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <!--文件路径,定义了日志的切分方式——把每一天的日志归档到一个文件中,以防止日志填满整个磁盘空间-->
-            <FileNamePattern>${LOG_PATH}/serviceinfo.${LOG_APPNAME}.%d{yyyy-MM-dd}.log.gz</FileNamePattern>
+            <FileNamePattern>${LOG_PATH}/serviceinfo.${LOG_APPNAME}.%d{yyyy-MM-dd}.log.gz
+            </FileNamePattern>
            <!--只保留最近30天的日志-->
            <maxHistory>30</maxHistory>
            <!--用来指定日志文件的上限大小，那么到了这个值，就会删除旧的日志-->