Merge b1dadb4a1a into a3293e6788

chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/ChatQueryExecutor.java

@@ -5,7 +5,5 @@ import com.tencent.supersonic.chat.server.pojo.ExecuteContext;
 
 public interface ChatQueryExecutor {
 
-    boolean accept(ExecuteContext executeContext);
-
     QueryResult execute(ExecuteContext executeContext);
 }

chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/PlainTextExecutor.java

@@ -36,13 +36,12 @@ public class PlainTextExecutor implements ChatQueryExecutor {
                 .appModule(AppModule.CHAT).description("直接将原始输入透传大模型").enable(false).build());
     }
 
-    @Override
-    public boolean accept(ExecuteContext executeContext) {
-        return "PLAIN_TEXT".equals(executeContext.getParseInfo().getQueryMode());
-    }
-
     @Override
     public QueryResult execute(ExecuteContext executeContext) {
+        if (!"PLAIN_TEXT".equals(executeContext.getParseInfo().getQueryMode())) {
+            return null;
+        }
+
         AgentService agentService = ContextUtils.getBean(AgentService.class);
         Agent chatAgent = agentService.getAgent(executeContext.getAgent().getId());
         ChatApp chatApp = chatAgent.getChatAppConfig().get(APP_KEY);

chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/PluginExecutor.java

@@ -8,11 +8,6 @@ import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo;
 
 public class PluginExecutor implements ChatQueryExecutor {
 
-    @Override
-    public boolean accept(ExecuteContext executeContext) {
-        return PluginQueryManager.isPluginQuery(executeContext.getParseInfo().getQueryMode());
-    }
-
     @Override
     public QueryResult execute(ExecuteContext executeContext) {
         SemanticParseInfo parseInfo = executeContext.getParseInfo();

chat/server/src/main/java/com/tencent/supersonic/chat/server/executor/SqlExecutor.java

@@ -25,11 +25,6 @@ import java.util.Objects;
 
 public class SqlExecutor implements ChatQueryExecutor {
 
-    @Override
-    public boolean accept(ExecuteContext executeContext) {
-        return true;
-    }
-
     @SneakyThrows
     @Override
     public QueryResult execute(ExecuteContext executeContext) {
@@ -85,9 +80,9 @@ public class SqlExecutor implements ChatQueryExecutor {
         queryResult.setQueryId(executeContext.getRequest().getQueryId());
         queryResult.setChatContext(parseInfo);
         queryResult.setQueryMode(parseInfo.getQueryMode());
+        queryResult.setQueryTimeCost(System.currentTimeMillis() - startTime);
         SemanticQueryResp queryResp =
                 semanticLayer.queryByReq(sqlReq, executeContext.getRequest().getUser());
-        queryResult.setQueryTimeCost(System.currentTimeMillis() - startTime);
         if (queryResp != null) {
             queryResult.setQueryAuthorization(queryResp.getQueryAuthorization());
             queryResult.setQuerySql(queryResp.getSql());

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

@@ -4,7 +4,5 @@ import com.tencent.supersonic.chat.server.pojo.ParseContext;
 
 public interface ChatQueryParser {
 
-    boolean accept(ParseContext parseContext);
-
     void parse(ParseContext parseContext);
 }

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

@@ -14,12 +14,12 @@ public class NL2PluginParser implements ChatQueryParser {
     private final List<PluginRecognizer> pluginRecognizers =
             ComponentFactory.getPluginRecognizers();
 
-    public boolean accept(ParseContext parseContext) {
-        return parseContext.getAgent().containsPluginTool();
-    }
-
     @Override
     public void parse(ParseContext parseContext) {
+        if (!parseContext.getAgent().containsPluginTool()) {
+            return;
+        }
+
         pluginRecognizers.forEach(pluginRecognizer -> {
             pluginRecognizer.recognize(parseContext);
             log.info("{} recallResult:{}", pluginRecognizer.getClass().getSimpleName(),

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

@@ -73,12 +73,12 @@ public class NL2SQLParser implements ChatQueryParser {
                         .build());
     }
 
-    public boolean accept(ParseContext parseContext) {
-        return parseContext.enableNL2SQL();
-    }
-
     @Override
     public void parse(ParseContext parseContext) {
+        if (!parseContext.enableNL2SQL()) {
+            return;
+        }
+
         // first go with rule-based parsers unless the user has already selected one parse.
         if (Objects.isNull(parseContext.getRequest().getSelectedParse())) {
             QueryNLReq queryNLReq = QueryReqConverter.buildQueryNLReq(parseContext);

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

@@ -6,12 +6,12 @@ import com.tencent.supersonic.headless.api.pojo.response.ParseResp;
 
 public class PlainTextParser implements ChatQueryParser {
 
-    public boolean accept(ParseContext parseContext) {
-        return !parseContext.getAgent().containsAnyTool();
-    }
-
     @Override
     public void parse(ParseContext parseContext) {
+        if (parseContext.getAgent().containsAnyTool()) {
+            return;
+        }
+
         SemanticParseInfo parseInfo = new SemanticParseInfo();
         parseInfo.setQueryMode("PLAIN_TEXT");
         parseInfo.setId(1);

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

@@ -66,10 +66,8 @@ public class ChatConfigController {
     }
 
     @GetMapping("/getDomainDataSetTree")
-    public List<ItemResp> getDomainDataSetTree(HttpServletRequest request,
+    public List<ItemResp> getDomainDataSetTree() {
-            HttpServletResponse response) {
+        return semanticLayerService.getDomainDataSetTree();
-        User user = UserHolder.findUser(request, response);
-        return semanticLayerService.getDomainDataSetTree(user);
     }
 
     @GetMapping("/getDataSetSchema/{id}")

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

@@ -95,11 +95,7 @@ public class ChatQueryServiceImpl implements ChatQueryService {
         }
 
         ParseContext parseContext = buildParseContext(chatParseReq, new ChatParseResp(queryId));
-        for (ChatQueryParser parser : chatQueryParsers) {
+        chatQueryParsers.forEach(p -> p.parse(parseContext));
-            if (parser.accept(parseContext)) {
-                parser.parse(parseContext);
-            }
-        }
 
         for (ParseResultProcessor processor : parseResultProcessors) {
             if (processor.accept(parseContext)) {
@@ -120,11 +116,9 @@ public class ChatQueryServiceImpl implements ChatQueryService {
         QueryResult queryResult = new QueryResult();
         ExecuteContext executeContext = buildExecuteContext(chatExecuteReq);
         for (ChatQueryExecutor chatQueryExecutor : chatQueryExecutors) {
-            if (chatQueryExecutor.accept(executeContext)) {
+            queryResult = chatQueryExecutor.execute(executeContext);
-                queryResult = chatQueryExecutor.execute(executeContext);
+            if (queryResult != null) {
-                if (queryResult != null) {
+                break;
-                    break;
-                }
             }
         }
 

common/src/main/java/com/tencent/supersonic/common/config/ChatModel.java

@@ -1,11 +1,9 @@
 package com.tencent.supersonic.common.config;
 
-import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.ChatModelConfig;
 import lombok.Data;
 
 import java.util.Date;
-import java.util.List;
 
 @Data
 public class ChatModel {
@@ -27,11 +25,5 @@ public class ChatModel {
 
     private String admin;
 
-    private List<String> viewers = Lists.newArrayList();
+    private String viewer;
-
-    private Integer isOpen = 0;
-
-    public boolean isPublic() {
-        return isOpen != null && isOpen == 1;
-    }
 }

common/src/main/java/com/tencent/supersonic/common/persistence/dataobject/ChatModelDO.java

@@ -30,6 +30,4 @@ public class ChatModelDO {
     private String admin;
 
     private String viewer;
-
-    private Integer isOpen;
 }

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

@@ -7,7 +7,7 @@ import com.tencent.supersonic.common.pojo.User;
 import java.util.List;
 
 public interface ChatModelService {
-    List<ChatModel> getChatModels(User user);
+    List<ChatModel> getChatModels();
 
     ChatModel getChatModel(Integer id);
 

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

@@ -23,15 +23,8 @@ import java.util.stream.Collectors;
 public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModelDO>
         implements ChatModelService {
     @Override
-    public List<ChatModel> getChatModels(User user) {
+    public List<ChatModel> getChatModels() {
-        return list().stream().map(this::convert).filter(chatModel -> {
+        return list().stream().map(this::convert).collect(Collectors.toList());
-            if (chatModel.isPublic() || user.isSuperAdmin()
-                    || chatModel.getCreatedBy().equals(user.getName())
-                    || chatModel.getViewers().contains(user.getName())) {
-                return true;
-            }
-            return false;
-        }).collect(Collectors.toList());
     }
 
     @Override
@@ -48,15 +41,12 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
         chatModelDO.setCreatedBy(user.getName());
         chatModelDO.setCreatedAt(new Date());
         chatModelDO.setUpdatedBy(user.getName());
-        chatModelDO.setUpdatedAt(chatModelDO.getCreatedAt());
+        chatModelDO.setUpdatedAt(new Date());
-        chatModelDO.setIsOpen(chatModel.getIsOpen());
         if (StringUtils.isBlank(chatModel.getAdmin())) {
             chatModelDO.setAdmin(user.getName());
         }
-        if (!chatModel.getViewers().isEmpty()) {
-            chatModelDO.setViewer(JsonUtil.toString(chatModel.getViewers()));
-        }
         save(chatModelDO);
+        chatModel.setId(chatModelDO.getId());
         return chatModel;
     }
 
@@ -65,13 +55,9 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
         ChatModelDO chatModelDO = convert(chatModel);
         chatModelDO.setUpdatedBy(user.getName());
         chatModelDO.setUpdatedAt(new Date());
-        chatModelDO.setIsOpen(chatModel.getIsOpen());
         if (StringUtils.isBlank(chatModel.getAdmin())) {
             chatModel.setAdmin(user.getName());
         }
-        if (!chatModel.getViewers().isEmpty()) {
-            chatModelDO.setViewer(JsonUtil.toString(chatModel.getViewers()));
-        }
         updateById(chatModelDO);
         return chatModel;
     }
@@ -88,7 +74,6 @@ public class ChatModelServiceImpl extends ServiceImpl<ChatModelMapper, ChatModel
         ChatModel chatModel = new ChatModel();
         BeanUtils.copyProperties(chatModelDO, chatModel);
         chatModel.setConfig(JsonUtil.toObject(chatModelDO.getConfig(), ChatModelConfig.class));
-        chatModel.setViewers(JsonUtil.toList(chatModelDO.getViewer(), String.class));
         return chatModel;
     }
 

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

@@ -32,12 +32,9 @@ public class DatabaseReq extends RecordInfo {
     private String description;
 
     private String schema;
-
     private String url;
 
     private List<String> admins = Lists.newArrayList();
 
     private List<String> viewers = Lists.newArrayList();
-
-    private Integer isOpen = 0;
 }

headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/DatabaseResp.java

@@ -28,8 +28,6 @@ public class DatabaseResp extends RecordInfo {
 
     private List<String> viewers = Lists.newArrayList();
 
-    private Integer isOpen = 0;
-
     private String type;
 
     private String url;
@@ -50,10 +48,6 @@ public class DatabaseResp extends RecordInfo {
 
     private boolean hasEditPermission = false;
 
-    public boolean isPublic() {
-        return isOpen != null && isOpen == 1;
-    }
-
     public String getHost() {
         Pattern p = Pattern.compile("jdbc:(?<db>\\w+):.*((//)|@)(?<host>.+):(?<port>\\d+).*");
         Matcher m = p.matcher(url);

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

@@ -24,7 +24,7 @@ public interface SemanticLayerService {
 
     DataSetSchema getDataSetSchema(Long id);
 
-    List<ItemResp> getDomainDataSetTree(User user);
+    List<ItemResp> getDomainDataSetTree();
 
     List<DimensionResp> getDimensions(MetaFilter metaFilter);
 

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

@@ -5,7 +5,6 @@ import com.google.common.collect.Sets;
 import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.pojo.User;
-import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
 import com.tencent.supersonic.headless.api.pojo.DataSetSchema;
 import com.tencent.supersonic.headless.api.pojo.Dimension;
@@ -30,7 +29,10 @@ import com.tencent.supersonic.headless.core.utils.ComponentFactory;
 import com.tencent.supersonic.headless.server.annotation.S2DataPermission;
 import com.tencent.supersonic.headless.server.facade.service.SemanticLayerService;
 import com.tencent.supersonic.headless.server.manager.SemanticSchemaManager;
-import com.tencent.supersonic.headless.server.service.*;
+import com.tencent.supersonic.headless.server.service.DataSetService;
+import com.tencent.supersonic.headless.server.service.DimensionService;
+import com.tencent.supersonic.headless.server.service.MetricService;
+import com.tencent.supersonic.headless.server.service.SchemaService;
 import com.tencent.supersonic.headless.server.utils.MetricDrillDownChecker;
 import com.tencent.supersonic.headless.server.utils.QueryUtils;
 import com.tencent.supersonic.headless.server.utils.StatUtils;
@@ -57,7 +59,6 @@ public class S2SemanticLayerService implements SemanticLayerService {
     private final MetricDrillDownChecker metricDrillDownChecker;
     private final KnowledgeBaseService knowledgeBaseService;
     private final MetricService metricService;
-    private final DomainService domainService;
     private final DimensionService dimensionService;
     private final TranslatorConfig translatorConfig;
     private final QueryCache queryCache = ComponentFactory.getQueryCache();
@@ -68,8 +69,7 @@ public class S2SemanticLayerService implements SemanticLayerService {
             SchemaService schemaService, SemanticTranslator semanticTranslator,
             MetricDrillDownChecker metricDrillDownChecker,
             KnowledgeBaseService knowledgeBaseService, MetricService metricService,
-            DimensionService dimensionService, DomainService domainService,
+            DimensionService dimensionService, TranslatorConfig translatorConfig) {
-            TranslatorConfig translatorConfig) {
         this.statUtils = statUtils;
         this.queryUtils = queryUtils;
         this.semanticSchemaManager = semanticSchemaManager;
@@ -80,7 +80,6 @@ public class S2SemanticLayerService implements SemanticLayerService {
         this.knowledgeBaseService = knowledgeBaseService;
         this.metricService = metricService;
         this.dimensionService = dimensionService;
-        this.domainService = domainService;
         this.translatorConfig = translatorConfig;
     }
 
@@ -263,11 +262,8 @@ public class S2SemanticLayerService implements SemanticLayerService {
     }
 
     @Override
-    public List<ItemResp> getDomainDataSetTree(User user) {
+    public List<ItemResp> getDomainDataSetTree() {
-        List<Long> domainsWithAuth = domainService.getDomainAuthSet(user, AuthType.VIEWER).stream()
+        return schemaService.getDomainDataSetTree();
-                .map(DomainResp::getId).toList();
-        return schemaService.getDomainDataSetTree().stream()
-                .filter(item -> domainsWithAuth.contains(item.getId())).toList();
     }
 
     @Override

headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/DatabaseDO.java

@@ -44,8 +44,6 @@ public class DatabaseDO {
     /** */
     private String viewer;
 
-    private Integer isOpen = 0;
-
     /** 配置信息 */
     private String config;
 

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

@@ -52,10 +52,8 @@ public class ChatModelController {
     }
 
     @RequestMapping("/getModelList")
-    public List<ChatModel> getModelList(HttpServletRequest httpServletRequest,
+    public List<ChatModel> getModelList() {
-            HttpServletResponse httpServletResponse) {
+        return chatModelService.getChatModels();
-        User user = UserHolder.findUser(httpServletRequest, httpServletResponse);
-        return chatModelService.getChatModels(user);
     }
 
     @RequestMapping("/getModelAppList")

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

@@ -96,15 +96,14 @@ public class DatabaseServiceImpl extends ServiceImpl<DatabaseDOMapper, DatabaseD
                 databaseResp.setHasEditPermission(true);
                 databaseResp.setHasUsePermission(true);
             }
-            if (databaseResp.getViewers().contains(user.getName()) || databaseResp.isPublic()) {
+            if (databaseResp.getViewers().contains(user.getName())) {
                 databaseResp.setHasUsePermission(true);
             }
         });
     }
 
     private boolean filterByAuth(DatabaseResp database, User user, AuthType authType) {
-        if (database.isPublic() || user.isSuperAdmin()
+        if (user.isSuperAdmin() || user.getName().equals(database.getCreatedBy())) {
-                || user.getName().equals(database.getCreatedBy())) {
             return true;
         }
         authType = authType == null ? AuthType.VIEWER : authType;

launchers/standalone/src/main/java/com/tencent/supersonic/demo/S2BaseDemo.java

@@ -140,7 +140,7 @@ public abstract class S2BaseDemo implements CommandLineRunner {
     }
 
     protected ChatModel addChatModelIfNotExist() {
-        List<ChatModel> chatModels = chatModelService.getChatModels(defaultUser);
+        List<ChatModel> chatModels = chatModelService.getChatModels();
         if (!chatModels.isEmpty()) {
             return chatModels.get(0);
         } else {

launchers/standalone/src/main/resources/config.update/sql-update-mysql.sql

@@ -414,7 +414,3 @@ ALTER TABLE s2_agent add column `is_open` tinyint DEFAULT NULL COMMENT '是否
 
 --20250309
 ALTER TABLE s2_model_rela alter column join_condition type text;
-
---20250310
-ALTER TABLE s2_chat_model add column is_open tinyint DEFAULT NULL COMMENT '是否公开';
-ALTER TABLE s2_database add column is_open tinyint DEFAULT NULL COMMENT '是否公开';

launchers/standalone/src/main/resources/db/schema-h2.sql

@@ -116,7 +116,6 @@ CREATE TABLE IF NOT EXISTS `s2_chat_model`
    `updated_by` varchar(100) NOT  NULL,
    `admin` varchar(500) NOT  NULL,
    `viewer` varchar(500) DEFAULT  NULL,
-   `is_open` TINYINT DEFAULT NULL  , -- whether public
     PRIMARY KEY (`id`)
 ); COMMENT ON TABLE s2_chat_model IS 'chat model table';
 
@@ -198,7 +197,6 @@ CREATE TABLE IF NOT EXISTS `s2_database` (
    `updated_by` varchar(100) NOT  NULL,
    `admin` varchar(500) NOT  NULL,
    `viewer` varchar(500) DEFAULT  NULL,
-   `is_open` TINYINT DEFAULT NULL  , -- whether public
    PRIMARY KEY (`id`)
 );
 COMMENT ON TABLE s2_database IS 'database instance table';
@@ -381,7 +379,7 @@ CREATE TABLE IF NOT EXISTS s2_agent
     enable_feedback int null,
     `admin` varchar(3000) DEFAULT NULL  , -- administrator
     `admin_org` varchar(3000) DEFAULT NULL  , -- administrators organization
-    `is_open` TINYINT DEFAULT NULL  , -- whether public
+    `is_open` TINYINT DEFAULT NULL  , -- whether the public
     `viewer` varchar(3000) DEFAULT NULL  , -- available users
     `view_org` varchar(3000) DEFAULT NULL  , -- available organization
     PRIMARY KEY (`id`)

launchers/standalone/src/main/resources/db/schema-mysql.sql

@@ -161,7 +161,6 @@ CREATE TABLE IF NOT EXISTS `s2_chat_model` (
    `updated_by` varchar(100) NOT NULL COMMENT '更新人',
    `admin` varchar(500) DEFAULT NULL,
    `viewer` varchar(500) DEFAULT NULL,
-   `is_open` tinyint DEFAULT NULL COMMENT '是否公开',
    PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='对话大模型实例表';
 
@@ -178,7 +177,6 @@ CREATE TABLE IF NOT EXISTS `s2_database` (
    `updated_by` varchar(100) NOT NULL COMMENT '更新人',
    `admin` varchar(500) DEFAULT NULL,
    `viewer` varchar(500) DEFAULT NULL,
-   `is_open` tinyint DEFAULT NULL COMMENT '是否公开',
    PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='数据库实例表';
 

launchers/standalone/src/main/resources/db/schema-postgres.sql

@@ -147,8 +147,7 @@ CREATE TABLE IF NOT EXISTS s2_chat_model (
     updated_at timestamp NOT NULL,
     updated_by varchar(100) NOT NULL,
     admin varchar(500) DEFAULT NULL,
-    viewer varchar(500) DEFAULT NULL,
+    viewer varchar(500) DEFAULT NULL
-    is_open smallint DEFAULT NULL
 );
 
 CREATE TABLE IF NOT EXISTS s2_database (
@@ -163,8 +162,7 @@ CREATE TABLE IF NOT EXISTS s2_database (
     updated_at timestamp NOT NULL,
     updated_by varchar(100) NOT NULL,
     admin varchar(500) DEFAULT NULL,
-    viewer varchar(500) DEFAULT NULL,
+    viewer varchar(500) DEFAULT NULL
-    is_open smallint DEFAULT NULL
 );
 
 

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

@@ -99,7 +99,6 @@ const DatasetCreateForm: React.FC<ModelCreateFormModalProps> = forwardRef(
       setSaveLoading(false);
       if (code === 200) {
         onSubmit?.(queryData);
-        message.success('保存成功');
       } else {
         message.error(msg);
       }

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

@@ -109,7 +109,6 @@ const ViewCreateFormModal: React.FC<ModelCreateFormModalProps> = ({
     setSaveLoading(false);
     if (code === 200) {
       onSubmit?.(queryData);
-      message.success('保存成功');
     } else {
       message.error(msg);
     }

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

@@ -87,7 +87,6 @@ const ViewSearchFormModal: React.FC<ModelCreateFormModalProps> = ({
     setSaveLoading(false);
     if (code === 200) {
       onSubmit?.(queryData);
-      message.success('保存成功');
     } else {
       message.error(msg);
     }