(fix)(headless)Updating dimension should update modelDetail as well.

2025-12-10 19:18:23 +00:00 · 2025-03-19 10:05:04 +08:00
parent 1c85bcecc5
commit 35b835172b
8 changed files with 62 additions and 52 deletions
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/MemoryServiceImpl.java
@@ -34,7 +34,7 @@ import java.util.stream.Collectors;

@Service
@Slf4j
-public class MemoryServiceImpl implements MemoryService , CommandLineRunner {
+public class MemoryServiceImpl implements MemoryService, CommandLineRunner {

    @Autowired
    private ChatMemoryRepository chatMemoryRepository;
@@ -195,12 +195,14 @@ public class MemoryServiceImpl implements MemoryService , CommandLineRunner {
    public void run(String... args) { // 优化，启动时检查，向量数据，将记忆放到向量数据库
        loadSysExemplars();
    }
+
    public void loadSysExemplars() {
        try {
-            List<ChatMemory> memories =
-                    this.getMemories(ChatMemoryFilter.builder().status(MemoryStatus.ENABLED).build());
-            for(ChatMemory memory:memories){
-                exemplarService.storeExemplar(embeddingConfig.getMemoryCollectionName(memory.getAgentId()),
+            List<ChatMemory> memories = this
+                    .getMemories(ChatMemoryFilter.builder().status(MemoryStatus.ENABLED).build());
+            for (ChatMemory memory : memories) {
+                exemplarService.storeExemplar(
+                        embeddingConfig.getMemoryCollectionName(memory.getAgentId()),
                        Text2SQLExemplar.builder().question(memory.getQuestion())
                                .sideInfo(memory.getSideInfo()).dbSchema(memory.getDbSchema())
                                .sql(memory.getS2sql()).build());
--- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Dimension.java
+++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/Dimension.java
@@ -3,10 +3,12 @@ package com.tencent.supersonic.headless.api.pojo;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.headless.api.pojo.enums.DimensionType;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;

@Data
+@Builder
@AllArgsConstructor
@NoArgsConstructor
 public class Dimension {
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SelectCorrector.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SelectCorrector.java
@@ -45,7 +45,7 @@ public class SelectCorrector extends BaseSemanticCorrector {
        }
        needAddFields.removeAll(selectFields);

-        if (!SqlSelectHelper.hasSubSelect(correctS2SQL)) { //优化内容 ， 如果sql 条件包含了这个字段，而且是全等，则不再查询该字段
+        if (!SqlSelectHelper.hasSubSelect(correctS2SQL)) { // 优化内容 ， 如果sql 条件包含了这个字段，而且是全等，则不再查询该字段
            List<FieldExpression> tmp4 = SqlSelectHelper.getWhereExpressions(correctS2SQL);
            Iterator<String> it = needAddFields.iterator();
            while (it.hasNext()) {
--- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/KeywordMapper.java
+++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/KeywordMapper.java
@@ -75,7 +75,9 @@ public class KeywordMapper extends BaseMapper {
                    continue;
                }
                Long elementID = NatureHelper.getElementID(nature);
-                if (elementID == null)continue; //  判空优化
+                if (elementID == null) {
+                    continue;
+                }
                SchemaElement element = getSchemaElement(dataSetId, elementType, elementID,
                        chatQueryContext.getSemanticSchema());
                if (Objects.isNull(element)) {
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/ModelService.java
@@ -3,13 +3,11 @@ package com.tencent.supersonic.headless.server.service;
 import com.tencent.supersonic.common.pojo.ItemDateResp;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
+import com.tencent.supersonic.headless.api.pojo.Dimension;
 import com.tencent.supersonic.headless.api.pojo.ItemDateFilter;
 import com.tencent.supersonic.headless.api.pojo.MetaFilter;
 import com.tencent.supersonic.headless.api.pojo.ModelSchema;
-import com.tencent.supersonic.headless.api.pojo.request.FieldRemovedReq;
-import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq;
-import com.tencent.supersonic.headless.api.pojo.request.ModelBuildReq;
-import com.tencent.supersonic.headless.api.pojo.request.ModelReq;
+import com.tencent.supersonic.headless.api.pojo.request.*;
 import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp;
 import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
 import com.tencent.supersonic.headless.api.pojo.response.UnAvailableItemResp;
@@ -54,4 +52,6 @@ public interface ModelService {
    DatabaseResp getDatabaseByModelId(Long modelId);

    void batchUpdateStatus(MetaBatchReq metaBatchReq, User user);
+
+    Dimension updateDimension(DimensionReq dimensionReq, User user);
 }
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java
@@ -84,6 +84,10 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
        DimensionDO dimensionDO = DimensionConverter.convert2DimensionDO(dimensionReq);
        dimensionRepository.createDimension(dimensionDO);
        sendEventBatch(Lists.newArrayList(dimensionDO), EventType.ADD);
+
+        // should update modelDetail
+        modelService.updateDimension(dimensionReq, user);
+
        return DimensionConverter.convert2DimensionResp(dimensionDO);
    }

@@ -136,6 +140,9 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
        String oldName = dimensionDO.getName();
        DimensionConverter.convert(dimensionDO, dimensionReq);
        dimensionRepository.updateDimension(dimensionDO);
+        // should update modelDetail as well
+        modelService.updateDimension(dimensionReq, user);
+
        if (!oldName.equals(dimensionDO.getName())) {
            sendEvent(getDataItem(dimensionDO), EventType.UPDATE);
        }
--- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java
+++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java
@@ -2,52 +2,24 @@ package com.tencent.supersonic.headless.server.service.impl;

 import com.google.common.collect.Lists;
 import com.tencent.supersonic.auth.api.authentication.service.UserService;
-import com.tencent.supersonic.common.pojo.DataEvent;
-import com.tencent.supersonic.common.pojo.DataItem;
-import com.tencent.supersonic.common.pojo.ItemDateResp;
-import com.tencent.supersonic.common.pojo.ModelRela;
-import com.tencent.supersonic.common.pojo.User;
+import com.tencent.supersonic.common.pojo.*;
 import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.common.pojo.enums.EventType;
 import com.tencent.supersonic.common.pojo.enums.StatusEnum;
 import com.tencent.supersonic.common.pojo.enums.TypeEnums;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.headless.api.pojo.DBColumn;
-import com.tencent.supersonic.headless.api.pojo.DbSchema;
-import com.tencent.supersonic.headless.api.pojo.Dimension;
-import com.tencent.supersonic.headless.api.pojo.Identify;
-import com.tencent.supersonic.headless.api.pojo.ItemDateFilter;
-import com.tencent.supersonic.headless.api.pojo.Measure;
-import com.tencent.supersonic.headless.api.pojo.MetaFilter;
-import com.tencent.supersonic.headless.api.pojo.ModelSchema;
-import com.tencent.supersonic.headless.api.pojo.request.DateInfoReq;
-import com.tencent.supersonic.headless.api.pojo.request.DimensionReq;
-import com.tencent.supersonic.headless.api.pojo.request.FieldRemovedReq;
-import com.tencent.supersonic.headless.api.pojo.request.MetaBatchReq;
-import com.tencent.supersonic.headless.api.pojo.request.MetricReq;
-import com.tencent.supersonic.headless.api.pojo.request.ModelBuildReq;
-import com.tencent.supersonic.headless.api.pojo.request.ModelReq;
-import com.tencent.supersonic.headless.api.pojo.response.DataSetResp;
-import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp;
-import com.tencent.supersonic.headless.api.pojo.response.DimensionResp;
-import com.tencent.supersonic.headless.api.pojo.response.DomainResp;
-import com.tencent.supersonic.headless.api.pojo.response.MetricResp;
-import com.tencent.supersonic.headless.api.pojo.response.ModelResp;
-import com.tencent.supersonic.headless.api.pojo.response.UnAvailableItemResp;
+import com.tencent.supersonic.headless.api.pojo.*;
+import com.tencent.supersonic.headless.api.pojo.enums.DimensionType;
+import com.tencent.supersonic.headless.api.pojo.request.*;
+import com.tencent.supersonic.headless.api.pojo.response.*;
 import com.tencent.supersonic.headless.server.modeller.SemanticModeller;
 import com.tencent.supersonic.headless.server.persistence.dataobject.DateInfoDO;
 import com.tencent.supersonic.headless.server.persistence.dataobject.ModelDO;
 import com.tencent.supersonic.headless.server.persistence.repository.DateInfoRepository;
 import com.tencent.supersonic.headless.server.persistence.repository.ModelRepository;
 import com.tencent.supersonic.headless.server.pojo.ModelFilter;
-import com.tencent.supersonic.headless.server.service.DataSetService;
-import com.tencent.supersonic.headless.server.service.DatabaseService;
-import com.tencent.supersonic.headless.server.service.DimensionService;
-import com.tencent.supersonic.headless.server.service.DomainService;
-import com.tencent.supersonic.headless.server.service.MetricService;
-import com.tencent.supersonic.headless.server.service.ModelRelaService;
-import com.tencent.supersonic.headless.server.service.ModelService;
+import com.tencent.supersonic.headless.server.service.*;
 import com.tencent.supersonic.headless.server.utils.CoreComponentFactory;
 import com.tencent.supersonic.headless.server.utils.ModelConverter;
 import com.tencent.supersonic.headless.server.utils.NameCheckUtils;
@@ -62,12 +34,7 @@ import org.springframework.util.CollectionUtils;

 import java.sql.SQLException;
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 import java.util.stream.Collectors;

@Service
@@ -553,6 +520,35 @@ public class ModelServiceImpl implements ModelService {
        modelRepository.batchUpdate(modelDOS);
    }

+    @Override
+    public Dimension updateDimension(DimensionReq dimensionReq, User user) {
+        ModelDO modelDO = getModelDO(dimensionReq.getModelId());
+        ModelDetail modelDetail = JsonUtil.toObject(modelDO.getModelDetail(), ModelDetail.class);
+        Optional<Dimension> dimOptional = modelDetail.getDimensions().stream()
+                .filter(dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
+                .findFirst();
+        Dimension result;
+        if (dimOptional.isPresent()) {
+            Dimension dimension = dimOptional.get();
+            dimension.setExpr(dimensionReq.getExpr());
+            dimension.setName(dimensionReq.getName());
+            dimension.setType(DimensionType.valueOf(dimensionReq.getType()));
+            dimension.setDescription(dimensionReq.getDescription());
+            result = dimension;
+        } else {
+            Dimension dimension = Dimension.builder().name(dimensionReq.getName())
+                    .bizName(dimensionReq.getBizName()).expr(dimensionReq.getExpr())
+                    .type(DimensionType.valueOf(dimensionReq.getType()))
+                    .description(dimensionReq.getDescription()).build();
+            modelDetail.getDimensions().add(dimension);
+            result = dimension;
+        }
+
+        modelDO.setModelDetail(JsonUtil.toString(modelDetail));
+        modelRepository.updateModel(modelDO);
+        return result;
+    }
+
    protected ModelDO getModelDO(Long id) {
        return modelRepository.getModelById(id);
    }
--- a/headless/server/src/test/java/com/tencent/supersonic/headless/server/utils/SqlVariableParseUtilsTest.java
+++ b/headless/server/src/test/java/com/tencent/supersonic/headless/server/utils/SqlVariableParseUtilsTest.java
@@ -36,7 +36,8 @@ public class SqlVariableParseUtilsTest {

    @Test
    void testParseSql_if() {
-        String sql = "select * from t_$interval$ where id = $id$ $if(name)$and name = $name$$endif$";
+        String sql =
+                "select * from t_$interval$ where id = $id$ $if(name)$and name = $name$$endif$";
        List<SqlVariable> variables = Lists.newArrayList(mockNumSqlVariable(),
                mockExprSqlVariable(), mockStrSqlVariable());
        List<Param> params =