topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2025-12-10 19:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(improvement)(Headless) add ext info for model (#1019)

Browse Source
This commit is contained in:
LXW
2024-05-20 20:58:27 +08:00
committed by GitHub
parent 3bd3321b8d
commit 6b7fdfec11
10 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/ModelReq.java
View File

@@ -9,6 +9,7 @@ import com.tencent.supersonic.headless.api.pojo.SchemaItem;
import lombok.Data;
import java.util.List;
import java.util.Map;
@Data
@@ -40,6 +41,8 @@ public class ModelReq extends SchemaItem {
private Long tagObjectId;
private Map<String, Object> ext;
public List<Dim> getTimeDimension() {
if (modelDetail == null) {
return Lists.newArrayList();

3
headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/response/ModelResp.java
View File

@@ -16,6 +16,7 @@ import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
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;
@@ -54,6 +55,8 @@ public class ModelResp extends SchemaItem {
private String fullPath;
private Map<String, Object> ext;
public boolean openToAll() {
return isOpen != null && isOpen == 1;
}

2
headless/server/src/main/java/com/tencent/supersonic/headless/server/persistence/dataobject/ModelDO.java
View File

@@ -58,4 +58,6 @@ public class ModelDO {
private String sourceType;
private String ext;
}

1
headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java
View File

@@ -87,6 +87,7 @@ public class DataSetServiceImpl
DataSetResp dataSetResp = convert(dataSetDO);
conflictCheck(dataSetResp);
save(dataSetDO);
dataSetResp.setId(dataSetDO.getId());
return dataSetResp;
}

9
headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/ModelConverter.java
View File

@@ -45,6 +45,9 @@ public class ModelConverter {
modelDO.setStatus(StatusEnum.ONLINE.getCode());
modelDO.setModelDetail(JSONObject.toJSONString(modelDetail));
modelDO.setDrillDownDimensions(JSONObject.toJSONString(modelReq.getDrillDownDimensions()));
if (modelReq.getExt() != null) {
modelDO.setExt(JSONObject.toJSONString(modelReq.getExt()));
}
return modelDO;
}
@@ -60,7 +63,8 @@ public class ModelConverter {
modelResp.setViewOrgs(StringUtils.isBlank(modelDO.getViewOrg())
? Lists.newArrayList() : Arrays.asList(modelDO.getViewOrg().split(",")));
modelResp.setDrillDownDimensions(JsonUtil.toList(modelDO.getDrillDownDimensions(), DrillDownDimension.class));
modelResp.setModelDetail(JSONObject.parseObject(modelDO.getModelDetail(), ModelDetail.class));
modelResp.setModelDetail(JsonUtil.toObject(modelDO.getModelDetail(), ModelDetail.class));
modelResp.setExt(JsonUtil.toObject(modelDO.getExt(), Map.class));
return modelResp;
}
@@ -81,6 +85,9 @@ public class ModelConverter {
modelDO.setDrillDownDimensions(JSONObject.toJSONString(modelReq.getDrillDownDimensions()));
}
modelDO.setModelDetail(JSONObject.toJSONString((modelDetail)));
if (modelReq.getExt() != null) {
modelDO.setExt(JSONObject.toJSONString(modelReq.getExt()));
}
modelDO.setUpdatedBy(user.getName());
modelDO.setUpdatedAt(new Date());
return modelDO;

10
launchers/standalone/src/main/java/com/tencent/supersonic/ModelDemoDataLoader.java
View File

@@ -140,7 +140,7 @@ public class ModelDemoDataLoader {
DimensionResp pageDimension = getDimension("page", stayTimeModel);
updateDimension(stayTimeModel, pageDimension);
updateMetric(stayTimeModel, departmentDimension, userDimension);
addTags(singerModel);
addTags(userModel, singerModel);
updateMetric_pv(pvUvModel, departmentDimension, userDimension, metricPv);
DataSetResp s2DataSet = addDataSet_1(s2Domain);
addDataSet_2(singerDomain, singerModel);
@@ -402,7 +402,9 @@ public class ModelDemoDataLoader {
return modelService.createModel(modelReq, user);
}
private void addTags(ModelResp singerModel) {
private void addTags(ModelResp userModel, ModelResp singerModel) {
addTag(dimensionService.getDimension("department", userModel.getId()).getId(),
TagDefineType.DIMENSION);
addTag(dimensionService.getDimension("act_area", singerModel.getId()).getId(),
TagDefineType.DIMENSION);
addTag(dimensionService.getDimension("song_name", singerModel.getId()).getId(),
@@ -597,12 +599,12 @@ public class ModelDemoDataLoader {
termService.saveOrUpdate(termReq, User.getFakeUser());
}
public void addTerm_1(DomainResp domainResp) {
public void addTerm_1(DomainResp s2Domain) {
TermReq termReq = new TermReq();
termReq.setName("核心用户");
termReq.setDescription("核心用户指tom和lucy");
termReq.setAlias(Lists.newArrayList("VIP用户"));
termReq.setDomainId(domainResp.getId());
termReq.setDomainId(s2Domain.getId());
termService.saveOrUpdate(termReq, User.getFakeUser());
}

4
launchers/standalone/src/main/resources/config.update/sql-update.sql
View File

@@ -312,4 +312,6 @@ CREATE TABLE IF NOT EXISTS `s2_term` (
--20240520
alter table s2_agent add column `llm_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL;
alter table s2_agent add column `multi_turn_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL;
alter table s2_agent add column `visual_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL;
alter table s2_agent add column `visual_config` varchar(2000) COLLATE utf8_unicode_ci DEFAULT NULL;
alter table s2_model add column `ext` varchar(1000) DEFAULT NULL;

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

@@ -140,6 +140,7 @@ CREATE TABLE IF NOT EXISTS `s2_model` (
`depends` varchar(500) DEFAULT NULL ,
`source_type` varchar(128) DEFAULT NULL ,
`filter_sql` varchar(1000) DEFAULT NULL ,
`ext` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`id`)
);
COMMENT ON TABLE s2_model IS 'model information';

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

@@ -330,6 +330,7 @@ CREATE TABLE `s2_model` (
`depends` varchar(500) DEFAULT NULL ,
`filter_sql` varchar(1000) DEFAULT NULL ,
`tag_object_id` int(11) DEFAULT '0',
`ext` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;

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

@@ -140,6 +140,7 @@ CREATE TABLE IF NOT EXISTS `s2_model` (
`depends` varchar(500) DEFAULT NULL ,
`source_type` varchar(128) DEFAULT NULL ,
`filter_sql` varchar(1000) DEFAULT NULL ,
`ext` varchar(1000) DEFAULT NULL,
PRIMARY KEY (`id`)
);
COMMENT ON TABLE s2_model IS 'model information';