Skip to content

Commit

Permalink
Merge pull request #24 from secretflow/sprint/v1.6
Browse files Browse the repository at this point in the history
refactor: v1.6 版本更新
  • Loading branch information
yinrouni authored May 20, 2024
2 parents 4e5562d + 7f0fe17 commit 6f3fc92
Show file tree
Hide file tree
Showing 5 changed files with 51 additions and 11 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { PlusCircleFilled, DeleteOutlined } from '@ant-design/icons';
import { useDeepCompareEffect } from 'ahooks';
import { Button, Divider, Form, Input, Select, Switch } from 'antd';
import { parse } from 'query-string';
import { useEffect, useState, useMemo } from 'react';
Expand Down Expand Up @@ -119,7 +120,7 @@ export const CaseWhenRender = (prop: { node: AtomicConfigNode }) => {
const { search } = useLocation();
const { projectId, dagId } = parse(search) as { projectId: string; dagId: string };

useEffect(() => {
useDeepCompareEffect(() => {
const getTables = async () => {
const dataTableList: IDataTable[] = [];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { DeleteOutlined } from '@ant-design/icons';
import { useDeepCompareEffect } from 'ahooks';
import { Form, Space, Select, Button, Input } from 'antd';
import classnames from 'classnames';
import { parse } from 'query-string';
Expand Down Expand Up @@ -57,7 +58,7 @@ export const GroupByRender = (prop: { node: AtomicConfigNode }) => {
const [tables, setTables] = useState<IDataTable[]>([]);
const [outputTables, setOutputTables] = useState<IOutputDataTable[]>([]);

useEffect(() => {
useDeepCompareEffect(() => {
const getTables = async () => {
const dataTableList: IDataTable[] = [];
const { search } = window.location;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { LinearModelParamsModificationsRenderView } from '..';
import styles from '../index.less';
import type { ParametersDatum } from '../types';

const MIN_FLOAT32 = -3.40282347e38;
const MAX_FLOAT32 = 3.40282347e38;
const MIN_FLOAT32 = -3.4e38;
const MAX_FLOAT32 = 3.4e38;

type FormInstance<T> = GetRef<typeof Form<T>>;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
DeleteOutlined,
DownloadOutlined,
PlusOutlined,
QuestionCircleOutlined,
UploadOutlined,
} from '@ant-design/icons';
import {
Expand All @@ -12,21 +13,21 @@ import {
Input,
Select,
Space,
Tooltip,
Upload,
message,
} from 'antd';
import { Drawer } from 'antd';
import { parse } from 'query-string';
import { useEffect, useRef } from 'react';
import { CSVLink } from 'react-csv';
import { createFeatureDatasource } from '@/services/secretpad/FeatureDatasourceController';

import { createFeatureDatasource } from '@/services/secretpad/FeatureDatasourceController';
import { Model, useModel } from '@/util/valtio-helper';

import { analysisCsv } from '../component/upload-table/util';

import styles from './index.less';
import { parse } from 'query-string';
import { flushSync } from 'react-dom';

const downloadData = [
{ 特征名称: 'id1', 特征类型: 'string', 特征描述: '' },
Expand Down Expand Up @@ -204,7 +205,13 @@ export const HttpDataAddDrawer = ({
</Space>
}
>
<div className={styles.titleSheet}>数据表类型:http数据源</div>
<div className={styles.titleSheet}>
数据表类型
<Tooltip title="http数据源通常用于模型发布环节,用于在线服务调用">
<QuestionCircleOutlined style={{ margin: 4 }} />
</Tooltip>
:http数据源
</div>
<CSVLink filename="示例文件.csv" data={downloadData} ref={csvRef} />
<Form form={form} layout="vertical" autoComplete="off" requiredMark="optional">
<Form.Item
Expand Down
37 changes: 34 additions & 3 deletions apps/platform/src/modules/main-dag/graph-request-service.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { GraphModel, GraphNode } from '@secretflow/dag';
import { NodeStatus } from '@secretflow/dag';
import { ActionType, NodeStatus } from '@secretflow/dag';
import { DefaultRequestService } from '@secretflow/dag';
import { Emitter } from '@secretflow/utils';
import { message, Image as AntdImage } from 'antd';
Expand Down Expand Up @@ -33,6 +33,7 @@ import { getModel } from '@/util/valtio-helper';
import type { User } from '../login/login.service';
import { LoginService } from '../login/login.service';

import mainDag from './dag';
import type { IGraphEdgeType, IGraphNodeType } from './graph.protocol';
import { nodeStatus } from './util';

Expand Down Expand Up @@ -168,6 +169,7 @@ export class GraphRequestService extends DefaultRequestService {
}

const { nodes, edges } = data;

const convertedNodes = nodes?.map((n) => {
const { graphNodeId, status, codeName, ...options } = n;
const configs =
Expand All @@ -185,7 +187,6 @@ export class GraphRequestService extends DefaultRequestService {
if (graphNodeStatus === NodeStatus.default && !isFinished) {
graphNodeStatus = NodeStatus.unfinished;
}

return {
...options,
codeName,
Expand Down Expand Up @@ -222,7 +223,7 @@ export class GraphRequestService extends DefaultRequestService {
const { mode } = parse(window.location.search);
const nodes = await Promise.all(
n.map(async (i) => {
const { id, codeName, nodeDef, ...restNodes } = i;
const { id, codeName, nodeDef, styles, ...restNodes } = i;
const config = this.componentConfigRegistry.getComponentConfig(
codeName,
mode as ComputeMode,
Expand Down Expand Up @@ -250,6 +251,17 @@ export class GraphRequestService extends DefaultRequestService {
}
return newNodeDef;
};

const getNewStyles = () => {
if (mlTrainCodeNames.includes(codeName as string)) {
return {
...styles,
isContinueRun: true,
};
}
return styles;
};

return id
? {
...restNodes,
Expand All @@ -258,11 +270,30 @@ export class GraphRequestService extends DefaultRequestService {
inputs: [],
outputs: outputPorts,
nodeDef: getNewNodeDef(),
styles: getNewStyles(),
}
: i;
}),
);

// 更新节点样式
const styledNodes = (
nodes as {
graphNodeId: string;
styles?: {
isContinueRun?: boolean;
isOpaque?: boolean;
isHighlighted: boolean;
};
}[]
)?.map(({ graphNodeId, styles }) => {
return {
nodeId: graphNodeId,
styles,
};
});
mainDag.graphManager.executeAction(ActionType.changeStyles, styledNodes);

const edges = e.map((i) => {
const { id, ...restEdges } = i;
const { sourceAnchor, target, targetAnchor } = i;
Expand Down

0 comments on commit 6f3fc92

Please sign in to comment.