, TreeGraphData {
children: ModelDepsData[];
expanded: boolean; // 是否展开
level: number; // 层级，从 0 开始
@@ -92,8 +93,11 @@ export function normalizeChildren(data: ModelDepsData[]) {
item.model_type = NodeType.Children;
item.expanded = false;
item.level = 0;
- item.datasetLen = item.train_dataset.length + item.test_dataset.length;
- item.id = `$M_${item.current_model_id}_${item.version}`;
+ item.datasetLen = getDatasetLen(
+ item.model_meta.train_datasets,
+ item.model_meta.test_datasets,
+ );
+ item.id = `$M_${item.repo_id}_${item.version}`;
item.label = getLabel(item);
item.style = getStyle(NodeType.Children);
normalizeChildren(item.children);
@@ -104,16 +108,17 @@ export function normalizeChildren(data: ModelDepsData[]) {
// 获取 label
export function getLabel(node: ModelDepsData | ModelDepsAPIData) {
return (
- fittingString(
- `${node.model_version_dependcy_vo.name ?? ''}`,
- nodeWidth - labelPadding,
- nodeFontSize,
- ) +
+ fittingString(`${node.model_name ?? ''}`, nodeWidth - labelPadding, nodeFontSize) +
'\n' +
fittingString(`${node.version}`, nodeWidth - labelPadding, nodeFontSize)
);
}
+// 获取数据集数量
+export function getDatasetLen(train?: TrainDataset[], test?: TrainDataset[]) {
+ return (train?.length || 0) + (test?.length || 0);
+}
+
// 获取 style
export function getStyle(model_type: NodeType) {
let fill = '';
@@ -148,41 +153,43 @@ export function getStyle(model_type: NodeType) {
export function normalizeTreeData(apiData: ModelDepsAPIData): ModelDepsData {
// 将 children_models 转换成 children
let normalizedData = changePropertyName(apiData, {
- children_models: 'children',
+ child_model_list: 'children',
}) as ModelDepsData;
// 设置当前模型的数据
normalizedData.model_type = NodeType.Current;
- normalizedData.id = `$M_${normalizedData.current_model_id}_${normalizedData.version}`;
+ normalizedData.id = `$M_${normalizedData.repo_id}_${normalizedData.version}`;
normalizedData.label = getLabel(normalizedData);
normalizedData.style = getStyle(NodeType.Current);
normalizedData.expanded = true;
- normalizedData.datasetLen =
- normalizedData.train_dataset.length + normalizedData.test_dataset.length;
+ normalizedData.datasetLen = getDatasetLen(
+ normalizedData.model_meta.train_datasets,
+ normalizedData.model_meta.test_datasets,
+ );
normalizeChildren(normalizedData.children as ModelDepsData[]);
normalizedData.level = 0;
// 将 parent_models 转换成树形结构
- let parent_models = normalizedData.parent_models || [];
- while (parent_models.length > 0) {
- const parent = parent_models[0];
+ let parent_model = normalizedData.parent_model_vo;
+ while (parent_model) {
+ const parent = parent_model;
normalizedData = {
...parent,
expanded: false,
level: 0,
- datasetLen: parent.train_dataset.length + parent.test_dataset.length,
+ datasetLen: getDatasetLen(parent.model_meta.train_datasets, parent.model_meta.test_datasets),
model_type: NodeType.Parent,
- id: `$M_${parent.current_model_id}_${parent.version}`,
+ id: `$M_${parent.repo_id}_${parent.version}`,
label: getLabel(parent),
style: getStyle(NodeType.Parent),
children: [
{
...normalizedData,
- parent_models: [],
+ parent_model: null,
},
],
};
- parent_models = normalizedData.parent_models || [];
+ parent_model = normalizedData.parent_model_vo;
}
return normalizedData;
}
@@ -195,11 +202,12 @@ export function getGraphData(data: ModelDepsData, hierarchyNodes: ModelDepsData[
getWidth: () => nodeWidth,
getVGap: (node: NodeConfig) => {
const model = node as ModelDepsData;
- const { model_type, expanded, project_dependency } = model;
+ const { model_type, expanded, model_meta } = model;
+ const { project_depency } = model_meta;
if (model_type === NodeType.Current || model_type === NodeType.Parent) {
return vGap / 2;
}
- const selfGap = expanded && project_dependency?.url ? nodeHeight + vGap : 0;
+ const selfGap = expanded && project_depency?.url ? nodeHeight + vGap : 0;
const nextNode = getSameHierarchyNextNode(model, hierarchyNodes);
if (!nextNode) {
return vGap / 2;
@@ -254,28 +262,35 @@ const addDatasetDependency = (
nodes: NodeConfig[],
edges: EdgeConfig[],
) => {
- const { train_dataset, test_dataset, id } = data;
- train_dataset.forEach((item) => {
- item.id = `$DTrain_${id}_${item.dataset_id}_${item.dataset_version}`;
+ const { repo_id, model_meta } = data;
+ const { train_datasets, test_datasets } = model_meta;
+ train_datasets?.forEach((item) => {
+ if (!item.repo_id) {
+ item.repo_id = item.id;
+ }
+ item.id = `$DTrain_${repo_id}_${item.repo_id}_${item.version}`;
item.model_type = NodeType.TrainDataset;
item.style = getStyle(NodeType.TrainDataset);
});
- test_dataset.forEach((item) => {
- item.id = `$DTest_${id}_${item.dataset_id}_${item.dataset_version}`;
+ test_datasets?.forEach((item) => {
+ if (!item.repo_id) {
+ item.repo_id = item.id;
+ }
+ item.id = `$DTest_${repo_id}_${item.repo_id}_${item.version}`;
item.model_type = NodeType.TestDataset;
item.style = getStyle(NodeType.TestDataset);
});
datasetNodes.length = 0;
- const len = train_dataset.length + test_dataset.length;
- [...train_dataset, ...test_dataset].forEach((item, index) => {
+ const len = getDatasetLen(train_datasets, test_datasets);
+ [...(train_datasets ?? []), ...(test_datasets ?? [])].forEach((item, index) => {
const node = { ...item };
node.type = 'ellipse';
node.size = [ellipseWidth, nodeHeight];
node.label =
- fittingString(node.dataset_name, ellipseWidth - labelPadding, nodeFontSize) +
+ fittingString(node.name, ellipseWidth - labelPadding, nodeFontSize) +
'\n' +
- fittingString(node.dataset_version, ellipseWidth - labelPadding, nodeFontSize);
+ fittingString(node.version, ellipseWidth - labelPadding, nodeFontSize);
const half = len / 2 - 0.5;
node.x = currentNode.x! - (half - index) * (ellipseWidth + datasetHGap);
@@ -299,10 +314,11 @@ const addProjectDependency = (
nodes: NodeConfig[],
edges: EdgeConfig[],
) => {
- const { project_dependency, id } = data;
- if (project_dependency?.url) {
- const node = { ...project_dependency };
- node.id = `$P_${id}_${node.url}_${node.branch}`;
+ const { repo_id, model_meta } = data;
+ const { project_depency } = model_meta;
+ if (project_depency?.url) {
+ const node = { ...project_depency };
+ node.id = `$P_${repo_id}_${node.url}_${node.branch}`;
node.model_type = NodeType.Project;
node.type = 'rect';
node.label = fittingString(node.name, nodeWidth - labelPadding, nodeFontSize);
@@ -322,6 +338,7 @@ const addProjectDependency = (
}
};
+/*
// 判断两个矩形是否相交
function isRectanglesOverlap(rect1: Rect, rect2: Rect) {
const a2x = rect1.x + rect1.width / 2;
@@ -366,6 +383,7 @@ function adjustDatasetPosition(node: NodeConfig) {
});
}
}
+*/
// 层级遍历树结构
export function traverseHierarchically(data: ModelDepsData | undefined): ModelDepsData[] {
diff --git a/react-ui/src/pages/Model/components/NodeTooltips/index.less b/react-ui/src/pages/Model/components/NodeTooltips/index.less
index 564fe812..eabb979a 100644
--- a/react-ui/src/pages/Model/components/NodeTooltips/index.less
+++ b/react-ui/src/pages/Model/components/NodeTooltips/index.less
@@ -2,6 +2,7 @@
position: absolute;
bottom: -100px;
left: -300px;
+ z-index: 10;
width: 300px;
padding: 10px;
background: white;
@@ -50,6 +51,7 @@
flex: 1;
min-width: 0;
font-weight: 500;
+ word-break: break-all;
&:hover {
text-decoration: underline @underline-color;
diff --git a/react-ui/src/pages/Model/components/NodeTooltips/index.tsx b/react-ui/src/pages/Model/components/NodeTooltips/index.tsx
index 4b978294..ebf2966a 100644
--- a/react-ui/src/pages/Model/components/NodeTooltips/index.tsx
+++ b/react-ui/src/pages/Model/components/NodeTooltips/index.tsx
@@ -14,9 +14,9 @@ function ModelInfo({ resourceId, data, onVersionChange }: ModelInfoProps) {
const navigate = useNavigate();
const gotoExperimentPage = () => {
- if (data.train_task?.ins_id) {
+ if (data.model_meta.train_task?.ins_id) {
const { origin } = location;
- const url = `${origin}/pipeline/experiment/instance/${data.workflow_id}/${data.train_task.ins_id}`;
+ const url = `${origin}/pipeline/experiment/instance/${data.model_meta.train_task.task_id}/${data.model_meta.train_task.ins_id}`;
window.open(url, '_blank');
}
};
@@ -25,10 +25,10 @@ function ModelInfo({ resourceId, data, onVersionChange }: ModelInfoProps) {
if (data.model_type === NodeType.Current) {
return;
}
- if (data.current_model_id === resourceId) {
+ if (data.repo_id === resourceId) {
onVersionChange?.(data.version);
} else {
- const path = `/dataset/model/info/${data.current_model_id}?tab=${ResourceInfoTabKeys.Evolution}&version=${data.version}`;
+ const path = `/dataset/model/info/${data.repo_id}?tab=${ResourceInfoTabKeys.Evolution}&version=${data.version}&name=${data.model_name}&owner=${data.owner}&identifier=${data.identifier}`;
navigate(path);
}
};
@@ -40,12 +40,10 @@ function ModelInfo({ resourceId, data, onVersionChange }: ModelInfoProps) {
模型名称：
{data.model_type === NodeType.Current ? (
-
- {data.model_version_dependcy_vo?.name || '--'}
-
+
{data.model_name || '--'}
) : (
模型框架：
- {data.model_version_dependcy_vo?.model_type_name || '--'}
+ {data.model_meta.model_type || '--'}
模型大小：
- {data.model_version_dependcy_vo?.file_size || '--'}
+ {data.model_meta.file_size || '--'}
创建时间：
- {formatDate(data.model_version_dependcy_vo?.create_time)}
+ {formatDate(data.model_meta.create_time || '--')}
模型权限：
- {data.model_version_dependcy_vo?.available_range === 1 ? '公开' : '私有'}
+ {data.model_meta.is_public ? '公开' : '私有'}