[feature](headless)Add request user to data events.

CLAUDE.md

@@ -1,113 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
-
-## Build Commands
-
-### Backend (Java/Maven)
-
-```bash
-# Clean build (skip tests)
-mvn clean package -DskipTests -Dspotless.skip=true
-
-# Run all tests
-mvn test
-
-# Run single test class
-mvn test -Dtest=ClassName
-
-# Full CI build
-mvn -B package --file pom.xml
-```
-
-**Requirements:** Java 21, Maven
-
-### Frontend (pnpm/React)
-
-```bash
-cd webapp
-
-# Install dependencies
-pnpm install
-
-# Start dev server (port 9000)
-pnpm dev
-
-# Production build
-pnpm build
-
-# Run tests
-pnpm test
-```
-
-**Requirements:** Node.js >=16, pnpm 9.12.3+
-
-### Quick Start
-
-```bash
-# Build full release
-./assembly/bin/supersonic-build.sh standalone
-
-# Start service
-./assembly/bin/supersonic-daemon.sh start
-
-# Stop service
-./assembly/bin/supersonic-daemon.sh stop
-```
-
-Visit http://localhost:9080 after startup.
-
-## Architecture Overview
-
-SuperSonic unifies **Chat BI** (LLM-powered) and **Headless BI** (semantic layer) paradigms.
-
-### Core Modules
-
-```
-supersonic/
-├── auth/           # Authentication & authorization (SPI-based)
-├── chat/           # Chat BI module - LLM-powered Q&A interface
-├── common/         # Shared utilities
-├── headless/       # Headless BI - semantic layer with open API
-├── launchers/      # Application entry points
-│   ├── standalone/ # Combined Chat + Headless (default)
-│   ├── chat/       # Chat-only service
-│   └── headless/   # Headless-only service
-└── webapp/         # Frontend React app (UmiJS 4 + Ant Design)
-```
-
-### Data Flow
-
-1. **Knowledge Base**: Extracts schema from semantic models, builds dictionary/index for schema mapping
-2. **Schema Mapper**: Identifies metrics/dimensions/entities/values in user queries
-3. **Semantic Parser**: Generates S2SQL (semantic SQL) using rule-based and LLM-based parsers
-4. **Semantic Corrector**: Validates and corrects semantic queries
-5. **Semantic Translator**: Converts S2SQL to executable SQL
-
-### Key Entry Points
-
-- `StandaloneLauncher.java` - Combined service with `scanBasePackages: ["com.tencent.supersonic", "dev.langchain4j"]`
-- `ChatLauncher.java` - Chat BI only
-- `HeadlessLauncher.java` - Headless BI only
-
-## Key Technologies
-
-**Backend:** Spring Boot 3.3.9, MyBatis-Plus 3.5.10.1, LangChain4j 0.36.2, JSqlParser 4.9, Calcite 1.38.0
-
-**Frontend:** React 18, UmiJS 4, Ant Design 5.17.4, ECharts 5.0.2, AntV G6/X6
-
-**Databases:** MySQL, PostgreSQL (with pgvector), H2, ClickHouse, StarRocks, Presto, Trino, DuckDB
-
-## Testing
-
-**Java tests:** JUnit 5, Mockito. Located in `src/test/java/` of each module.
-
-**Frontend tests:** Jest with Puppeteer environment in `webapp/packages/supersonic-fe/`
-
-**Evaluation scripts:** Python scripts in `evaluation/` directory for Text2SQL accuracy testing.
-
-## Related Documentation
-
-- [README.md](README.md) - English documentation
-- [README_CN.md](README_CN.md) - Chinese documentation
-- [Evaluation Guide](evaluation/README.md) - Text2SQL evaluation process

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/request/UserReq.java

