Merge branch 'master' into feature/lxw

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/constant/UserConstants.java

@@ -12,6 +12,8 @@ public class UserConstants {
 
     public static final String TOKEN_USER_EMAIL = "token_user_email";
 
+    public static final String TOKEN_IS_ADMIN = "token_is_admin";
+
     public static final String TOKEN_ALGORITHM = "HS512";
 
     public static final String TOKEN_CREATE_TIME = "token_create_time";

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/User.java

@@ -18,17 +18,22 @@ public class User {
 
     private String email;
 
-    public static User get(Long id, String name, String displayName, String email) {
+    private Integer isAdmin;
-        return new User(id, name, displayName, email);
+
+    public static User get(Long id, String name, String displayName, String email, Integer isAdmin) {
+        return new User(id, name, displayName, email, isAdmin);
     }
 
     public static User getFakeUser() {
-        return new User(1L, "admin", "admin", "admin@email");
+        return new User(1L, "admin", "admin", "admin@email", 1);
     }
 
     public String getDisplayName() {
         return StringUtils.isBlank(displayName) ? name : displayName;
     }
 
+    public boolean isSuperAdmin() {
+        return isAdmin != null && isAdmin == 1;
+    }
 
 }

auth/api/src/main/java/com/tencent/supersonic/auth/api/authentication/pojo/UserWithPassword.java

@@ -9,13 +9,14 @@ public class UserWithPassword extends User {
 
     private String password;
 
-    public UserWithPassword(Long id, String name, String displayName, String email, String password) {
+    public UserWithPassword(Long id, String name, String displayName, String email, String password, Integer isAdmin) {
-        super(id, name, displayName, email);
+        super(id, name, displayName, email, isAdmin);
         this.password = password;
     }
 
-    public static UserWithPassword get(Long id, String name, String displayName, String email, String password) {
+    public static UserWithPassword get(Long id, String name, String displayName,
-        return new UserWithPassword(id, name, displayName, email, password);
+                                       String email, String password, Integer isAdmin) {
+        return new UserWithPassword(id, name, displayName, email, password, isAdmin);
     }
 
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/adaptor/DefaultUserAdaptor.java

@@ -71,7 +71,7 @@ public class DefaultUserAdaptor implements UserAdaptor {
         }
         if (userDO.getPassword().equals(userReq.getPassword())) {
             UserWithPassword user = UserWithPassword.get(userDO.getId(), userDO.getName(), userDO.getDisplayName(),
-                    userDO.getEmail(), userDO.getPassword());
+                    userDO.getEmail(), userDO.getPassword(), userDO.getIsAdmin());
             return userTokenUtils.generateToken(user);
         }
         throw new RuntimeException("password not correct, please try again");

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDO.java

@@ -1,7 +1,6 @@
 package com.tencent.supersonic.auth.authentication.persistence.dataobject;
 
 public class UserDO {
-
     /**
      * 
      */
@@ -28,6 +27,12 @@ public class UserDO {
     private String email;
 
     /**
+     * 
+     */
+    private Integer isAdmin;
+
+    /**
+     * 
      * @return id 
      */
     public Long getId() {
@@ -35,6 +40,7 @@ public class UserDO {
     }
 
     /**
+     * 
      * @param id 
      */
     public void setId(Long id) {
@@ -42,6 +48,7 @@ public class UserDO {
     }
 
     /**
+     * 
      * @return name 
      */
     public String getName() {
@@ -49,6 +56,7 @@ public class UserDO {
     }
 
     /**
+     * 
      * @param name 
      */
     public void setName(String name) {
@@ -56,6 +64,7 @@ public class UserDO {
     }
 
     /**
+     * 
      * @return password 
      */
     public String getPassword() {
@@ -63,6 +72,7 @@ public class UserDO {
     }
 
     /**
+     * 
      * @param password 
      */
     public void setPassword(String password) {
@@ -70,6 +80,7 @@ public class UserDO {
     }
 
     /**
+     * 
      * @return display_name 
      */
     public String getDisplayName() {
@@ -77,6 +88,7 @@ public class UserDO {
     }
 
     /**
+     * 
      * @param displayName 
      */
     public void setDisplayName(String displayName) {
@@ -84,6 +96,7 @@ public class UserDO {
     }
 
     /**
+     * 
      * @return email 
      */
     public String getEmail() {
@@ -91,9 +104,26 @@ public class UserDO {
     }
 
     /**
+     * 
      * @param email 
      */
     public void setEmail(String email) {
         this.email = email == null ? null : email.trim();
     }
+
+    /**
+     * 
+     * @return is_admin 
+     */
+    public Integer getIsAdmin() {
+        return isAdmin;
+    }
+
+    /**
+     * 
+     * @param isAdmin 
+     */
+    public void setIsAdmin(Integer isAdmin) {
+        this.isAdmin = isAdmin;
+    }
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/persistence/dataobject/UserDOExample.java

@@ -4,7 +4,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class UserDOExample {
-
     /**
      * s2_user
      */
@@ -31,6 +30,7 @@ public class UserDOExample {
     protected Integer limitEnd;
 
     /**
+     *
      * @mbg.generated
      */
     public UserDOExample() {
@@ -38,13 +38,7 @@ public class UserDOExample {
     }
 
     /**
-     * @mbg.generated
+     *
-     */
-    public String getOrderByClause() {
-        return orderByClause;
-    }
-
-    /**
      * @mbg.generated
      */
     public void setOrderByClause(String orderByClause) {
@@ -52,13 +46,15 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
-    public boolean isDistinct() {
+    public String getOrderByClause() {
-        return distinct;
+        return orderByClause;
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void setDistinct(boolean distinct) {
@@ -66,6 +62,15 @@ public class UserDOExample {
     }
 
     /**
+     *
+     * @mbg.generated
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     *
      * @mbg.generated
      */
     public List<Criteria> getOredCriteria() {
@@ -73,6 +78,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void or(Criteria criteria) {
@@ -80,6 +86,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Criteria or() {
@@ -89,6 +96,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Criteria createCriteria() {
@@ -100,6 +108,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     protected Criteria createCriteriaInternal() {
@@ -108,6 +117,7 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void clear() {
@@ -117,6 +127,15 @@ public class UserDOExample {
     }
 
     /**
+     *
+     * @mbg.generated
+     */
+    public void setLimitStart(Integer limitStart) {
+        this.limitStart=limitStart;
+    }
+
+    /**
+     *
      * @mbg.generated
      */
     public Integer getLimitStart() {
@@ -124,31 +143,25 @@ public class UserDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
-    public void setLimitStart(Integer limitStart) {
+    public void setLimitEnd(Integer limitEnd) {
-        this.limitStart = limitStart;
+        this.limitEnd=limitEnd;
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Integer getLimitEnd() {
         return limitEnd;
     }
 
-    /**
-     * @mbg.generated
-     */
-    public void setLimitEnd(Integer limitEnd) {
-        this.limitEnd = limitEnd;
-    }
-
     /**
      * s2_user null
      */
     protected abstract static class GeneratedCriteria {
-
         protected List<Criterion> criteria;
 
         protected GeneratedCriteria() {
@@ -528,6 +541,66 @@ public class UserDOExample {
             addCriterion("email not between", value1, value2, "email");
             return (Criteria) this;
         }
+
+        public Criteria andIsAdminIsNull() {
+            addCriterion("is_admin is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminIsNotNull() {
+            addCriterion("is_admin is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminEqualTo(Integer value) {
+            addCriterion("is_admin =", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminNotEqualTo(Integer value) {
+            addCriterion("is_admin <>", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminGreaterThan(Integer value) {
+            addCriterion("is_admin >", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminGreaterThanOrEqualTo(Integer value) {
+            addCriterion("is_admin >=", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminLessThan(Integer value) {
+            addCriterion("is_admin <", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminLessThanOrEqualTo(Integer value) {
+            addCriterion("is_admin <=", value, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminIn(List<Integer> values) {
+            addCriterion("is_admin in", values, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminNotIn(List<Integer> values) {
+            addCriterion("is_admin not in", values, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminBetween(Integer value1, Integer value2) {
+            addCriterion("is_admin between", value1, value2, "isAdmin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsAdminNotBetween(Integer value1, Integer value2) {
+            addCriterion("is_admin not between", value1, value2, "isAdmin");
+            return (Criteria) this;
+        }
     }
 
     /**
@@ -544,7 +617,6 @@ public class UserDOExample {
      * s2_user null
      */
     public static class Criterion {
-
         private String condition;
 
         private Object value;
@@ -561,6 +633,38 @@ public class UserDOExample {
 
         private String typeHandler;
 
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
         protected Criterion(String condition) {
             super();
             this.condition = condition;
@@ -596,37 +700,5 @@ public class UserDOExample {
         protected Criterion(String condition, Object value, Object secondValue) {
             this(condition, value, secondValue, null);
         }
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
     }
 }

auth/authentication/src/main/java/com/tencent/supersonic/auth/authentication/utils/UserTokenUtils.java

@@ -2,6 +2,7 @@ package com.tencent.supersonic.auth.authentication.utils;
 
 import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_ALGORITHM;
 import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_CREATE_TIME;
+import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_IS_ADMIN;
 import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_PREFIX;
 import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_TIME_OUT;
 import static com.tencent.supersonic.auth.api.authentication.constant.UserConstants.TOKEN_USER_DISPLAY_NAME;
@@ -42,6 +43,7 @@ public class UserTokenUtils {
         claims.put(TOKEN_USER_PASSWORD, StringUtils.isEmpty(user.getPassword()) ? "" : user.getPassword());
         claims.put(TOKEN_USER_DISPLAY_NAME, user.getDisplayName());
         claims.put(TOKEN_CREATE_TIME, System.currentTimeMillis());
+        claims.put(TOKEN_IS_ADMIN, user.getIsAdmin());
         return generate(claims);
     }
 
@@ -52,6 +54,7 @@ public class UserTokenUtils {
         claims.put(TOKEN_USER_PASSWORD, "admin");
         claims.put(TOKEN_USER_DISPLAY_NAME, "admin");
         claims.put(TOKEN_CREATE_TIME, System.currentTimeMillis());
+        claims.put(TOKEN_IS_ADMIN, 1);
         return generate(claims);
     }
 
@@ -63,7 +66,9 @@ public class UserTokenUtils {
         String userName = String.valueOf(claims.get(TOKEN_USER_NAME));
         String email = String.valueOf(claims.get(TOKEN_USER_EMAIL));
         String displayName = String.valueOf(claims.get(TOKEN_USER_DISPLAY_NAME));
-        return User.get(userId, userName, displayName, email);
+        Integer isAdmin = claims.get(TOKEN_IS_ADMIN) == null
+                ? 0 : Integer.parseInt(claims.get(TOKEN_IS_ADMIN).toString());
+        return User.get(userId, userName, displayName, email, isAdmin);
     }
 
     public UserWithPassword getUserWithPassword(HttpServletRequest request) {
@@ -79,7 +84,9 @@ public class UserTokenUtils {
         String email = String.valueOf(claims.get(TOKEN_USER_EMAIL));
         String displayName = String.valueOf(claims.get(TOKEN_USER_DISPLAY_NAME));
         String password = String.valueOf(claims.get(TOKEN_USER_PASSWORD));
-        return UserWithPassword.get(userId, userName, displayName, email, password);
+        Integer isAdmin = claims.get(TOKEN_IS_ADMIN) == null
+                ? 0 : Integer.parseInt(claims.get(TOKEN_IS_ADMIN).toString());
+        return UserWithPassword.get(userId, userName, displayName, email, password, isAdmin);
     }
 
     private Claims getClaims(String token) {

auth/authentication/src/main/resources/mapper/UserDOMapper.xml

@@ -2,11 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.tencent.supersonic.auth.authentication.persistence.mapper.UserDOMapper">
   <resultMap id="BaseResultMap" type="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="password" jdbcType="VARCHAR" property="password" />
     <result column="display_name" jdbcType="VARCHAR" property="displayName" />
     <result column="email" jdbcType="VARCHAR" property="email" />
+    <result column="is_admin" jdbcType="INTEGER" property="isAdmin" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -38,7 +39,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, password, display_name, email
+    id, name, password, display_name, email, is_admin
   </sql>
   <select id="selectByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultMap="BaseResultMap">
     select
@@ -57,21 +58,13 @@
       limit #{limitStart} , #{limitEnd}
     </if>
   </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
-    select 
-    <include refid="Base_Column_List" />
-    from s2_user
-    where id = #{id,jdbcType=BIGINT}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-    delete from s2_user
-    where id = #{id,jdbcType=BIGINT}
-  </delete>
   <insert id="insert" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     insert into s2_user (id, name, password, 
-      display_name, email)
+      display_name, email, is_admin
+      )
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
-      #{displayName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR})
+      #{displayName,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR}, #{isAdmin,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
     insert into s2_user
@@ -91,6 +84,9 @@
       <if test="email != null">
         email,
       </if>
+      <if test="isAdmin != null">
+        is_admin,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -108,6 +104,9 @@
       <if test="email != null">
         #{email,jdbcType=VARCHAR},
       </if>
+      <if test="isAdmin != null">
+        #{isAdmin,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDOExample" resultType="java.lang.Long">
@@ -116,30 +115,4 @@
       <include refid="Example_Where_Clause" />
     </if>
   </select>
-  <update id="updateByPrimaryKeySelective" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-    update s2_user
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="password != null">
-        password = #{password,jdbcType=VARCHAR},
-      </if>
-      <if test="displayName != null">
-        display_name = #{displayName,jdbcType=VARCHAR},
-      </if>
-      <if test="email != null">
-        email = #{email,jdbcType=VARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=BIGINT}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="com.tencent.supersonic.auth.authentication.persistence.dataobject.UserDO">
-    update s2_user
-    set name = #{name,jdbcType=VARCHAR},
-      password = #{password,jdbcType=VARCHAR},
-      display_name = #{displayName,jdbcType=VARCHAR},
-      email = #{email,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=BIGINT}
-  </update>
 </mapper>

chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticLayer.java

@@ -8,9 +8,11 @@ import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq;
 import com.tencent.supersonic.semantic.api.model.request.PageMetricReq;
 import com.tencent.supersonic.semantic.api.model.response.DomainResp;
 import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import com.tencent.supersonic.semantic.api.model.response.ModelResp;
 import com.tencent.supersonic.semantic.api.model.response.MetricResp;
 import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDslReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
@@ -32,14 +34,27 @@ import java.util.List;
 public interface SemanticLayer {
 
     QueryResultWithSchemaResp queryByStruct(QueryStructReq queryStructReq, User user);
+
     QueryResultWithSchemaResp queryByMultiStruct(QueryMultiStructReq queryMultiStructReq, User user);
+
     QueryResultWithSchemaResp queryByDsl(QueryDslReq queryDslReq, User user);
+
     QueryResultWithSchemaResp queryDimValue(QueryDimValueReq queryDimValueReq, User user);
+
     List<ModelSchema> getModelSchema();
+
     List<ModelSchema> getModelSchema(List<Long> ids);
+
     ModelSchema getModelSchema(Long model, Boolean cacheEnable);
+
     PageInfo<DimensionResp> getDimensionPage(PageDimensionReq pageDimensionCmd);
-    PageInfo<MetricResp> getMetricPage(PageMetricReq pageMetricCmd);
+
+    PageInfo<MetricResp> getMetricPage(PageMetricReq pageMetricCmd, User user);
+
     List<DomainResp> getDomainList(User user);
+
     List<ModelResp> getModelList(AuthType authType, Long domainId, User user);
+
+    <T> ExplainResp explain(ExplainSqlReq<T> explainSqlReq, User user) throws Exception;
+
 }

chat/api/src/main/java/com/tencent/supersonic/chat/api/component/SemanticQuery.java

@@ -3,6 +3,7 @@ package com.tencent.supersonic.chat.api.component;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
 import com.tencent.supersonic.chat.api.pojo.response.QueryResult;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import org.apache.calcite.sql.parser.SqlParseException;
 
 /**
@@ -14,6 +15,8 @@ public interface SemanticQuery {
 
     QueryResult execute(User user) throws SqlParseException;
 
+    ExplainResp explain(User user);
+
     SemanticParseInfo getParseInfo();
 
     void setParseInfo(SemanticParseInfo parseInfo);

chat/api/src/main/java/com/tencent/supersonic/chat/api/pojo/SemanticParseInfo.java

@@ -37,6 +37,8 @@ public class SemanticParseInfo {
     private List<SchemaElementMatch> elementMatches = new ArrayList<>();
     private Map<String, Object> properties = new HashMap<>();
     private EntityInfo entityInfo;
+    private String sql;
+
     public Long getModelId() {
         return model != null ? model.getId() : 0L;
     }
@@ -46,6 +48,7 @@ public class SemanticParseInfo {
     }
 
     private static class SchemaNameLengthComparator implements Comparator<SchemaElement> {
+
         @Override
         public int compare(SchemaElement o1, SchemaElement o2) {
             int len1 = o1.getName().length();

chat/core/src/main/java/com/tencent/supersonic/chat/config/LLMParserConfig.java

@@ -16,4 +16,10 @@ public class LLMParserConfig {
     @Value("${query2sql.path:/query2sql}")
     private String queryToSqlPath;
 
+    @Value("${dimension.topn:5}")
+    private Integer dimensionTopN;
+
+    @Value("${metric.topn:5}")
+    private Integer metricTopN;
+
 }

chat/core/src/main/java/com/tencent/supersonic/chat/parser/llm/dsl/LLMDslParser.java

@@ -39,6 +39,7 @@ import com.tencent.supersonic.semantic.api.model.enums.TimeDimensionEnum;
 import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -87,7 +88,7 @@ public class LLMDslParser implements SemanticParser {
                 return;
             }
 
-            LLMReq llmReq = getLlmReq(queryCtx, modelId);
+            LLMReq llmReq = getLlmReq(queryCtx, modelId, llmParserConfig);
             LLMResp llmResp = requestLLM(llmReq, modelId, llmParserConfig);
 
             if (Objects.isNull(llmResp)) {
@@ -340,22 +341,28 @@ public class LLMDslParser implements SemanticParser {
         return null;
     }
 
-    private LLMReq getLlmReq(QueryContext queryCtx, Long modelId) {
+    private LLMReq getLlmReq(QueryContext queryCtx, Long modelId, LLMParserConfig llmParserConfig) {
         SemanticSchema semanticSchema = ContextUtils.getBean(SchemaService.class).getSemanticSchema();
         Map<Long, String> modelIdToName = semanticSchema.getModelIdToName();
         String queryText = queryCtx.getRequest().getQueryText();
+
         LLMReq llmReq = new LLMReq();
         llmReq.setQueryText(queryText);
+
         LLMReq.LLMSchema llmSchema = new LLMReq.LLMSchema();
         llmSchema.setModelName(modelIdToName.get(modelId));
         llmSchema.setDomainName(modelIdToName.get(modelId));
-        List<String> fieldNameList = getFieldNameList(queryCtx, modelId, semanticSchema);
+
+        List<String> fieldNameList = getFieldNameList(queryCtx, modelId, semanticSchema, llmParserConfig);
+
         fieldNameList.add(BaseSemanticCorrector.DATE_FIELD);
         llmSchema.setFieldNameList(fieldNameList);
         llmReq.setSchema(llmSchema);
+
         List<ElementValue> linking = new ArrayList<>();
         linking.addAll(getValueList(queryCtx, modelId, semanticSchema));
         llmReq.setLinking(linking);
+
         String currentDate = DSLDateHelper.getReferenceDate(modelId);
         llmReq.setCurrentDate(currentDate);
         return llmReq;
@@ -399,12 +406,29 @@ public class LLMDslParser implements SemanticParser {
     }
 
 
-    protected List<String> getFieldNameList(QueryContext queryCtx, Long modelId, SemanticSchema semanticSchema) {
+    protected List<String> getFieldNameList(QueryContext queryCtx, Long modelId, SemanticSchema semanticSchema,
+            LLMParserConfig llmParserConfig) {
         Map<Long, String> itemIdToName = getItemIdToName(modelId, semanticSchema);
 
+        Set<String> results = semanticSchema.getDimensions().stream()
+                .filter(schemaElement -> modelId.equals(schemaElement.getModel()))
+                .sorted(Comparator.comparing(SchemaElement::getUseCnt).reversed())
+                .limit(llmParserConfig.getDimensionTopN())
+                .map(entry -> entry.getName())
+                .collect(Collectors.toSet());
+
+        Set<String> metrics = semanticSchema.getMetrics().stream()
+                .filter(schemaElement -> modelId.equals(schemaElement.getModel()))
+                .sorted(Comparator.comparing(SchemaElement::getUseCnt).reversed())
+                .limit(llmParserConfig.getMetricTopN())
+                .map(entry -> entry.getName())
+                .collect(Collectors.toSet());
+
+        results.addAll(metrics);
+
         List<SchemaElementMatch> matchedElements = queryCtx.getMapInfo().getMatchedElements(modelId);
         if (CollectionUtils.isEmpty(matchedElements)) {
-            return new ArrayList<>();
+            return new ArrayList<>(results);
         }
         Set<String> fieldNameList = matchedElements.stream()
                 .filter(schemaElementMatch -> {
@@ -423,7 +447,8 @@ public class LLMDslParser implements SemanticParser {
                 })
                 .filter(name -> StringUtils.isNotEmpty(name) && !name.contains("%"))
                 .collect(Collectors.toSet());
-        return new ArrayList<>(fieldNameList);
+        results.addAll(fieldNameList);
+        return new ArrayList<>(results);
     }
 
     protected Map<Long, String> getItemIdToName(Long modelId, SemanticSchema semanticSchema) {

chat/core/src/main/java/com/tencent/supersonic/chat/query/llm/dsl/DslQuery.java

@@ -15,7 +15,10 @@ import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.JsonUtil;
+import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDslReq;
 import java.util.ArrayList;
 import java.util.List;
@@ -42,12 +45,10 @@ public class DslQuery extends PluginSemanticQuery {
 
     @Override
     public QueryResult execute(User user) {
-        String json = JsonUtil.toString(parseInfo.getProperties().get(Constants.CONTEXT));
+        LLMResp llmResp = getLlmResp();
-        DSLParseResult dslParseResult = JsonUtil.toObject(json, DSLParseResult.class);
-        LLMResp llmResp = dslParseResult.getLlmResp();
 
         long startTime = System.currentTimeMillis();
-        QueryDslReq queryDslReq = QueryReqBuilder.buildDslReq(llmResp.getCorrectorSql(), parseInfo.getModelId());
+        QueryDslReq queryDslReq = getQueryDslReq(llmResp);
         QueryResultWithSchemaResp queryResp = semanticLayer.queryByDsl(queryDslReq, user);
 
         log.info("queryByDsl cost:{},querySql:{}", System.currentTimeMillis() - startTime, llmResp.getSqlOutput());
@@ -71,4 +72,30 @@ public class DslQuery extends PluginSemanticQuery {
         parseInfo.setProperties(null);
         return queryResult;
     }
+
+    private LLMResp getLlmResp() {
+        String json = JsonUtil.toString(parseInfo.getProperties().get(Constants.CONTEXT));
+        DSLParseResult dslParseResult = JsonUtil.toObject(json, DSLParseResult.class);
+        return dslParseResult.getLlmResp();
+    }
+
+    private QueryDslReq getQueryDslReq(LLMResp llmResp) {
+        QueryDslReq queryDslReq = QueryReqBuilder.buildDslReq(llmResp.getCorrectorSql(), parseInfo.getModelId());
+        return queryDslReq;
+    }
+
+    @Override
+    public ExplainResp explain(User user) {
+        ExplainSqlReq explainSqlReq = null;
+        try {
+            explainSqlReq = ExplainSqlReq.builder()
+                    .queryTypeEnum(QueryTypeEnum.SQL)
+                    .queryReq(getQueryDslReq(getLlmResp()))
+                    .build();
+            return semanticLayer.explain(explainSqlReq, user);
+        } catch (Exception e) {
+            log.error("explain error explainSqlReq:{}", explainSqlReq, e);
+        }
+        return null;
+    }
 }

chat/core/src/main/java/com/tencent/supersonic/chat/query/plugin/PluginSemanticQuery.java

@@ -1,7 +1,9 @@
 package com.tencent.supersonic.chat.query.plugin;
 
+import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.chat.api.component.SemanticQuery;
 import com.tencent.supersonic.chat.api.pojo.SemanticParseInfo;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -17,5 +19,8 @@ public abstract class PluginSemanticQuery implements SemanticQuery {
         return parseInfo;
     }
 
-
+    @Override
+    public ExplainResp explain(User user) {
+        return null;
+    }
 }

chat/core/src/main/java/com/tencent/supersonic/chat/query/rule/RuleSemanticQuery.java

@@ -21,8 +21,11 @@ import com.tencent.supersonic.chat.utils.ComponentFactory;
 import com.tencent.supersonic.chat.utils.QueryReqBuilder;
 import com.tencent.supersonic.common.pojo.QueryColumn;
 import com.tencent.supersonic.common.util.ContextUtils;
+import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
 import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
+import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
 import java.io.Serializable;
@@ -215,6 +218,22 @@ public abstract class RuleSemanticQuery implements SemanticQuery, Serializable {
         return queryResult;
     }
 
+
+    @Override
+    public ExplainResp explain(User user) {
+        ExplainSqlReq explainSqlReq = null;
+        try {
+            explainSqlReq = ExplainSqlReq.builder()
+                    .queryTypeEnum(QueryTypeEnum.STRUCT)
+                    .queryReq(convertQueryStruct())
+                    .build();
+            return semanticLayer.explain(explainSqlReq, user);
+        } catch (Exception e) {
+            log.error("explain error explainSqlReq:{}", explainSqlReq, e);
+        }
+        return null;
+    }
+
     public QueryResult multiStructExecute(User user) {
         String queryMode = parseInfo.getQueryMode();
 

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

@@ -110,17 +110,18 @@ public class ChatConfigController {
     }
 
     @PostMapping("/dimension/page")
-    public PageInfo<DimensionResp> getDimension(@RequestBody PageDimensionReq pageDimensionCmd,
+    public PageInfo<DimensionResp> getDimension(@RequestBody PageDimensionReq pageDimensionReq,
                                                 HttpServletRequest request,
                                                 HttpServletResponse response) {
-        return semanticLayer.getDimensionPage(pageDimensionCmd);
+        return semanticLayer.getDimensionPage(pageDimensionReq);
     }
 
     @PostMapping("/metric/page")
-    public PageInfo<MetricResp> getMetric(@RequestBody PageMetricReq pageMetrricCmd,
+    public PageInfo<MetricResp> getMetric(@RequestBody PageMetricReq pageMetricReq,
                                           HttpServletRequest request,
                                           HttpServletResponse response) {
-        return semanticLayer.getMetricPage(pageMetrricCmd);
+        User user = UserHolder.findUser(request, response);
+        return semanticLayer.getMetricPage(pageMetricReq, user);
     }
 
 

chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/QueryServiceImpl.java

@@ -29,6 +29,7 @@ import com.tencent.supersonic.chat.service.SemanticService;
 import com.tencent.supersonic.chat.service.StatisticsService;
 import com.tencent.supersonic.chat.utils.ComponentFactory;
 
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Set;
@@ -37,9 +38,7 @@ import java.util.Comparator;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-//import com.tencent.supersonic.common.pojo.Aggregator;
 import com.tencent.supersonic.common.pojo.DateConf;
-//import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum;
 import com.tencent.supersonic.common.util.ContextUtils;
 import com.tencent.supersonic.common.util.JsonUtil;
 import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
@@ -68,8 +67,6 @@ public class QueryServiceImpl implements QueryService {
     @Autowired
     private QueryResponder queryResponder;
 
-    private final String entity = "ENTITY";
-
     @Value("${time.threshold: 100}")
     private Integer timeThreshold;
 
@@ -113,12 +110,16 @@ public class QueryServiceImpl implements QueryService {
                     .map(SemanticQuery::getParseInfo)
                     .sorted(Comparator.comparingDouble(SemanticParseInfo::getScore).reversed())
                     .collect(Collectors.toList());
+
             selectedParses.forEach(parseInfo -> {
-                if (parseInfo.getQueryMode().contains(entity)) {
+                String queryMode = parseInfo.getQueryMode();
+                if (QueryManager.isEntityQuery(queryMode)) {
                     EntityInfo entityInfo = ContextUtils.getBean(SemanticService.class)
                             .getEntityInfo(parseInfo, queryReq.getUser());
                     parseInfo.setEntityInfo(entityInfo);
                 }
+                addExplainSql(queryReq, parseInfo);
+
             });
             List<SemanticParseInfo> candidateParses = queryCtx.getCandidateQueries().stream()
                     .map(SemanticQuery::getParseInfo).collect(Collectors.toList());
@@ -145,6 +146,19 @@ public class QueryServiceImpl implements QueryService {
         return parseResult;
     }
 
+    private void addExplainSql(QueryReq queryReq, SemanticParseInfo parseInfo) {
+        SemanticQuery semanticQuery = QueryManager.createQuery(parseInfo.getQueryMode());
+        if (Objects.isNull(semanticQuery)) {
+            return;
+        }
+        semanticQuery.setParseInfo(parseInfo);
+        ExplainResp explain = semanticQuery.explain(queryReq.getUser());
+        if (Objects.isNull(explain)) {
+            return;
+        }
+        parseInfo.setSql(explain.getSql());
+    }
+
     @Override
     public QueryResult performExecution(ExecuteQueryReq queryReq) throws Exception {
         ChatParseDO chatParseDO = chatService.getParseInfo(queryReq.getQueryId(),
@@ -162,9 +176,9 @@ public class QueryServiceImpl implements QueryService {
         chatCtx.setAgentId(queryReq.getAgentId());
         Long startTime = System.currentTimeMillis();
         QueryResult queryResult = semanticQuery.execute(queryReq.getUser());
-        Long endTime = System.currentTimeMillis();
+
         if (queryResult != null) {
-            timeCostDOList.add(StatisticsDO.builder().cost((int) (endTime - startTime))
+            timeCostDOList.add(StatisticsDO.builder().cost((int) (System.currentTimeMillis() - startTime))
                     .interfaceName(semanticQuery.getClass().getSimpleName()).type(CostType.QUERY.getType()).build());
             saveInfo(timeCostDOList, queryReq.getQueryText(), queryReq.getQueryId(),
                     queryReq.getUser().getName(), queryReq.getChatId().longValue());
@@ -176,7 +190,6 @@ public class QueryServiceImpl implements QueryService {
             }
             chatCtx.setQueryText(queryReq.getQueryText());
             chatCtx.setUser(queryReq.getUser().getName());
-            //chatService.addQuery(queryResult, chatCtx);
             chatService.updateQuery(queryReq.getQueryId(), queryResult, chatCtx);
             queryResponder.saveSolvedQuery(queryReq.getQueryText(), queryReq.getQueryId(), queryReq.getParseId());
         } else {
@@ -272,13 +285,6 @@ public class QueryServiceImpl implements QueryService {
         dateConf.setPeriod("DAY");
         queryStructReq.setDateInfo(dateConf);
         queryStructReq.setLimit(20L);
-
-        //        List<Aggregator> aggregators = new ArrayList<>();
-        //        Aggregator aggregator = new Aggregator(dimensionValueReq.getQueryFilter().getBizName(),
-        //                AggOperatorEnum.DISTINCT);
-        //        aggregators.add(aggregator);
-        //        queryStructReq.setAggregators(aggregators);
-
         queryStructReq.setModelId(dimensionValueReq.getModelId());
         queryStructReq.setNativeQuery(true);
         List<String> groups = new ArrayList<>();

chat/core/src/main/python/run_config.py

@@ -15,6 +15,7 @@ CHROMA_DB_PERSIST_DIR = 'chm_db'
 PRESET_QUERY_COLLECTION_NAME = "preset_query_collection"
 TEXT2DSL_COLLECTION_NAME = "text2dsl_collection"
 TEXT2DSL_FEW_SHOTS_EXAMPLE_NUM = 15
+TEXT2DSL_IS_SHORTCUT = False
 
 CHROMA_DB_PERSIST_PATH = os.path.join(PROJECT_DIR_PATH, CHROMA_DB_PERSIST_DIR)
 

chat/core/src/main/python/sql/constructor.py

@@ -22,10 +22,8 @@ from util.text2vec import Text2VecEmbeddingFunction, hg_embedding
 from util.chromadb_instance import client as chromadb_client, empty_chroma_collection_2
 from run_config import TEXT2DSL_COLLECTION_NAME, TEXT2DSL_FEW_SHOTS_EXAMPLE_NUM
 
-
 def reload_sql_example_collection(vectorstore:Chroma, 
                                 sql_examplars:List[Mapping[str, str]],
-                                schema_linking_example_selector:SemanticSimilarityExampleSelector,
                                 sql_example_selector:SemanticSimilarityExampleSelector, 
                                 example_nums:int
                                 ):
@@ -35,20 +33,16 @@ def reload_sql_example_collection(vectorstore:Chroma,
 
     print("emptied sql_examples_collection size:", vectorstore._collection.count())
 
-    schema_linking_example_selector = SemanticSimilarityExampleSelector(vectorstore=sql_examples_vectorstore, k=example_nums,
-                                                        input_keys=["question"], 
-                                                        example_keys=["table_name", "fields_list", "prior_schema_links", "question", "analysis", "schema_links"])
-
     sql_example_selector = SemanticSimilarityExampleSelector(vectorstore=sql_examples_vectorstore, k=example_nums,
                                                         input_keys=["question"], 
-                                                        example_keys=["question", "current_date", "table_name", "schema_links", "sql"])
+                                                        example_keys=["table_name", "fields_list", "prior_schema_links", "question", "analysis", "schema_links", "current_date", "sql"])
 
     for example in sql_examplars:
-        schema_linking_example_selector.add_example(example)
+        sql_example_selector.add_example(example)
 
     print("reloaded sql_examples_collection size:", vectorstore._collection.count())
 
-    return vectorstore, schema_linking_example_selector, sql_example_selector
+    return vectorstore, sql_example_selector
 
 
 sql_examples_vectorstore = Chroma(collection_name=TEXT2DSL_COLLECTION_NAME, 
@@ -57,22 +51,14 @@ sql_examples_vectorstore = Chroma(collection_name=TEXT2DSL_COLLECTION_NAME,
 
 example_nums = TEXT2DSL_FEW_SHOTS_EXAMPLE_NUM
 
-schema_linking_example_selector = SemanticSimilarityExampleSelector(vectorstore=sql_examples_vectorstore, k=example_nums,
-                                                        input_keys=["question"], 
-                                                        example_keys=["table_name", "fields_list", "prior_schema_links", "question", "analysis", "schema_links"])
-
 sql_example_selector = SemanticSimilarityExampleSelector(vectorstore=sql_examples_vectorstore, k=example_nums,
                                                         input_keys=["question"], 
-                                                        example_keys=["question", "current_date", "table_name", "schema_links", "sql"])
+                                                        example_keys=["table_name", "fields_list", "prior_schema_links", "question", "analysis", "schema_links", "current_date", "sql"])
 
 if sql_examples_vectorstore._collection.count() > 0:
     print("examples already in sql_vectorstore")
     print("init sql_vectorstore size:", sql_examples_vectorstore._collection.count()) 
-    if sql_examples_vectorstore._collection.count() < len(sql_examplars):
-        print("sql_examplars size:", len(sql_examplars))
-        sql_examples_vectorstore, schema_linking_example_selector, sql_example_selector = reload_sql_example_collection(sql_examples_vectorstore, sql_examplars, schema_linking_example_selector, sql_example_selector, example_nums)
-        print("added sql_vectorstore size:", sql_examples_vectorstore._collection.count())
-else:
-    sql_examples_vectorstore, schema_linking_example_selector, sql_example_selector = reload_sql_example_collection(sql_examples_vectorstore, sql_examplars, schema_linking_example_selector, sql_example_selector, example_nums)
-    print("added sql_vectorstore size:", sql_examples_vectorstore._collection.count())
 
+print("sql_examplars size:", len(sql_examplars))
+sql_examples_vectorstore, sql_example_selector = reload_sql_example_collection(sql_examples_vectorstore, sql_examplars, sql_example_selector, example_nums)
+print("added sql_vectorstore size:", sql_examples_vectorstore._collection.count())

chat/core/src/main/python/sql/examples_reload_run.py

@@ -8,24 +8,22 @@ import json
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-from run_config import TEXT2DSL_FEW_SHOTS_EXAMPLE_NUM
+from run_config import TEXT2DSL_FEW_SHOTS_EXAMPLE_NUM, TEXT2DSL_IS_SHORTCUT
 from few_shot_example.sql_exampler import examplars as sql_examplars
-from run_config import LLMPARSER_HOST
+from run_config import LLMPARSER_HOST, LLMPARSER_PORT
-from run_config import LLMPARSER_PORT
 
 
 def text2dsl_setting_update(llm_parser_host:str, llm_parser_port:str,
-        sql_examplars:List[Mapping[str, str]], example_nums:int):
+        sql_examplars:List[Mapping[str, str]], example_nums:int, is_shortcut:bool):
 
     url = f"http://{llm_parser_host}:{llm_parser_port}/query2sql_setting_update/"
     print("url: ", url)
-    payload = {"sqlExamplars":sql_examplars, "exampleNums":example_nums}
+    payload = {"sqlExamplars":sql_examplars, "exampleNums":example_nums, "isShortcut":is_shortcut}
     headers = {'content-type': 'application/json'}
     response = requests.post(url, data=json.dumps(payload), headers=headers)
     print(response.text)
 
 
 if __name__ == "__main__":
-    arguments = sys.argv
     text2dsl_setting_update(LLMPARSER_HOST, LLMPARSER_PORT,
-                            sql_examplars, TEXT2DSL_FEW_SHOTS_EXAMPLE_NUM)
+                            sql_examplars, TEXT2DSL_FEW_SHOTS_EXAMPLE_NUM, TEXT2DSL_IS_SHORTCUT)

chat/core/src/main/python/sql/output_parser.py

@@ -11,3 +11,35 @@ def schema_link_parse(schema_link_output):
         schema_link_output = None
 
     return schema_link_output
+
+def combo_schema_link_parse(schema_linking_sql_combo_output: str):
+    try:
+        schema_linking_sql_combo_output = schema_linking_sql_combo_output.strip()
+        pattern = r'Schema_links:(\[.*?\])'
+        schema_links_match = re.search(pattern, schema_linking_sql_combo_output)
+
+        if schema_links_match:
+            schema_links = schema_links_match.group(1)
+        else:
+            schema_links = None
+    except Exception as e:
+        print(e)
+        schema_links = None
+
+    return schema_links
+
+def combo_sql_parse(schema_linking_sql_combo_output: str):
+    try:
+        schema_linking_sql_combo_output = schema_linking_sql_combo_output.strip()
+        pattern = r'SQL:(.*)'
+        sql_match = re.search(pattern, schema_linking_sql_combo_output)
+
+        if sql_match:
+            sql = sql_match.group(1)
+        else:
+            sql = None
+    except Exception as e:
+        print(e)
+        sql = None
+
+    return sql

chat/core/src/main/python/sql/prompt_maker.py

@@ -73,3 +73,38 @@ def sql_exampler(user_query: str,
                                                             schema_links=schema_link_str)
 
     return sql_example_prompt
+
+
+def schema_linking_sql_combo_examplar(user_query: str,
+                            domain_name: str,
+                            data_date : str,
+                            fields_list: List[str],
+                            prior_schema_links: Mapping[str,str],
+                            example_selector: SemanticSimilarityExampleSelector) -> str:
+    
+    prior_schema_links_str = '['+ ','.join(["""'{}'->{}""".format(k,v) for k,v in prior_schema_links.items()]) + ']'
+
+    example_prompt_template = PromptTemplate(input_variables=["table_name", "fields_list", "prior_schema_links", "current_date", "question", "analysis", "schema_links", "sql"],
+                                template="Table {table_name}, columns = {fields_list}, prior_schema_links = {prior_schema_links}\nCurrent_date:{current_date}\n问题:{question}\n分析:{analysis} 所以Schema_links是:\nSchema_links:{schema_links}\nSQL:{sql}")
+
+    instruction = "# 根据数据库的表结构,参考先验信息,找出为每个问题生成SQL查询语句的schema_links,再根据schema_links为每个问题生成SQL查询语句"
+
+    schema_linking_sql_combo_prompt = "Table {table_name}, columns = {fields_list}, prior_schema_links = {prior_schema_links}\nCurrent_date:{current_date}\n问题:{question}\n分析: 让我们一步一步地思考。"
+
+    schema_linking_sql_combo_example_prompt_template = FewShotPromptTemplate(
+        example_selector=example_selector,
+        example_prompt=example_prompt_template,
+        example_separator="\n\n", 
+        prefix=instruction,
+        input_variables=["table_name", "fields_list", "prior_schema_links", "current_date", "question"],
+        suffix=schema_linking_sql_combo_prompt
+        )
+
+    schema_linking_sql_combo_example_prompt = schema_linking_sql_combo_example_prompt_template.format(table_name=domain_name,
+                                                                                    fields_list=fields_list,
+                                                                                    prior_schema_links=prior_schema_links_str,
+                                                                                    current_date=data_date,
+                                                                                    question=user_query)
+    return schema_linking_sql_combo_example_prompt
+
+

chat/core/src/main/python/sql/run.py

@@ -7,32 +7,37 @@ import sys
 sys.path.append(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
-from sql.prompt_maker import schema_linking_exampler, sql_exampler
+from sql.prompt_maker import schema_linking_exampler, sql_exampler, schema_linking_sql_combo_examplar
-from sql.constructor import schema_linking_example_selector, sql_example_selector,sql_examples_vectorstore, reload_sql_example_collection
+from sql.constructor import sql_examples_vectorstore, sql_example_selector, reload_sql_example_collection
-from sql.output_parser import schema_link_parse
+from sql.output_parser import schema_link_parse, combo_schema_link_parse, combo_sql_parse
 
 from util.llm_instance import llm
-
+from run_config import TEXT2DSL_IS_SHORTCUT
 
 class Text2DSLAgent(object):
         def __init__(self):
             self.schema_linking_exampler = schema_linking_exampler
             self.sql_exampler = sql_exampler
 
+            self.schema_linking_sql_combo_exampler = schema_linking_sql_combo_examplar
+
             self.sql_examples_vectorstore = sql_examples_vectorstore
-            self.schema_linking_example_selector = schema_linking_example_selector
             self.sql_example_selector = sql_example_selector
 
             self.schema_link_parse = schema_link_parse
+            self.combo_schema_link_parse = combo_schema_link_parse
+            self.combo_sql_parse = combo_sql_parse
 
             self.llm = llm
 
-        def update_examples(self, sql_examplars, example_nums):
+            self.is_shortcut = TEXT2DSL_IS_SHORTCUT
-            self.sql_examples_vectorstore, self.schema_linking_example_selector, self.sql_example_selector = reload_sql_example_collection(self.sql_examples_vectorstore, 
+
-                                                                                                                                           sql_examplars, 
+        def update_examples(self, sql_examples, example_nums, is_shortcut):
-                                                                                                                                           self.schema_linking_example_selector, 
+            self.sql_examples_vectorstore,  self.sql_example_selector = reload_sql_example_collection(self.sql_examples_vectorstore, 
+                                                                                                    sql_examples, 
                                                                                                     self.sql_example_selector, 
                                                                                                     example_nums)
+            self.is_shortcut = is_shortcut
 
         def query2sql(self, query_text: str, 
             schema : Union[dict, None] = None,
@@ -53,14 +58,14 @@ class Text2DSLAgent(object):
             model_name = schema['modelName']
             fields_list = schema['fieldNameList']
 
-            schema_linking_prompt = self.schema_linking_exampler(query_text, model_name, fields_list, prior_schema_links, self.schema_linking_example_selector)
+            schema_linking_prompt = self.schema_linking_exampler(query_text, model_name, fields_list, prior_schema_links, self.sql_example_selector)
             print("schema_linking_prompt->", schema_linking_prompt)
             schema_link_output = self.llm(schema_linking_prompt)
             schema_link_str = self.schema_link_parse(schema_link_output)
             
             sql_prompt = self.sql_exampler(query_text, model_name, schema_link_str, current_date, self.sql_example_selector)
             print("sql_prompt->", sql_prompt)
-            sql_output = llm(sql_prompt)
+            sql_output = self.llm(sql_prompt)
 
             resp = dict()
             resp['query'] = query_text
@@ -69,7 +74,7 @@ class Text2DSLAgent(object):
             resp['priorSchemaLinking'] = linking
             resp['dataDate'] = current_date
 
-            resp['schemaLinkingOutput'] = schema_link_output
+            resp['analysisOutput'] = schema_link_output
             resp['schemaLinkStr'] = schema_link_str
             
             resp['sqlOutput'] = sql_output
@@ -78,5 +83,57 @@ class Text2DSLAgent(object):
 
             return resp
 
+        def query2sqlcombo(self, query_text: str, 
+            schema : Union[dict, None] = None,
+            current_date: str = None,
+            linking: Union[List[Mapping[str, str]], None] = None
+            ):
+
+            print("query_text: ", query_text)
+            print("schema: ", schema)
+            print("current_date: ", current_date)
+            print("prior_schema_links: ", linking)
+
+            if linking is not None:
+                  prior_schema_links = {item['fieldValue']:item['fieldName'] for item in linking}
+            else:
+                  prior_schema_links = {}
+
+            model_name = schema['modelName']
+            fields_list = schema['fieldNameList']
+
+            schema_linking_sql_combo_prompt = self.schema_linking_sql_combo_exampler(query_text, model_name, current_date, fields_list,
+                                                                                    prior_schema_links, self.sql_example_selector)
+            print("schema_linking_sql_combo_prompt->", schema_linking_sql_combo_prompt)
+            schema_linking_sql_combo_output = self.llm(schema_linking_sql_combo_prompt)
+
+            schema_linking_str = self.combo_schema_link_parse(schema_linking_sql_combo_output)
+            sql_str = self.combo_sql_parse(schema_linking_sql_combo_output)
+
+            resp = dict()
+            resp['query'] = query_text
+            resp['model'] = model_name
+            resp['fields'] = fields_list
+            resp['priorSchemaLinking'] = prior_schema_links
+            resp['dataDate'] = current_date
+
+            resp['analysisOutput'] = schema_linking_sql_combo_output
+            resp['schemaLinkStr'] = schema_linking_str
+            resp['sqlOutput'] = sql_str
+
+            print("resp: ", resp)
+
+            return resp
+
+        def query2sql_run(self, query_text: str, 
+            schema : Union[dict, None] = None,
+            current_date: str = None,
+            linking: Union[List[Mapping[str, str]], None] = None):
+
+            if self.is_shortcut:
+                  return self.query2sqlcombo(query_text, schema, current_date, linking)
+            else:
+                  return self.query2sql(query_text, schema, current_date, linking)
+
 text2sql_agent = Text2DSLAgent()
 

chat/core/src/main/python/supersonic_llmparser.py

@@ -51,7 +51,7 @@ async def din_query2sql(query_body: Mapping[str, Any]):
     else:
         linking = query_body['linking']
 
-    resp = text2sql_agent.query2sql(query_text=query_text,  
+    resp = text2sql_agent.query2sql_run(query_text=query_text,  
                      schema=schema, current_date=current_date, linking=linking)
 
     return resp
@@ -70,7 +70,12 @@ async def query2sql_setting_update(query_body: Mapping[str, Any]):
     else:
         example_nums = query_body['exampleNums']
 
-    text2sql_agent.update_examples(sql_examplars=sql_examplars, example_nums=example_nums)
+    if 'isShortcut' not in query_body:
+        raise HTTPException(status_code=400, detail="isShortcut is not in query_body")
+    else:
+        is_shortcut = query_body['isShortcut']
+
+    text2sql_agent.update_examples(sql_examples=sql_examplars, example_nums=example_nums, is_shortcut=is_shortcut)
 
     return "success"
 

chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/DefaultSemanticConfig.java

@@ -38,4 +38,7 @@ public class DefaultSemanticConfig {
     @Value("${fetchModelList.path:/api/semantic/schema/model/list}")
     private String fetchModelListPath;
 
+    @Value("${explain.path:/api/semantic/query/explain}")
+    private String explainPath;
+
 }

chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/LocalSemanticLayer.java

@@ -8,12 +8,14 @@ import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq;
 import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq;
 import com.tencent.supersonic.semantic.api.model.request.PageMetricReq;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
 import com.tencent.supersonic.semantic.api.model.response.ModelResp;
 import com.tencent.supersonic.semantic.api.model.response.MetricResp;
 import com.tencent.supersonic.semantic.api.model.response.DomainResp;
 import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
 import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
+import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDslReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
@@ -79,8 +81,9 @@ public class LocalSemanticLayer extends BaseSemanticLayer {
     public List<ModelSchemaResp> doFetchModelSchema(List<Long> ids) {
         ModelSchemaFilterReq filter = new ModelSchemaFilterReq();
         filter.setModelIds(ids);
-        modelService = ContextUtils.getBean(ModelService.class);
+        schemaService = ContextUtils.getBean(SchemaService.class);
-        return modelService.fetchModelSchema(filter);
+        User user = User.getFakeUser();
+        return schemaService.fetchModelSchema(filter, user);
     }
 
     @Override
@@ -95,6 +98,12 @@ public class LocalSemanticLayer extends BaseSemanticLayer {
         return schemaService.getModelList(user, authType, domainId);
     }
 
+    @Override
+    public <T> ExplainResp explain(ExplainSqlReq<T> explainSqlReq, User user) throws Exception {
+        queryService = ContextUtils.getBean(QueryService.class);
+        return queryService.explain(explainSqlReq, user);
+    }
+
     @Override
     public PageInfo<DimensionResp> getDimensionPage(PageDimensionReq pageDimensionCmd) {
         dimensionService = ContextUtils.getBean(DimensionService.class);
@@ -102,9 +111,9 @@ public class LocalSemanticLayer extends BaseSemanticLayer {
     }
 
     @Override
-    public PageInfo<MetricResp> getMetricPage(PageMetricReq pageMetricReq) {
+    public PageInfo<MetricResp> getMetricPage(PageMetricReq pageMetricReq, User user) {
         metricService = ContextUtils.getBean(MetricService.class);
-        return metricService.queryMetric(pageMetricReq);
+        return metricService.queryMetric(pageMetricReq, user);
     }
 
 }

chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/semantic/RemoteSemanticLayer.java

@@ -1,38 +1,44 @@
 package com.tencent.supersonic.knowledge.semantic;
 
+import static com.tencent.supersonic.common.pojo.Constants.LIST_LOWER;
+import static com.tencent.supersonic.common.pojo.Constants.PAGESIZE_LOWER;
+import static com.tencent.supersonic.common.pojo.Constants.TOTAL_LOWER;
+import static com.tencent.supersonic.common.pojo.Constants.TRUE_LOWER;
+
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageInfo;
 import com.google.gson.Gson;
 import com.tencent.supersonic.auth.api.authentication.config.AuthenticationConfig;
 import com.tencent.supersonic.auth.api.authentication.constant.UserConstants;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.ResultData;
+import com.tencent.supersonic.common.pojo.ReturnCode;
+import com.tencent.supersonic.common.pojo.enums.AuthType;
+import com.tencent.supersonic.common.pojo.exception.CommonException;
 import com.tencent.supersonic.common.util.ContextUtils;
+import com.tencent.supersonic.common.util.JsonUtil;
 import com.tencent.supersonic.common.util.S2ThreadContext;
 import com.tencent.supersonic.common.util.ThreadContext;
-import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq;
 import com.tencent.supersonic.semantic.api.model.request.PageDimensionReq;
 import com.tencent.supersonic.semantic.api.model.request.PageMetricReq;
-import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricResp;
-import com.tencent.supersonic.semantic.api.model.response.DomainResp;
 import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
+import com.tencent.supersonic.semantic.api.model.response.DomainResp;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
+import com.tencent.supersonic.semantic.api.model.response.MetricResp;
+import com.tencent.supersonic.semantic.api.model.response.ModelResp;
 import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
+import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDslReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
-import com.tencent.supersonic.common.pojo.exception.CommonException;
-import com.tencent.supersonic.common.pojo.ResultData;
-import com.tencent.supersonic.common.pojo.ReturnCode;
-
 import java.net.URI;
+import java.net.URL;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Objects;
-import java.util.LinkedHashMap;
-
 import lombok.extern.slf4j.Slf4j;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.BeanUtils;
@@ -45,11 +51,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
-import static com.tencent.supersonic.common.pojo.Constants.TRUE_LOWER;
-import static com.tencent.supersonic.common.pojo.Constants.LIST_LOWER;
-import static com.tencent.supersonic.common.pojo.Constants.TOTAL_LOWER;
-import static com.tencent.supersonic.common.pojo.Constants.PAGESIZE_LOWER;
-
 @Slf4j
 public class RemoteSemanticLayer extends BaseSemanticLayer {
 
@@ -61,6 +62,10 @@ public class RemoteSemanticLayer extends BaseSemanticLayer {
             new ParameterizedTypeReference<ResultData<QueryResultWithSchemaResp>>() {
             };
 
+    private ParameterizedTypeReference<ResultData<ExplainResp>> explainTypeRef =
+            new ParameterizedTypeReference<ResultData<ExplainResp>>() {
+            };
+
     @Override
     public QueryResultWithSchemaResp queryByStruct(QueryStructReq queryStructReq, User user) {
         DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
@@ -130,9 +135,10 @@ public class RemoteSemanticLayer extends BaseSemanticLayer {
         fillToken(headers);
         DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
 
-        URI requestUrl = UriComponentsBuilder.fromHttpUrl(
+        String semanticUrl = defaultSemanticConfig.getSemanticUrl();
-                defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getFetchModelSchemaPath()).build()
+        String fetchModelSchemaPath = defaultSemanticConfig.getFetchModelSchemaPath();
-                .encode().toUri();
+        URI requestUrl = UriComponentsBuilder.fromHttpUrl(semanticUrl + fetchModelSchemaPath)
+                .build().encode().toUri();
         ModelSchemaFilterReq filter = new ModelSchemaFilterReq();
         filter.setModelIds(ids);
         ParameterizedTypeReference<ResultData<List<ModelSchemaResp>>> responseTypeRef =
@@ -179,6 +185,39 @@ public class RemoteSemanticLayer extends BaseSemanticLayer {
         return JsonUtil.toList(JsonUtil.toString(domainDescListObject), ModelResp.class);
     }
 
+    @Override
+    public <T> ExplainResp explain(ExplainSqlReq<T> explainResp, User user) throws Exception {
+        DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
+        String semanticUrl = defaultSemanticConfig.getSemanticUrl();
+        String explainPath = defaultSemanticConfig.getExplainPath();
+        URL url = new URL(new URL(semanticUrl), explainPath);
+        return explain(url.toString(), JsonUtil.toString(explainResp));
+    }
+
+    public ExplainResp explain(String url, String jsonReq) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        fillToken(headers);
+        URI requestUrl = UriComponentsBuilder.fromHttpUrl(url).build().encode().toUri();
+        HttpEntity<String> entity = new HttpEntity<>(jsonReq, headers);
+        log.info("url:{},explain:{}", url, entity.getBody());
+        ResultData<ExplainResp> responseBody;
+        try {
+            RestTemplate restTemplate = ContextUtils.getBean(RestTemplate.class);
+
+            ResponseEntity<ResultData<ExplainResp>> responseEntity = restTemplate.exchange(
+                    requestUrl, HttpMethod.POST, entity, explainTypeRef);
+            log.info("ApiResponse<ExplainResp> responseBody:{}", responseEntity);
+            responseBody = responseEntity.getBody();
+            if (Objects.nonNull(responseBody.getData())) {
+                return responseBody.getData();
+            }
+            return null;
+        } catch (Exception e) {
+            throw new RuntimeException("explain interface error,url:" + url, e);
+        }
+    }
+
     public Object fetchHttpResult(String url, String bodyJson, HttpMethod httpMethod) {
         HttpHeaders headers = new HttpHeaders();
         headers.setContentType(MediaType.APPLICATION_JSON);
@@ -219,7 +258,7 @@ public class RemoteSemanticLayer extends BaseSemanticLayer {
     }
 
     @Override
-    public PageInfo<MetricResp> getMetricPage(PageMetricReq pageMetricCmd) {
+    public PageInfo<MetricResp> getMetricPage(PageMetricReq pageMetricCmd, User user) {
         String body = JsonUtil.toString(pageMetricCmd);
         DefaultSemanticConfig defaultSemanticConfig = ContextUtils.getBean(DefaultSemanticConfig.class);
         log.info("url:{}", defaultSemanticConfig.getSemanticUrl() + defaultSemanticConfig.getFetchMetricPagePath());

chat/knowledge/src/main/java/com/tencent/supersonic/knowledge/service/SchemaService.java

@@ -18,7 +18,7 @@ public class SchemaService {
 
 
     public static final String ALL_CACHE = "all";
-    private static final Integer META_CACHE_TIME = 5;
+    private static final Integer META_CACHE_TIME = 2;
     private SemanticLayer semanticLayer = ComponentFactory.getSemanticLayer();
 
     private LoadingCache<String, SemanticSchema> cache = CacheBuilder.newBuilder()

common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlParserSelectHelperTest.java

@@ -75,6 +75,13 @@ class SqlParserSelectHelperTest {
                         + "user_id like '%alice%' AND  publish_date > 10000   ORDER BY pv DESC LIMIT 1");
 
         System.out.println(filterExpression);
+
+        filterExpression = SqlParserSelectHelper.getFilterExpression(
+                "SELECT department, pv FROM s2 WHERE "
+                        + "user_id like '%alice%' AND  publish_date > 10000  "
+                        + "group by department having sum(pv) > 2000 ORDER BY pv DESC LIMIT 1");
+
+        System.out.println(filterExpression);
     }
 
 

docs/userguides/text2sql_cn.md

@@ -5,21 +5,25 @@ text2sql的功能实现，高度依赖对LLM的应用。通过LLM生成SQL的过
 
 ### **配置方式**
 1. 样本池的配置。
-   - supersonic/chat/core/src/main/python/llm/few_shot_example/sql_exampler.py为样本池配置文件。用户可以以已有的样本作为参考，配置更贴近自身业务需求的样本，用于更好的引导LLM生成SQL。
+   - supersonic/chat/core/src/main/python/few_shot_example/sql_exampler.py 为样本池配置文件。用户可以以已有的样本作为参考，配置更贴近自身业务需求的样本，用于更好的引导LLM生成SQL。
 2. 样本数量的配置。
-   - 在supersonic/chat/core/src/main/python/llm/run_config.py 中通过 TEXT2DSL_FEW_SHOTS_EXAMPLE_NUM 变量进行配置。
+   - 在 supersonic/chat/core/src/main/python/run_config.py 中通过 TEXT2DSL_FEW_SHOTS_EXAMPLE_NUM 变量进行配置。
    - 默认值为15，为项目在内部实践后较优的经验值。样本少太少，对导致LLM在生成SQL的过程中缺少引导和示范，生成的SQL会更不稳定；样本太多，会增加生成SQL需要的时间和LLM的token消耗（或超过LLM的token上限）。
-   - <div align="left" >
+3. SQL生成方式的配置
+   - 在 supersonic/chat/core/src/main/python/run_config.py 中通过 TEXT2DSL_IS_SHORTCUT 变量进行配置。
+   - 默认值为False；当为False时，会调用2次LLM生成SQL；当为True时，会只调用1次LLM生成SQL。相较于2次LLM调用生成的SQL，耗时会减少30-40%，token的消耗量会减少30%左右，但生成的SQL正确率会有所下降。
+<div align="left" >
     <img src=../images/text2sql_config.png width="70%"/>
-    <p>图1-1 样本数量的配置文件</p>
+    <p>图1-1 配置文件</p>
 </div>
 
-3. 运行中更新配置的脚本。
+### **运行中更新配置的脚本**
-   - 如果在启动项目后，用户需要对text2sql功能的相关配置进行调试，可以在修改相关配置文件后，通过脚本 supersonic/chat/core/src/main/python/bin/text2sql_resetting.sh 在项目运行中让配置生效。
+1. 如果在启动项目后，用户需要对text2sql功能的相关配置进行调试，可以在修改相关配置文件后，通过以下2种方式让配置在项目运行中让配置生效。
-
+   - 执行 supersonic-daemon.sh reload llmparser 
+   - 执行 python examples_reload_run.py
 ### **FAQ**
 1. 生成一个SQL需要消耗的的LLM token数量太多了，按照openAI对token的收费标准，生成一个SQL太贵了，可以少用一些token吗？
-   - 可以。 用户可以根据自身需求，如配置方式1.中所示，修改样本池中的样本，选用一些更加简短的样本。如配置方式2.中所示，减少使用的样本数量。
+   - 可以。 用户可以根据自身需求，如配置方式1.中所示，修改样本池中的样本，选用一些更加简短的样本。如配置方式2.中所示，减少使用的样本数量。配置方式3.中所示，只调用1次LLM生成SQL。
    - 需要注意，样本和样本数量的选择对生成SQL的质量有很大的影响。过于激进的降低输入的token数量可能会降低生成SQL的质量。需要用户根据自身业务特点实测后进行平衡。
 
 

launchers/chat/src/main/resources/db/chat-data-h2.sql

@@ -1,4 +1,4 @@
-insert into s2_user (id, `name`, password, display_name, email) values (1, 'admin','admin','admin','admin@xx.com');
+insert into s2_user (id, `name`, password, display_name, email, is_admin) values (1, 'admin','admin','admin','admin@xx.com', 1);
 insert into s2_user (id, `name`, password, display_name, email) values (2, 'jack','123456','jack','jack@xx.com');
 insert into s2_user (id, `name`, password, display_name, email) values (3, 'tom','123456','tom','tom@xx.com');
 insert into s2_user (id, `name`, password, display_name, email) values (4, 'lucy','123456','lucy','lucy@xx.com');

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

@@ -1,3 +1,4 @@
+-- chat tables
 CREATE TABLE IF NOT EXISTS `s2_chat_context`
 (
     `chat_id`        BIGINT NOT NULL , -- context chat id
@@ -7,7 +8,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat_context`
     `semantic_parse` LONGVARCHAR DEFAULT NULL , -- parse data
     `ext_data`       LONGVARCHAR DEFAULT NULL , -- extend data
     PRIMARY KEY (`chat_id`)
-);
+    );
 
 CREATE TABLE IF NOT EXISTS `s2_chat`
 (
@@ -21,7 +22,7 @@ CREATE TABLE IF NOT EXISTS `s2_chat`
     `is_delete`     INT DEFAULT '0' COMMENT 'is deleted',
     `is_top`        INT DEFAULT '0' COMMENT 'is top',
     PRIMARY KEY (`chat_id`)
-) ;
+    ) ;
 
 
 CREATE TABLE `s2_chat_query`
@@ -75,61 +76,10 @@ CREATE TABLE IF NOT EXISTS `s2_chat_config` (
     `updated_by` varchar(100) NOT NULL   ,
     `status` INT NOT NULL  DEFAULT '0' , -- domain extension information status : 0 is normal, 1 is off the shelf, 2 is deleted
     PRIMARY KEY (`id`)
-) ;
+    ) ;
-
-
--- CREATE TABLE IF NOT EXISTS `s2_chat_config` (
---     `id` INT NOT NULL AUTO_INCREMENT,
---     `domain_id` INT DEFAULT NULL ,
---     `default_metrics` varchar(655) DEFAULT NULL,
---     `visibility` varchar(655)    , -- invisible dimension metric information
---     `entity_info` varchar(655)    ,
---     `dictionary_info` varchar(655)    , -- dictionary-related dimension setting information
---     `created_at` TIMESTAMP  NOT NULL   ,
---     `updated_at` TIMESTAMP  NOT NULL   ,
---     `created_by` varchar(100) NOT NULL   ,
---     `updated_by` varchar(100) NOT NULL   ,
---     `status` INT NOT NULL  DEFAULT '0' , -- domain extension information status : 0 is normal, 1 is off the shelf, 2 is deleted
---     PRIMARY KEY (`id`)
--- ) ;
 COMMENT ON TABLE s2_chat_config IS 'chat config information table ';
 
 
-
-
-CREATE TABLE IF NOT EXISTS `s2_dictionary` (
-    `id` INT NOT NULL AUTO_INCREMENT,
-    `domain_id` INT NOT NULL ,
-    `dim_value_infos` LONGVARCHAR , -- dimension value setting information
-    `created_at` TIMESTAMP  NOT NULL ,
-    `updated_at` TIMESTAMP  NOT NULL ,
-    `created_by` varchar(100) NOT NULL ,
-    `updated_by` varchar(100) DEFAULT NULL ,
-    `status` INT NOT NULL  DEFAULT '0' , -- domain extension information status : 0 is normal, 1 is off the shelf, 2 is deleted
-    PRIMARY KEY (`id`),
-    UNIQUE (domain_id)
-    );
-COMMENT ON TABLE s2_dictionary IS 'dictionary configuration information table';
-
-
-CREATE TABLE IF NOT EXISTS `s2_dictionary_task` (
-   `id` INT NOT NULL AUTO_INCREMENT,
-   `name` varchar(255) NOT NULL , -- task name
-   `description` varchar(255) ,
-   `command`LONGVARCHAR  NOT NULL , -- task Request Parameters
-   `command_md5` varchar(255)  NOT NULL , -- task Request Parameters md5
-   `dimension_ids` varchar(500) ,
-   `status` INT NOT NULL , -- the final status of the task
-   `created_at` TIMESTAMP DEFAULT CURRENT_TIMESTAMP  ,
-   `created_by` varchar(100) NOT NULL ,
-   `progress` DOUBLE default 0.00  ,  -- task real-time progress
-   `elapsed_ms` bigINT DEFAULT NULL , -- the task takes time in milliseconds
-   `message` LONGVARCHAR  , -- remark related information
-   PRIMARY KEY (`id`)
-);
-COMMENT ON TABLE s2_dictionary_task IS 'dictionary task information table';
-
-
 create table s2_user
 (
     id       INT AUTO_INCREMENT,
@@ -137,10 +87,33 @@ create table s2_user
     display_name varchar(100) null,
     password varchar(100) null,
     email varchar(100) null,
+    is_admin INT null,
     PRIMARY KEY (`id`)
 );
 COMMENT ON TABLE s2_user IS 'user information table';
 
+
+CREATE TABLE IF NOT EXISTS `s2_semantic_pasre_info` (
+                                                        `id` INT NOT NULL AUTO_INCREMENT,
+                                                        `trace_id` varchar(200) NOT NULL  ,
+    `model_id` INT  NOT NULL ,
+    `dimensions`LONGVARCHAR ,
+    `metrics`LONGVARCHAR ,
+    `orders`LONGVARCHAR ,
+    `filters`LONGVARCHAR ,
+    `date_info`LONGVARCHAR ,
+    `limit` INT NOT NULL ,
+    `native_query` TINYINT NOT NULL DEFAULT '0' ,
+    `sql`LONGVARCHAR ,
+    `created_at` TIMESTAMP  NOT NULL ,
+    `created_by` varchar(100) NOT NULL ,
+    `status` INT NOT NULL ,
+    `elapsed_ms` bigINT DEFAULT NULL ,
+    PRIMARY KEY (`id`)
+    );
+COMMENT ON TABLE s2_semantic_pasre_info IS 'semantic layer sql parsing information table';
+
+
 CREATE TABLE IF NOT EXISTS `s2_plugin`
 (
     `id`         INT AUTO_INCREMENT,
@@ -157,5 +130,50 @@ CREATE TABLE IF NOT EXISTS `s2_plugin`
     `config`     LONGVARCHAR  NULL,
     `comment`     LONGVARCHAR  NULL,
     PRIMARY KEY (`id`)
-); COMMENT ON TABLE s2_plugin IS 'plugin information table';
+    ); COMMENT ON TABLE s2_plugin IS 'plugin information table';
+
+CREATE TABLE IF NOT EXISTS s2_agent
+(
+    id          int AUTO_INCREMENT,
+    name        varchar(100)  null,
+    description varchar(500) null,
+    status       int null,
+    examples    varchar(500) null,
+    config      varchar(2000)  null,
+    created_by  varchar(100) null,
+    created_at  TIMESTAMP  null,
+    updated_by  varchar(100) null,
+    updated_at  TIMESTAMP null,
+    enable_search int null,
+    PRIMARY KEY (`id`)
+    ); COMMENT ON TABLE s2_agent IS 'agent information table';
+
+
+-------demo for semantic and chat
+CREATE TABLE IF NOT EXISTS `s2_user_department` (
+    `user_name` varchar(200) NOT NULL,
+    `department` varchar(200) NOT NULL -- department of user
+    );
+COMMENT ON TABLE s2_user_department IS 'user_department_info';
+
+
+CREATE TABLE IF NOT EXISTS `s2_dictionary_task` (
+                                                    `id` INT NOT NULL AUTO_INCREMENT,
+                                                    `name` varchar(255) NOT NULL , -- task name
+    `description` varchar(255) ,
+    `command`LONGVARCHAR  NOT NULL , -- task Request Parameters
+    `command_md5` varchar(255)  NOT NULL , -- task Request Parameters md5
+    `status` INT NOT NULL , -- the final status of the task
+    `dimension_ids` varchar(500)  NULL ,
+    `created_at` TIMESTAMP DEFAULT CURRENT_TIMESTAMP  ,
+    `created_by` varchar(100) NOT NULL ,
+    `progress` DOUBLE default 0.00  ,  -- task real-time progress
+    `elapsed_ms` bigINT DEFAULT NULL , -- the task takes time in milliseconds
+    `message` LONGVARCHAR  , -- remark related information
+    PRIMARY KEY (`id`)
+    );
+COMMENT ON TABLE s2_dictionary_task IS 'dictionary task information table';
+
+
+
 

launchers/semantic/src/main/resources/db/semantic-data-h2.sql

@@ -36,7 +36,7 @@ insert into s2_auth_groups (group_id, config)
 values (2, '{"domainId":"1","name":"tom_sales_permission","groupId":2,"authRules":[{"metrics":["stay_hours"],"dimensions":["page"]}],"dimensionFilters":["department in (''sales'')"],"dimensionFilterDescription":"开通 tom sales部门权限", "authorizedUsers":["tom"],"authorizedDepartmentIds":[]}');
 
 
-insert into s2_user (id, `name`, password, display_name, email) values (1, 'admin','admin','admin','admin@xx.com');
+insert into s2_user (id, `name`, password, display_name, email, is_admin) values (1, 'admin','admin','admin','admin@xx.com', 1);
 insert into s2_user (id, `name`, password, display_name, email) values (2, 'jack','123456','jack','jack@xx.com');
 insert into s2_user (id, `name`, password, display_name, email) values (3, 'tom','123456','tom','tom@xx.com');
 insert into s2_user (id, `name`, password, display_name, email) values (4, 'lucy','123456','lucy','lucy@xx.com');

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

@@ -80,6 +80,7 @@ create table s2_user
     display_name varchar(100) null,
     password varchar(100) null,
     email varchar(100) null,
+    is_admin INT null,
     PRIMARY KEY (`id`)
 );
 COMMENT ON TABLE s2_user IS 'user information table';
@@ -108,6 +109,7 @@ CREATE TABLE IF NOT EXISTS `s2_metric` (
     `data_format_type` varchar(50) DEFAULT NULL ,
     `data_format` varchar(500) DEFAULT NULL,
     `alias` varchar(500) DEFAULT NULL,
+    `tags` varchar(500) DEFAULT NULL,
     PRIMARY KEY (`id`)
     );
 COMMENT ON TABLE s2_metric IS 'metric information table';

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

@@ -1,8 +1,8 @@
 -- sample user
-insert into s2_user (id, `name`, password, display_name, email) values (1, 'admin','admin','admin','admin@xx.com');
+insert into s2_user (id, `name`, password, display_name, email, is_admin) values (1, 'admin','admin','admin','admin@xx.com', 1);
 insert into s2_user (id, `name`, password, display_name, email) values (2, 'jack','123456','jack','jack@xx.com');
 insert into s2_user (id, `name`, password, display_name, email) values (3, 'tom','123456','tom','tom@xx.com');
-insert into s2_user (id, `name`, password, display_name, email) values (4, 'lucy','123456','lucy','lucy@xx.com');
+insert into s2_user (id, `name`, password, display_name, email, is_admin) values (4, 'lucy','123456','lucy','lucy@xx.com', 1);
 insert into s2_user (id, `name`, password, display_name, email) values (5, 'alice','123456','alice','alice@xx.com');
 
 -- sample models

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

@@ -87,6 +87,7 @@ create table s2_user
     display_name varchar(100) null,
     password varchar(100) null,
     email varchar(100) null,
+    is_admin INT null,
     PRIMARY KEY (`id`)
 );
 COMMENT ON TABLE s2_user IS 'user information table';
@@ -190,6 +191,7 @@ CREATE TABLE IF NOT EXISTS `s2_metric` (
     `data_format_type` varchar(50) DEFAULT NULL ,
     `data_format` varchar(500) DEFAULT NULL,
     `alias` varchar(500) DEFAULT NULL,
+    `tags` varchar(500) DEFAULT NULL,
     PRIMARY KEY (`id`)
     );
 COMMENT ON TABLE s2_metric IS 'metric information table';

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

@@ -254,6 +254,7 @@ CREATE TABLE `s2_metric` (
                              `data_format_type` varchar(50) DEFAULT NULL COMMENT '数值类型',
                              `data_format` varchar(500) DEFAULT NULL COMMENT '数值类型参数',
                              `alias` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
+                             `tags` varchar(500) CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL,
                              PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='指标表';
 
@@ -368,7 +369,8 @@ create table s2_user
     display_name varchar(100) null,
     password varchar(100) null,
     email varchar(100) null,
+    is_admin int(11) null,
     PRIMARY KEY (`id`)
 );
 
-insert into s2_user (id, `name`, password, display_name, email) values (1, 'admin','admin','admin','admin@xx.com');
+insert into s2_user (id, `name`, password, display_name, email, is_admin) values (1, 'admin','admin','admin','admin@xx.com', 1);

launchers/standalone/src/main/resources/db/sql-update.sql

@@ -48,5 +48,10 @@ alter table s2_database drop column domain_id;
 alter table s2_chat add column agent_id int after chat_id;
 
 --20230907
-
 ALTER TABLE s2_model add alias varchar(200) default null after domain_id;
+
+--20230919
+alter table s2_metric add tags varchar(500) null;
+
+--20230920
+alter table s2_user add is_admin int null;

launchers/standalone/src/test/java/com/tencent/supersonic/util/DataUtils.java

@@ -23,7 +23,7 @@ import static java.time.LocalDate.now;
 
 public class DataUtils {
 
-    private static final User user_test = new User(1L, "admin", "admin", "admin@email");
+    private static final User user_test = User.getFakeUser();
 
     public static User getUser() {
         return user_test;

launchers/standalone/src/test/resources/db/data-h2.sql

@@ -1,5 +1,5 @@
 -- sample user
-insert into s2_user (id, `name`, password, display_name, email) values (1, 'admin','admin','admin','admin@xx.com');
+insert into s2_user (id, `name`, password, display_name, email, is_admin) values (1, 'admin','admin','admin','admin@xx.com', 1);
 insert into s2_user (id, `name`, password, display_name, email) values (2, 'jack','123456','jack','jack@xx.com');
 insert into s2_user (id, `name`, password, display_name, email) values (3, 'tom','123456','tom','tom@xx.com');
 insert into s2_user (id, `name`, password, display_name, email) values (4, 'lucy','123456','lucy','lucy@xx.com');

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

@@ -102,6 +102,7 @@ create table s2_user
     display_name varchar(100) null,
     password varchar(100) null,
     email varchar(100) null,
+    is_admin INT null,
     PRIMARY KEY (`id`)
 );
 COMMENT ON TABLE s2_user IS 'user information table';
@@ -205,6 +206,7 @@ CREATE TABLE IF NOT EXISTS `s2_metric` (
     `data_format_type` varchar(50) DEFAULT NULL ,
     `data_format` varchar(500) DEFAULT NULL,
     `alias` varchar(500) DEFAULT NULL,
+    `tags` varchar(500) DEFAULT NULL,
     PRIMARY KEY (`id`)
     );
 COMMENT ON TABLE s2_metric IS 'metric information table';

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/pojo/QueryStat.java

@@ -79,7 +79,7 @@ public class QueryStat {
         return this;
     }
 
-    public QueryStat setClassId(Long modelId) {
+    public QueryStat setModelId(Long modelId) {
         this.modelId = modelId;
         return this;
     }

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/MetricBaseReq.java

@@ -4,6 +4,7 @@ package com.tencent.supersonic.semantic.api.model.request;
 import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
 import com.tencent.supersonic.common.pojo.DataFormat;
 import lombok.Data;
+import java.util.List;
 
 
 @Data
@@ -17,4 +18,6 @@ public class MetricBaseReq extends SchemaItem {
 
     private DataFormat dataFormat;
 
+    private List<String> tags;
+
 }

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageMetricReq.java

@@ -9,6 +9,4 @@ public class PageMetricReq extends PageSchemaItemReq {
 
     private String type;
 
-    private String key;
-
 }

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/request/PageSchemaItemReq.java

@@ -16,4 +16,5 @@ public class PageSchemaItemReq extends PageBaseReq {
     private List<Long> modelIds = Lists.newArrayList();
     private Integer sensitiveLevel;
     private Integer status;
+    private String key;
 }

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/ExplainResp.java

@@ -0,0 +1,19 @@
+package com.tencent.supersonic.semantic.api.model.response;
+
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExplainResp implements Serializable {
+
+    private String sql;
+
+}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/model/response/MetricResp.java

@@ -1,11 +1,15 @@
 package com.tencent.supersonic.semantic.api.model.response;
 
 
+import com.google.common.collect.Lists;
 import com.tencent.supersonic.common.pojo.DataFormat;
 import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams;
 import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
 import lombok.Data;
 import lombok.ToString;
+import org.apache.commons.lang3.StringUtils;
+import java.util.Arrays;
+import java.util.List;
 
 
 @Data
@@ -14,6 +18,8 @@ public class MetricResp extends SchemaItem {
 
     private Long modelId;
 
+    private Long domainId;
+
     private String modelName;
 
     //ATOMIC DERIVED
@@ -27,5 +33,15 @@ public class MetricResp extends SchemaItem {
 
     private String alias;
 
+    private List<String> tags;
 
+    private boolean hasAdminRes = false;
+
+    public void setTag(String tag) {
+        if (StringUtils.isBlank(tag)) {
+            tags = Lists.newArrayList();
+        } else {
+            tags = Arrays.asList(tag.split(","));
+        }
+    }
 }

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ExplainSqlReq.java

@@ -0,0 +1,20 @@
+package com.tencent.supersonic.semantic.api.query.request;
+
+import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@Data
+@ToString
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class ExplainSqlReq<T> {
+
+    private QueryTypeEnum queryTypeEnum;
+
+    private T queryReq;
+}

semantic/api/src/main/java/com/tencent/supersonic/semantic/api/query/request/ItemUseReq.java

@@ -1,5 +1,6 @@
 package com.tencent.supersonic.semantic.api.query.request;
 
+import java.util.List;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
@@ -11,6 +12,7 @@ public class ItemUseReq {
 
     private String startTime;
     private Long modelId;
+    private List<Long> modelIds;
     private Boolean cacheEnable = true;
     private String metric;
 
@@ -18,4 +20,8 @@ public class ItemUseReq {
         this.startTime = startTime;
         this.modelId = modelId;
     }
+    public ItemUseReq(String startTime, List<Long> modelIds) {
+        this.startTime = startTime;
+        this.modelIds = modelIds;
+    }
 }

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DatabaseServiceImpl.java

@@ -72,7 +72,8 @@ public class DatabaseServiceImpl implements DatabaseService {
     private void fillPermission(List<DatabaseResp> databaseResps, User user) {
         databaseResps.forEach(databaseResp -> {
             if (databaseResp.getAdmins().contains(user.getName())
-                    || user.getName().equalsIgnoreCase(databaseResp.getCreatedBy())) {
+                    || user.getName().equalsIgnoreCase(databaseResp.getCreatedBy())
+                    || user.isSuperAdmin()) {
                 databaseResp.setHasPermission(true);
                 databaseResp.setHasEditPermission(true);
                 databaseResp.setHasUsePermission(true);
@@ -111,7 +112,8 @@ public class DatabaseServiceImpl implements DatabaseService {
         List<String> viewers = databaseResp.getViewers();
         if (!admins.contains(user.getName())
                 && !viewers.contains(user.getName())
-                && !databaseResp.getCreatedBy().equalsIgnoreCase(user.getName())) {
+                && !databaseResp.getCreatedBy().equalsIgnoreCase(user.getName())
+                && !user.isSuperAdmin()) {
             String message = String.format("您暂无当前数据库%s权限, 请联系数据库管理员%s开通",
                     databaseResp.getName(),
                     String.join(",", admins));

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/DomainServiceImpl.java

@@ -96,12 +96,12 @@ public class DomainServiceImpl implements DomainService {
 
     @Override
     public List<DomainResp> getDomainListWithAdminAuth(User user) {
-        Set<DomainResp> domainWithAuthAll = getDomainAuthSet(user.getName(), AuthType.ADMIN);
+        Set<DomainResp> domainWithAuthAll = getDomainAuthSet(user, AuthType.ADMIN);
         if (!CollectionUtils.isEmpty(domainWithAuthAll)) {
             List<Long> domainIds = domainWithAuthAll.stream().map(DomainResp::getId).collect(Collectors.toList());
             domainWithAuthAll.addAll(getParentDomain(domainIds));
         }
-        List<ModelResp> modelResps = modelService.getModelAuthList(user.getName(), AuthType.ADMIN);
+        List<ModelResp> modelResps = modelService.getModelAuthList(user, AuthType.ADMIN);
         if (!CollectionUtils.isEmpty(modelResps)) {
             List<Long> domainIds = modelResps.stream().map(ModelResp::getDomainId).collect(Collectors.toList());
             domainWithAuthAll.addAll(getParentDomain(domainIds));
@@ -111,18 +111,18 @@ public class DomainServiceImpl implements DomainService {
     }
 
     @Override
-    public Set<DomainResp> getDomainAuthSet(String userName, AuthType authTypeEnum) {
+    public Set<DomainResp> getDomainAuthSet(User user, AuthType authTypeEnum) {
         List<DomainResp> domainResps = getDomainList();
-        Set<String> orgIds = userService.getUserAllOrgId(userName);
+        Set<String> orgIds = userService.getUserAllOrgId(user.getName());
         List<DomainResp> domainWithAuth = Lists.newArrayList();
         if (authTypeEnum.equals(AuthType.ADMIN)) {
             domainWithAuth = domainResps.stream()
-                    .filter(domainResp -> checkAdminPermission(orgIds, userName, domainResp))
+                    .filter(domainResp -> checkAdminPermission(orgIds, user, domainResp))
                     .collect(Collectors.toList());
         }
         if (authTypeEnum.equals(AuthType.VISIBLE)) {
             domainWithAuth = domainResps.stream()
-                    .filter(domainResp -> checkViewerPermission(orgIds, userName, domainResp))
+                    .filter(domainResp -> checkViewerPermission(orgIds, user, domainResp))
                     .collect(Collectors.toList());
         }
         List<Long> domainIds = domainWithAuth.stream().map(DomainResp::getId)
@@ -240,11 +240,13 @@ public class DomainServiceImpl implements DomainService {
     }
 
 
-    private boolean checkAdminPermission(Set<String> orgIds, String userName, DomainResp domainResp) {
+    private boolean checkAdminPermission(Set<String> orgIds, User user, DomainResp domainResp) {
-
         List<String> admins = domainResp.getAdmins();
         List<String> adminOrgs = domainResp.getAdminOrgs();
-        if (admins.contains(userName) || domainResp.getCreatedBy().equals(userName)) {
+        if (user.isSuperAdmin()) {
+            return true;
+        }
+        if (admins.contains(user.getName()) || domainResp.getCreatedBy().equals(user.getName())) {
             return true;
         }
         if (CollectionUtils.isEmpty(adminOrgs)) {
@@ -258,12 +260,17 @@ public class DomainServiceImpl implements DomainService {
         return false;
     }
 
-    private boolean checkViewerPermission(Set<String> orgIds, String userName, DomainResp domainDesc) {
+    private boolean checkViewerPermission(Set<String> orgIds, User user, DomainResp domainDesc) {
         List<String> admins = domainDesc.getAdmins();
         List<String> viewers = domainDesc.getViewers();
         List<String> adminOrgs = domainDesc.getAdminOrgs();
         List<String> viewOrgs = domainDesc.getViewOrgs();
-        if (admins.contains(userName) || viewers.contains(userName) || domainDesc.getCreatedBy().equals(userName)) {
+        if (user.isSuperAdmin()) {
+            return true;
+        }
+        if (admins.contains(user.getName())
+                || viewers.contains(user.getName())
+                || domainDesc.getCreatedBy().equals(user.getName())) {
             return true;
         }
         if (CollectionUtils.isEmpty(adminOrgs) && CollectionUtils.isEmpty(viewOrgs)) {

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/MetricServiceImpl.java

@@ -9,6 +9,7 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.common.pojo.DataAddEvent;
 import com.tencent.supersonic.common.pojo.DataDeleteEvent;
 import com.tencent.supersonic.common.pojo.DataUpdateEvent;
+import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.common.pojo.enums.DictWordType;
 import com.tencent.supersonic.common.util.ChatGptHelper;
 import com.tencent.supersonic.semantic.api.model.pojo.Measure;
@@ -28,6 +29,7 @@ import com.tencent.supersonic.semantic.model.domain.utils.MetricConverter;
 import com.tencent.supersonic.semantic.model.domain.MetricService;
 import com.tencent.supersonic.semantic.model.domain.pojo.Metric;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -123,7 +125,7 @@ public class MetricServiceImpl implements MetricService {
     }
 
     @Override
-    public PageInfo<MetricResp> queryMetric(PageMetricReq pageMetricReq) {
+    public PageInfo<MetricResp> queryMetric(PageMetricReq pageMetricReq, User user) {
         MetricFilter metricFilter = new MetricFilter();
         BeanUtils.copyProperties(pageMetricReq, metricFilter);
         Set<DomainResp> domainResps = domainService.getDomainChildren(pageMetricReq.getDomainIds());
@@ -137,7 +139,9 @@ public class MetricServiceImpl implements MetricService {
                 .doSelectPageInfo(() -> queryMetric(metricFilter));
         PageInfo<MetricResp> pageInfo = new PageInfo<>();
         BeanUtils.copyProperties(metricDOPageInfo, pageInfo);
-        pageInfo.setList(convertList(metricDOPageInfo.getList()));
+        List<MetricResp> metricResps = convertList(metricDOPageInfo.getList());
+        fillAdminRes(metricResps, user);
+        pageInfo.setList(metricResps);
         return pageInfo;
     }
 
@@ -145,6 +149,21 @@ public class MetricServiceImpl implements MetricService {
         return metricRepository.getMetric(metricFilter);
     }
 
+
+    private void fillAdminRes(List<MetricResp> metricResps, User user) {
+        List<ModelResp> modelResps = modelService.getModelListWithAuth(user, null, AuthType.ADMIN);
+        if (CollectionUtils.isEmpty(modelResps)) {
+            return;
+        }
+        Set<Long> modelIdSet = modelResps.stream().map(ModelResp::getId).collect(Collectors.toSet());
+        for (MetricResp metricResp : metricResps) {
+            if (modelIdSet.contains(metricResp.getModelId())) {
+                metricResp.setHasAdminRes(true);
+            }
+        }
+
+    }
+
     @Override
     public MetricResp getMetric(Long modelId, String bizName) {
         List<MetricResp> metricDescs = getMetricByModelId(modelId);
@@ -250,6 +269,16 @@ public class MetricServiceImpl implements MetricService {
         });
     }
 
+    @Override
+    public Set<String> getMetricTags() {
+        List<MetricResp> metricResps = getMetrics();
+        if (CollectionUtils.isEmpty(metricResps)) {
+            return new HashSet<>();
+        }
+        return metricResps.stream().flatMap(metricResp ->
+                metricResp.getTags().stream()).collect(Collectors.toSet());
+    }
+
 
     private void saveMetricBatch(List<Metric> metrics, User user) {
         if (CollectionUtils.isEmpty(metrics)) {
@@ -293,7 +322,7 @@ public class MetricServiceImpl implements MetricService {
         Map<Long, ModelResp> modelMap = modelService.getModelMap();
         if (!CollectionUtils.isEmpty(metricDOS)) {
             metricDescs = metricDOS.stream()
-                    .map(metricDO -> MetricConverter.convert2MetricDesc(metricDO, modelMap))
+                    .map(metricDO -> MetricConverter.convert2MetricResp(metricDO, modelMap))
                     .collect(Collectors.toList());
         }
         return metricDescs;

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/application/ModelServiceImpl.java

@@ -4,44 +4,43 @@ import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Lists;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.service.UserService;
+import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.common.util.BeanMapper;
 import com.tencent.supersonic.common.util.JsonUtil;
-import com.tencent.supersonic.common.pojo.enums.AuthType;
 import com.tencent.supersonic.semantic.api.model.request.ModelReq;
 import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq;
 import com.tencent.supersonic.semantic.api.model.response.DatabaseResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelResp;
-import com.tencent.supersonic.semantic.api.model.response.DomainResp;
-import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricResp;
-import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
-import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp;
 import com.tencent.supersonic.semantic.api.model.response.DatasourceResp;
+import com.tencent.supersonic.semantic.api.model.response.DimSchemaResp;
+import com.tencent.supersonic.semantic.api.model.response.DimensionResp;
+import com.tencent.supersonic.semantic.api.model.response.DomainResp;
+import com.tencent.supersonic.semantic.api.model.response.MetricResp;
+import com.tencent.supersonic.semantic.api.model.response.MetricSchemaResp;
+import com.tencent.supersonic.semantic.api.model.response.ModelResp;
+import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
 import com.tencent.supersonic.semantic.model.domain.DatabaseService;
-import com.tencent.supersonic.semantic.model.domain.ModelService;
-import com.tencent.supersonic.semantic.model.domain.DomainService;
-import com.tencent.supersonic.semantic.model.domain.DimensionService;
-import com.tencent.supersonic.semantic.model.domain.MetricService;
 import com.tencent.supersonic.semantic.model.domain.DatasourceService;
-
+import com.tencent.supersonic.semantic.model.domain.DimensionService;
+import com.tencent.supersonic.semantic.model.domain.DomainService;
+import com.tencent.supersonic.semantic.model.domain.MetricService;
+import com.tencent.supersonic.semantic.model.domain.ModelService;
 import com.tencent.supersonic.semantic.model.domain.dataobject.ModelDO;
 import com.tencent.supersonic.semantic.model.domain.pojo.Model;
 import com.tencent.supersonic.semantic.model.domain.repository.ModelRepository;
 import com.tencent.supersonic.semantic.model.domain.utils.ModelConvert;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import java.util.List;
-import java.util.Objects;
-import java.util.Date;
-import java.util.Set;
-import java.util.Map;
-import java.util.HashSet;
-import java.util.ArrayList;
-import java.util.stream.Collectors;
 
 @Slf4j
 @Service
@@ -97,10 +96,10 @@ public class ModelServiceImpl implements ModelService {
     }
 
     @Override
-    public List<ModelResp> getModelListWithAuth(String userName, Long domainId, AuthType authType) {
+    public List<ModelResp> getModelListWithAuth(User user, Long domainId, AuthType authType) {
-        List<ModelResp> modelResps = getModelAuthList(userName, authType);
+        List<ModelResp> modelResps = getModelAuthList(user, authType);
         Set<ModelResp> modelRespSet = new HashSet<>(modelResps);
-        List<ModelResp> modelRespsAuthInheritDomain = getModelRespAuthInheritDomain(userName, authType);
+        List<ModelResp> modelRespsAuthInheritDomain = getModelRespAuthInheritDomain(user, authType);
         modelRespSet.addAll(modelRespsAuthInheritDomain);
         if (domainId != null && domainId > 0) {
             modelRespSet = modelRespSet.stream().filter(modelResp ->
@@ -109,8 +108,8 @@ public class ModelServiceImpl implements ModelService {
         return fillMetricInfo(new ArrayList<>(modelRespSet));
     }
 
-    public List<ModelResp> getModelRespAuthInheritDomain(String userName, AuthType authType) {
+    public List<ModelResp> getModelRespAuthInheritDomain(User user, AuthType authType) {
-        Set<DomainResp> domainResps = domainService.getDomainAuthSet(userName, authType);
+        Set<DomainResp> domainResps = domainService.getDomainAuthSet(user, authType);
         if (CollectionUtils.isEmpty(domainResps)) {
             return Lists.newArrayList();
         }
@@ -121,18 +120,18 @@ public class ModelServiceImpl implements ModelService {
     }
 
     @Override
-    public List<ModelResp> getModelAuthList(String userName, AuthType authTypeEnum) {
+    public List<ModelResp> getModelAuthList(User user, AuthType authTypeEnum) {
         List<ModelResp> modelResps = getModelList();
-        Set<String> orgIds = userService.getUserAllOrgId(userName);
+        Set<String> orgIds = userService.getUserAllOrgId(user.getName());
         List<ModelResp> modelWithAuth = Lists.newArrayList();
         if (authTypeEnum.equals(AuthType.ADMIN)) {
             modelWithAuth = modelResps.stream()
-                    .filter(modelResp -> checkAdminPermission(orgIds, userName, modelResp))
+                    .filter(modelResp -> checkAdminPermission(orgIds, user, modelResp))
                     .collect(Collectors.toList());
         }
         if (authTypeEnum.equals(AuthType.VISIBLE)) {
             modelWithAuth = modelResps.stream()
-                    .filter(domainResp -> checkViewerPermission(orgIds, userName, domainResp))
+                    .filter(domainResp -> checkViewerPermission(orgIds, user, domainResp))
                     .collect(Collectors.toList());
         }
         return modelWithAuth;
@@ -325,9 +324,13 @@ public class ModelServiceImpl implements ModelService {
         return new ArrayList<>(getModelMap().keySet());
     }
 
-    public static boolean checkAdminPermission(Set<String> orgIds, String userName, ModelResp modelResp) {
+    public static boolean checkAdminPermission(Set<String> orgIds, User user, ModelResp modelResp) {
         List<String> admins = modelResp.getAdmins();
         List<String> adminOrgs = modelResp.getAdminOrgs();
+        if (user.isSuperAdmin()) {
+            return true;
+        }
+        String userName = user.getName();
         if (admins.contains(userName) || modelResp.getCreatedBy().equals(userName)) {
             return true;
         }
@@ -342,14 +345,18 @@ public class ModelServiceImpl implements ModelService {
         return false;
     }
 
-    public static boolean checkViewerPermission(Set<String> orgIds, String userName, ModelResp modelResp) {
+    public static boolean checkViewerPermission(Set<String> orgIds, User user, ModelResp modelResp) {
         List<String> admins = modelResp.getAdmins();
         List<String> viewers = modelResp.getViewers();
         List<String> adminOrgs = modelResp.getAdminOrgs();
         List<String> viewOrgs = modelResp.getViewOrgs();
+        if (user.isSuperAdmin()) {
+            return true;
+        }
         if (modelResp.openToAll()) {
             return true;
         }
+        String userName = user.getName();
         if (admins.contains(userName) || viewers.contains(userName) || modelResp.getCreatedBy().equals(userName)) {
             return true;
         }

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/DomainService.java

@@ -30,7 +30,7 @@ public interface DomainService {
 
     List<DomainResp> getDomainListWithAdminAuth(User user);
 
-    Set<DomainResp> getDomainAuthSet(String userName, AuthType authTypeEnum);
+    Set<DomainResp> getDomainAuthSet(User user, AuthType authTypeEnum);
 
     Set<DomainResp> getDomainChildren(List<Long> domainId);
 

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/MetricService.java

@@ -7,6 +7,7 @@ import com.tencent.supersonic.semantic.api.model.request.PageMetricReq;
 import com.tencent.supersonic.semantic.api.model.response.MetricResp;
 
 import java.util.List;
+import java.util.Set;
 
 public interface MetricService {
 
@@ -22,7 +23,7 @@ public interface MetricService {
 
     void createMetricBatch(List<MetricReq> metricReqs, User user) throws Exception;
 
-    PageInfo<MetricResp> queryMetric(PageMetricReq pageMetrricReq);
+    PageInfo<MetricResp> queryMetric(PageMetricReq pageMetricReq, User user);
 
     MetricResp getMetric(Long modelId, String bizName);
 
@@ -35,4 +36,6 @@ public interface MetricService {
     void deleteMetric(Long id) throws Exception;
 
     List<String> mockAlias(MetricReq metricReq, String mockType, User user);
+
+    Set<String> getMetricTags();
 }

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/ModelService.java

@@ -13,9 +13,9 @@ import java.util.Map;
 
 public interface ModelService {
 
-    List<ModelResp> getModelListWithAuth(String userName, Long domainId, AuthType authType);
+    List<ModelResp> getModelListWithAuth(User user, Long domainId, AuthType authType);
 
-    List<ModelResp> getModelAuthList(String userName, AuthType authTypeEnum);
+    List<ModelResp> getModelAuthList(User user, AuthType authTypeEnum);
 
     List<ModelResp> getModelByDomainIds(List<Long> domainIds);
 

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/MetricDO.java

@@ -3,116 +3,247 @@ package com.tencent.supersonic.semantic.model.domain.dataobject;
 import java.util.Date;
 
 public class MetricDO {
-
+    /**
+     * 
+     */
     private Long id;
 
+    /**
+     * 主体域ID
+     */
     private Long modelId;
 
+    /**
+     * 指标名称
+     */
     private String name;
 
+    /**
+     * 字段名称
+     */
     private String bizName;
 
+    /**
+     * 描述
+     */
     private String description;
 
+    /**
+     * 指标状态,0正常,1下架,2删除
+     */
     private Integer status;
 
+    /**
+     * 敏感级别
+     */
     private Integer sensitiveLevel;
 
+    /**
+     * 指标类型 proxy,expr
+     */
     private String type;
 
+    /**
+     * 创建时间
+     */
     private Date createdAt;
 
+    /**
+     * 创建人
+     */
     private String createdBy;
 
+    /**
+     * 更新时间
+     */
     private Date updatedAt;
 
+    /**
+     * 更新人
+     */
     private String updatedBy;
 
+    /**
+     * 数值类型
+     */
     private String dataFormatType;
 
+    /**
+     * 数值类型参数
+     */
     private String dataFormat;
 
+    /**
+     * 
+     */
     private String alias;
 
+    /**
+     * 
+     */
+    private String tags;
+
+    /**
+     * 类型参数
+     */
     private String typeParams;
 
-
+    /**
+     * 
+     * @return id 
+     */
     public Long getId() {
         return id;
     }
 
+    /**
+     * 
+     * @param id 
+     */
     public void setId(Long id) {
         this.id = id;
     }
 
+    /**
+     * 主体域ID
+     * @return model_id 主体域ID
+     */
     public Long getModelId() {
         return modelId;
     }
 
+    /**
+     * 主体域ID
+     * @param modelId 主体域ID
+     */
     public void setModelId(Long modelId) {
         this.modelId = modelId;
     }
 
+    /**
+     * 指标名称
+     * @return name 指标名称
+     */
     public String getName() {
         return name;
     }
 
+    /**
+     * 指标名称
+     * @param name 指标名称
+     */
     public void setName(String name) {
         this.name = name == null ? null : name.trim();
     }
 
+    /**
+     * 字段名称
+     * @return biz_name 字段名称
+     */
     public String getBizName() {
         return bizName;
     }
 
+    /**
+     * 字段名称
+     * @param bizName 字段名称
+     */
     public void setBizName(String bizName) {
         this.bizName = bizName == null ? null : bizName.trim();
     }
 
+    /**
+     * 描述
+     * @return description 描述
+     */
     public String getDescription() {
         return description;
     }
 
+    /**
+     * 描述
+     * @param description 描述
+     */
     public void setDescription(String description) {
         this.description = description == null ? null : description.trim();
     }
 
+    /**
+     * 指标状态,0正常,1下架,2删除
+     * @return status 指标状态,0正常,1下架,2删除
+     */
     public Integer getStatus() {
         return status;
     }
 
+    /**
+     * 指标状态,0正常,1下架,2删除
+     * @param status 指标状态,0正常,1下架,2删除
+     */
     public void setStatus(Integer status) {
         this.status = status;
     }
 
+    /**
+     * 敏感级别
+     * @return sensitive_level 敏感级别
+     */
     public Integer getSensitiveLevel() {
         return sensitiveLevel;
     }
 
+    /**
+     * 敏感级别
+     * @param sensitiveLevel 敏感级别
+     */
     public void setSensitiveLevel(Integer sensitiveLevel) {
         this.sensitiveLevel = sensitiveLevel;
     }
 
+    /**
+     * 指标类型 proxy,expr
+     * @return type 指标类型 proxy,expr
+     */
     public String getType() {
         return type;
     }
 
+    /**
+     * 指标类型 proxy,expr
+     * @param type 指标类型 proxy,expr
+     */
     public void setType(String type) {
         this.type = type == null ? null : type.trim();
     }
 
+    /**
+     * 创建时间
+     * @return created_at 创建时间
+     */
     public Date getCreatedAt() {
         return createdAt;
     }
 
+    /**
+     * 创建时间
+     * @param createdAt 创建时间
+     */
     public void setCreatedAt(Date createdAt) {
         this.createdAt = createdAt;
     }
 
+    /**
+     * 创建人
+     * @return created_by 创建人
+     */
     public String getCreatedBy() {
         return createdBy;
     }
 
+    /**
+     * 创建人
+     * @param createdBy 创建人
+     */
     public void setCreatedBy(String createdBy) {
         this.createdBy = createdBy == null ? null : createdBy.trim();
     }
@@ -197,6 +328,22 @@ public class MetricDO {
         this.alias = alias == null ? null : alias.trim();
     }
 
+    /**
+     * 
+     * @return tags 
+     */
+    public String getTags() {
+        return tags;
+    }
+
+    /**
+     * 
+     * @param tags 
+     */
+    public void setTags(String tags) {
+        this.tags = tags == null ? null : tags.trim();
+    }
+
     /**
      * 类型参数
      * @return type_params 类型参数

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/dataobject/MetricDOExample.java

@@ -31,6 +31,7 @@ public class MetricDOExample {
     protected Integer limitEnd;
 
     /**
+     *
      * @mbg.generated
      */
     public MetricDOExample() {
@@ -38,6 +39,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void setOrderByClause(String orderByClause) {
@@ -45,6 +47,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public String getOrderByClause() {
@@ -52,6 +55,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void setDistinct(boolean distinct) {
@@ -59,6 +63,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public boolean isDistinct() {
@@ -66,6 +71,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public List<Criteria> getOredCriteria() {
@@ -73,6 +79,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void or(Criteria criteria) {
@@ -80,6 +87,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Criteria or() {
@@ -89,6 +97,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Criteria createCriteria() {
@@ -100,6 +109,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     protected Criteria createCriteriaInternal() {
@@ -108,6 +118,7 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void clear() {
@@ -117,13 +128,15 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void setLimitStart(Integer limitStart) {
-        this.limitStart = limitStart;
+        this.limitStart=limitStart;
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Integer getLimitStart() {
@@ -131,13 +144,15 @@ public class MetricDOExample {
     }
 
     /**
+     *
      * @mbg.generated
      */
     public void setLimitEnd(Integer limitEnd) {
-        this.limitEnd = limitEnd;
+        this.limitEnd=limitEnd;
     }
 
     /**
+     *
      * @mbg.generated
      */
     public Integer getLimitEnd() {
@@ -1177,6 +1192,76 @@ public class MetricDOExample {
             addCriterion("alias not between", value1, value2, "alias");
             return (Criteria) this;
         }
+
+        public Criteria andTagsIsNull() {
+            addCriterion("tags is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsIsNotNull() {
+            addCriterion("tags is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsEqualTo(String value) {
+            addCriterion("tags =", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsNotEqualTo(String value) {
+            addCriterion("tags <>", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsGreaterThan(String value) {
+            addCriterion("tags >", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsGreaterThanOrEqualTo(String value) {
+            addCriterion("tags >=", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsLessThan(String value) {
+            addCriterion("tags <", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsLessThanOrEqualTo(String value) {
+            addCriterion("tags <=", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsLike(String value) {
+            addCriterion("tags like", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsNotLike(String value) {
+            addCriterion("tags not like", value, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsIn(List<String> values) {
+            addCriterion("tags in", values, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsNotIn(List<String> values) {
+            addCriterion("tags not in", values, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsBetween(String value1, String value2) {
+            addCriterion("tags between", value1, value2, "tags");
+            return (Criteria) this;
+        }
+
+        public Criteria andTagsNotBetween(String value1, String value2) {
+            addCriterion("tags not between", value1, value2, "tags");
+            return (Criteria) this;
+        }
     }
 
     /**
@@ -1209,6 +1294,38 @@ public class MetricDOExample {
 
         private String typeHandler;
 
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
         protected Criterion(String condition) {
             super();
             this.condition = condition;
@@ -1244,37 +1361,5 @@ public class MetricDOExample {
         protected Criterion(String condition, Object value, Object secondValue) {
             this(condition, value, secondValue, null);
         }
-
-        public String getCondition() {
-            return condition;
-        }
-
-        public Object getValue() {
-            return value;
-        }
-
-        public Object getSecondValue() {
-            return secondValue;
-        }
-
-        public boolean isNoValue() {
-            return noValue;
-        }
-
-        public boolean isSingleValue() {
-            return singleValue;
-        }
-
-        public boolean isBetweenValue() {
-            return betweenValue;
-        }
-
-        public boolean isListValue() {
-            return listValue;
-        }
-
-        public String getTypeHandler() {
-            return typeHandler;
-        }
     }
 }

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/pojo/Metric.java

@@ -1,10 +1,12 @@
 package com.tencent.supersonic.semantic.model.domain.pojo;
 
-
 import com.tencent.supersonic.common.pojo.DataFormat;
 import com.tencent.supersonic.semantic.api.model.pojo.MetricTypeParams;
 import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.util.CollectionUtils;
+import java.util.List;
 
 @Data
 public class Metric extends SchemaItem {
@@ -23,4 +25,13 @@ public class Metric extends SchemaItem {
 
     private String alias;
 
+    private List<String> tags;
+
+    public String getTag() {
+        if (CollectionUtils.isEmpty(tags)) {
+            return "";
+        }
+        return StringUtils.join(tags, ",");
+    }
+
 }

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/domain/utils/MetricConverter.java

@@ -37,6 +37,7 @@ public class MetricConverter {
         if (metric.getDataFormat() != null) {
             metricDO.setDataFormat(JSONObject.toJSONString(metric.getDataFormat()));
         }
+        metricDO.setTags(metric.getTag());
         return metricDO;
     }
 
@@ -51,27 +52,23 @@ public class MetricConverter {
         BeanUtils.copyProperties(metric, metricDO);
         metricDO.setTypeParams(JSONObject.toJSONString(metric.getTypeParams()));
         metricDO.setDataFormat(JSONObject.toJSONString(metric.getDataFormat()));
+        metricDO.setTags(metric.getTag());
         return metricDO;
     }
 
 
-    public static MetricResp convert2MetricDesc(MetricDO metricDO, Map<Long, ModelResp> modelMap) {
+    public static MetricResp convert2MetricResp(MetricDO metricDO, Map<Long, ModelResp> modelMap) {
-        MetricResp metricDesc = new MetricResp();
+        MetricResp metricResp = new MetricResp();
-        BeanUtils.copyProperties(metricDO, metricDesc);
+        BeanUtils.copyProperties(metricDO, metricResp);
-        metricDesc.setTypeParams(JSONObject.parseObject(metricDO.getTypeParams(), MetricTypeParams.class));
+        metricResp.setTypeParams(JSONObject.parseObject(metricDO.getTypeParams(), MetricTypeParams.class));
-        metricDesc.setDataFormat(JSONObject.parseObject(metricDO.getDataFormat(), DataFormat.class));
+        metricResp.setDataFormat(JSONObject.parseObject(metricDO.getDataFormat(), DataFormat.class));
         ModelResp modelResp = modelMap.get(metricDO.getModelId());
         if (modelResp != null) {
-            metricDesc.setModelName(modelResp.getName());
+            metricResp.setModelName(modelResp.getName());
+            metricResp.setDomainId(modelResp.getDomainId());
         }
-        return metricDesc;
+        metricResp.setTag(metricDO.getTags());
-    }
+        return metricResp;
-
-    public static Metric convert2Metric(MetricDO metricDO) {
-        Metric metric = new Metric();
-        BeanUtils.copyProperties(metricDO, metric);
-        metric.setTypeParams(JSONObject.parseObject(metricDO.getTypeParams(), MetricTypeParams.class));
-        return metric;
     }
 
 

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/MetricController.java

@@ -9,6 +9,7 @@ import com.tencent.supersonic.semantic.api.model.request.PageMetricReq;
 import com.tencent.supersonic.semantic.api.model.response.MetricResp;
 import com.tencent.supersonic.semantic.model.domain.MetricService;
 import java.util.List;
+import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -68,8 +69,11 @@ public class MetricController {
 
 
     @PostMapping("/queryMetric")
-    public PageInfo<MetricResp> queryMetric(@RequestBody PageMetricReq pageMetrricReq) {
+    public PageInfo<MetricResp> queryMetric(@RequestBody PageMetricReq pageMetricReq,
-        return metricService.queryMetric(pageMetrricReq);
+                                            HttpServletRequest request,
+                                            HttpServletResponse response) {
+        User user = UserHolder.findUser(request, response);
+        return metricService.queryMetric(pageMetricReq, user);
     }
 
     @GetMapping("getMetric/{modelId}/{bizName}")
@@ -90,4 +94,9 @@ public class MetricController {
     }
 
 
+    @GetMapping("/getMetricTags")
+    public Set<String> getMetricTags() {
+        return metricService.getMetricTags();
+    }
+
 }

semantic/model/src/main/java/com/tencent/supersonic/semantic/model/rest/ModelController.java

@@ -60,7 +60,7 @@ public class ModelController {
                                          HttpServletRequest request,
                                           HttpServletResponse response) {
         User user = UserHolder.findUser(request, response);
-        return modelService.getModelListWithAuth(user.getName(), domainId, AuthType.ADMIN);
+        return modelService.getModelListWithAuth(user, domainId, AuthType.ADMIN);
     }
 
 

semantic/model/src/main/resources/mapper/MetricDOMapper.xml

@@ -17,6 +17,7 @@
     <result column="data_format_type" jdbcType="VARCHAR" property="dataFormatType" />
     <result column="data_format" jdbcType="VARCHAR" property="dataFormat" />
     <result column="alias" jdbcType="VARCHAR" property="alias" />
+    <result column="tags" jdbcType="VARCHAR" property="tags" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO">
     <result column="type_params" jdbcType="LONGVARCHAR" property="typeParams" />
@@ -52,7 +53,7 @@
   </sql>
   <sql id="Base_Column_List">
     id, model_id, name, biz_name, description, status, sensitive_level, type, created_at, 
-    created_by, updated_at, updated_by, data_format_type, data_format, alias
+    created_by, updated_at, updated_by, data_format_type, data_format, alias, tags
   </sql>
   <sql id="Blob_Column_List">
     type_params
@@ -108,13 +109,13 @@
       sensitive_level, type, created_at, 
       created_by, updated_at, updated_by, 
       data_format_type, data_format, alias, 
-      type_params)
+      tags, type_params)
     values (#{id,jdbcType=BIGINT}, #{modelId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
       #{bizName,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{sensitiveLevel,jdbcType=INTEGER}, #{type,jdbcType=VARCHAR}, #{createdAt,jdbcType=TIMESTAMP}, 
       #{createdBy,jdbcType=VARCHAR}, #{updatedAt,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=VARCHAR}, 
       #{dataFormatType,jdbcType=VARCHAR}, #{dataFormat,jdbcType=VARCHAR}, #{alias,jdbcType=VARCHAR}, 
-      #{typeParams,jdbcType=LONGVARCHAR})
+      #{tags,jdbcType=VARCHAR}, #{typeParams,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO">
     insert into s2_metric
@@ -164,6 +165,9 @@
       <if test="alias != null">
         alias,
       </if>
+      <if test="tags != null">
+        tags,
+      </if>
       <if test="typeParams != null">
         type_params,
       </if>
@@ -214,6 +218,9 @@
       <if test="alias != null">
         #{alias,jdbcType=VARCHAR},
       </if>
+      <if test="tags != null">
+        #{tags,jdbcType=VARCHAR},
+      </if>
       <if test="typeParams != null">
         #{typeParams,jdbcType=LONGVARCHAR},
       </if>
@@ -270,6 +277,9 @@
       <if test="alias != null">
         alias = #{alias,jdbcType=VARCHAR},
       </if>
+      <if test="tags != null">
+        tags = #{tags,jdbcType=VARCHAR},
+      </if>
       <if test="typeParams != null">
         type_params = #{typeParams,jdbcType=LONGVARCHAR},
       </if>
@@ -292,6 +302,7 @@
       data_format_type = #{dataFormatType,jdbcType=VARCHAR},
       data_format = #{dataFormat,jdbcType=VARCHAR},
       alias = #{alias,jdbcType=VARCHAR},
+      tags = #{tags,jdbcType=VARCHAR},
       type_params = #{typeParams,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -310,7 +321,8 @@
       updated_by = #{updatedBy,jdbcType=VARCHAR},
       data_format_type = #{dataFormatType,jdbcType=VARCHAR},
       data_format = #{dataFormat,jdbcType=VARCHAR},
-      alias = #{alias,jdbcType=VARCHAR}
+      alias = #{alias,jdbcType=VARCHAR},
+      tags = #{tags,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>

semantic/model/src/main/resources/mapper/custom/MetricDOCustomMapper.xml

@@ -2,22 +2,26 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.tencent.supersonic.semantic.model.infrastructure.mapper.MetricDOCustomMapper">
-    <resultMap id="BaseResultMap"
+    <resultMap id="BaseResultMap" type="com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO">
-            type="com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO">
+        <id column="id" jdbcType="BIGINT" property="id" />
-        <id column="id" jdbcType="BIGINT" property="id"/>
+        <result column="model_id" jdbcType="BIGINT" property="modelId" />
-        <result column="model_id" jdbcType="BIGINT" property="modelId"/>
+        <result column="name" jdbcType="VARCHAR" property="name" />
-        <result column="name" jdbcType="VARCHAR" property="name"/>
+        <result column="biz_name" jdbcType="VARCHAR" property="bizName" />
-        <result column="biz_name" jdbcType="VARCHAR" property="bizName"/>
+        <result column="description" jdbcType="VARCHAR" property="description" />
-        <result column="description" jdbcType="VARCHAR" property="description"/>
+        <result column="status" jdbcType="INTEGER" property="status" />
-        <result column="type" jdbcType="VARCHAR" property="type"/>
+        <result column="sensitive_level" jdbcType="INTEGER" property="sensitiveLevel" />
-        <result column="created_at" jdbcType="TIMESTAMP" property="createdAt"/>
+        <result column="type" jdbcType="VARCHAR" property="type" />
-        <result column="created_by" jdbcType="VARCHAR" property="createdBy"/>
+        <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
-        <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt"/>
+        <result column="created_by" jdbcType="VARCHAR" property="createdBy" />
-        <result column="updated_by" jdbcType="VARCHAR" property="updatedBy"/>
+        <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+        <result column="updated_by" jdbcType="VARCHAR" property="updatedBy" />
+        <result column="data_format_type" jdbcType="VARCHAR" property="dataFormatType" />
+        <result column="data_format" jdbcType="VARCHAR" property="dataFormat" />
+        <result column="alias" jdbcType="VARCHAR" property="alias" />
+        <result column="tags" jdbcType="VARCHAR" property="tags" />
     </resultMap>
-    <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs"
+    <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO">
-            type="com.tencent.supersonic.semantic.model.domain.dataobject.MetricDO">
+        <result column="type_params" jdbcType="LONGVARCHAR" property="typeParams" />
-        <result column="type_params" jdbcType="LONGVARCHAR" property="typeParams"/>
     </resultMap>
     <sql id="Example_Where_Clause">
         <where>
@@ -51,12 +55,11 @@
         </where>
     </sql>
     <sql id="Base_Column_List">
-        id
+        id, model_id, name, biz_name, description, status, sensitive_level, type, created_at,
-        , model_id, name, biz_name, description, type, created_at, created_by, updated_at,
+    created_by, updated_at, updated_by, data_format_type, data_format, alias, tags
-    updated_by
     </sql>
     <sql id="Blob_Column_List">
-        typeParams
+        type_params
     </sql>
 
     <insert id="batchInsert" parameterType="java.util.List">
@@ -108,7 +111,8 @@
             and ( id like CONCAT('%',#{key , jdbcType=VARCHAR},'%') or
             name like CONCAT('%',#{key , jdbcType=VARCHAR},'%') or
             biz_name like CONCAT('%',#{key , jdbcType=VARCHAR},'%') or
-            description like CONCAT('%',#{key , jdbcType=VARCHAR},'%') )
+            description like CONCAT('%',#{key , jdbcType=VARCHAR},'%') or
+            tags like CONCAT('%',#{key , jdbcType=VARCHAR},'%') )
         </if>
         <if test="id != null">
             and id like CONCAT('%',#{id , jdbcType=VARCHAR},'%')

semantic/query/src/main/java/com/tencent/supersonic/semantic/query/rest/QueryController.java

@@ -2,18 +2,22 @@ package com.tencent.supersonic.semantic.query.rest;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
 import com.tencent.supersonic.auth.api.authentication.utils.UserHolder;
+import com.tencent.supersonic.common.util.JsonUtil;
+import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
 import com.tencent.supersonic.semantic.api.model.response.SqlParserResp;
+import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
+import com.tencent.supersonic.semantic.api.query.request.ItemUseReq;
+import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDslReq;
-import com.tencent.supersonic.semantic.api.query.request.ParseSqlReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
-import com.tencent.supersonic.semantic.api.query.request.ItemUseReq;
+import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
 import com.tencent.supersonic.semantic.api.query.response.ItemUseResp;
-import com.tencent.supersonic.semantic.query.service.SemanticQueryEngine;
-import com.tencent.supersonic.semantic.query.service.QueryService;
 import com.tencent.supersonic.semantic.query.persistence.pojo.QueryStatement;
+import com.tencent.supersonic.semantic.query.service.QueryService;
+import com.tencent.supersonic.semantic.query.service.SemanticQueryEngine;
 import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -95,4 +99,30 @@ public class QueryController {
         return queryService.queryDimValue(queryDimValueReq, user);
     }
 
+    @PostMapping("/explain")
+    public <T> ExplainResp explain(@RequestBody ExplainSqlReq<T> explainSqlReq,
+            HttpServletRequest request,
+            HttpServletResponse response) throws Exception {
+
+        User user = UserHolder.findUser(request, response);
+        String queryReqJson = JsonUtil.toString(explainSqlReq.getQueryReq());
+        QueryTypeEnum queryTypeEnum = explainSqlReq.getQueryTypeEnum();
+
+        if (QueryTypeEnum.SQL.equals(queryTypeEnum)) {
+            QueryDslReq queryDslReq = JsonUtil.toObject(queryReqJson, QueryDslReq.class);
+            ExplainSqlReq<QueryDslReq> explainSqlReqNew = ExplainSqlReq.<QueryDslReq>builder()
+                    .queryReq(queryDslReq)
+                    .queryTypeEnum(queryTypeEnum).build();
+            return queryService.explain(explainSqlReqNew, user);
+        }
+        if (QueryTypeEnum.STRUCT.equals(queryTypeEnum)) {
+            QueryStructReq queryStructReq = JsonUtil.toObject(queryReqJson, QueryStructReq.class);
+            ExplainSqlReq<QueryStructReq> explainSqlReqNew = ExplainSqlReq.<QueryStructReq>builder()
+                    .queryReq(queryStructReq)
+                    .queryTypeEnum(queryTypeEnum).build();
+            return queryService.explain(explainSqlReqNew, user);
+        }
+        return null;
+    }
+
 }

semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryService.java

@@ -1,11 +1,13 @@
 package com.tencent.supersonic.semantic.query.service;
 
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
+import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
 import com.tencent.supersonic.semantic.api.query.request.ItemUseReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
-import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDslReq;
+import com.tencent.supersonic.semantic.api.query.request.QueryMultiStructReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
 import com.tencent.supersonic.semantic.api.query.response.ItemUseResp;
 import java.util.List;
@@ -25,4 +27,5 @@ public interface QueryService {
 
     List<ItemUseResp> getStatInfo(ItemUseReq itemUseCommend);
 
+    <T> ExplainResp explain(ExplainSqlReq<T> explainSqlReq, User user) throws Exception;
 }

semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/QueryServiceImpl.java

@@ -6,12 +6,15 @@ import com.tencent.supersonic.common.pojo.DateConf;
 import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
 import com.tencent.supersonic.common.util.cache.CacheUtils;
 import com.tencent.supersonic.common.util.ContextUtils;
+import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum;
 import com.tencent.supersonic.semantic.api.model.request.ModelSchemaFilterReq;
+import com.tencent.supersonic.semantic.api.model.response.ExplainResp;
 import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
 import com.tencent.supersonic.semantic.api.model.response.QueryResultWithSchemaResp;
 import com.tencent.supersonic.semantic.api.query.enums.FilterOperatorEnum;
 import com.tencent.supersonic.semantic.api.query.pojo.Cache;
 import com.tencent.supersonic.semantic.api.query.pojo.Filter;
+import com.tencent.supersonic.semantic.api.query.request.ExplainSqlReq;
 import com.tencent.supersonic.semantic.api.query.request.ItemUseReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDimValueReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryDslReq;
@@ -64,6 +67,14 @@ public class QueryServiceImpl implements QueryService {
 
     @Override
     public Object queryBySql(QueryDslReq querySqlCmd, User user) throws Exception {
+        statUtils.initStatInfo(querySqlCmd, user);
+        QueryStatement queryStatement = convertToQueryStatement(querySqlCmd, user);
+        QueryResultWithSchemaResp results = semanticQueryEngine.execute(queryStatement);
+        statUtils.statInfo2DbAsync(TaskStatusEnum.SUCCESS);
+        return results;
+    }
+
+    private QueryStatement convertToQueryStatement(QueryDslReq querySqlCmd, User user) throws Exception {
         ModelSchemaFilterReq filter = new ModelSchemaFilterReq();
         List<Long> modelIds = new ArrayList<>();
         modelIds.add(querySqlCmd.getModelId());
@@ -74,7 +85,7 @@ public class QueryServiceImpl implements QueryService {
 
         QueryStatement queryStatement = queryReqConverter.convert(querySqlCmd, domainSchemas);
         queryStatement.setModelId(querySqlCmd.getModelId());
-        return semanticQueryEngine.execute(queryStatement);
+        return queryStatement;
     }
 
     @Override
@@ -183,6 +194,32 @@ public class QueryServiceImpl implements QueryService {
         return statInfos;
     }
 
+    @Override
+    public <T> ExplainResp explain(ExplainSqlReq<T> explainSqlReq, User user) throws Exception {
+        QueryTypeEnum queryTypeEnum = explainSqlReq.getQueryTypeEnum();
+        T queryReq = explainSqlReq.getQueryReq();
+
+        if (QueryTypeEnum.SQL.equals(queryTypeEnum) && queryReq instanceof QueryDslReq) {
+            QueryStatement queryStatement = convertToQueryStatement((QueryDslReq) queryReq, user);
+            return getExplainResp(queryStatement);
+        }
+        if (QueryTypeEnum.STRUCT.equals(queryTypeEnum) && queryReq instanceof QueryStructReq) {
+            QueryStatement queryStatement = semanticQueryEngine.plan((QueryStructReq) queryReq);
+            return getExplainResp(queryStatement);
+        }
+
+        throw new IllegalArgumentException("Parameters are invalid, explainSqlReq: " + explainSqlReq);
+    }
+
+    private ExplainResp getExplainResp(QueryStatement queryStatement) {
+        String sql = "";
+        if (Objects.nonNull(queryStatement)) {
+            sql = queryStatement.getSql();
+        }
+        return ExplainResp.builder().sql(sql).build();
+    }
+
+
     private boolean isCache(QueryStructReq queryStructCmd) {
         if (!cacheEnable) {
             return false;

semantic/query/src/main/java/com/tencent/supersonic/semantic/query/service/SchemaServiceImpl.java

@@ -55,7 +55,10 @@ public class SchemaServiceImpl implements SchemaService {
     @Override
     public List<ModelSchemaResp> fetchModelSchema(ModelSchemaFilterReq filter, User user) {
         List<ModelSchemaResp> domainSchemaDescList = modelService.fetchModelSchema(filter);
-        List<ItemUseResp> statInfos = queryService.getStatInfo(new ItemUseReq());
+        ItemUseReq itemUseCommend = new ItemUseReq();
+        itemUseCommend.setModelIds(filter.getModelIds());
+
+        List<ItemUseResp> statInfos = queryService.getStatInfo(itemUseCommend);
         log.debug("statInfos:{}", statInfos);
         fillCnt(domainSchemaDescList, statInfos);
         return domainSchemaDescList;
@@ -116,7 +119,7 @@ public class SchemaServiceImpl implements SchemaService {
 
     @Override
     public PageInfo<MetricResp> queryMetric(PageMetricReq pageMetricCmd, User user) {
-        return metricService.queryMetric(pageMetricCmd);
+        return metricService.queryMetric(pageMetricCmd, user);
     }
 
     @Override
@@ -126,7 +129,7 @@ public class SchemaServiceImpl implements SchemaService {
 
     @Override
     public List<ModelResp> getModelList(User user, AuthType authTypeEnum, Long domainId) {
-        return modelService.getModelListWithAuth(user.getName(), domainId, authTypeEnum);
+        return modelService.getModelListWithAuth(user, domainId, authTypeEnum);
     }
 
 }

semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/DataPermissionAOP.java

@@ -140,7 +140,7 @@ public class DataPermissionAOP {
 
     private boolean doModelAdmin(User user, QueryStructReq queryStructReq) {
         Long modelId = queryStructReq.getModelId();
-        List<ModelResp> modelListAdmin = modelService.getModelListWithAuth(user.getName(), null, AuthType.ADMIN);
+        List<ModelResp> modelListAdmin = modelService.getModelListWithAuth(user, null, AuthType.ADMIN);
         if (CollectionUtils.isEmpty(modelListAdmin)) {
             return false;
         } else {
@@ -153,7 +153,7 @@ public class DataPermissionAOP {
     private void doModelVisible(User user, QueryStructReq queryStructReq) {
         Boolean visible = true;
         Long modelId = queryStructReq.getModelId();
-        List<ModelResp> modelListVisible = modelService.getModelListWithAuth(user.getName(), null, AuthType.VISIBLE);
+        List<ModelResp> modelListVisible = modelService.getModelListWithAuth(user, null, AuthType.VISIBLE);
         if (CollectionUtils.isEmpty(modelListVisible)) {
             visible = false;
         } else {

semantic/query/src/main/java/com/tencent/supersonic/semantic/query/utils/StatUtils.java

@@ -4,22 +4,30 @@ import com.alibaba.ttl.TransmittableThreadLocal;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.tencent.supersonic.auth.api.authentication.pojo.User;
+import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
+import com.tencent.supersonic.common.util.jsqlparser.SqlParserSelectHelper;
 import com.tencent.supersonic.semantic.api.model.enums.QueryTypeBackEnum;
 import com.tencent.supersonic.semantic.api.model.enums.QueryTypeEnum;
 import com.tencent.supersonic.semantic.api.model.pojo.QueryStat;
+import com.tencent.supersonic.semantic.api.model.pojo.SchemaItem;
+import com.tencent.supersonic.semantic.api.model.response.ModelSchemaResp;
 import com.tencent.supersonic.semantic.api.query.request.ItemUseReq;
+import com.tencent.supersonic.semantic.api.query.request.QueryDslReq;
 import com.tencent.supersonic.semantic.api.query.request.QueryStructReq;
 import com.tencent.supersonic.semantic.api.query.response.ItemUseResp;
-import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum;
+import com.tencent.supersonic.semantic.model.domain.ModelService;
 import com.tencent.supersonic.semantic.query.persistence.repository.StatRepository;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 @Component
 @Slf4j
@@ -28,13 +36,17 @@ public class StatUtils {
     private static final TransmittableThreadLocal<QueryStat> STATS = new TransmittableThreadLocal<>();
     private final StatRepository statRepository;
     private final SqlFilterUtils sqlFilterUtils;
+
+    private final ModelService modelService;
     private final ObjectMapper objectMapper = new ObjectMapper();
 
     public StatUtils(StatRepository statRepository,
-            SqlFilterUtils sqlFilterUtils) {
+            SqlFilterUtils sqlFilterUtils,
+            ModelService modelService) {
 
         this.statRepository = statRepository;
         this.sqlFilterUtils = sqlFilterUtils;
+        this.modelService = modelService;
     }
 
     public static QueryStat get() {
@@ -69,6 +81,44 @@ public class StatUtils {
         return true;
     }
 
+
+    public void initStatInfo(QueryDslReq queryDslReq, User facadeUser) {
+        QueryStat queryStatInfo = new QueryStat();
+        List<String> allFields = SqlParserSelectHelper.getAllFields(queryDslReq.getSql());
+        queryStatInfo.setModelId(queryDslReq.getModelId());
+        ModelSchemaResp modelSchemaResp = modelService.fetchSingleModelSchema(queryDslReq.getModelId());
+
+        List<String> dimensions = new ArrayList<>();
+        if (Objects.nonNull(modelSchemaResp)) {
+            dimensions = getFieldNames(allFields, modelSchemaResp.getDimensions());
+        }
+
+        List<String> metrics = new ArrayList<>();
+        if (Objects.nonNull(modelSchemaResp)) {
+            metrics = getFieldNames(allFields, modelSchemaResp.getMetrics());
+        }
+
+        String userName = getUserName(facadeUser);
+        try {
+            queryStatInfo.setTraceId("")
+                    .setModelId(queryDslReq.getModelId())
+                    .setUser(userName)
+                    .setQueryType(QueryTypeEnum.SQL.getValue())
+                    .setQueryTypeBack(QueryTypeBackEnum.NORMAL.getState())
+                    .setQuerySqlCmd(queryDslReq.toString())
+                    .setQuerySqlCmdMd5(DigestUtils.md5Hex(queryDslReq.toString()))
+                    .setStartTime(System.currentTimeMillis())
+                    .setUseResultCache(true)
+                    .setUseSqlCache(true)
+                    .setMetrics(objectMapper.writeValueAsString(metrics))
+                    .setDimensions(objectMapper.writeValueAsString(dimensions));
+        } catch (JsonProcessingException e) {
+            log.error("initStatInfo:{}", e);
+        }
+        StatUtils.set(queryStatInfo);
+
+    }
+
     public void initStatInfo(QueryStructReq queryStructCmd, User facadeUser) {
         QueryStat queryStatInfo = new QueryStat();
         String traceId = "";
@@ -76,12 +126,11 @@ public class StatUtils {
 
         List<String> metrics = new ArrayList<>();
         queryStructCmd.getAggregators().stream().forEach(aggregator -> metrics.add(aggregator.getColumn()));
-        String user = (Objects.nonNull(facadeUser) && Strings.isNotEmpty(facadeUser.getName())) ? facadeUser.getName()
+        String user = getUserName(facadeUser);
-                : "Admin";
 
         try {
             queryStatInfo.setTraceId(traceId)
-                    .setClassId(queryStructCmd.getModelId())
+                    .setModelId(queryStructCmd.getModelId())
                     .setUser(user)
                     .setQueryType(QueryTypeEnum.STRUCT.getValue())
                     .setQueryTypeBack(QueryTypeBackEnum.NORMAL.getState())
@@ -105,6 +154,25 @@ public class StatUtils {
 
     }
 
+    private List<String> getFieldNames(List<String> allFields, List<? extends SchemaItem> schemaItems) {
+        Set<String> fieldNames = schemaItems
+                .stream()
+                .map(dimSchemaResp -> dimSchemaResp.getBizName())
+                .collect(Collectors.toSet());
+        if (!CollectionUtils.isEmpty(fieldNames)) {
+            return allFields.stream().filter(fieldName -> fieldNames.contains(fieldName))
+                    .collect(Collectors.toList());
+        }
+        return new ArrayList<>();
+    }
+
+    private String getUserName(User facadeUser) {
+        return (Objects.nonNull(facadeUser) && Strings.isNotEmpty(facadeUser.getName())) ? facadeUser.getName()
+                : "Admin";
+    }
+
+
+
     public List<ItemUseResp> getStatInfo(ItemUseReq itemUseCommend) {
         return statRepository.getStatInfo(itemUseCommend);
     }

semantic/query/src/main/resources/mapper/StatMapper.xml

@@ -64,6 +64,12 @@
             <if test="modelId != null">
                 and model_id = #{modelId}
             </if>
+            <if test="modelIds != null and modelIds.size() > 0">
+                and model_id in
+                <foreach item="id" collection="modelIds" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
             <if test="metric != null">
                 and metrics like concat('%',#{metric},'%')
             </if>

webapp/.gitignore

@@ -19,7 +19,6 @@ supersonic-webapp.tar.gz
 
 package-lock.json
 yarn.lock
-pnpm-lock.yaml
 
 # misc
 .DS_Store

webapp/packages/chat-sdk/.gitignore

@@ -13,8 +13,6 @@
 
 /dist
 
-pnpm-lock.yaml
-
 # misc
 .DS_Store
 .env.local

webapp/packages/supersonic-fe/.gitignore

@@ -20,7 +20,6 @@ yarn-error.log
 .idea
 yarn.lock
 package-lock.json
-pnpm-lock.yaml
 *bak
 .vscode
 

webapp/packages/supersonic-fe/package.json

@@ -76,7 +76,7 @@
     "antd": "^4.24.8",
     "classnames": "^2.2.6",
     "copy-to-clipboard": "^3.3.1",
-    "cross-env": "^7.0.0",
+    "cross-env": "^7.0.3",
     "crypto-js": "^4.0.0",
     "echarts": "^5.0.2",
     "echarts-for-react": "^3.0.1",

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

@@ -81,7 +81,7 @@ const MetricFilter: React.FC<Props> = ({ filterValues = {}, onFiltersChange }) =
               <FormItem name="key" noStyle>
                 <div className={styles.searchInput}>
                   <Input.Search
-                    placeholder="请输入需要查询指标的ID、指标名称、字段名称"
+                    placeholder="请输入需要查询指标的ID、指标名称、字段名称、标签"
                     enterButton={<SearchOutlined style={{ marginTop: 5 }} />}
                     onSearch={(value) => {
                       onSearch(value);

webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/index.tsx

@@ -1,9 +1,9 @@
 import type { ActionType, ProColumns } from '@ant-design/pro-table';
 import ProTable from '@ant-design/pro-table';
-import { message, Space, Popconfirm } from 'antd';
+import { message, Space, Popconfirm, Tag } from 'antd';
 import React, { useRef, useState, useEffect } from 'react';
 import type { Dispatch } from 'umi';
-import { connect } from 'umi';
+import { connect, history } from 'umi';
 import type { StateType } from '../model';
 import { SENSITIVE_LEVEL_ENUM } from '../constant';
 import { queryMetric, deleteMetric } from '../service';
@@ -89,6 +89,20 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
     {
       dataIndex: 'name',
       title: '指标名称',
+      render: (_, record: any) => {
+        if (record.hasAdminRes) {
+          return (
+            <a
+              onClick={() => {
+                history.replace(`/model/${record.domainId}/${record.modelId}/metric`);
+              }}
+            >
+              {record.name}
+            </a>
+          );
+        }
+        return <> {record.name}</>;
+      },
     },
     // {
     //   dataIndex: 'alias',
@@ -113,6 +127,25 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
       title: '创建人',
       search: false,
     },
+    {
+      dataIndex: 'tags',
+      title: '标签',
+      search: false,
+      render: (tags) => {
+        if (Array.isArray(tags)) {
+          return (
+            <Space size={2}>
+              {tags.map((tag) => (
+                <Tag color="blue" key={tag}>
+                  {tag}
+                </Tag>
+              ))}
+            </Space>
+          );
+        }
+        return <>--</>;
+      },
+    },
     {
       dataIndex: 'description',
       title: '描述',
@@ -140,6 +173,7 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
       dataIndex: 'x',
       valueType: 'option',
       render: (_, record) => {
+        if (record.hasAdminRes) {
           return (
             <Space>
               <a
@@ -160,7 +194,7 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
                   const { code, msg } = await deleteMetric(record.id);
                   if (code === 200) {
                     setMetricItem(undefined);
-                  actionRef.current?.reload();
+                    queryMetricList();
                   } else {
                     message.error(msg);
                   }
@@ -177,6 +211,9 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
               </Popconfirm>
             </Space>
           );
+        } else {
+          return <></>;
+        }
       },
     },
   ];
@@ -239,7 +276,7 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
           metricItem={metricItem}
           onSubmit={() => {
             setCreateModalVisible(false);
-            actionRef?.current?.reload();
+            queryMetricList();
             dispatch({
               type: 'domainManger/queryMetricList',
               payload: {

webapp/packages/supersonic-fe/src/pages/SemanticModel/Metric/style.less

@@ -15,7 +15,7 @@
     // margin-bottom: 12px;
     background: #fff;
     border-radius: 10px;
-    width: 500px;
+    width: 540px;
     margin: 0 auto;
     .searchInput {
         width: 100%;

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

@@ -1,6 +1,6 @@
 import type { ActionType, ProColumns } from '@ant-design/pro-table';
 import ProTable from '@ant-design/pro-table';
-import { message, Button, Space, Popconfirm, Input } from 'antd';
+import { message, Button, Space, Popconfirm, Input, Tag } from 'antd';
 import React, { useRef, useState } from 'react';
 import type { Dispatch } from 'umi';
 import { connect } from 'umi';
@@ -76,7 +76,7 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
       dataIndex: 'key',
       title: '指标搜索',
       hideInTable: true,
-      renderFormItem: () => <Input placeholder="请输入ID/指标名称/字段名称" />,
+      renderFormItem: () => <Input placeholder="请输入ID/指标名称/字段名称/标签" />,
     },
     {
       dataIndex: 'alias',
@@ -101,6 +101,25 @@ const ClassMetricTable: React.FC<Props> = ({ domainManger, dispatch }) => {
       title: '创建人',
       search: false,
     },
+    {
+      dataIndex: 'tags',
+      title: '标签',
+      search: false,
+      render: (tags) => {
+        if (Array.isArray(tags)) {
+          return (
+            <Space size={2} wrap>
+              {tags.map((tag) => (
+                <Tag color="blue" key={tag}>
+                  {tag}
+                </Tag>
+              ))}
+            </Space>
+          );
+        }
+        return <>--</>;
+      },
+    },
     {
       dataIndex: 'description',
       title: '描述',

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

@@ -24,7 +24,7 @@ import FormItemTitle from '@/components/FormHelper/FormItemTitle';
 import styles from './style.less';
 import { getMeasureListByModelId } from '../service';
 import TableTitleTooltips from '../components/TableTitleTooltips';
-import { creatExprMetric, updateExprMetric, mockMetricAlias } from '../service';
+import { creatExprMetric, updateExprMetric, mockMetricAlias, getMetricTags } from '../service';
 import { ISemantic } from '../data';
 import { history } from 'umi';
 
@@ -75,6 +75,8 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
   const [hasMeasuresState, setHasMeasuresState] = useState<boolean>(true);
   const [llmLoading, setLlmLoading] = useState<boolean>(false);
 
+  const [tagOptions, setTagOptions] = useState<{ label: string; value: string }[]>([]);
+
   const forward = () => setCurrentStep(currentStep + 1);
   const backward = () => setCurrentStep(currentStep - 1);
 
@@ -95,6 +97,7 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
 
   useEffect(() => {
     queryClassMeasureList();
+    queryMetricTags();
   }, []);
 
   const handleNext = async () => {
@@ -126,6 +129,7 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
       dataFormat,
       dataFormatType,
       alias,
+      tags,
     } = metricItem as any;
     const isPercent = dataFormatType === 'percent';
     const isDecimal = dataFormatType === 'decimal';
@@ -135,6 +139,7 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
       bizName,
       sensitiveLevel,
       description,
+      tags,
       // isPercent,
       dataFormatType: dataFormatType || '',
       alias: alias && alias.trim() ? alias.split(',') : [],
@@ -204,6 +209,22 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
     }
   };
 
+  const queryMetricTags = async () => {
+    const { code, data } = await getMetricTags();
+    if (code === 200) {
+      // form.setFieldValue('alias', Array.from(new Set([...formAlias, ...data])));
+      setTagOptions(
+        Array.isArray(data)
+          ? data.map((tag: string) => {
+              return { label: tag, value: tag };
+            })
+          : [],
+      );
+    } else {
+      message.error('获取指标标签失败');
+    }
+  };
+
   const renderContent = () => {
     if (currentStep === 1) {
       return (
@@ -277,6 +298,15 @@ const MetricInfoCreateForm: React.FC<CreateFormProps> = ({
             )}
           </Row>
         </FormItem>
+        <FormItem name="tags" label="标签">
+          <Select
+            mode="tags"
+            placeholder="输入别名后回车确认，多别名输入、复制粘贴支持英文逗号自动分隔"
+            tokenSeparators={[',']}
+            maxTagCount={9}
+            options={tagOptions}
+          />
+        </FormItem>
         <FormItem
           name="sensitiveLevel"
           label="敏感度"

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

@@ -41,6 +41,7 @@ const PermissionAdminForm: React.FC<Props> = ({
         ...data,
       };
       fieldsValue.admins = fieldsValue.admins || [];
+      fieldsValue.adminOrgs = fieldsValue.adminOrgs || [];
       fieldsValue.viewers = fieldsValue.viewers || [];
       fieldsValue.viewOrgs = fieldsValue.viewOrgs || [];
       fieldsValue.isOpen = !!fieldsValue.isOpen;
@@ -57,10 +58,11 @@ const PermissionAdminForm: React.FC<Props> = ({
 
   const saveAuth = async () => {
     const values = await form.validateFields();
-    const { admins, isOpen, viewOrgs = [], viewers = [] } = values;
+    const { admins, adminOrgs, isOpen, viewOrgs = [], viewers = [] } = values;
     const queryClassData = {
       ...classDetail,
       admins,
+      adminOrgs,
       viewOrgs,
       viewers,
       isOpen: isOpen ? 1 : 0,
@@ -100,7 +102,16 @@ const PermissionAdminForm: React.FC<Props> = ({
         >
           <SelectTMEPerson placeholder="请邀请团队成员" />
         </FormItem>
-
+        {APP_TARGET === 'inner' && (
+          <FormItem name="adminOrgs" label="按组织">
+            <SelectPartner
+              type="selectedDepartment"
+              treeSelectProps={{
+                placeholder: '请选择需要授权的部门',
+              }}
+            />
+          </FormItem>
+        )}
         <Form.Item
           label={
             <FormItemTitle

webapp/packages/supersonic-fe/src/pages/SemanticModel/service.ts

@@ -119,6 +119,10 @@ export function mockMetricAlias(data: any): Promise<any> {
   });
 }
 
+export function getMetricTags(): Promise<any> {
+  return request.get(`${process.env.API_BASE_URL}metric/getMetricTags`);
+}
+
 export function getMeasureListByModelId(modelId: number): Promise<any> {
   return request.get(`${process.env.API_BASE_URL}datasource/getMeasureListOfModel/${modelId}`);
 }