(improvement)(Headless) Dataset supports query mode settings, and the chat layer supports tag mode (#802)

This commit is contained in:
lexluo09
2024-03-12 12:15:21 +08:00
committed by GitHub
parent 1d91a972da
commit ae7acb4817
26 changed files with 171 additions and 207 deletions

View File

@@ -1,11 +1,11 @@
package com.tencent.supersonic.headless.api.pojo.request;
import com.tencent.supersonic.common.pojo.enums.QueryType;
import com.tencent.supersonic.headless.api.pojo.DataSetDetail;
import com.tencent.supersonic.headless.api.pojo.QueryConfig;
import com.tencent.supersonic.headless.api.pojo.SchemaItem;
import com.tencent.supersonic.headless.api.pojo.DataSetDetail;
import lombok.Data;
import java.util.List;
import lombok.Data;
@Data
public class DataSetReq extends SchemaItem {
@@ -22,6 +22,8 @@ public class DataSetReq extends SchemaItem {
private List<String> adminOrgs;
private QueryType queryType;
public String getAdmin() {
if (admins == null) {
return null;

View File

@@ -53,16 +53,7 @@ public class QueryStructReq extends SemanticQueryReq {
private DateConf dateInfo;
private Long limit = 2000L;
private QueryType queryType = QueryType.ID;
/**
* Later deleted for compatibility only
*/
private String s2SQL;
/**
* Later deleted for compatibility only
*/
private String correctS2SQL;
private boolean convertToSql = true;
public List<String> getGroups() {
if (!CollectionUtils.isEmpty(this.groups)) {

View File

@@ -1,17 +1,17 @@
package com.tencent.supersonic.headless.api.pojo.response;
import com.google.common.collect.Lists;
import com.tencent.supersonic.headless.api.pojo.QueryConfig;
import com.tencent.supersonic.headless.api.pojo.SchemaItem;
import com.tencent.supersonic.common.pojo.enums.QueryType;
import com.tencent.supersonic.headless.api.pojo.DataSetDetail;
import com.tencent.supersonic.headless.api.pojo.DataSetModelConfig;
import lombok.Data;
import org.springframework.util.CollectionUtils;
import com.tencent.supersonic.headless.api.pojo.QueryConfig;
import com.tencent.supersonic.headless.api.pojo.SchemaItem;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
import lombok.Data;
import org.springframework.util.CollectionUtils;
@Data
public class DataSetResp extends SchemaItem {
@@ -30,6 +30,8 @@ public class DataSetResp extends SchemaItem {
private QueryConfig queryConfig;
private QueryType queryType;
public List<Long> getAllMetrics() {
return getDataSetModelConfigs().stream().map(DataSetModelConfig::getMetrics)
.flatMap(Collection::stream).collect(Collectors.toList());