[improvement][launcher]Refactor built-in demos.

tencentmusic · Nov 10, 2024 · 5368e0b · 5368e0b
1 parent 14a19a9
commit 5368e0b
Show file tree

Hide file tree

Showing 19 changed files with 2,464 additions and 2,810 deletions.
diff --git a/...n/java/com/tencent/supersonic/chat/server/processor/execute/MetricRecommendProcessor.java b/...n/java/com/tencent/supersonic/chat/server/processor/execute/MetricRecommendProcessor.java
@@ -39,7 +39,8 @@ public void process(ExecuteContext executeContext, QueryResult queryResult) {
     }
 
     private void fillSimilarMetric(SemanticParseInfo parseInfo) {
-        if (!parseInfo.getQueryType().equals(QueryType.AGGREGATE)
+        if (Objects.isNull(parseInfo.getQueryType())
+                || !parseInfo.getQueryType().equals(QueryType.AGGREGATE)
                 || parseInfo.getMetrics().size() > METRIC_RECOMMEND_SIZE
                 || CollectionUtils.isEmpty(parseInfo.getMetrics())) {
             return;

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -62,7 +62,9 @@ services:
       sleep 15 &&
       if ! mysql -h supersonic_mysql -usupersonic_user -psupersonic_password -e 'use supersonic_db; show tables;' | grep -q 's2_database'; then
         mysql -h supersonic_mysql -usupersonic_user -psupersonic_password supersonic_db < /usr/src/app/supersonic-standalone-${SUPERSONIC_VERSION:-latest}/conf/db/schema-mysql.sql &&
-        mysql -h supersonic_mysql -usupersonic_user -psupersonic_password supersonic_db < /usr/src/app/supersonic-standalone-${SUPERSONIC_VERSION:-latest}/conf/db/data-mysql.sql
+        mysql -h supersonic_mysql -usupersonic_user -psupersonic_password supersonic_db < /usr/src/app/supersonic-standalone-${SUPERSONIC_VERSION:-latest}/conf/db/schema-mysql-demo.sql &&
+        mysql -h supersonic_mysql -usupersonic_user -psupersonic_password supersonic_db < /usr/src/app/supersonic-standalone-${SUPERSONIC_VERSION:-latest}/conf/db/data-mysql.sql &&
+        mysql -h supersonic_mysql -usupersonic_user -psupersonic_password supersonic_db < /usr/src/app/supersonic-standalone-${SUPERSONIC_VERSION:-latest}/conf/db/data-mysql-demo.sql
       else
         echo 'Database already initialized.'
       fi

diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/CspiderDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/CspiderDemo.java
diff --git a/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java b/launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java
@@ -8,6 +8,8 @@
 import com.tencent.supersonic.chat.server.service.PluginService;
 import com.tencent.supersonic.common.config.ChatModel;
 import com.tencent.supersonic.common.pojo.User;
+import com.tencent.supersonic.common.pojo.enums.StatusEnum;
+import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.common.service.ChatModelService;
 import com.tencent.supersonic.common.util.AESEncryptionUtil;
 import com.tencent.supersonic.headless.api.pojo.DataSetModelConfig;
@@ -17,6 +19,8 @@
 import com.tencent.supersonic.headless.api.pojo.enums.DataType;
 import com.tencent.supersonic.headless.api.pojo.enums.TagDefineType;
 import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq;
+import com.tencent.supersonic.headless.api.pojo.request.DictItemReq;
+import com.tencent.supersonic.headless.api.pojo.request.DictSingleTaskReq;
 import com.tencent.supersonic.headless.api.pojo.request.TagReq;
 import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp;
 import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
@@ -198,4 +202,11 @@ protected RelateDimension getRelateDimension(List<Long> dimensionIds) {
     protected void updateQueryScore(Integer queryId) {
         chatManageService.updateFeedback(queryId, 5, "");
     }
+
+    protected void enableDimensionValue(DimensionResp dimension) {
+        dictConfService.addDictConf(DictItemReq.builder().type(TypeEnums.DIMENSION)
+                .itemId(dimension.getId()).status(StatusEnum.ONLINE).build(), defaultUser);
+        dictTaskService.addDictTask(DictSingleTaskReq.builder().itemId(dimension.getId())
+                .type(TypeEnums.DIMENSION).build(), defaultUser);
+    }
 }