(improvement)(launcher) Optimize the demo to prevent the dimension value dictionary from being loaded after the demo is loaded. (#1059)

Co-authored-by: jolunoluo
This commit is contained in:
LXW
2024-05-30 22:26:20 +08:00
committed by GitHub
parent 4e6c076481
commit c000dfeb06
14 changed files with 161 additions and 182 deletions

View File

@@ -34,6 +34,7 @@ import com.tencent.supersonic.headless.server.service.ModelService;
import com.tencent.supersonic.headless.server.service.TagMetaService;
import com.tencent.supersonic.headless.server.service.TagObjectService;
import com.tencent.supersonic.headless.server.service.TermService;
import com.tencent.supersonic.headless.server.service.impl.DictWordService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -86,6 +87,8 @@ public abstract class S2BaseDemo implements CommandLineRunner {
protected SysParameterService sysParameterService;
@Autowired
protected CanvasService canvasService;
@Autowired
protected DictWordService dictWordService;
@Value("${s2.demo.names:S2VisitsDemo}")
protected List<String> demoList;
@Value("${s2.demo.enableLLM:true}")

View File

@@ -13,7 +13,6 @@ import com.tencent.supersonic.chat.server.agent.MultiTurnConfig;
import com.tencent.supersonic.chat.server.agent.RuleParserTool;
import com.tencent.supersonic.chat.server.plugin.Plugin;
import com.tencent.supersonic.chat.server.plugin.PluginParseConfig;
import com.tencent.supersonic.chat.server.plugin.build.ParamOption;
import com.tencent.supersonic.chat.server.plugin.build.WebBase;
import com.tencent.supersonic.common.pojo.JoinCondition;
import com.tencent.supersonic.common.pojo.ModelRela;
@@ -111,9 +110,12 @@ public class S2VisitsDemo extends S2BaseDemo {
//create terms and plugin
addTerm(s2Domain);
addTerm_1(s2Domain);
addPlugin(s2DataSet, userDimension, userModel);
addPlugin(s2DataSet);
addSysParameter();
//load dict word
loadDictWord();
//create agent
Integer agentId = addAgent(s2DataSet.getId());
addSampleChats(agentId);
@@ -531,8 +533,7 @@ public class S2VisitsDemo extends S2BaseDemo {
authService.addOrUpdateAuthGroup(authGroupReq);
}
private void addPlugin(DataSetResp s2DataSet, DimensionResp userDimension,
ModelResp userModel) {
private void addPlugin(DataSetResp s2DataSet) {
Plugin plugin1 = new Plugin();
plugin1.setType("WEB_PAGE");
plugin1.setDataSetList(Arrays.asList(s2DataSet.getId()));
@@ -545,13 +546,7 @@ public class S2VisitsDemo extends S2BaseDemo {
plugin1.setParseModeConfig(JSONObject.toJSONString(pluginParseConfig));
WebBase webBase = new WebBase();
webBase.setUrl("www.yourbi.com");
ParamOption paramOption = new ParamOption();
paramOption.setKey("name");
paramOption.setParamType(ParamOption.ParamType.SEMANTIC);
paramOption.setElementId(userDimension.getId());
paramOption.setModelId(userModel.getId());
List<ParamOption> paramOptions = Arrays.asList(paramOption);
webBase.setParamOptions(paramOptions);
webBase.setParamOptions(Lists.newArrayList());
plugin1.setConfig(JsonUtil.toString(webBase));
pluginService.createPlugin(plugin1, user);
}
@@ -565,4 +560,8 @@ public class S2VisitsDemo extends S2BaseDemo {
return tagObjectService.create(tagObjectReq, user);
}
private void loadDictWord() {
dictWordService.loadDictWord();
}
}

View File

@@ -60,14 +60,12 @@ com.tencent.supersonic.chat.server.plugin.recognize.PluginRecognizer=\
com.tencent.supersonic.chat.server.processor.parse.ParseResultProcessor=\
com.tencent.supersonic.chat.server.processor.parse.QueryRecommendProcessor,\
com.tencent.supersonic.chat.server.processor.parse.EntityInfoProcessor,\
com.tencent.supersonic.chat.server.processor.parse.TimeCostProcessor,\
com.tencent.supersonic.chat.server.processor.parse.ParseResultFormatProcessor
com.tencent.supersonic.chat.server.processor.parse.TimeCostProcessor
com.tencent.supersonic.chat.server.processor.execute.ExecuteResultProcessor=\
com.tencent.supersonic.chat.server.processor.execute.MetricRecommendProcessor,\
com.tencent.supersonic.chat.server.processor.execute.DimensionRecommendProcessor,\
com.tencent.supersonic.chat.server.processor.execute.MetricRatioProcessor,\
com.tencent.supersonic.chat.server.processor.execute.QueryResultFormatProcessor
com.tencent.supersonic.chat.server.processor.execute.MetricRatioProcessor
com.tencent.supersonic.common.util.embedding.S2EmbeddingStore=\
com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore

View File

@@ -61,7 +61,7 @@ s2:
embedding:
url: ${s2.pyllm.url}
persistent:
path: /tmp
path: d://
demo:
names: S2VisitsDemo,S2ArtistDemo