topdog/supersonic
1
0
Fork 0
mirror of https://github.com/tencentmusic/supersonic.git synced 2026-01-18 17:01:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'tencentmusic:master' into master

Browse Source
This commit is contained in:
williamhliu
2023-06-30 15:25:22 +08:00
committed by GitHub
parent 7c57a1cb33 bab8b67217
commit 8639c23dc4
18 changed files with 64 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/config/ChatConfigBase.java
View File

@@ -31,7 +31,7 @@ public class ChatConfigBase {
/**
* information about dictionary about the domain
*/
private List<KnowledgeInfo> dictionaryInfos;
private List<KnowledgeInfo> knowledgeInfos;
/**
* available status

2
chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/config/ChatConfigInfo.java
View File

@@ -30,7 +30,7 @@ public class ChatConfigInfo {
/**
* information about dictionary about the domain
*/
private List<KnowledgeInfo> dictionaryInfos;
private List<KnowledgeInfo> knowledgeInfos;
/**
* available status

2
chat/core/src/main/java/com/tencent/supersonic/chat/domain/pojo/config/ChatConfigRichInfo.java
View File

@@ -33,7 +33,7 @@ public class ChatConfigRichInfo {
/**
* information about dictionary about the domain
*/
private List<KnowledgeInfo> dictionaryInfos;
private List<KnowledgeInfo> knowledgeInfos;
/**
* available status

2
chat/core/src/main/java/com/tencent/supersonic/chat/domain/utils/ChatConfigUtils.java
View File

@@ -154,7 +154,7 @@ public class ChatConfigUtils {
JsonUtil.toList(chaConfigDO.getDefaultMetrics(), DefaultMetricInfo.class));
chaConfigDescriptor.setVisibility(JsonUtil.toObject(chaConfigDO.getVisibility(), ItemVisibility.class));
chaConfigDescriptor.setEntity(JsonUtil.toObject(chaConfigDO.getEntity(), Entity.class));
chaConfigDescriptor.setDictionaryInfos(JsonUtil.toList(chaConfigDO.getKnowledgeInfo(), KnowledgeInfo.class));
chaConfigDescriptor.setKnowledgeInfos(JsonUtil.toList(chaConfigDO.getKnowledgeInfo(), KnowledgeInfo.class));
chaConfigDescriptor.setStatusEnum(StatusEnum.of(chaConfigDO.getStatus()));
chaConfigDescriptor.setCreatedBy(chaConfigDO.getCreatedBy());

32
chat/core/src/main/java/com/tencent/supersonic/chat/domain/utils/DictMetaUtils.java
View File

@@ -14,6 +14,7 @@ import com.tencent.supersonic.chat.domain.pojo.config.ItemVisibilityInfo;
import com.tencent.supersonic.chat.domain.pojo.config.KnowledgeInfo;
import com.tencent.supersonic.knowledge.domain.pojo.DictUpdateMode;
import com.tencent.supersonic.knowledge.domain.pojo.DimValue2DictCommand;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -22,6 +23,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import org.apache.logging.log4j.util.Strings;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
@@ -37,7 +39,7 @@ public class DictMetaUtils {
private final DefaultSemanticInternalUtils defaultSemanticUtils;
public DictMetaUtils(SemanticLayer semanticLayer,
DefaultSemanticInternalUtils defaultSemanticUtils) {
DefaultSemanticInternalUtils defaultSemanticUtils) {
this.semanticLayer = semanticLayer;
this.defaultSemanticUtils = defaultSemanticUtils;
}
@@ -129,21 +131,21 @@ public class DictMetaUtils {
}
private void fillDimValueDOList(List<DimValueDO> dimValueDOList, Long domainId,
Map<Long, DimSchemaResp> dimIdAndDescPair) {
Map<Long, DimSchemaResp> dimIdAndDescPair) {
ChatConfigRichInfo chaConfigRichDesc = defaultSemanticUtils.getChatConfigRichInfo(domainId);
if (Objects.nonNull(chaConfigRichDesc)) {
List<DefaultMetric> defaultMetricDescList = chaConfigRichDesc.getDefaultMetrics();
List<KnowledgeInfo> dictionaryInfos = chaConfigRichDesc.getDictionaryInfos();
if (!CollectionUtils.isEmpty(dictionaryInfos)) {
List<KnowledgeInfo> knowledgeInfos = chaConfigRichDesc.getKnowledgeInfos();
if (!CollectionUtils.isEmpty(knowledgeInfos)) {
List<Dim4Dict> dimensions = new ArrayList<>();
dictionaryInfos.stream()
.filter(dictionaryInfo -> dictionaryInfo.getIsDictInfo()
&& isVisibleDim(dictionaryInfo, chaConfigRichDesc.getVisibility()))
.forEach(dictionaryInfo -> {
if (dimIdAndDescPair.containsKey(dictionaryInfo.getItemId())) {
DimSchemaResp dimensionDesc = dimIdAndDescPair.get(dictionaryInfo.getItemId());
knowledgeInfos.stream()
.filter(knowledgeInfo -> knowledgeInfo.getIsDictInfo()
&& isVisibleDim(knowledgeInfo, chaConfigRichDesc.getVisibility()))
.forEach(knowledgeInfo -> {
if (dimIdAndDescPair.containsKey(knowledgeInfo.getItemId())) {
DimSchemaResp dimensionDesc = dimIdAndDescPair.get(knowledgeInfo.getItemId());
//default cnt
if (CollectionUtils.isEmpty(defaultMetricDescList)) {
@@ -156,9 +158,9 @@ public class DictMetaUtils {
}
String bizName = dimensionDesc.getBizName();
dimensions.add(new Dim4Dict(dictionaryInfo.getItemId(), bizName,
dictionaryInfo.getBlackList(), dictionaryInfo.getWhiteList(),
dictionaryInfo.getRuleList()));
dimensions.add(new Dim4Dict(knowledgeInfo.getItemId(), bizName,
knowledgeInfo.getBlackList(), knowledgeInfo.getWhiteList(),
knowledgeInfo.getRuleList()));
}
});
@@ -173,10 +175,10 @@ public class DictMetaUtils {
}
}
private boolean isVisibleDim(KnowledgeInfo dictionaryInfo, ItemVisibilityInfo itemVisibilityDesc) {
private boolean isVisibleDim(KnowledgeInfo knowledgeInfo, ItemVisibilityInfo itemVisibilityDesc) {
if (Objects.isNull(itemVisibilityDesc) || CollectionUtils.isEmpty(itemVisibilityDesc.getBlackDimIdList())) {
return true;
}
return !itemVisibilityDesc.getBlackDimIdList().contains(dictionaryInfo.getItemId());
return !itemVisibilityDesc.getBlackDimIdList().contains(knowledgeInfo.getItemId());
}
}

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

@@ -3,7 +3,6 @@ insert into s2_user (id, `name`, password, display_name, email) values (2, 'jack
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_chat_config (`id` ,`domain_id` ,`default_metrics`,`visibility`,`entity_info` ,`dictionary_info`,`created_at`,`updated_at`,`created_by`,`updated_by`,`status` ) values (1,1,'[{"metricId":1,"unit":7,"period":"DAY"}]','{"blackDimIdList":[],"blackMetricIdList":[]}','{"entityIds":[2],"names":["用户","用户姓名"],"detailData":{"dimensionIds":[1,2],"metricIds":[2]}}','[{"itemId":1,"type":"DIMENSION","blackList":[],"isDictInfo":true},{"itemId":2,"type":"DIMENSION","blackList":[],"isDictInfo":true},{"itemId":3,"type":"DIMENSION","blackList":[],"isDictInfo":true}]','2023-05-24 18:00:00','2023-05-25 11:00:00','admin','admin',1);
insert into s2_chat_config (id, domain_id, default_metrics, visibility, entity_info, dictionary_info, created_at, updated_at, created_by, updated_by, status) values (2, 1, '[{"metricId":1,"unit":7,"period":"DAY"}]','{"blackDimIdList":[],"blackMetricIdList":[]}','{"entityIds":[2],"names":["用户","用户姓名"],"detailData":{"dimensionIds":[1,2],"metricIds":[2]}}','[{"itemId":1,"type":"DIMENSION","blackList":[],"isDictInfo":true},{"itemId":2,"type":"DIMENSION","blackList":[],"isDictInfo":true},{"itemId":3,"type":"DIMENSION","blackList":[],"isDictInfo":true}]','2023-05-24 18:00:00', '2023-05-25 11:00:00', 'admin', 'admin', 1 );
insert into s2_chat (chat_id, `chat_name`, create_time, last_time, creator,last_question,is_delete,is_top) values (1, '超音数访问统计','2023-06-10 10:00:52.495','2023-06-10 10:00:52','admin','您好，欢迎使用内容智能小Q','0','0');

3
webapp/packages/supersonic-fe/package.json
View File

@@ -53,6 +53,7 @@
],
"dependencies": {
"@ant-design/charts": "^1.3.3",
"@ant-design/cssinjs": "^1.10.1",
"@ant-design/icons": "^4.7.0",
"@ant-design/pro-card": "^1.11.13",
"@ant-design/pro-components": "^2.4.4",
@@ -143,4 +144,4 @@
"@types/react": "17.0.0"
},
"__npminstall_done": false
}
}

2
webapp/packages/supersonic-fe/src/app.tsx
View File

@@ -50,7 +50,7 @@ const getToken = async () => {
try {
const fromUrl = localStorage.getItem(FROM_URL_KEY);
const res = await queryToken(data.code as string);
localStorage.setItem(TOKEN_KEY, res.data.authToken);
localStorage.setItem(TOKEN_KEY, res.payload);
const newUrl = deleteUrlQuery(window.location.href, 'code');
window.location.href = fromUrl || newUrl;
} catch (err) {

3
webapp/packages/supersonic-fe/src/common/constants.ts
View File

@@ -1,6 +1,5 @@
// 登陆 token key
export const AUTH_TOKEN_KEY = 'SUPERSONIC_TOKEN';
export const AUTH_TOKEN_KEY = process.env.APP_TARGET === 'inner' ? 'TME_TOKEN' : 'SUPERSONIC_TOKEN';
// 记录上次访问页面
export const FROM_URL_KEY = 'FROM_URL';

5
webapp/packages/supersonic-fe/src/components/SelectTMEPerson/index.tsx
View File

@@ -22,11 +22,12 @@ const SelectTMEPerson: FC<Props> = ({ placeholder, value, isMultiple = true, onC
{
fetcher: async () => {
const res = await getAllUser();
if (res.code !== 200) {
if (res.code == 200 || Number(res.code) == 0) {
return res.data || [];
} else {
message.error(res.msg);
throw new Error(res.msg);
}
return res.data || [];
},
updater: (list) => {
const users = list.map((item: UserItem) => {

20
webapp/packages/supersonic-fe/src/pages/Chat/RightSection/Context/index.tsx
View File

@@ -17,15 +17,17 @@ const Context: React.FC<Props> = ({ chatContext }) => {
<span className={styles.fieldName}>主题域：</span>
<span className={styles.fieldValue}>{domainName}</span>
</div>
{dateInfo && (
<div className={styles.field}>
<span className={styles.fieldName}>时间范围：</span>
<span className={styles.fieldValue}>
{dateInfo.text ||
`近${moment(dateInfo.endDate).diff(moment(dateInfo.startDate), 'days') + 1}天`}
</span>
</div>
)}
{
dateInfo && (
<div className={styles.field}>
<span className={styles.fieldName}>时间范围：</span>
<span className={styles.fieldValue}>
{dateInfo.text ||
`近${moment(dateInfo.endDate).diff(moment(dateInfo.startDate), 'days') + 1}天`}
</span>
</div>
)
}
{metrics && metrics.length > 0 && (
<div className={styles.field}>
<span className={styles.fieldName}>指标：</span>

9
webapp/packages/supersonic-fe/src/pages/Chat/index.tsx
View File

@@ -11,9 +11,14 @@ import RightSection from './RightSection';
import ChatFooter from './ChatFooter';
import classNames from 'classnames';
import { AUTH_TOKEN_KEY, DEFAULT_CONVERSATION_NAME, WEB_TITLE } from '@/common/constants';
import { HistoryMsgItemType, MsgDataType, getHistoryMsg, queryContext } from 'supersonic-chat-sdk';
import {
HistoryMsgItemType,
MsgDataType,
getHistoryMsg,
queryContext,
setToken as setChatSdkToken,
} from 'supersonic-chat-sdk';
import { getConversationContext } from './utils';
import { setToken as setChatSdkToken } from 'supersonic-chat-sdk';
import 'supersonic-chat-sdk/dist/index.css';
const Chat = () => {

1
webapp/packages/supersonic-fe/src/pages/SemanticModel/ProjectManager.tsx
View File

@@ -26,6 +26,7 @@ type Props = {
const DEFAULT_LEFT_SIZE = '300px';
const DomainManger: React.FC<Props> = ({ domainManger, dispatch }) => {
window.RUNNING_ENV = 'semantic';
const [collapsed, setCollapsed] = useState(false);
const [leftSize, setLeftSize] = useState('');
const { selectDomainId, selectDomainName } = domainManger;

3
webapp/packages/supersonic-fe/src/pages/SemanticModel/SemanticGraph/index.tsx
View File

@@ -196,7 +196,6 @@ const DomainManger: React.FC<Props> = ({ domainManger, domainId }) => {
};
// const [visible, setVisible] = useState(false);
useEffect(() => {
console.log(domainId, graphData, 'domainId');
if (!(Array.isArray(graphData.children) && graphData.children.length > 0)) {
return;
}
@@ -356,7 +355,6 @@ const DomainManger: React.FC<Props> = ({ domainManger, domainId }) => {
labelCfg: { style: { fill: '#3c3c3c' } },
};
});
console.log(graphData, 'graphData');
// graph.data(graphData);
graph.changeData(graphData);
graph.render();
@@ -386,7 +384,6 @@ const DomainManger: React.FC<Props> = ({ domainManger, domainId }) => {
value={graphShowType}
onChange={(e) => {
const { value } = e.target;
console.log(value, 'value');
setGraphShowType(value);
changeGraphData(dataSourceListData, value);
}}

12
webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Entity/DimensionSearchVisibleModal.tsx
View File

@@ -26,13 +26,13 @@ const DimensionSearchVisibleModal: React.FC<Props> = ({
const [dictRules, setDictRules] = useState<string>('');
useEffect(() => {
const dictionaryInfos = themeData?.dictionaryInfos;
if (Array.isArray(dictionaryInfos)) {
const target = dictionaryInfos[0];
const knowledgeInfos = themeData?.knowledgeInfos;
if (Array.isArray(knowledgeInfos)) {
const target = knowledgeInfos[0];
if (Array.isArray(target?.ruleList)) {
setDictRules(target.ruleList[0]);
}
const selectKeys = dictionaryInfos.map((item: any) => {
const selectKeys = knowledgeInfos.map((item: any) => {
return item.itemId;
});
setSelectedKeyList(selectKeys);
@@ -48,7 +48,7 @@ const DimensionSearchVisibleModal: React.FC<Props> = ({
}, [settingSourceList]);
const saveDictBatch = async () => {
const dictionaryInfos = selectedKeyList.map((key: string) => {
const knowledgeInfos = selectedKeyList.map((key: string) => {
return {
itemId: key,
type: 'DIMENSION',
@@ -62,7 +62,7 @@ const DimensionSearchVisibleModal: React.FC<Props> = ({
saveDomainExtendQuery = editDomainExtend;
}
const { code, msg } = await saveDomainExtendQuery({
dictionaryInfos,
knowledgeInfos,
domainId,
id,
});

4
webapp/packages/supersonic-fe/src/pages/SemanticModel/components/Permission/PermissionTable.tsx
View File

@@ -53,14 +53,14 @@ const PermissionTable: React.FC<Props> = ({ domainManger }) => {
const queryDepartmentData = async () => {
const { code, data } = await getDepartmentTree();
if (code === 200) {
if (code === 200 || code === '0') {
setDepartmentTreeData(data);
}
};
const queryTmePersonData = async () => {
const { code, data } = await getAllUser();
if (code === 200) {
if (code === 200 || Number(code) === 0) {
setTmePerson(data);
}
};

2
webapp/packages/supersonic-fe/src/services/login.ts
View File

@@ -9,7 +9,7 @@ export type LoginParamsType = {
};
export async function queryToken(code: string) {
return request(`${process.env.API_BASE_URL}user/ioaLoginCallback`, {
return request(`/davinciapi/login/tmeloginCallback`, {
params: { code },
});
}

21
webapp/packages/supersonic-fe/src/services/request.ts
View File

@@ -20,6 +20,7 @@ const authHeaderInterceptor = (url: string, options: RequestOptionsInit) => {
const token = query[TOKEN_KEY] || localStorage.getItem(TOKEN_KEY);
if (token) {
headers.Authorization = `Bearer ${token}`;
headers.auth = `Bearer ${token}`;
localStorage.setItem(TOKEN_KEY, token);
}
@@ -31,25 +32,19 @@ const authHeaderInterceptor = (url: string, options: RequestOptionsInit) => {
};
const responseInterceptor = async (response: Response) => {
const data: Result<any> = await response?.clone()?.json?.();
if (Number(data.code) === 403) {
history.push('/login');
return response;
}
const redirect = response.headers.get('redirect'); // 若HEADER中含有REDIRECT说明后端想重定向
if (redirect === 'REDIRECT') {
localStorage.removeItem(TOKEN_KEY);
let win: any = window;
while (win !== win.top) {
win = win.top;
}
if (!/fromExternal=true/.test(win.location.search)) {
localStorage.setItem(FROM_URL_KEY, win.location.href);
}
const win: any = window;
// 将后端重定向的地址取出来,使用win.location.href去实现重定向的要求
const contextpath = response.headers.get('contextpath');
win.location.href = contextpath;
} else {
const data: Result<any> = await response?.clone()?.json?.();
if (Number(data.code) === 403) {
history.push('/login');
return response;
}
}
return response;