@@ -15,6 +15,4 @@ public class UserReq {
 
     @NotBlank(message = "password can not be null")
     private String newPassword;
-
-    private String role;
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/request/ChatExecuteReq.java

@@ -18,5 +18,4 @@ public class ChatExecuteReq {
     private int parseId;
     private String queryText;
     private boolean saveAnswer;
-    private boolean streamingResult;
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/response/QueryResp.java

@@ -13,7 +13,6 @@ public class QueryResp {
     private Long questionId;
     private Date createTime;
     private Long chatId;
-    private Integer agentId;
     private Integer score;
     private String feedback;
     private String queryText;

chat/server/src/main/java/com/tencent/supersonic/chat/server/parser/NL2SQLParser.java

@@ -32,7 +32,6 @@ import dev.langchain4j.model.input.PromptTemplate;
 import dev.langchain4j.model.output.Response;
 import dev.langchain4j.provider.ModelProvider;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -172,6 +171,10 @@ public class NL2SQLParser implements ChatQueryParser {
             return;
         }
 
+        // derive mapping result of current question and parsing result of last question.
+        ChatLayerService chatLayerService = ContextUtils.getBean(ChatLayerService.class);
+        MapResp currentMapResult = chatLayerService.map(queryNLReq);
+
         List<QueryResp> historyQueries =
                 getHistoryQueries(parseContext.getRequest().getChatId(), 1);
         if (historyQueries.isEmpty()) {
@@ -179,18 +182,12 @@ public class NL2SQLParser implements ChatQueryParser {
         }
         QueryResp lastQuery = historyQueries.get(0);
         SemanticParseInfo lastParseInfo = lastQuery.getParseInfos().get(0);
-        String histSQL = lastParseInfo.getSqlInfo().getCorrectedS2SQL();
-        if (StringUtils.isBlank(histSQL)) // 优化性能,如果问答不是chat bi 则无需重写，因为数据都不全
-            return;
-
-        // derive mapping result of current question and parsing result of last question.
-        ChatLayerService chatLayerService = ContextUtils.getBean(ChatLayerService.class);
-        MapResp currentMapResult = chatLayerService.map(queryNLReq); // 优化性能 ,只有满足条件才mapping
-
         Long dataId = lastParseInfo.getDataSetId();
+
         String curtMapStr =
                 generateSchemaPrompt(currentMapResult.getMapInfo().getMatchedElements(dataId));
         String histMapStr = generateSchemaPrompt(lastParseInfo.getElementMatches());
+        String histSQL = lastParseInfo.getSqlInfo().getCorrectedS2SQL();
 
         Map<String, Object> variables = new HashMap<>();
         variables.put("current_question", currentMapResult.getQueryText());

chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/DataInterpretProcessor.java

@@ -1,20 +1,13 @@
 package com.tencent.supersonic.chat.server.processor.execute;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.server.agent.Agent;
-import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO;
-import com.tencent.supersonic.chat.server.persistence.repository.ChatQueryRepository;
 import com.tencent.supersonic.chat.server.pojo.ExecuteContext;
 import com.tencent.supersonic.common.pojo.ChatApp;
 import com.tencent.supersonic.common.pojo.enums.AppModule;
 import com.tencent.supersonic.common.util.ChatAppManager;
-import com.tencent.supersonic.common.util.ContextUtils;
 import dev.langchain4j.data.message.AiMessage;
-import dev.langchain4j.model.StreamingResponseHandler;
 import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.input.Prompt;
 import dev.langchain4j.model.input.PromptTemplate;
 import dev.langchain4j.model.output.Response;
@@ -31,10 +24,8 @@ import java.util.Objects;
  * DataInterpretProcessor interprets query result to make it more readable to the users.
  */
 public class DataInterpretProcessor implements ExecuteResultProcessor {
-    public static String tip = "AI 回答中...\r\n";
-    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
 
-    private static Map<Long, StringBuffer> resultCache = new HashMap<>();
+    private static final Logger keyPipelineLog = LoggerFactory.getLogger("keyPipeline");
 
     public static final String APP_KEY = "DATA_INTERPRETER";
     private static final String INSTRUCTION = ""
@@ -50,16 +41,6 @@ public class DataInterpretProcessor implements ExecuteResultProcessor {
                 .appModule(AppModule.CHAT).description("通过大模型对结果数据做提炼总结").enable(false).build());
     }
 
-    public static String getTextSummary(Long queryId) {
-        if (resultCache.get(queryId) != null) {
-            return resultCache.get(queryId).toString();
-        }
-        return "";
-    }
-
-    public static Map<Long, StringBuffer> getResultCache() {
-        return resultCache;
-    }
 
     @Override
     public boolean accept(ExecuteContext executeContext) {
@@ -90,49 +71,14 @@ public class DataInterpretProcessor implements ExecuteResultProcessor {
         variable.put("data", queryResult.getTextResult());
 
         Prompt prompt = PromptTemplate.from(chatApp.getPrompt()).apply(variable);
-        if (executeContext.getRequest().isStreamingResult()) {
-            StreamingChatLanguageModel chatLanguageModel =
-                    ModelProvider.getChatStreamingModel(chatApp.getChatModelConfig());
-            final Long queryId = executeContext.getRequest().getQueryId();
-            resultCache.put(queryId, new StringBuffer(tip));
-            chatLanguageModel.generate(prompt.toUserMessage(),
-                    new StreamingResponseHandler<AiMessage>() {
-                        @Override
-                        public void onNext(String token) {
-                            resultCache.get(queryId).append(token);
-                        }
-
-                        @Override
-                        public void onComplete(Response<AiMessage> response) {
-                            ChatQueryRepository chatQueryRepository =
-                                    ContextUtils.getBean(ChatQueryRepository.class);
-                            ChatQueryDO chatQueryDO = chatQueryRepository.getChatQueryDO(queryId);
-                            JSONObject queryResult = JSON.parseObject(chatQueryDO.getQueryResult());
-                            queryResult.put("textSummary",
-                                    resultCache.get(queryId).toString().substring(tip.length()));
-                            chatQueryDO.setQueryResult(queryResult.toJSONString());
-                            chatQueryRepository.updateChatQuery(chatQueryDO);
-                            resultCache.remove(queryId);
-                        }
-
-                        @Override
-                        public void onError(Throwable error) {
-                            error.printStackTrace();
-                            resultCache.remove(queryId);
-                        }
-                    });
-        } else {
         ChatLanguageModel chatLanguageModel =
                 ModelProvider.getChatModel(chatApp.getChatModelConfig());
         Response<AiMessage> response = chatLanguageModel.generate(prompt.toUserMessage());
         String anwser = response.content().text();
-            keyPipelineLog.info("DataInterpretProcessor modelReq:\n{} \nmodelResp:\n{}",
+        keyPipelineLog.info("DataInterpretProcessor modelReq:\n{} \nmodelResp:\n{}", prompt.text(),
-                    prompt.text(), anwser);
+                anwser);
         if (StringUtils.isNotBlank(anwser)) {
             queryResult.setTextSummary(anwser);
         }
     }
-
-
-    }
 }

chat/server/src/main/java/com/tencent/supersonic/chat/server/rest/ChatQueryController.java

@@ -5,7 +5,6 @@ import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatQueryDataReq;
 import com.tencent.supersonic.chat.api.pojo.response.ChatParseResp;
-import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.server.service.ChatQueryService;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException;
@@ -51,14 +50,6 @@ public class ChatQueryController {
         return chatQueryService.execute(chatExecuteReq);
     }
 
-    @PostMapping("getExecuteSummary")
-    public Object getExecuteSummary(@RequestBody ChatExecuteReq chatExecuteReq,
-            HttpServletRequest request, HttpServletResponse response) {
-        chatExecuteReq.setUser(UserHolder.findUser(request, response));
-        QueryResult res = chatQueryService.getTextSummary(chatExecuteReq);
-        return res;
-    }
-
     @PostMapping("/")
     public Object query(@RequestBody ChatParseReq chatParseReq, HttpServletRequest request,
             HttpServletResponse response) throws Exception {

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatManageService.java

@@ -35,8 +35,6 @@ public interface ChatManageService {
 
     QueryResp getChatQuery(Long queryId);
 
-    ChatQueryDO getChatQueryDO(Long queryId);
-
     List<QueryResp> getChatQueries(Integer chatId);
 
     ShowCaseResp queryShowCase(PageQueryInfoReq pageQueryInfoReq, int agentId);

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/ChatQueryService.java

@@ -19,8 +19,6 @@ public interface ChatQueryService {
 
     QueryResult execute(ChatExecuteReq chatExecuteReq) throws Exception;
 
-    QueryResult getTextSummary(ChatExecuteReq chatExecuteReq);
-
     QueryResult parseAndExecute(ChatParseReq chatParseReq);
 
     Object queryData(ChatQueryDataReq chatQueryDataReq, User user) throws Exception;

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatManageServiceImpl.java

@@ -123,11 +123,6 @@ public class ChatManageServiceImpl implements ChatManageService {
         return chatQueryRepository.getChatQuery(queryId);
     }
 
-    @Override
-    public ChatQueryDO getChatQueryDO(Long queryId) {
-        return chatQueryRepository.getChatQueryDO(queryId);
-    }
-
     @Override
     public List<QueryResp> getChatQueries(Integer chatId) {
         List<QueryResp> queries = chatQueryRepository.getChatQueries(chatId);

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/ChatQueryServiceImpl.java

@@ -1,6 +1,5 @@
 package com.tencent.supersonic.chat.server.service.impl;
 
-import com.alibaba.fastjson2.JSON;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.chat.api.pojo.request.ChatExecuteReq;
 import com.tencent.supersonic.chat.api.pojo.request.ChatParseReq;
@@ -10,10 +9,8 @@ import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
 import com.tencent.supersonic.chat.server.agent.Agent;
 import com.tencent.supersonic.chat.server.executor.ChatQueryExecutor;
 import com.tencent.supersonic.chat.server.parser.ChatQueryParser;
-import com.tencent.supersonic.chat.server.persistence.dataobject.ChatQueryDO;
 import com.tencent.supersonic.chat.server.pojo.ExecuteContext;
 import com.tencent.supersonic.chat.server.pojo.ParseContext;
-import com.tencent.supersonic.chat.server.processor.execute.DataInterpretProcessor;
 import com.tencent.supersonic.chat.server.processor.execute.ExecuteResultProcessor;
 import com.tencent.supersonic.chat.server.processor.parse.ParseResultProcessor;
 import com.tencent.supersonic.chat.server.service.AgentService;
@@ -21,11 +18,7 @@ import com.tencent.supersonic.chat.server.service.ChatManageService;
 import com.tencent.supersonic.chat.server.service.ChatQueryService;
 import com.tencent.supersonic.chat.server.util.ComponentFactory;
 import com.tencent.supersonic.chat.server.util.QueryReqConverter;
-import com.tencent.supersonic.common.jsqlparser.FieldExpression;
+import com.tencent.supersonic.common.jsqlparser.*;
-import com.tencent.supersonic.common.jsqlparser.SqlAddHelper;
-import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper;
-import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper;
-import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper;
 import com.tencent.supersonic.common.pojo.User;
 import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum;
 import com.tencent.supersonic.common.util.DateUtils;
@@ -51,11 +44,7 @@ import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.StringValue;
-import net.sf.jsqlparser.expression.operators.relational.ComparisonOperator;
+import net.sf.jsqlparser.expression.operators.relational.*;
-import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
-import net.sf.jsqlparser.expression.operators.relational.InExpression;
-import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
-import net.sf.jsqlparser.expression.operators.relational.ParenthesedExpressionList;
 import net.sf.jsqlparser.schema.Column;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -64,14 +53,7 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 @Slf4j
@@ -128,8 +110,6 @@ public class ChatQueryServiceImpl implements ChatQueryService {
         }
 
         if (!parseContext.needFeedback()) {
-            parseContext.getResponse().getParseTimeCost().setParseTime(System.currentTimeMillis()
-                    - parseContext.getResponse().getParseTimeCost().getParseStartTime());
             chatManageService.batchAddParse(chatParseReq, parseContext.getResponse());
             chatManageService.updateParseCostTime(parseContext.getResponse());
         }
@@ -163,21 +143,6 @@ public class ChatQueryServiceImpl implements ChatQueryService {
         return queryResult;
     }
 
-    @Override
-    public QueryResult getTextSummary(ChatExecuteReq chatExecuteReq) {
-        String text = DataInterpretProcessor.getTextSummary(chatExecuteReq.getQueryId());
-        if (StringUtils.isNotBlank(text)) {
-            QueryResult res = new QueryResult();
-            res.setTextSummary(text);
-            res.setQueryId(chatExecuteReq.getQueryId());
-            return res;
-        } else {
-            ChatQueryDO chatQueryDo = chatManageService.getChatQueryDO(chatExecuteReq.getQueryId());
-            QueryResult res = JSON.parseObject(chatQueryDo.getQueryResult(), QueryResult.class);
-            return res;
-        }
-    }
-
     @Override
     public QueryResult parseAndExecute(ChatParseReq chatParseReq) {
         ChatParseResp parseResp = parse(chatParseReq);

chat/server/src/main/java/com/tencent/supersonic/chat/server/service/impl/PluginServiceImpl.java

@@ -108,7 +108,6 @@ public class PluginServiceImpl implements PluginService {
         if (StringUtils.isNotBlank(pluginQueryReq.getCreatedBy())) {
             queryWrapper.lambda().eq(PluginDO::getCreatedBy, pluginQueryReq.getCreatedBy());
         }
-        queryWrapper.orderByAsc("name");
         List<PluginDO> pluginDOS = pluginRepository.query(queryWrapper);
         if (StringUtils.isNotBlank(pluginQueryReq.getPattern())) {
             pluginDOS = pluginDOS.stream()

common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java

@@ -118,26 +118,22 @@ public class SqlReplaceHelper {
     }
 
     public static void getFromSelect(FromItem fromItem, List<PlainSelect> plainSelectList) {
-        if (!(fromItem instanceof ParenthesedSelect parenthesedSelect)) {
+        if (!(fromItem instanceof ParenthesedSelect)) {
             return;
         }
+        ParenthesedSelect parenthesedSelect = (ParenthesedSelect) fromItem;
         Select select = parenthesedSelect.getSelect();
-        if (select instanceof PlainSelect plainSelect) {
+        if (select instanceof PlainSelect) {
+            PlainSelect plainSelect = (PlainSelect) select;
             plainSelectList.add(plainSelect);
             getFromSelect(plainSelect.getFromItem(), plainSelectList);
-        } else if (select instanceof SetOperationList setOperationList) {
+        } else if (select instanceof SetOperationList) {
+            SetOperationList setOperationList = (SetOperationList) select;
             if (!CollectionUtils.isEmpty(setOperationList.getSelects())) {
                 setOperationList.getSelects().forEach(subSelectBody -> {
-                    if (subSelectBody instanceof PlainSelect subPlainSelect) {
+                    PlainSelect subPlainSelect = (PlainSelect) subSelectBody;
                     plainSelectList.add(subPlainSelect);
                     getFromSelect(subPlainSelect.getFromItem(), plainSelectList);
-                    } else if (subSelectBody instanceof ParenthesedSelect subParenthesedSelect) {
-                        Select innerSelect = subParenthesedSelect.getSelect();
-                        if (innerSelect instanceof PlainSelect innerPlainSelect) {
-                            plainSelectList.add(innerPlainSelect);
-                            getFromSelect(innerPlainSelect.getFromItem(), plainSelectList);
-                        }
-                    }
                 });
             }
         }
@@ -192,13 +188,8 @@ public class SqlReplaceHelper {
                 SetOperationList setOperationList = (SetOperationList) select;
                 if (!CollectionUtils.isEmpty(setOperationList.getSelects())) {
                     setOperationList.getSelects().forEach(subSelectBody -> {
-                        if (subSelectBody instanceof PlainSelect) {
                         PlainSelect subPlainSelect = (PlainSelect) subSelectBody;
                         replaceFieldsInPlainOneSelect(fieldNameMap, exactReplace, subPlainSelect);
-                        } else if (subSelectBody instanceof ParenthesedSelect) {
-                            replaceFieldsInPlainOneSelect(fieldNameMap, exactReplace,
-                                    ((ParenthesedSelect) subSelectBody).getPlainSelect());
-                        }
                     });
                 }
             }

common/src/main/java/com/tencent/supersonic/common/pojo/DataEvent.java

@@ -15,8 +15,7 @@ public class DataEvent extends ApplicationEvent {
 
     private final String userName;
 
-    public DataEvent(Object source, List<DataItem> dataItems, EventType eventType,
+    public DataEvent(Object source, List<DataItem> dataItems, EventType eventType, String userName) {
-            String userName) {
         super(source);
         this.dataItems = dataItems;
         this.eventType = eventType;

common/src/main/java/com/tencent/supersonic/common/service/ChatModelService.java

@@ -15,5 +15,5 @@ public interface ChatModelService {
 
     ChatModel updateChatModel(ChatModel chatModel, User user);
 
-    void deleteChatModel(Integer id, User user);
+    void deleteChatModel(Integer id);
 }

common/src/main/java/com/tencent/supersonic/common/service/impl/ChatModelServiceImpl.java

@@ -79,12 +79,7 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
     }
 
     @Override
-    public void deleteChatModel(Integer id, User user) {
+    public void deleteChatModel(Integer id) {
-        ChatModel chatModel = getChatModel(id);
-        if (!checkAdminPermission(user, chatModel)) {
-            throw new RuntimeException("没有权限删除该大模型");
-        }
-
         removeById(id);
     }
 
@@ -108,13 +103,4 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
         chatModelDO.setConfig(JsonUtil.toString(chatModel.getConfig()));
         return chatModelDO;
     }
-
-    private boolean checkAdminPermission(User user, ChatModel chatModel) {
-        String admin = chatModel.getAdmin();
-        if (user.isSuperAdmin()) {
-            return true;
-        }
-        return admin != null && admin.equals(user.getName())
-                || chatModel.getCreatedBy().equals(user.getName());
-    }
 }

common/src/main/java/com/tencent/supersonic/common/service/impl/SystemConfigServiceImpl.java

@@ -16,7 +16,6 @@ import org.springframework.util.CollectionUtils;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
 
 @Service
 public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigMapper, SystemConfigDO>
@@ -39,8 +38,8 @@ public class SystemConfigServiceImpl extends ServiceImpl<SystemConfigMapper, Sys
         return systemConfigDb;
     }
 
-    private SystemConfig getSystemConfigFromDB() { // 加上id ，如果有多条记录，会出错
+    private SystemConfig getSystemConfigFromDB() {
-        List<SystemConfigDO> list = this.lambdaQuery().eq(SystemConfigDO::getId, 1).list();
+        List<SystemConfigDO> list = list();
         if (CollectionUtils.isEmpty(list)) {
             SystemConfig systemConfig = new SystemConfig();
             systemConfig.setId(1);

common/src/main/java/dev/langchain4j/provider/DifyModelFactory.java

@@ -7,7 +7,6 @@ import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.dify.DifyAiChatModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.openai.OpenAiEmbeddingModel;
-import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
@@ -26,11 +25,6 @@ public class DifyModelFactory implements ModelFactory, InitializingBean {
                 .modelName(modelConfig.getModelName()).timeOut(modelConfig.getTimeOut()).build();
     }
 
-    @Override
-    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
-        throw new RuntimeException("待开发");
-    }
-
     @Override
     public EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModelConfig) {
         return OpenAiEmbeddingModel.builder().baseUrl(embeddingModelConfig.getBaseUrl())

common/src/main/java/dev/langchain4j/provider/InMemoryModelFactory.java

@@ -5,7 +5,6 @@ import com.tencent.supersonic.common.pojo.EmbeddingModelConfig;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.embedding.S2OnnxEmbeddingModel;
-import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
@@ -36,11 +35,6 @@ public class InMemoryModelFactory implements ModelFactory, InitializingBean {
         return EmbeddingModelConstant.BGE_SMALL_ZH_MODEL;
     }
 
-    @Override
-    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
-        throw new RuntimeException("待开发");
-    }
-
     @Override
     public void afterPropertiesSet() {
         ModelProvider.add(PROVIDER, this);

common/src/main/java/dev/langchain4j/provider/LocalAiModelFactory.java

@@ -6,7 +6,6 @@ import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.localai.LocalAiChatModel;
 import dev.langchain4j.model.localai.LocalAiEmbeddingModel;
-import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
@@ -28,11 +27,6 @@ public class LocalAiModelFactory implements ModelFactory, InitializingBean {
                 .build();
     }
 
-    @Override
-    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
-        throw new RuntimeException("待开发");
-    }
-
     @Override
     public EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModel) {
         return LocalAiEmbeddingModel.builder().baseUrl(embeddingModel.getBaseUrl())

common/src/main/java/dev/langchain4j/provider/ModelFactory.java

@@ -4,12 +4,9 @@ import com.tencent.supersonic.common.pojo.ChatModelConfig;
 import com.tencent.supersonic.common.pojo.EmbeddingModelConfig;
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 
 public interface ModelFactory {
     ChatLanguageModel createChatModel(ChatModelConfig modelConfig);
 
-    OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig);
-
     EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModel);
 }

common/src/main/java/dev/langchain4j/provider/ModelProvider.java

@@ -5,9 +5,7 @@ import com.tencent.supersonic.common.pojo.ChatModelConfig;
 import com.tencent.supersonic.common.pojo.EmbeddingModelConfig;
 import com.tencent.supersonic.common.util.ContextUtils;
 import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.chat.StreamingChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
-import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.HashMap;
@@ -43,20 +41,6 @@ public class ModelProvider {
                 "Unsupported ChatLanguageModel provider: " + modelConfig.getProvider());
     }
 
-    public static StreamingChatLanguageModel getChatStreamingModel(ChatModelConfig modelConfig) {
-        if (modelConfig == null || StringUtils.isBlank(modelConfig.getProvider())
-                || StringUtils.isBlank(modelConfig.getBaseUrl())) {
-            modelConfig = DEMO_CHAT_MODEL;
-        }
-        ModelFactory modelFactory = factories.get(modelConfig.getProvider().toUpperCase());
-        if (modelFactory != null) {
-            return modelFactory.createChatStreamingModel(modelConfig);
-        }
-
-        throw new RuntimeException(
-                "Unsupported ChatLanguageModel provider: " + modelConfig.getProvider());
-    }
-
     public static EmbeddingModel getEmbeddingModel() {
         return getEmbeddingModel(null);
     }

common/src/main/java/dev/langchain4j/provider/OllamaModelFactory.java

@@ -6,7 +6,6 @@ import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.ollama.OllamaChatModel;
 import dev.langchain4j.model.ollama.OllamaEmbeddingModel;
-import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
@@ -29,11 +28,6 @@ public class OllamaModelFactory implements ModelFactory, InitializingBean {
                 .logResponses(modelConfig.getLogResponses()).build();
     }
 
-    @Override
-    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
-        throw new RuntimeException("待开发");
-    }
-
     @Override
     public EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModelConfig) {
         return OllamaEmbeddingModel.builder().baseUrl(embeddingModelConfig.getBaseUrl())

common/src/main/java/dev/langchain4j/provider/OpenAiModelFactory.java

@@ -6,7 +6,6 @@ import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.openai.OpenAiChatModel;
 import dev.langchain4j.model.openai.OpenAiEmbeddingModel;
-import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.stereotype.Service;
 
@@ -38,16 +37,6 @@ public class OpenAiModelFactory implements ModelFactory, InitializingBean {
         return openAiChatModelBuilder.build();
     }
 
-    @Override
-    public OpenAiStreamingChatModel createChatStreamingModel(ChatModelConfig modelConfig) {
-        return OpenAiStreamingChatModel.builder().baseUrl(modelConfig.getBaseUrl())
-                .modelName(modelConfig.getModelName()).apiKey(modelConfig.keyDecrypt())
-                .temperature(modelConfig.getTemperature()).topP(modelConfig.getTopP())
-                .timeout(Duration.ofSeconds(modelConfig.getTimeOut()))
-                .logRequests(modelConfig.getLogRequests())
-                .logResponses(modelConfig.getLogResponses()).build();
-    }
-
     @Override
     public EmbeddingModel createEmbeddingModel(EmbeddingModelConfig embeddingModel) {
         return OpenAiEmbeddingModel.builder().baseUrl(embeddingModel.getBaseUrl())

common/src/main/java/dev/langchain4j/store/embedding/TextSegmentConvert.java

@@ -42,6 +42,6 @@ public class TextSegmentConvert {
         if (Objects.isNull(textSegment) || Objects.isNull(textSegment.metadata())) {
             return null;
         }
-        return textSegment.metadata().getString(QUERY_ID);
+        return textSegment.metadata().get(QUERY_ID);
     }
 }

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DictSingleTaskReq.java

@@ -12,6 +12,4 @@ public class DictSingleTaskReq {
     private TypeEnums type;
     @NotNull
     private Long itemId;
-    private String startDate;
-    private String endDate;
 }

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/DimValueAliasReq.java

@@ -4,8 +4,6 @@ import com.tencent.supersonic.headless.api.pojo.DimValueMap;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 
-import java.util.List;
-
 /**
  * @author: kanedai
  * @date: 2024/10/31
@@ -17,7 +15,7 @@ public class DimValueAliasReq {
     private Long id;
 
     /**
-     * alias 为空代表删除 否则更新
+     * alias为空代表删除 否则更新
      */
-    private List<DimValueMap> dimValueMaps;
+    DimValueMap dimValueMaps;
 }

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/PageSchemaItemReq.java

@@ -15,7 +15,6 @@ public class PageSchemaItemReq extends PageBaseReq {
     private String createdBy;
     private List<Long> domainIds = Lists.newArrayList();
     private List<Long> modelIds = Lists.newArrayList();
-    private Long dataSetId;
     private Integer sensitiveLevel;
     private Integer status;
     private String key;

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/KnowledgeBaseService.java

@@ -8,107 +8,43 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.stream.Collectors;
 
 @Service
 @Slf4j
 public class KnowledgeBaseService {
-    private static final Map<Long, List<DictWord>> dimValueAliasMap = new ConcurrentHashMap<>();
+    private static volatile Map<Long, List<DictWord>> dimValueAliasMap = new HashMap<>();
-    private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
 
-    /**
-     * Get dimension value alias map (read-only).
-     *
-     * @return unmodifiable view of the map
-     */
     public static Map<Long, List<DictWord>> getDimValueAlias() {
-        return Collections.unmodifiableMap(dimValueAliasMap);
+        return dimValueAliasMap;
     }
 
-    /**
-     * Add dimension value aliases with deduplication. Thread-safe implementation using
-     * ConcurrentHashMap.
-     *
-     * @param dimId dimension ID
-     * @param newWords new words to add
-     * @return updated list of aliases for the dimension
-     */
     public static List<DictWord> addDimValueAlias(Long dimId, List<DictWord> newWords) {
-        if (dimId == null || CollectionUtils.isEmpty(newWords)) {
-            return dimValueAliasMap.get(dimId);
-        }
-
-        // Use computeIfAbsent and synchronized block for thread safety
-        synchronized (dimValueAliasMap) {
         List<DictWord> dimValueAlias =
-                    dimValueAliasMap.computeIfAbsent(dimId, k -> new ArrayList<>());
+                dimValueAliasMap.containsKey(dimId) ? dimValueAliasMap.get(dimId)
-
+                        : new ArrayList<>();
-            // Build deduplication key set
+        Set<String> wordSet =
-            Set<String> existingKeys = dimValueAlias.stream().map(word -> buildDedupKey(word))
+                dimValueAlias
+                        .stream().map(word -> String.format("%s_%s_%s",
+                                word.getNatureWithFrequency(), word.getWord(), word.getAlias()))
                         .collect(Collectors.toSet());
-
-            // Add new words with deduplication
         for (DictWord dictWord : newWords) {
-                String key = buildDedupKey(dictWord);
+            String key = String.format("%s_%s_%s", dictWord.getNatureWithFrequency(),
-                if (!existingKeys.contains(key)) {
+                    dictWord.getWord(), dictWord.getAlias());
+            if (!wordSet.contains(key)) {
                 dimValueAlias.add(dictWord);
-                    existingKeys.add(key);
             }
         }
-
+        dimValueAliasMap.put(dimId, dimValueAlias);
         return dimValueAlias;
     }
-    }
 
-    /**
-     * Remove dimension value aliases by dimension ID.
-     *
-     * @param dimId dimension ID to remove, or null to clear all
-     */
-    public static void removeDimValueAlias(Long dimId) {
-        if (dimId == null) {
-            dimValueAliasMap.clear();
-            log.info("Cleared all dimension value aliases");
-        } else {
-            dimValueAliasMap.remove(dimId);
-            log.info("Removed dimension value alias for dimId: {}", dimId);
-        }
-    }
-
-    /**
-     * Build deduplication key for DictWord.
-     *
-     * @param word the DictWord object
-     * @return deduplication key string
-     */
-    private static String buildDedupKey(DictWord word) {
-        return String.format("%s_%s_%s", word.getNatureWithFrequency(), word.getWord(),
-                word.getAlias());
-    }
-
-    /**
-     * Update semantic knowledge (incremental add, no clearing). Use this method to add new words
-     * without removing existing data.
-     *
-     * @param natures the words to add
-     */
     public void updateSemanticKnowledge(List<DictWord> natures) {
-        lock.writeLock().lock();
-        try {
-            updateSemanticKnowledgeInternal(natures);
-        } finally {
-            lock.writeLock().unlock();
-        }
-    }
 
-    private void updateSemanticKnowledgeInternal(List<DictWord> natures) {
         List<DictWord> prefixes = natures.stream().filter(
                 entry -> !entry.getNatureWithFrequency().contains(DictWordType.SUFFIX.getType()))
                 .collect(Collectors.toList());
@@ -124,82 +60,52 @@ public class KnowledgeBaseService {
         SearchService.loadSuffix(suffixes);
     }
 
-    /**
-     * Reload all knowledge (full replacement with clearing). Use this method to rebuild the entire
-     * knowledge base.
-     *
-     * @param natures all words to load
-     */
     public void reloadAllData(List<DictWord> natures) {
-        // 1. reload custom knowledge (executed outside lock to avoid long blocking)
+        // 1. reload custom knowledge
         try {
             HanlpHelper.reloadCustomDictionary();
         } catch (Exception e) {
             log.error("reloadCustomDictionary error", e);
         }
 
-        // 2. acquire write lock, clear trie and rebuild (short operation)
+        // 2. update online knowledge
-        lock.writeLock().lock();
-        try {
-            SearchService.clear();
-
         if (CollectionUtils.isNotEmpty(dimValueAliasMap)) {
             for (Long dimId : dimValueAliasMap.keySet()) {
                 natures.addAll(dimValueAliasMap.get(dimId));
             }
         }
-            updateSemanticKnowledgeInternal(natures);
+        updateOnlineKnowledge(natures);
-        } finally {
+    }
-            lock.writeLock().unlock();
+
+    private void updateOnlineKnowledge(List<DictWord> natures) {
+        try {
+            updateSemanticKnowledge(natures);
+        } catch (Exception e) {
+            log.error("updateSemanticKnowledge error", e);
         }
     }
 
     public List<S2Term> getTerms(String text, Map<Long, List<Long>> modelIdToDataSetIds) {
-        lock.readLock().lock();
-        try {
         return HanlpHelper.getTerms(text, modelIdToDataSetIds);
-        } finally {
-            lock.readLock().unlock();
-        }
     }
 
     public List<HanlpMapResult> prefixSearch(String key, int limit,
             Map<Long, List<Long>> modelIdToDataSetIds, Set<Long> detectDataSetIds) {
-        lock.readLock().lock();
-        try {
         return prefixSearchByModel(key, limit, modelIdToDataSetIds, detectDataSetIds);
-        } finally {
-            lock.readLock().unlock();
-        }
     }
 
     public List<HanlpMapResult> prefixSearchByModel(String key, int limit,
             Map<Long, List<Long>> modelIdToDataSetIds, Set<Long> detectDataSetIds) {
-        lock.readLock().lock();
-        try {
         return SearchService.prefixSearch(key, limit, modelIdToDataSetIds, detectDataSetIds);
-        } finally {
-            lock.readLock().unlock();
-        }
     }
 
     public List<HanlpMapResult> suffixSearch(String key, int limit,
             Map<Long, List<Long>> modelIdToDataSetIds, Set<Long> detectDataSetIds) {
-        lock.readLock().lock();
-        try {
         return suffixSearchByModel(key, limit, modelIdToDataSetIds, detectDataSetIds);
-        } finally {
-            lock.readLock().unlock();
-        }
     }
 
     public List<HanlpMapResult> suffixSearchByModel(String key, int limit,
             Map<Long, List<Long>> modelIdToDataSetIds, Set<Long> detectDataSetIds) {
-        lock.readLock().lock();
-        try {
         return SearchService.suffixSearch(key, limit, modelIdToDataSetIds, detectDataSetIds);
-        } finally {
-            lock.readLock().unlock();
-        }
     }
 }

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/MultiCustomDictionary.java

@@ -117,17 +117,9 @@ public class MultiCustomDictionary extends DynamicCustomDictionary {
                         dictWord.setAlias(word.toLowerCase());
                         String[] split = nature.split(DictWordType.NATURE_SPILT);
                         if (split.length >= 2) {
-                            try {
                             Long dimId = Long.parseLong(
                                     nature.split(DictWordType.NATURE_SPILT)[split.length - 1]);
-                                KnowledgeBaseService.addDimValueAlias(dimId,
+                            KnowledgeBaseService.addDimValueAlias(dimId, Arrays.asList(dictWord));
-                                        Arrays.asList(dictWord));
-                            } catch (NumberFormatException e) {
-                                logger.warning(path + " : 非标准文件，不存入KnowledgeBaseService");
-                                return true;
-                            }
-
-
                         }
                     }
                 }

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/SearchService.java

@@ -31,8 +31,8 @@ import java.util.stream.Collectors;
 public class SearchService {
 
     public static final int SEARCH_SIZE = 200;
-    private static volatile BinTrie<List<String>> trie;
+    private static BinTrie<List<String>> trie;
-    private static volatile BinTrie<List<String>> suffixTrie;
+    private static BinTrie<List<String>> suffixTrie;
 
     static {
         trie = new BinTrie<>();

headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/helper/HanlpHelper.java

@@ -100,6 +100,8 @@ public class HanlpHelper {
             FileHelper.deleteCacheFile(HanLP.Config.CustomDictionaryPath);
             FileHelper.resetCustomPath(getDynamicCustomDictionary());
         }
+        // 3.clear trie
+        SearchService.clear();
 
         boolean reload = getDynamicCustomDictionary().reload();
         if (reload) {

headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/DbAdaptorFactory.java

@@ -23,7 +23,6 @@ public class DbAdaptorFactory {
         dbAdaptorMap.put(EngineType.PRESTO.getName(), new PrestoAdaptor());
         dbAdaptorMap.put(EngineType.TRINO.getName(), new TrinoAdaptor());
         dbAdaptorMap.put(EngineType.ORACLE.getName(), new OracleAdaptor());
-        dbAdaptorMap.put(EngineType.TDW.getName(), new DefaultDbAdaptor());
     }
 
     public static DbAdaptor getEngineAdaptor(String engineType) {

headless/core/src/main/java/com/tencent/supersonic/headless/core/translator/parser/calcite/DataModelNode.java

@@ -43,8 +43,15 @@ public class DataModelNode extends SemanticNode {
             }
         } else if (dataModel.getModelDetail().getTableQuery() != null
                 && !dataModel.getModelDetail().getTableQuery().isEmpty()) {
+            if (dataModel.getModelDetail().getDbType()
+                    .equalsIgnoreCase(EngineType.POSTGRESQL.getName())) {
+                String fullTableName = String.join(".public.",
+                        dataModel.getModelDetail().getTableQuery().split("\\."));
+                sqlTable = "SELECT * FROM " + fullTableName;
+            } else {
                 sqlTable = "SELECT * FROM " + dataModel.getModelDetail().getTableQuery();
             }
+        }
 
         // String filterSql = dataModel.getFilterSql();
         String filterSql = dataModel.getModelDetail().getFilterSql();

headless/server/src/main/java/com/tencent/supersonic/headless/server/facade/service/impl/S2SemanticLayerService.java

@@ -123,9 +123,7 @@ public class S2SemanticLayerService implements SemanticLayerService {
 
             // 3 translate query
             QueryStatement queryStatement = buildQueryStatement(queryReq, user);
-            if (!queryStatement.isTranslated()) {
             semanticTranslator.translate(queryStatement);
-            }
 
             // Check whether the dimensions of the metric drill-down are correct temporarily,
             // add the abstraction of a validator later.

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/DictRepositoryImpl.java

@@ -17,11 +17,12 @@ import com.tencent.supersonic.headless.server.service.DimensionService;
 import com.tencent.supersonic.headless.server.utils.DictUtils;
 import com.xkzhangsan.time.utils.CollectionUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
+import org.codehaus.plexus.util.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Repository;
 import org.springframework.util.CollectionUtils;
 
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Objects;

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/repository/impl/MetricRepositoryImpl.java

@@ -109,7 +109,7 @@ public class MetricRepositoryImpl implements MetricRepository {
         if (StringUtils.isNotBlank(metricFilter.getCreatedBy())) {
             queryWrapper.lambda().eq(MetricDO::getCreatedBy, metricFilter.getCreatedBy());
         }
-        if (Objects.nonNull(metricFilter.getIsPublish())) {
+        if (Objects.nonNull(metricFilter.getIsPublish()) && metricFilter.getIsPublish() == 1) {
             queryWrapper.lambda().eq(MetricDO::getIsPublish, metricFilter.getIsPublish());
         }
         if (StringUtils.isNotBlank(metricFilter.getKey())) {

headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/ChatModelController.java

@@ -46,10 +46,8 @@ public class ChatModelController {
     }
 
     @DeleteMapping("/{id}")
-    public boolean deleteModel(@PathVariable("id") Integer id,
+    public boolean deleteModel(@PathVariable("id") Integer id) {
-            HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) {
+        chatModelService.deleteChatModel(id);
-        User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
-        chatModelService.deleteChatModel(id, user);
         return true;
     }
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/rest/DatabaseController.java

@@ -64,10 +64,8 @@ public class DatabaseController {
     }
 
     @DeleteMapping("/{id}")
-    public boolean deleteDatabase(@PathVariable("id") Long id, HttpServletRequest request,
+    public boolean deleteDatabase(@PathVariable("id") Long id) {
-            HttpServletResponse response) {
+        databaseService.deleteDatabase(id);
-        User user = UserHolder.findUser(request, response);
-        databaseService.deleteDatabase(id, user);
         return true;
     }
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/DatabaseService.java

@@ -34,7 +34,7 @@ public interface DatabaseService {
 
     List<DatabaseResp> getDatabaseList(User user);
 
-    void deleteDatabase(Long databaseId, User user);
+    void deleteDatabase(Long databaseId);
 
     List<String> getCatalogs(Long id) throws SQLException;
 

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java

@@ -138,12 +138,7 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
     }
 
     @Override
-    public void deleteDatabase(Long databaseId, User user) {
+    public void deleteDatabase(Long databaseId) {
-        DatabaseResp databaseResp = getDatabase(databaseId);
-        if (!checkAdminPermission(user, databaseResp)) {
-            throw new RuntimeException("没有权限删除该数据库");
-        }
-
         ModelFilter modelFilter = new ModelFilter();
         modelFilter.setDatabaseId(databaseId);
         modelFilter.setIncludesDetail(false);

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DimensionServiceImpl.java

@@ -58,7 +58,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 @Service
@@ -82,8 +81,7 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
 
     public DimensionServiceImpl(DimensionRepository dimensionRepository, ModelService modelService,
             AliasGenerateHelper aliasGenerateHelper, DatabaseService databaseService,
-            ModelRelaService modelRelaService, DataSetService dataSetService,
+            ModelRelaService modelRelaService, DataSetService dataSetService, ApplicationEventPublisher eventPublisher) {
-            ApplicationEventPublisher eventPublisher) {
         this.modelService = modelService;
         this.dimensionRepository = dimensionRepository;
         this.aliasGenerateHelper = aliasGenerateHelper;
@@ -117,11 +115,29 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
                 .collect(Collectors.toMap(DimensionResp::getBizName, a -> a, (k1, k2) -> k1));
 
         List<DimensionReq> dimensionToInsert = Lists.newArrayList();
+        List<DimensionReq> dimensionToUpdate = Lists.newArrayList();
+        List<Long> dimensionToDelete = Lists.newArrayList();
 
         // look for which dimension need to insert, update, delete
-        dimensionReqs.forEach(dimension -> {
+        dimensionReqs.stream().forEach(dimension -> {
             if (!bizNameMap.containsKey(dimension.getBizName())) {
                 dimensionToInsert.add(dimension);
+            } else {
+                DimensionResp dimensionRespByBizName = bizNameMap.get(dimension.getBizName());
+                if (null != dimensionRespByBizName && isChange(dimension, dimensionRespByBizName)) {
+                    dimension.setId(dimensionRespByBizName.getId());
+                    dimension.updatedBy(user.getName());
+                    dimensionToUpdate.add(dimension);
+                }
+            }
+        });
+
+        // the bizNames from alter dimensions
+        List<String> bizNames =
+                dimensionReqs.stream().map(DimensionReq::getBizName).collect(Collectors.toList());
+        bizNameMap.keySet().forEach(bizNameInDb -> {
+            if (!bizNames.contains(bizNameInDb)) {
+                dimensionToDelete.add(bizNameMap.get(bizNameInDb).getId());
             }
         });
 
@@ -130,6 +146,16 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
             createDimensionBatch(dimensionToInsert, user);
         }
 
+        // update
+        if (!CollectionUtils.isEmpty(dimensionToUpdate)) {
+            updateDimensionBatch(dimensionToUpdate, user);
+        }
+
+        // delete
+        if (!CollectionUtils.isEmpty(dimensionToDelete)) {
+            deleteDimensionBatch(dimensionToDelete, user);
+        }
+
     }
 
     @Override
@@ -475,53 +501,31 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
         if (StringUtils.isNotEmpty(dimensionDO.getDimValueMaps())) {
             dimValueMapList = JsonUtil.toList(dimensionDO.getDimValueMaps(), DimValueMap.class);
         }
-
+        DimValueMap dimValueMaps = req.getDimValueMaps();
-        // 预先处理请求列表，设置默认的 techName
+        if (StringUtils.isEmpty(dimValueMaps.getTechName())) {
-        for (DimValueMap dimValueMap : req.getDimValueMaps()) {
+            dimValueMaps.setTechName(dimValueMaps.getValue());
-            if (StringUtils.isEmpty(dimValueMap.getTechName())) {
-                dimValueMap.setTechName(dimValueMap.getValue());
         }
-        }
+        Map<String, DimValueMap> valeAndMapInfo = dimValueMapList.stream()
-
-        // 构建现有数据的 Map，用于快速查找 (value -> DimValueMap)
-        Map<String, DimValueMap> existingMap = dimValueMapList.stream()
                 .collect(Collectors.toMap(DimValueMap::getValue, v -> v, (v1, v2) -> v2));
-
+        String value = dimValueMaps.getValue();
-        // 收集需要删除的 values（alias 为空的）
+        if (CollectionUtils.isEmpty(dimValueMaps.getAlias())) {
-        Set<String> valuesToDelete = req.getDimValueMaps().stream()
+            // 删除
-                .filter(dimValueMap -> CollectionUtils.isEmpty(dimValueMap.getAlias()))
-                .map(DimValueMap::getValue).collect(Collectors.toSet());
-
-        // 一次性删除所有需要删除的数据
-        if (!valuesToDelete.isEmpty()) {
             dimValueMapList =
-                    dimValueMapList.stream().filter(map -> !valuesToDelete.contains(map.getValue()))
+                    dimValueMapList.stream().filter(map -> !map.getValue().equalsIgnoreCase(value))
                             .collect(Collectors.toList());
-            // 同时从 existingMap 中移除
-            existingMap.keySet().removeAll(valuesToDelete);
-        }
-
-        // 处理新增和更新
-        for (DimValueMap dimValueMap : req.getDimValueMaps()) {
-            // 跳过需要删除的
-            if (CollectionUtils.isEmpty(dimValueMap.getAlias())) {
-                continue;
-            }
-
-            String value = dimValueMap.getValue();
-            if (!existingMap.containsKey(value)) {
-                // 新增
-                dimValueMapList.add(dimValueMap);
-                existingMap.put(value, dimValueMap);
         } else {
-                // 更新 - 直接更新已存在的对象
+            // 新增
-                DimValueMap existing = existingMap.get(value);
+            if (!valeAndMapInfo.keySet().contains(value)) {
-                existing.setAlias(dimValueMap.getAlias());
+                dimValueMapList.add(dimValueMaps);
-                existing.setTechName(dimValueMap.getTechName());
+            } else {
-                existing.setBizName(dimValueMap.getBizName());
+                // 更新
+                dimValueMapList.stream().forEach(map -> {
+                    if (map.getValue().equalsIgnoreCase(value)) {
+                        map.setAlias(dimValueMaps.getAlias());
+                    }
+                });
             }
         }
-
         dimensionDO.setDimValueMaps(JsonUtil.toString(dimValueMapList));
         updateById(dimensionDO);
         return true;
@@ -539,16 +543,14 @@ public class DimensionServiceImpl extends ServiceImpl<DimensionDOMapper, Dimensi
                 .domainId(dimensionResp.getDomainId().toString()).type(TypeEnums.DIMENSION).build();
     }
 
-    private DataEvent getDataEvent(List<DimensionDO> dimensionDOS, EventType eventType,
+    private DataEvent getDataEvent(List<DimensionDO> dimensionDOS, EventType eventType, String userName) {
-            String userName) {
         List<DataItem> dataItems = dimensionDOS.stream().map(this::getDataItem)
                 .filter(Objects::nonNull).collect(Collectors.toList());
         return new DataEvent(this, dataItems, eventType, userName);
     }
 
     private void sendEvent(DataItem dataItem, EventType eventType, String userName) {
-        eventPublisher.publishEvent(
+        eventPublisher.publishEvent(new DataEvent(this, Lists.newArrayList(dataItem), eventType, userName));
-                new DataEvent(this, Lists.newArrayList(dataItem), eventType, userName));
     }
 
     private boolean isChange(DimensionReq dimensionReq, DimensionResp dimensionResp) {

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java

@@ -157,9 +157,28 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
                 .collect(Collectors.toMap(MetricResp::getBizName, a -> a, (k1, k2) -> k1));
 
         List<MetricReq> metricToInsert = Lists.newArrayList();
-        metricReqs.forEach(metric -> {
+        List<MetricReq> metricToUpdate = Lists.newArrayList();
+        List<Long> metricToDelete = Lists.newArrayList();
+
+        metricReqs.stream().forEach(metric -> {
             if (!bizNameMap.containsKey(metric.getBizName())) {
                 metricToInsert.add(metric);
+            } else {
+                MetricResp metricRespByBizName = bizNameMap.get(metric.getBizName());
+                if (null != metricRespByBizName && isChange(metric, metricRespByBizName)) {
+                    metric.setId(metricRespByBizName.getId());
+                    metric.updatedBy(user.getName());
+                    metricToUpdate.add(metric);
+                }
+            }
+        });
+
+        // the bizNames from alter dimensions
+        List<String> bizNames =
+                metricReqs.stream().map(MetricReq::getBizName).collect(Collectors.toList());
+        bizNameMap.keySet().forEach(bizNameInDb -> {
+            if (!bizNames.contains(bizNameInDb)) {
+                metricToDelete.add(bizNameMap.get(bizNameInDb).getId());
             }
         });
 
@@ -168,6 +187,16 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
             createMetricBatch(metricToInsert, user);
         }
 
+        // update
+        if (!CollectionUtils.isEmpty(metricToUpdate)) {
+            updateMetricBatch(metricToUpdate, user);
+        }
+
+        // delete
+        if (!CollectionUtils.isEmpty(metricToDelete)) {
+            deleteMetricBatch(metricToDelete, user);
+        }
+
     }
 
     @Override
@@ -374,15 +403,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
         MetricFilter metricFilter = new MetricFilter();
         metricFilter.setUserName(user.getName());
         BeanUtils.copyProperties(pageMetricReq, metricFilter);
-
+        if (!CollectionUtils.isEmpty(pageMetricReq.getDomainIds())) {
-        // If dataSetId is provided, get models directly from the dataset
-        if (pageMetricReq.getDataSetId() != null) {
-            DataSetResp dataSetResp = dataSetService.getDataSet(pageMetricReq.getDataSetId());
-            if (dataSetResp != null) {
-                pageMetricReq.getModelIds().addAll(dataSetResp.getAllModels());
-            }
-        } else if (!CollectionUtils.isEmpty(pageMetricReq.getDomainIds())) {
-            // Only check domainIds when dataSetId is not provided
             List<ModelResp> modelResps =
                     modelService.getAllModelByDomainIds(pageMetricReq.getDomainIds());
             List<Long> modelIds =
@@ -721,8 +742,7 @@ public class MetricServiceImpl extends ServiceImpl<MetricDOMapper, MetricDO>
     }
 
     private void sendEvent(DataItem dataItem, EventType eventType, User user) {
-        eventPublisher.publishEvent(
+        eventPublisher.publishEvent(new DataEvent(this, Lists.newArrayList(dataItem), eventType, user.getName()));
-                new DataEvent(this, Lists.newArrayList(dataItem), eventType, user.getName()));
     }
 
     private DataItem getDataItem(MetricDO metricDO) {

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelRelaServiceImpl.java

@@ -47,9 +47,22 @@ public class ModelRelaServiceImpl extends ServiceImpl<ModelRelaDOMapper, ModelRe
     }
 
     private void check(ModelRela modelRela) {
+        ModelResp fromModel = modelService.getModel(modelRela.getFromModelId());
+        ModelResp toModel = modelService.getModel(modelRela.getToModelId());
         if (CollectionUtils.isEmpty(modelRela.getJoinConditions())) {
             throw new RuntimeException("关联关系不可为空");
         }
+        for (JoinCondition joinCondition : modelRela.getJoinConditions()) {
+            IdentifyType identifyTypeLeft = fromModel.getIdentifyType(joinCondition.getLeftField());
+            IdentifyType identifyTypeRight = toModel.getIdentifyType(joinCondition.getRightField());
+            if (IdentifyType.foreign.equals(identifyTypeLeft)
+                    || IdentifyType.foreign.equals(identifyTypeRight)) {
+                if (!IdentifyType.primary.equals(identifyTypeLeft)
+                        && !IdentifyType.primary.equals(identifyTypeRight)) {
+                    throw new RuntimeException("外键必须跟主键关联");
+                }
+            }
+        }
     }
 
     @Override

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ModelServiceImpl.java

@@ -39,8 +39,6 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
 
-import static com.tencent.supersonic.common.pojo.DimensionConstants.DIMENSION_TIME_FORMAT;
-
 @Service
 @Slf4j
 public class ModelServiceImpl implements ModelService {
@@ -532,23 +530,17 @@ public class ModelServiceImpl implements ModelService {
                 Optional<Dimension> dimOptional = modelDetail.getDimensions().stream().filter(
                         dimension -> dimension.getBizName().equals(dimensionReq.getBizName()))
                         .findFirst();
-                String dateFormat = null;
-                if (dimensionReq.getExt().containsKey(DIMENSION_TIME_FORMAT)) {
-                    dateFormat = (String) dimensionReq.getExt().get(DIMENSION_TIME_FORMAT);
-                }
                 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());
-                    dimension.setDateFormat(dateFormat);
                 } else {
                     Dimension dimension = Dimension.builder().name(dimensionReq.getName())
                             .bizName(dimensionReq.getBizName()).expr(dimensionReq.getExpr())
                             .type(DimensionType.valueOf(dimensionReq.getType()))
-                            .dateFormat(dateFormat).description(dimensionReq.getDescription())
+                            .description(dimensionReq.getDescription()).build();
-                            .build();
                     modelDetail.getDimensions().add(dimension);
                 }
             });
@@ -680,8 +672,7 @@ public class ModelServiceImpl implements ModelService {
 
     private void sendEvent(ModelDO modelDO, EventType eventType, User user) {
         DataItem dataItem = getDataItem(modelDO);
-        eventPublisher.publishEvent(
+        eventPublisher.publishEvent(new DataEvent(this, Lists.newArrayList(dataItem), eventType, user.getName()));
-                new DataEvent(this, Lists.newArrayList(dataItem), eventType, user.getName()));
     }
 
     private DataItem getDataItem(ModelDO modelDO) {

headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/SchemaServiceImpl.java

@@ -413,11 +413,11 @@ public class SchemaServiceImpl implements SchemaService {
     public List<ItemResp> getDomainDataSetTree() {
         List<DomainResp> domainResps = domainService.getDomainList();
         List<ItemResp> itemResps = domainResps.stream().map(domain -> new ItemResp(domain.getId(),
-                domain.getParentId(), domain.getName(), TypeEnums.DOMAIN)).toList();
+                domain.getParentId(), domain.getName(), TypeEnums.DOMAIN))
+                .collect(Collectors.toList());
         Map<Long, ItemResp> itemRespMap =
                 itemResps.stream().collect(Collectors.toMap(ItemResp::getId, item -> item));
-        List<DataSetResp> dataSetResps = dataSetService
+        List<DataSetResp> dataSetResps = dataSetService.getDataSetList(new MetaFilter());
-                .getDataSetList(MetaFilter.builder().status(StatusEnum.ONLINE.getCode()).build());
         for (DataSetResp dataSetResp : dataSetResps) {
             ItemResp itemResp = itemRespMap.get(dataSetResp.getDomainId());
             if (itemResp != null) {

headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/DictUtils.java

@@ -296,8 +296,6 @@ public class DictUtils {
         modelIds.add(dictItemResp.getModelId());
         QuerySqlReq querySqlReq = new QuerySqlReq();
         querySqlReq.setSql(sql);
-        // bypass semantic translation
-        querySqlReq.getSqlInfo().setQuerySQL(sql);
         querySqlReq.setNeedAuth(false);
         querySqlReq.setModelIds(modelIds);
 
@@ -447,29 +445,14 @@ public class DictUtils {
         if (DateConf.DateMode.ALL.equals(config.getDateConf().getDateMode())) {
             return "";
         }
-
         // 静态日期
         if (DateConf.DateMode.BETWEEN.equals(config.getDateConf().getDateMode())) {
-            String dateFormat = partitionTimeDimension.getDateFormat();
-            if (StringUtils.isEmpty(dateFormat)) {
-                dateFormat = "yyyy-MM-dd"; // 默认格式
-            }
-
-            // 格式化起止日期
-            DateTimeFormatter formatter = DateTimeFormatter.ofPattern(dateFormat);
-            String startDate =
-                    LocalDate.parse(config.getDateConf().getStartDate()).format(formatter);
-            String endDate = LocalDate.parse(config.getDateConf().getEndDate()).format(formatter);
-
             return String.format("( %s >= '%s' and %s <= '%s' )",
-                    partitionTimeDimension.getBizName(), startDate,
+                    config.getDateConf().getDateField(), config.getDateConf().getStartDate(),
-                    partitionTimeDimension.getBizName(), endDate);
+                    config.getDateConf().getDateField(), config.getDateConf().getEndDate());
         }
-
         // 动态日期
         if (DateConf.DateMode.RECENT.equals(config.getDateConf().getDateMode())) {
-            dictItemResp.getConfig().getDateConf()
-                    .setDateField(partitionTimeDimension.getBizName());
             return generateDictDateFilterRecent(dictItemResp);
         }
 

webapp/packages/chat-sdk/src/components/ChatItem/index.tsx

@@ -10,14 +10,7 @@ import {
   SimilarQuestionType,
 } from '../../common/type';
 import { createContext, useEffect, useRef, useState } from 'react';
-import {
+import { chatExecute, chatParse, queryData, deleteQuery, switchEntity } from '../../service';
-  chatExecute,
-  chatParse,
-  queryData,
-  deleteQuery,
-  switchEntity,
-  getExecuteSummary,
-} from '../../service';
 import { PARSE_ERROR_TIP, PREFIX_CLS, SEARCH_EXCEPTION_TIP } from '../../common/constants';
 import { message, Spin } from 'antd';
 import IconFont from '../IconFont';
@@ -176,7 +169,7 @@ const ChatItem: React.FC<Props> = ({
       setExecuteLoading(true);
     }
     try {
-      const res: any = await chatExecute(msg, conversationId!, parseInfoValue, agentId, true);
+      const res: any = await chatExecute(msg, conversationId!, parseInfoValue, agentId);
       const valid = updateData(res);
       onMsgDataLoaded?.(
         {
@@ -187,20 +180,6 @@ const ChatItem: React.FC<Props> = ({
         valid,
         isRefresh
       );
-      const queryId = parseInfoValue.queryId; // 伪流式 大模型输出
-      if (queryId != undefined && res.data.queryState != 'INVALID') {
-        const getSummary = async (data: any, queryId: number) => {
-          const res2: any = await getExecuteSummary(queryId);
-          if (res2.data.queryMode == null) {
-            res2.data = { ...data, textSummary: res2.data.textSummary };
-            setData(res2.data);
-            setTimeout(() => getSummary(data, queryId), 500);
-          } else {
-            setData(res2.data);
-          }
-        };
-        setTimeout(() => getSummary(res.data, queryId), 500);
-      }
     } catch (e) {
       const tip = SEARCH_EXCEPTION_TIP;
       setExecuteTip(SEARCH_EXCEPTION_TIP);
@@ -444,10 +423,6 @@ const ChatItem: React.FC<Props> = ({
           return result;
         }, {});
       });
-      if (exportData.length === 0) {
-        message.error('该条消息暂不支持该操作');
-        return;
-      }
       exportCsvFile(exportData);
     }
   };

webapp/packages/chat-sdk/src/service/index.ts

@@ -79,8 +79,7 @@ export function chatExecute(
   queryText: string,
   chatId: number,
   parseInfo: ChatContextType,
-  agentId?: number,
+  agentId?: number
-  streamingResult?:boolean
 ) {
   return axios.post<MsgDataType>(`${prefix}/chat/query/execute`, {
     queryText,
@@ -88,15 +87,6 @@ export function chatExecute(
     chatId: chatId || DEFAULT_CHAT_ID,
     queryId: parseInfo.queryId,
     parseId: parseInfo.id,
-    streamingResult:streamingResult
-  });
-}
-
-export function getExecuteSummary(
-    queryId: number
-) {
-  return axios.post<MsgDataType>(`${prefix}/chat/query/getExecuteSummary`, {
-    queryId: queryId,
   });
 }
 

webapp/packages/supersonic-fe/src/pages/SemanticModel/components/DimensionValueSettingModal.tsx

@@ -355,11 +355,9 @@ const DimensionValueSettingModal: React.FC<CreateFormProps> = ({
               onRecordSave={(record) => {
                 modifyDimensionValue({
                   id: dimensionItem.id,
-                  dimValueMaps: [
+                  dimValueMaps: {
-                    {
                     ...record,
                   },
-                  ],
                 });
               }}
               hideCtrlBtn={['deleteBtn']}