Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit a4787bce by heheer Committed by GitHub
Options

feat: get node variables in prompt editor (#2087) 

* feat: get node variables in prompt editor

* fix

* fix build

* merge

* fix build

* delete default parent

* fix

* fix
parent f24e41f5
Showing with 886 additions and 50 deletions
packages/global/core/workflow/utils.ts
...@@ -3,9 +3,10 @@ import { ...@@ -3,9 +3,10 @@ import {
WorkflowIOValueTypeEnum, WorkflowIOValueTypeEnum,
NodeInputKeyEnum, NodeInputKeyEnum,
VariableInputEnum, VariableInputEnum,
variableMap variableMap,
VARIABLE_NODE_ID
} from './constants'; } from './constants';
import { FlowNodeInputItemType, FlowNodeOutputItemType } from './type/io.d'; import { FlowNodeInputItemType, FlowNodeOutputItemType, ReferenceValueProps } from './type/io.d';
import { StoreNodeItemType } from './type/node'; import { StoreNodeItemType } from './type/node';
import type { import type {
VariableItemType, VariableItemType,
...@@ -23,6 +24,7 @@ import { ...@@ -23,6 +24,7 @@ import {
} from '../app/constants'; } from '../app/constants';
import { IfElseResultEnum } from './template/system/ifElse/constant'; import { IfElseResultEnum } from './template/system/ifElse/constant';
import { RuntimeNodeItemType } from './runtime/type'; import { RuntimeNodeItemType } from './runtime/type';
import { getReferenceVariableValue } from './runtime/utils';
export const getHandleId = (nodeId: string, type: 'source' | 'target', key: string) => { export const getHandleId = (nodeId: string, type: 'source' | 'target', key: string) => {
return `${nodeId}-${type}-${key}`; return `${nodeId}-${type}-${key}`;
...@@ -226,3 +228,69 @@ export const updatePluginInputByVariables = ( ...@@ -226,3 +228,69 @@ export const updatePluginInputByVariables = (
: node : node
); );
}; };
export function replaceVariableLabel({
text,
nodes,
variables,
runningNode
}: {
text: any;
nodes: RuntimeNodeItemType[];
variables: Record<string, string | number>;
runningNode: RuntimeNodeItemType;
}) {
if (!(typeof text === 'string')) return text;
const globalVariables = Object.keys(variables).map((key) => {
return {
nodeId: VARIABLE_NODE_ID,
id: key,
value: variables[key]
};
});
const nodeVariables = nodes
.map((node) => {
return node.outputs.map((output) => {
return {
nodeId: node.nodeId,
id: output.id,
value: output.value
};
});
})
.flat();
const customInputs = runningNode.inputs.flatMap((item) => {
if (Array.isArray(item.value)) {
return [
{
id: item.key,
value: getReferenceVariableValue({
value: item.value as ReferenceValueProps,
nodes,
variables
}),
nodeId: runningNode.nodeId
}
];
}
return [];
});
const allVariables = [...globalVariables, ...nodeVariables, ...customInputs];
for (const key in allVariables) {
const val = allVariables[key];
const regex = new RegExp(`\\{\\{\\$(${val.nodeId}\\.${val.id})\\$\\}\\}`, 'g');
if (['string', 'number'].includes(typeof val.value)) {
text = text.replace(regex, String(val.value));
} else if (['object'].includes(typeof val.value)) {
text = text.replace(regex, JSON.stringify(val.value));
} else {
continue;
}
}
return text || '';
}
packages/service/core/workflow/dispatch/index.ts
...@@ -19,6 +19,7 @@ import { ...@@ -19,6 +19,7 @@ import {
import { replaceVariable } from '@fastgpt/global/common/string/tools'; import { replaceVariable } from '@fastgpt/global/common/string/tools';
import { responseWriteNodeStatus } from '../../../common/response'; import { responseWriteNodeStatus } from '../../../common/response';
import { getSystemTime } from '@fastgpt/global/common/time/timezone'; import { getSystemTime } from '@fastgpt/global/common/time/timezone';
import { replaceVariableLabel } from '@fastgpt/global/core/workflow/utils';
import { dispatchWorkflowStart } from './init/workflowStart'; import { dispatchWorkflowStart } from './init/workflowStart';
import { dispatchChatCompletion } from './chat/oneapi'; import { dispatchChatCompletion } from './chat/oneapi';
...@@ -54,6 +55,7 @@ import { surrenderProcess } from '../../../common/system/tools'; ...@@ -54,6 +55,7 @@ import { surrenderProcess } from '../../../common/system/tools';
import { dispatchRunCode } from './code/run'; import { dispatchRunCode } from './code/run';
import { dispatchTextEditor } from './tools/textEditor'; import { dispatchTextEditor } from './tools/textEditor';
import { dispatchCustomFeedback } from './tools/customFeedback'; import { dispatchCustomFeedback } from './tools/customFeedback';
import { ReferenceValueProps } from '@fastgpt/global/core/workflow/type/io';
const callbackMap: Record<FlowNodeTypeEnum, Function> = { const callbackMap: Record<FlowNodeTypeEnum, Function> = {
[FlowNodeTypeEnum.workflowStart]: dispatchWorkflowStart, [FlowNodeTypeEnum.workflowStart]: dispatchWorkflowStart,
...@@ -291,6 +293,14 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons ...@@ -291,6 +293,14 @@ export async function dispatchWorkFlow(data: Props): Promise<DispatchFlowRespons
// replace {{}} variables // replace {{}} variables
let value = replaceVariable(input.value, variables); let value = replaceVariable(input.value, variables);
// replace {{$$}} variables
value = replaceVariableLabel({
text: value,
nodes: runtimeNodes,
variables: variables,
runningNode: node
});
// replace reference variables // replace reference variables
value = getReferenceVariableValue({ value = getReferenceVariableValue({
value, value,
......
packages/web/components/common/Avatar/index.tsx
import React from 'react'; import React from 'react';
import { Image } from '@chakra-ui/react'; import { Box, Flex, Image } from '@chakra-ui/react';
import type { ImageProps } from '@chakra-ui/react'; import type { ImageProps } from '@chakra-ui/react';
import { LOGO_ICON } from '@fastgpt/global/common/system/constants'; import { LOGO_ICON } from '@fastgpt/global/common/system/constants';
import MyIcon from '../Icon'; import MyIcon from '../Icon';
...@@ -10,12 +10,13 @@ const Avatar = ({ w = '30px', src, ...props }: ImageProps) => { ...@@ -10,12 +10,13 @@ const Avatar = ({ w = '30px', src, ...props }: ImageProps) => {
const isIcon = !!iconPaths[src as any]; const isIcon = !!iconPaths[src as any];
return isIcon ? ( return isIcon ? (
<Box {...props}>
<MyIcon name={src as any} w={w} borderRadius={props.borderRadius} /> <MyIcon name={src as any} w={w} borderRadius={props.borderRadius} />
</Box>
) : ( ) : (
<Image <Image
fallbackSrc={LOGO_ICON} fallbackSrc={LOGO_ICON}
fallbackStrategy={'onError'} fallbackStrategy={'onError'}
// borderRadius={'md'}
objectFit={'contain'} objectFit={'contain'}
alt="" alt=""
w={w} w={w}
......
packages/web/components/common/Icon/constants.ts
...@@ -200,6 +200,7 @@ export const iconPaths = { ...@@ -200,6 +200,7 @@ export const iconPaths = {
'core/workflow/template/textConcat': () => 'core/workflow/template/textConcat': () =>
import('./icons/core/workflow/template/textConcat.svg'), import('./icons/core/workflow/template/textConcat.svg'),
'core/workflow/template/toolCall': () => import('./icons/core/workflow/template/toolCall.svg'), 'core/workflow/template/toolCall': () => import('./icons/core/workflow/template/toolCall.svg'),
'core/workflow/template/variable': () => import('./icons/core/workflow/template/variable.svg'),
'core/workflow/template/variableUpdate': () => 'core/workflow/template/variableUpdate': () =>
import('./icons/core/workflow/template/variableUpdate.svg'), import('./icons/core/workflow/template/variableUpdate.svg'),
'core/workflow/template/workflowStart': () => 'core/workflow/template/workflowStart': () =>
......
packages/web/components/common/Icon/icons/core/workflow/template/variable.svg 0 → 100644
<svg viewBox="0 0 36 36" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect width="36" height="36" fill="url(#paint0_linear_7585_26727)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.5796 26.9153C11.7938 26.9153 11.9675 26.7416 11.9675 26.5274V24.7153C11.9675 24.5011 11.7938 24.3274 11.5796 24.3274C11.3077 24.3274 11.1751 24.2403 11.0931 24.1123C10.9905 23.9444 10.9068 23.5904 10.9068 22.9711V20.9846C10.9068 20.17 10.8199 19.4794 10.6306 18.928C10.5033 18.557 10.3257 18.2383 10.0893 17.99C10.6741 17.3773 10.9068 16.338 10.9068 15.035V12.971C10.9068 12.4371 10.9931 12.1027 11.1124 11.913C11.2128 11.7534 11.349 11.6728 11.5796 11.6728C11.7938 11.6728 11.9675 11.4991 11.9675 11.2849V9.47286C11.9675 9.25863 11.7938 9.08496 11.5796 9.08496C10.5396 9.08496 9.7021 9.37682 9.16909 10.044C8.64841 10.6893 8.43401 11.7393 8.43401 13.0872V15.2481C8.43401 15.8426 8.35093 16.2274 8.22932 16.4508C8.17169 16.5566 8.11045 16.617 8.05257 16.6524C7.99561 16.6873 7.92076 16.711 7.81429 16.711C7.60006 16.711 7.42639 16.8847 7.42639 17.0989V18.8819C7.42639 19.0961 7.60006 19.2698 7.81429 19.2698C8.0075 19.2698 8.13178 19.3406 8.2323 19.5185C8.35119 19.7289 8.43401 20.0944 8.43401 20.6649V22.9905C8.43401 24.3313 8.65018 25.3744 9.18213 26.0028C9.72047 26.6387 10.5521 26.9153 11.5796 26.9153Z" fill="white"/>
<path d="M24.0325 26.5274C24.0325 26.7416 24.2061 26.9153 24.4203 26.9153C25.4479 26.9153 26.2795 26.6387 26.8178 26.0028C27.3498 25.3744 27.5659 24.3313 27.5659 22.9905V20.6649C27.5659 20.0944 27.6488 19.7289 27.7676 19.5185C27.8682 19.3406 27.9925 19.2698 28.1857 19.2698C28.3999 19.2698 28.5736 19.0961 28.5736 18.8819V17.0989C28.5736 16.8847 28.3999 16.711 28.1857 16.711C28.0792 16.711 28.0043 16.6873 27.9474 16.6524C27.8895 16.617 27.8283 16.5566 27.7706 16.4508C27.649 16.2274 27.5659 15.8426 27.5659 15.2481V13.0872C27.5659 11.7392 27.3515 10.6891 26.8307 10.0438C26.2977 9.37677 25.4603 9.08496 24.4203 9.08496C24.2061 9.08496 24.0325 9.25863 24.0325 9.47286V11.2849C24.0325 11.4991 24.2061 11.6728 24.4203 11.6728C24.651 11.6728 24.7871 11.7534 24.8875 11.913C25.0069 12.1027 25.0931 12.4371 25.0931 12.971V15.035C25.0931 16.338 25.3259 17.3773 25.9107 17.99C25.6743 18.2383 25.4966 18.557 25.3693 18.928C25.1801 19.4794 25.0931 20.17 25.0931 20.9846V22.9711C25.0931 23.5904 25.0094 23.9445 24.9068 24.1123C24.8249 24.2404 24.6922 24.3274 24.4203 24.3274C24.2061 24.3274 24.0325 24.5011 24.0325 24.7153V26.5274Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.8172 15.3258C13.4006 14.9093 13.4006 14.2339 13.8172 13.8173C14.2337 13.4007 14.9091 13.4007 15.3257 13.8173L18 16.4916L20.6742 13.8173C21.0908 13.4007 21.7662 13.4007 22.1828 13.8173C22.5994 14.2339 22.5994 14.9093 22.1828 15.3258L19.5085 18.0001L22.1828 20.6744C22.5994 21.091 22.5994 21.7664 22.1828 22.1829C21.7662 22.5995 21.0908 22.5995 20.6742 22.1829L18 19.5087L15.3257 22.1829C14.9091 22.5995 14.2337 22.5995 13.8172 22.1829C13.4006 21.7664 13.4006 21.091 13.8172 20.6744L16.4914 18.0001L13.8172 15.3258Z" fill="white"/>
<defs>
<linearGradient id="paint0_linear_7585_26727" x1="18" y1="0" x2="5.5" y2="33" gradientUnits="userSpaceOnUse">
<stop stop-color="#69C1FF"/>
<stop offset="1" stop-color="#53A3FF"/>
</linearGradient>
</defs>
</svg>
packages/web/components/common/Textarea/PromptEditor/Editor.tsx
...@@ -5,7 +5,7 @@ import { ContentEditable } from '@lexical/react/LexicalContentEditable'; ...@@ -5,7 +5,7 @@ import { ContentEditable } from '@lexical/react/LexicalContentEditable';
import { HistoryPlugin } from '@lexical/react/LexicalHistoryPlugin'; import { HistoryPlugin } from '@lexical/react/LexicalHistoryPlugin';
import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin'; import { OnChangePlugin } from '@lexical/react/LexicalOnChangePlugin';
import LexicalErrorBoundary from '@lexical/react/LexicalErrorBoundary'; import LexicalErrorBoundary from '@lexical/react/LexicalErrorBoundary';
import VariablePickerPlugin from './plugins/VariablePickerPlugin'; import VariableLabelPickerPlugin from './plugins/VariableLabelPickerPlugin';
import { Box } from '@chakra-ui/react'; import { Box } from '@chakra-ui/react';
import styles from './index.module.scss'; import styles from './index.module.scss';
import VariablePlugin from './plugins/VariablePlugin'; import VariablePlugin from './plugins/VariablePlugin';
...@@ -18,6 +18,8 @@ import { getNanoid } from '@fastgpt/global/common/string/tools'; ...@@ -18,6 +18,8 @@ import { getNanoid } from '@fastgpt/global/common/string/tools';
import FocusPlugin from './plugins/FocusPlugin'; import FocusPlugin from './plugins/FocusPlugin';
import { textToEditorState } from './utils'; import { textToEditorState } from './utils';
import { MaxLengthPlugin } from './plugins/MaxLengthPlugin'; import { MaxLengthPlugin } from './plugins/MaxLengthPlugin';
import { VariableLabelNode } from './plugins/VariableLabelPlugin/node';
import VariableLabelPlugin from './plugins/VariableLabelPlugin';
export default function Editor({ export default function Editor({
h = 200, h = 200,
...@@ -51,7 +53,7 @@ export default function Editor({ ...@@ -51,7 +53,7 @@ export default function Editor({
const initialConfig = { const initialConfig = {
namespace: 'promptEditor', namespace: 'promptEditor',
nodes: [VariableNode], nodes: [VariableNode, VariableLabelNode],
editorState: textToEditorState(value), editorState: textToEditorState(value),
onError: (error: Error) => { onError: (error: Error) => {
throw error; throw error;
...@@ -127,8 +129,9 @@ export default function Editor({ ...@@ -127,8 +129,9 @@ export default function Editor({
}); });
}} }}
/> />
<VariablePickerPlugin variables={variables} /> <VariableLabelPickerPlugin variables={variables} />
<VariablePlugin variables={variables} /> <VariablePlugin variables={variables} />
<VariableLabelPlugin variables={variables} />
<OnBlurPlugin onBlur={onBlur} /> <OnBlurPlugin onBlur={onBlur} />
</LexicalComposer> </LexicalComposer>
{showResize && ( {showResize && (
......
packages/web/components/common/Textarea/PromptEditor/index.module.scss
...@@ -2,10 +2,11 @@ ...@@ -2,10 +2,11 @@
position: relative; position: relative;
height: 100%; height: 100%;
width: 100%; width: 100%;
border: 1px solid var(--chakra-colors-borderColor-base); border: 1px solid rgb(232, 235, 240);
border-radius: var(--chakra-radii-md); border-radius: var(--chakra-radii-md);
padding: 8px 12px; padding: 8px 12px;
background: var(--chakra-colors-gray-50); background: #fff;
font-size: var(--chakra-fontSizes-sm); font-size: var(--chakra-fontSizes-sm);
overflow-y: auto; overflow-y: auto;
} }
......
packages/web/components/common/Textarea/PromptEditor/plugins/VariableLabelPickerPlugin/index.tsx 0 → 100644
import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
import { LexicalTypeaheadMenuPlugin } from '@lexical/react/LexicalTypeaheadMenuPlugin';
import { $createTextNode, $getSelection, $isRangeSelection, TextNode } from 'lexical';
import * as React from 'react';
import { useCallback, useState } from 'react';
import * as ReactDOM from 'react-dom';
import { Box, Flex } from '@chakra-ui/react';
import { useBasicTypeaheadTriggerMatch } from '../../utils';
import { EditorVariablePickerType } from '../../type';
import { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
import { useTranslation } from 'react-i18next';
import Avatar from '../../../../Avatar';
type EditorVariablePickerType1 = {
key: string;
label: string;
required?: boolean;
icon?: string;
valueType?: WorkflowIOValueTypeEnum;
index: number;
};
interface TransformedParent {
id: string;
label: string;
avatar: string;
children: EditorVariablePickerType1[];
}
export default function VariableLabelPickerPlugin({
variables
}: {
variables: EditorVariablePickerType[];
}) {
const { t } = useTranslation();
const [editor] = useLexicalComposerContext();
const [queryString, setQueryString] = useState<string | null>(null);
const checkForTriggerMatch = useBasicTypeaheadTriggerMatch('/', {
minLength: 0
});
const onSelectOption = useCallback(
(selectedOption: any, nodeToRemove: TextNode | null, closeMenu: () => void) => {
editor.update(() => {
const selection = $getSelection();
if (!$isRangeSelection(selection) || selectedOption == null) {
return;
}
if (nodeToRemove) {
nodeToRemove.remove();
}
selection.insertNodes([
$createTextNode(`{{$${selectedOption.parent?.id}.${selectedOption.key}$}}`)
]);
closeMenu();
});
},
[editor]
);
return (
<LexicalTypeaheadMenuPlugin
onQueryChange={setQueryString}
onSelectOption={onSelectOption}
triggerFn={checkForTriggerMatch}
options={variables}
menuRenderFn={(
anchorElementRef,
{ selectedIndex, selectOptionAndCleanUp, setHighlightedIndex }
) => {
if (anchorElementRef.current == null) {
return null;
}
return anchorElementRef.current && variables.length
? ReactDOM.createPortal(
<Box
bg={'white'}
boxShadow={'lg'}
borderWidth={'1px'}
borderColor={'borderColor.base'}
p={2}
borderRadius={'md'}
position={'absolute'}
w={'auto'}
maxH={'300px'}
minW={'240px'}
overflow={'auto'}
zIndex={99999}
>
{variableFilter(variables, queryString || '').length === variables.length && (
<Box fontSize={'xs'} ml={4}>
{t('workflow:variable_picker_tips')}
</Box>
)}
{variableFilter(variables, queryString || '').length > 0 ? (
transformData(variableFilter(variables, queryString || '')).map((item) => {
return (
<Flex
key={item.id}
flexDirection={'column'}
px={4}
py={2}
_notLast={{
borderBottom: '1px solid',
borderColor: 'myGray.200'
}}
>
<Flex alignItems={'center'} mb={1.5}>
<Avatar
src={item.avatar as any}
w={'16px'}
borderRadius={'2.8px'}
display={'inline-flex'}
verticalAlign={'middle'}
/>
<Box
mx={2}
fontSize={'sm'}
whiteSpace={'nowrap'}
color={'myGray.600'}
fontWeight={'semibold'}
>
{item.label}
</Box>
</Flex>
{item.children?.map((child, index) => (
<Flex
alignItems={'center'}
as={'li'}
key={child.key}
px={4}
py={1.5}
rounded={'md'}
cursor={'pointer'}
overflow={'auto'}
_notLast={{
mb: 1
}}
{...(selectedIndex === child.index
? {
bg: '#1118240D',
color: 'primary.700'
}
: {
bg: 'white',
color: 'myGray.600'
})}
onClick={() => {
setHighlightedIndex(child.index);
selectOptionAndCleanUp({ ...child, parent: item });
}}
onMouseEnter={() => {
setHighlightedIndex(child.index);
}}
>
<Box ml={2} fontSize={'sm'} whiteSpace={'nowrap'}>
{child.label}
</Box>
</Flex>
))}
</Flex>
);
})
) : (
<Box p={2} color={'myGray.400'} fontSize={'sm'}>
{t('common:unusable_variable')}
</Box>
)}
</Box>,
anchorElementRef.current
)
: null;
}}
/>
);
}
function transformData(data: EditorVariablePickerType[]): TransformedParent[] {
const transformedData: TransformedParent[] = [];
const parentMap: { [key: string]: TransformedParent } = {};
data.forEach((item, index) => {
const parentId = item.parent!.id;
const parentLabel = item.parent!.label;
const parentAvatar = item.parent!.avatar;
if (!parentMap[parentId]) {
parentMap[parentId] = {
id: parentId,
label: parentLabel,
avatar: parentAvatar || '',
children: []
};
}
parentMap[parentId].children.push({
label: item.label,
key: item.key,
icon: item.icon,
index
});
});
const addedParents = new Set<string>();
data.forEach((item) => {
const parentId = item.parent!.id;
if (!addedParents.has(parentId)) {
transformedData.push(parentMap[parentId]);
addedParents.add(parentId);
}
});
return transformedData;
}
function variableFilter(
data: EditorVariablePickerType[],
queryString: string
): EditorVariablePickerType[] {
const lowerCaseQuery = queryString.toLowerCase();
return data.filter((item) => {
const labelMatch = item.label.toLowerCase().includes(lowerCaseQuery);
const keyMatch = item.key.toLowerCase().includes(lowerCaseQuery);
const parentLabelMatch = item.parent!.label.toLowerCase().includes(lowerCaseQuery);
return labelMatch || keyMatch || parentLabelMatch;
});
}
packages/web/components/common/Textarea/PromptEditor/plugins/VariableLabelPlugin/components/VariableLabel.tsx 0 → 100644
import { ChevronRightIcon } from '@chakra-ui/icons';
import { Box } from '@chakra-ui/react';
import { useTranslation } from 'react-i18next';
import Avatar from '../../../../../../../components/common/Avatar';
export default function VariableLabel({
variableLabel,
nodeAvatar
}: {
variableLabel: string;
nodeAvatar: string;
}) {
const { t } = useTranslation();
const [parentLabel, childLabel] = variableLabel.split('.');
return (
<>
<Box
display="inline-flex"
alignItems="center"
m={'2px'}
rounded={'4px'}
px={1.5}
py={'1px'}
bg={parentLabel !== 'undefined' ? 'primary.50' : 'red.50'}
color={parentLabel !== 'undefined' ? 'myGray.900' : 'red.600'}
>
{parentLabel !== 'undefined' ? (
<span>
<Avatar
src={nodeAvatar as any}
w={'16px'}
mr={1}
borderRadius={'2.8px'}
display={'inline-flex'}
verticalAlign={'middle'}
mb={'3px'}
/>
{parentLabel}
<ChevronRightIcon />
{childLabel}
</span>
) : (
<>
<Box>{t('common:invalid_variable')}</Box>
</>
)}
</Box>
</>
);
}
packages/web/components/common/Textarea/PromptEditor/plugins/VariableLabelPlugin/index.tsx 0 → 100644
import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext';
import { EditorVariablePickerType } from '../../type';
import { useCallback, useEffect, useMemo } from 'react';
import { $createVariableLabelNode, VariableLabelNode } from './node';
import { TextNode } from 'lexical';
import { getHashtagRegexString } from './utils';
import { mergeRegister } from '@lexical/utils';
import { registerLexicalTextEntity } from '../../utils';
const REGEX = new RegExp(getHashtagRegexString(), 'i');
export default function VariableLabelPlugin({
variables
}: {
variables: EditorVariablePickerType[];
}) {
const [editor] = useLexicalComposerContext();
useEffect(() => {
if (!editor.hasNodes([VariableLabelNode]))
throw new Error('VariableLabelPlugin: VariableLabelPlugin not registered on editor');
}, [editor]);
const createVariableLabelPlugin = useCallback((textNode: TextNode): VariableLabelNode => {
const [parentKey, childrenKey] = textNode.getTextContent().slice(3, -3).split('.');
const currentVariable = variables.find(
(item) => item.parent?.id === parentKey && item.key === childrenKey
);
const variableLabel = `${currentVariable && currentVariable.parent?.label}.${currentVariable?.label}`;
const nodeAvatar = currentVariable?.parent?.avatar || '';
return $createVariableLabelNode(textNode.getTextContent(), variableLabel, nodeAvatar);
}, []);
const getVariableMatch = useCallback((text: string) => {
const matches = REGEX.exec(text);
if (!matches) return null;
// if (variableKeys.indexOf(matches[4]) === -1) return null;
const hashtagLength = matches[4].length + 6;
const startOffset = matches.index;
const endOffset = startOffset + hashtagLength;
return {
end: endOffset,
start: startOffset
};
}, []);
useEffect(() => {
mergeRegister(
...registerLexicalTextEntity(
editor,
getVariableMatch,
VariableLabelNode,
createVariableLabelPlugin
)
);
}, [createVariableLabelPlugin, editor, getVariableMatch]);
return null;
}
packages/web/components/common/Textarea/PromptEditor/plugins/VariableLabelPlugin/node.tsx 0 → 100644
import {
DecoratorNode,
DOMConversionMap,
DOMExportOutput,
EditorConfig,
LexicalEditor,
LexicalNode,
NodeKey,
SerializedLexicalNode,
Spread,
TextFormatType
} from 'lexical';
import VariableLabel from './components/VariableLabel';
export type SerializedVariableLabelNode = Spread<
{
variableKey: string;
variableLabel: string;
nodeAvatar: string;
format: number | TextFormatType;
},
SerializedLexicalNode
>;
export class VariableLabelNode extends DecoratorNode<JSX.Element> {
__format: number | TextFormatType;
__variableKey: string;
__variableLabel: string;
__nodeAvatar: string;
static getType(): string {
return 'variableLabel';
}
static clone(node: VariableLabelNode): VariableLabelNode {
return new VariableLabelNode(
node.__variableKey,
node.__variableLabel,
node.__nodeAvatar,
node.__format,
node.__key
);
}
constructor(
variableKey: string,
variableLabel: string,
nodeAvatar: string,
format?: number | TextFormatType,
key?: NodeKey
) {
super(key);
this.__variableKey = variableKey;
this.__format = format || 0;
this.__variableLabel = variableLabel;
this.__nodeAvatar = nodeAvatar;
}
static importJSON(serializedNode: SerializedVariableLabelNode): VariableLabelNode {
const node = $createVariableLabelNode(
serializedNode.variableKey,
serializedNode.variableLabel,
serializedNode.nodeAvatar
);
node.setFormat(serializedNode.format);
return node;
}
setFormat(format: number | TextFormatType): void {
const self = this.getWritable();
self.__format = format;
}
getFormat(): number | TextFormatType {
return this.__format;
}
exportJSON(): SerializedVariableLabelNode {
return {
format: this.__format || 0,
type: 'variableLabel',
version: 1,
variableKey: this.getVariableKey(),
variableLabel: this.__variableLabel,
nodeAvatar: this.__nodeAvatar
};
}
createDOM(): HTMLElement {
const element = document.createElement('span');
return element;
}
exportDOM(): DOMExportOutput {
const element = document.createElement('span');
return { element };
}
static importDOM(): DOMConversionMap | null {
return {};
}
updateDOM(): false {
return false;
}
getVariableKey(): string {
return this.__variableKey;
}
getTextContent(
_includeInert?: boolean | undefined,
_includeDirectionless?: false | undefined
): string {
return `${this.__variableKey}`;
}
decorate(_editor: LexicalEditor, config: EditorConfig): JSX.Element {
return <VariableLabel variableLabel={this.__variableLabel} nodeAvatar={this.__nodeAvatar} />;
}
}
export function $createVariableLabelNode(
variableKey: string,
variableLabel: string,
nodeAvatar: string
): VariableLabelNode {
return new VariableLabelNode(variableKey, variableLabel, nodeAvatar);
}
export function $isVariableLabelNode(
node: VariableLabelNode | LexicalNode | null | undefined
): node is VariableLabelNode {
return node instanceof VariableLabelNode;
}
packages/web/components/common/Textarea/PromptEditor/type.d.ts
...@@ -6,4 +6,9 @@ export type EditorVariablePickerType = { ...@@ -6,4 +6,9 @@ export type EditorVariablePickerType = {
required?: boolean; required?: boolean;
icon?: string; icon?: string;
valueType?: WorkflowIOValueTypeEnum; valueType?: WorkflowIOValueTypeEnum;
parent?: {
id: string;
label: string;
avatar?: string;
};
}; };
packages/web/components/common/Textarea/PromptEditor/utils.ts
import type { Klass, LexicalEditor, LexicalNode } from 'lexical'; import type { DecoratorNode, Klass, LexicalEditor, LexicalNode } from 'lexical';
import type { EntityMatch } from '@lexical/text'; import type { EntityMatch } from '@lexical/text';
import { $createTextNode, $getRoot, $isTextNode, TextNode } from 'lexical'; import { $createTextNode, $getRoot, $isTextNode, TextNode } from 'lexical';
import { useCallback } from 'react'; import { useCallback } from 'react';
import { VariableLabelNode } from './plugins/VariableLabelPlugin/node';
export function registerLexicalTextEntity<T extends TextNode>( export function registerLexicalTextEntity<T extends TextNode | VariableLabelNode>(
editor: LexicalEditor, editor: LexicalEditor,
getMatch: (text: string) => null | EntityMatch, getMatch: (text: string) => null | EntityMatch,
targetNode: Klass<T>, targetNode: Klass<T>,
...@@ -13,7 +14,7 @@ export function registerLexicalTextEntity<T extends TextNode>( ...@@ -13,7 +14,7 @@ export function registerLexicalTextEntity<T extends TextNode>(
return node instanceof targetNode; return node instanceof targetNode;
}; };
const replaceWithSimpleText = (node: TextNode): void => { const replaceWithSimpleText = (node: TextNode | VariableLabelNode): void => {
const textNode = $createTextNode(node.getTextContent()); const textNode = $createTextNode(node.getTextContent());
textNode.setFormat(node.getFormat()); textNode.setFormat(node.getFormat());
node.replace(textNode); node.replace(textNode);
...@@ -136,7 +137,7 @@ export function registerLexicalTextEntity<T extends TextNode>( ...@@ -136,7 +137,7 @@ export function registerLexicalTextEntity<T extends TextNode>(
return; return;
} }
if (text.length > match.end) { if (text.length > match.end && $isTextNode(node)) {
// This will split out the rest of the text as simple text // This will split out the rest of the text as simple text
node.splitText(match.end); node.splitText(match.end);
...@@ -163,7 +164,7 @@ export function registerLexicalTextEntity<T extends TextNode>( ...@@ -163,7 +164,7 @@ export function registerLexicalTextEntity<T extends TextNode>(
}; };
const removePlainTextTransform = editor.registerNodeTransform(TextNode, textNodeTransform); const removePlainTextTransform = editor.registerNodeTransform(TextNode, textNodeTransform);
const removeReverseNodeTransform = editor.registerNodeTransform<T>( const removeReverseNodeTransform = editor.registerNodeTransform<any>(
targetNode, targetNode,
reverseNodeTransform reverseNodeTransform
); );
...@@ -217,6 +218,8 @@ export function editorStateToText(editor: LexicalEditor) { ...@@ -217,6 +218,8 @@ export function editorStateToText(editor: LexicalEditor) {
`); `);
} else if (child.text) { } else if (child.text) {
paragraphText.push(child.text); paragraphText.push(child.text);
} else if (child.type === 'variableLabel') {
paragraphText.push(child.variableKey);
} }
}); });
editorStateTextString.push(paragraphText.join('')); editorStateTextString.push(paragraphText.join(''));
......
packages/web/i18n/en/common.json
...@@ -901,6 +901,7 @@ ...@@ -901,6 +901,7 @@
"overSize": "Team members exceed the limit" "overSize": "Team members exceed the limit"
} }
}, },
"invalid_variable": "Invalid variable",
"navbar": { "navbar": {
"Account": "Account", "Account": "Account",
"Chat": "Chat", "Chat": "Chat",
...@@ -1146,6 +1147,7 @@ ...@@ -1146,6 +1147,7 @@
"Quote Content Tip": "You can customize the structure of the quote content to better adapt to different scenarios. You can use some variables for template configuration:\n{{q}} - search content, {{a}} - expected content, {{source}} - source, {{sourceId}} - source file name, {{index}} - the nth quote, they are all optional, here are the default values:\n{{default}}", "Quote Content Tip": "You can customize the structure of the quote content to better adapt to different scenarios. You can use some variables for template configuration:\n{{q}} - search content, {{a}} - expected content, {{source}} - source, {{sourceId}} - source file name, {{index}} - the nth quote, they are all optional, here are the default values:\n{{default}}",
"Quote Prompt Tip": "You can use {{quote}} to insert the quote content template, and use {{question}} to insert the question. Here are the default values:\n{{default}}" "Quote Prompt Tip": "You can use {{quote}} to insert the quote content template, and use {{question}} to insert the question. Here are the default values:\n{{default}}"
}, },
"unusable_variable": "no usable variable",
"user": { "user": {
"Account": "Account", "Account": "Account",
"Amount of earnings": "Earnings (¥)", "Amount of earnings": "Earnings (¥)",
......
packages/web/i18n/en/workflow.json
{ {
"add_new_input": "Add input",
"Code": "Code", "Code": "Code",
"add_new_input": "Add input",
"code": {
"Reset template": "Reset template",
"Reset template confirm": "Are you sure to restore the code template? All input and output to template values will be reset, please be careful to save the current code."
},
"confirm_delete_field_tip": "Confirm to delete the field?", "confirm_delete_field_tip": "Confirm to delete the field?",
"custom_input": "Custom input", "custom_input": "Custom input",
"edit_input": "Edit input", "edit_input": "Edit input",
"field_name_already_exists": "Field name already exists",
"field_description": "Field description", "field_description": "Field description",
"field_description_placeholder": "Describes the functionality of this input field, which affects the quality of model generation if the parameter is called for a tool", "field_description_placeholder": "Describes the functionality of this input field, which affects the quality of model generation if the parameter is called for a tool",
"field_name_already_exists": "Field name already exists",
"field_required": "Required", "field_required": "Required",
"field_used_as_tool_input": "As tool input", "field_used_as_tool_input": "As tool input",
"input_description": "Input descriotion",
"only_the_reference_type_is_supported": "Only the Reference type is supported",
"optional_value_type": "Optional value type",
"optional_value_type_tip": "One or more data types can be specified, and users can only select the configured type when adding fields in winter",
"tool_input": "Tool",
"code": {
"Reset template": "Reset template",
"Reset template confirm": "Are you sure to restore the code template? All input and output to template values will be reset, please be careful to save the current code."
},
"ifelse": { "ifelse": {
"Input value": "Input", "Input value": "Input",
"Select value": "Select" "Select value": "Select"
}, },
"input_description": "Input descriotion",
"only_the_reference_type_is_supported": "Only the Reference type is supported",
"optional_value_type": "Optional value type",
"optional_value_type_tip": "One or more data types can be specified, and users can only select the configured type when adding fields in winter",
"response": { "response": {
"Code log": "Log", "Code log": "Log",
"Custom inputs": "Custom inputs", "Custom inputs": "Custom inputs",
"Custom outputs": "Custom outputs", "Custom outputs": "Custom outputs",
"Error": "Error" "Error": "Error"
} },
"tool_input": "Tool",
"variable_picker_tips": "tips: enter node name or variable name to search"
} }
packages/web/i18n/zh/common.json
...@@ -901,6 +901,7 @@ ...@@ -901,6 +901,7 @@
"overSize": "团队成员超出上限" "overSize": "团队成员超出上限"
} }
}, },
"invalid_variable": "无效变量",
"navbar": { "navbar": {
"Account": "账号", "Account": "账号",
"Chat": "聊天", "Chat": "聊天",
...@@ -1146,6 +1147,7 @@ ...@@ -1146,6 +1147,7 @@
"Quote Content Tip": "可以自定义引用内容的结构，以更好的适配不同场景。可以使用一些变量来进行模板配置：\n{{q}} - 检索内容，{{a}} - 预期内容，{{source}} - 来源，{{sourceId}} - 来源文件名，{{index}} - 第 n 个引用，他们都是可选的，下面是默认值：\n{{default}}", "Quote Content Tip": "可以自定义引用内容的结构，以更好的适配不同场景。可以使用一些变量来进行模板配置：\n{{q}} - 检索内容，{{a}} - 预期内容，{{source}} - 来源，{{sourceId}} - 来源文件名，{{index}} - 第 n 个引用，他们都是可选的，下面是默认值：\n{{default}}",
"Quote Prompt Tip": "可以用 {{quote}} 来插入引用内容模板，使用 {{question}} 来插入问题。下面是默认值：\n{{default}}" "Quote Prompt Tip": "可以用 {{quote}} 来插入引用内容模板，使用 {{question}} 来插入问题。下面是默认值：\n{{default}}"
}, },
"unusable_variable": "无可用变量",
"user": { "user": {
"Account": "账号", "Account": "账号",
"Amount of earnings": "收益（￥）", "Amount of earnings": "收益（￥）",
......
packages/web/i18n/zh/workflow.json
{ {
"add_new_input": "新增输入",
"Code": "代码", "Code": "代码",
"add_new_input": "新增输入",
"code": {
"Reset template": "还原模板",
"Reset template confirm": "确认还原代码模板？将会重置所有输入和输出至模板值，请注意保存当前代码。"
},
"confirm_delete_field_tip": "确认删除该字段？", "confirm_delete_field_tip": "确认删除该字段？",
"custom_input": "自定义输入", "custom_input": "自定义输入",
"edit_input": "编辑输入", "edit_input": "编辑输入",
"field_name_already_exists": "字段名已经存在",
"field_description": "字段描述", "field_description": "字段描述",
"field_description_placeholder": "描述该输入字段的功能，如果为工具调用参数，则该描述会影响模型生成的质量", "field_description_placeholder": "描述该输入字段的功能，如果为工具调用参数，则该描述会影响模型生成的质量",
"field_name_already_exists": "字段名已经存在",
"field_required": "必填", "field_required": "必填",
"field_used_as_tool_input": "作为工具调用参数", "field_used_as_tool_input": "作为工具调用参数",
"input_description": "字段描述",
"only_the_reference_type_is_supported": "仅支持引用类型",
"optional_value_type": "可选的数据类型",
"optional_value_type_tip": "可以指定 1 个或多个数据类型，用户在冬天添加字段时，仅可选择配置的类型",
"tool_input": "工具参数",
"code": {
"Reset template": "还原模板",
"Reset template confirm": "确认还原代码模板？将会重置所有输入和输出至模板值，请注意保存当前代码。"
},
"ifelse": { "ifelse": {
"Input value": "输入值", "Input value": "输入值",
"Select value": "选择值" "Select value": "选择值"
}, },
"input_description": "字段描述",
"only_the_reference_type_is_supported": "仅支持引用类型",
"optional_value_type": "可选的数据类型",
"optional_value_type_tip": "可以指定 1 个或多个数据类型，用户在冬天添加字段时，仅可选择配置的类型",
"response": { "response": {
"Code log": "Log 日志", "Code log": "Log 日志",
"Custom inputs": "自定义输入", "Custom inputs": "自定义输入",
"Custom outputs": "自定义输出", "Custom outputs": "自定义输出",
"Error": "错误信息" "Error": "错误信息"
} },
"tool_input": "工具参数",
"variable_picker_tips": "tips: 可输入节点名或变量名搜索"
} }
projects/app/public/imgs/workflow/variable.png
projects/app/public/imgs/workflow/variable.png

1.61 KB | W: | H:

projects/app/public/imgs/workflow/variable.png

1.62 KB | W: | H:

projects/app/public/imgs/workflow/variable.png
projects/app/public/imgs/workflow/variable.png
projects/app/public/imgs/workflow/variable.png
projects/app/public/imgs/workflow/variable.png
  • 2-up
  • Swipe
  • Onion skin
projects/app/src/components/core/app/DatasetParamsModal.tsx
...@@ -13,7 +13,6 @@ import { ...@@ -13,7 +13,6 @@ import {
} from '@chakra-ui/react'; } from '@chakra-ui/react';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import MySlider from '@/components/Slider'; import MySlider from '@/components/Slider';
import MyTooltip from '@fastgpt/web/components/common/MyTooltip';
import MyModal from '@fastgpt/web/components/common/MyModal'; import MyModal from '@fastgpt/web/components/common/MyModal';
import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants'; import { DatasetSearchModeEnum } from '@fastgpt/global/core/dataset/constants';
import { useTranslation } from 'next-i18next'; import { useTranslation } from 'next-i18next';
......
projects/app/src/components/core/app/WelcomeTextConfig.tsx
...@@ -18,7 +18,6 @@ const WelcomeTextConfig = (props: TextareaProps) => { ...@@ -18,7 +18,6 @@ const WelcomeTextConfig = (props: TextareaProps) => {
</Flex> </Flex>
<MyTextarea <MyTextarea
mt={2} mt={2}
bg={'myWhite.400'}
rows={6} rows={6}
fontSize={'sm'} fontSize={'sm'}
placeholder={t('common:core.app.tip.welcomeTextTip')} placeholder={t('common:core.app.tip.welcomeTextTip')}
......
projects/app/src/pages/app/detail/components/SimpleApp/EditForm.tsx
...@@ -107,7 +107,14 @@ const EditForm = ({ ...@@ -107,7 +107,14 @@ const EditForm = ({
formatEditorVariablePickerIcon([ formatEditorVariablePickerIcon([
...getSystemVariables(t), ...getSystemVariables(t),
...(appForm.chatConfig.variables || []) ...(appForm.chatConfig.variables || [])
]), ]).map((item) => ({
...item,
parent: {
id: 'VARIABLE_NODE_ID',
label: '全局变量',
avatar: '/imgs/workflow/variable.png'
}
})),
[appForm.chatConfig.variables, t] [appForm.chatConfig.variables, t]
); );
......
projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/nodes/render/RenderInput/templates/Textarea.tsx
...@@ -5,13 +5,15 @@ import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor'; ...@@ -5,13 +5,15 @@ import PromptEditor from '@fastgpt/web/components/common/Textarea/PromptEditor';
import { formatEditorVariablePickerIcon } from '@fastgpt/global/core/workflow/utils'; import { formatEditorVariablePickerIcon } from '@fastgpt/global/core/workflow/utils';
import { useContextSelector } from 'use-context-selector'; import { useContextSelector } from 'use-context-selector';
import { WorkflowContext } from '@/pages/app/detail/components/WorkflowComponents/context'; import { WorkflowContext } from '@/pages/app/detail/components/WorkflowComponents/context';
import { getWorkflowGlobalVariables } from '@/web/core/workflow/utils'; import { computedNodeInputReference } from '@/web/core/workflow/utils';
import { useCreation } from 'ahooks'; import { useCreation } from 'ahooks';
import { AppContext } from '@/pages/app/detail/components/context'; import { AppContext } from '@/pages/app/detail/components/context';
import { WorkflowIOValueTypeEnum } from '@fastgpt/global/core/workflow/constants';
const TextareaRender = ({ inputs = [], item, nodeId }: RenderInputProps) => { const TextareaRender = ({ inputs = [], item, nodeId }: RenderInputProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
const nodeList = useContextSelector(WorkflowContext, (v) => v.nodeList); const nodeList = useContextSelector(WorkflowContext, (v) => v.nodeList);
const edges = useContextSelector(WorkflowContext, (v) => v.edges);
const onChangeNode = useContextSelector(WorkflowContext, (v) => v.onChangeNode); const onChangeNode = useContextSelector(WorkflowContext, (v) => v.onChangeNode);
const getNodeDynamicInputs = useContextSelector(WorkflowContext, (v) => v.getNodeDynamicInputs); const getNodeDynamicInputs = useContextSelector(WorkflowContext, (v) => v.getNodeDynamicInputs);
...@@ -19,20 +21,50 @@ const TextareaRender = ({ inputs = [], item, nodeId }: RenderInputProps) => { ...@@ -19,20 +21,50 @@ const TextareaRender = ({ inputs = [], item, nodeId }: RenderInputProps) => {
// get variable // get variable
const variables = useCreation(() => { const variables = useCreation(() => {
const globalVariables = getWorkflowGlobalVariables({ const currentNode = nodeList.find((node) => node.nodeId === nodeId);
nodes: nodeList,
chatConfig: appDetail.chatConfig,
t
});
const nodeVariables = formatEditorVariablePickerIcon( const nodeVariables = formatEditorVariablePickerIcon(
getNodeDynamicInputs(nodeId).map((item) => ({ getNodeDynamicInputs(nodeId).map((item) => ({
key: item.key, key: item.key,
label: item.label label: item.label,
parent: {
id: currentNode?.nodeId,
label: currentNode?.name,
avatar: currentNode?.avatar
}
})) }))
); );
return [...globalVariables, ...nodeVariables]; const sourceNodes = computedNodeInputReference({
nodeId,
nodes: nodeList,
edges: edges,
chatConfig: appDetail.chatConfig,
t
});
const sourceNodeVariables = !sourceNodes
? []
: sourceNodes
.map((node) => {
return node.outputs
.filter((output) => !!output.label)
.map((output) => {
return {
label: t((output.label as any) || ''),
key: output.id,
parent: {
id: node.nodeId,
label: node.name,
avatar: node.avatar
}
};
});
})
.flat();
const formatSourceNodeVariables = formatEditorVariablePickerIcon(sourceNodeVariables);
return [...nodeVariables, ...formatSourceNodeVariables];
}, [nodeList, inputs, t]); }, [nodeList, inputs, t]);
const onChange = useCallback( const onChange = useCallback(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment