Skip to content

赵月辉 / fastgpt-migrated

Go to a project
Commit ae95a890 by archer
Options

fix: savechat.feat: extract flow

parent 58153306
Showing with 105 additions and 62 deletions
client/src/components/MyTooltip/index.tsx
......@@ -6,7 +6,7 @@ interface Props extends TooltipProps {
forceShow?: boolean;
}
const MyTooltip = ({ children, forceShow = false, ...props }: Props) => {
const MyTooltip = ({ children, forceShow = false, shouldWrapChildren = true, ...props }: Props) => {
const { isPc } = useGlobalStore();
return isPc || forceShow ? (
<Tooltip
......@@ -21,6 +21,7 @@ const MyTooltip = ({ children, forceShow = false, ...props }: Props) => {
borderRadius={'8px'}
whiteSpace={'pre-wrap'}
boxShadow={'1px 1px 10px rgba(0,0,0,0.2)'}
shouldWrapChildren={shouldWrapChildren}
{...props}
>
{children}
......
client/src/constants/flow/index.ts
......@@ -45,7 +45,7 @@ export enum FlowValueTypeEnum {
'boolean' = 'boolean',
'chatHistory' = 'chat_history',
'kbQuote' = 'kb_quote',
'other' = 'other'
'any' = 'any'
}
export const FlowValueTypeStyle: Record<`${FlowValueTypeEnum}`, BoxProps> = {
......@@ -64,7 +64,7 @@ export const FlowValueTypeStyle: Record<`${FlowValueTypeEnum}`, BoxProps> = {
[FlowValueTypeEnum.kbQuote]: {
background: '#A558C9'
},
[FlowValueTypeEnum.other]: {
[FlowValueTypeEnum.any]: {
background: '#9CA2A8'
}
};
......
client/src/constants/flow/inputTemplate.ts
......@@ -6,7 +6,7 @@ export const Input_Template_TFSwitch: FlowInputItemType = {
key: SystemInputEnum.switch,
type: FlowInputItemTypeEnum.target,
label: '触发器',
valueType: FlowValueTypeEnum.boolean
valueType: FlowValueTypeEnum.any
};
export const Input_Template_History: FlowInputItemType = {
......
client/src/pages/api/openapi/v1/chat/completions.ts
......@@ -139,7 +139,7 @@ export default withNextCors(async function handler(req: NextApiRequest, res: Nex
// }
// save chat
if (typeof chatId === 'string') {
if (chatId) {
await saveChat({
chatId,
appId,
......
client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeAnswer.tsx
......@@ -11,8 +11,7 @@ const NodeAnswer = ({
}: NodeProps<FlowModuleItemType>) => {
return (
<NodeCard minW={'400px'} moduleId={moduleId} {...props}>
<Divider text="Input" />
<Container>
<Container borderTop={'2px solid'} borderTopColor={'myGray.200'}>
<RenderInput moduleId={moduleId} onChangeNode={onChangeNode} flowInputList={inputs} />
</Container>
</NodeCard>
......
client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeCQNode.tsx
......@@ -55,7 +55,7 @@ const NodeCQNode = ({
onChangeNode({
moduleId,
type: 'outputs',
key: agentKey,
key: '',
value: newOutputVal
});
}}
......
client/src/pages/app/detail/components/AdEdit/components/Nodes/NodeExtract.tsx
......@@ -13,6 +13,8 @@ import RenderOutput from '../render/RenderOutput';
import MyIcon from '@/components/Icon';
import ExtractFieldModal from '../modules/ExtractFieldModal';
import { ContextExtractEnum } from '@/constants/flow/flowField';
import SourceHandle from '../render/SourceHandle';
import { FlowOutputItemTypeEnum, FlowValueTypeEnum } from '@/constants/flow';
const NodeExtract = ({
data: { inputs, outputs, moduleId, onChangeNode, ...props }
......@@ -36,7 +38,22 @@ const NodeExtract = ({
key: string;
value?: ContextExtractAgentItemType[];
}) => (
<Box>
<Box pt={2}>
<Box position={'absolute'} top={0} right={0}>
<Button
variant={'base'}
leftIcon={<AddIcon fontSize={'10px'} />}
onClick={() =>
setEditExtractField({
desc: '',
key: '',
required: true
})
}
>
新增字段
</Button>
</Box>
<TableContainer>
<Table>
<Thead>
......@@ -49,10 +66,10 @@ const NodeExtract = ({
</Thead>
<Tbody>
{extractKeys.map((item, index) => (
<Tr key={index}>
<Tr key={index} position={'relative'}>
<Td>{item.key}</Td>
<Td whiteSpace={'pre-line'} wordBreak={'break-all'}>
{item.desc}{' '}
{item.desc}
</Td>
<Td>{item.required ? '✔' : ''}</Td>
<Td whiteSpace={'nowrap'}>
......@@ -70,11 +87,24 @@ const NodeExtract = ({
w={'16px'}
cursor={'pointer'}
onClick={() => {
const newInputValue = extractKeys.filter(
(extract) => item.key !== extract.key
);
const newOutputVal = outputs.filter(
(output) => output.key !== item.key
);
onChangeNode({
moduleId,
type: 'inputs',
key: ContextExtractEnum.extractKeys,
value: extractKeys.filter((extract) => item.key !== extract.key)
value: newInputValue
});
onChangeNode({
moduleId,
type: 'outputs',
key: '',
value: newOutputVal
});
}}
/>
......@@ -84,21 +114,6 @@ const NodeExtract = ({
</Tbody>
</Table>
</TableContainer>
<Box mt={2} textAlign={'right'}>
<Button
variant={'base'}
leftIcon={<AddIcon fontSize={'10px'} />}
onClick={() =>
setEditExtractField({
desc: '',
key: '',
required: true
})
}
>
新增字段
</Button>
</Box>
</Box>
)
}}
......@@ -119,21 +134,39 @@ const NodeExtract = ({
const exists = extracts.find((item) => item.key === editExtractFiled.key);
if (exists) {
onChangeNode({
moduleId,
type: 'inputs',
key: ContextExtractEnum.extractKeys,
value: extracts.map((item) => (item.key === editExtractFiled.key ? data : item))
});
} else {
onChangeNode({
moduleId,
type: 'inputs',
key: ContextExtractEnum.extractKeys,
value: extracts.concat(data)
});
}
const newInputs = exists
? extracts.map((item) => (item.key === editExtractFiled.key ? data : item))
: extracts.concat(data);
const newOutputs = exists
? outputs.map((output) =>
output.key === editExtractFiled.key
? {
...output,
key: data.key,
label: `提取结果-${data.desc}`
}
: output
)
: outputs.concat({
key: data.key,
label: `提取结果-${data.desc}`,
valueType: FlowValueTypeEnum.string,
type: FlowOutputItemTypeEnum.source,
targets: []
});
onChangeNode({
moduleId,
type: 'inputs',
key: ContextExtractEnum.extractKeys,
value: newInputs
});
onChangeNode({
moduleId,
type: 'outputs',
key: '',
value: newOutputs
});
setEditExtractField(undefined);
}}
......
client/src/pages/app/detail/components/AdEdit/components/render/RenderInput.tsx
......@@ -35,7 +35,7 @@ export const Label = ({
)}
{description && (
<MyTooltip label={description} forceShow>
<QuestionOutlineIcon display={['none', 'inline']} transform={'translateY(-1px)'} ml={1} />
<QuestionOutlineIcon display={['none', 'inline']} ml={1} />
</MyTooltip>
)}
</Box>
......
client/src/pages/app/detail/components/AdEdit/components/render/RenderOutput.tsx
......@@ -17,14 +17,14 @@ const Label = ({
<Flex as={'label'} justifyContent={'right'} alignItems={'center'} position={'relative'}>
{description && (
<MyTooltip label={description} forceShow>
<QuestionOutlineIcon display={['none', 'inline']} transform={'translateY(-1px)'} mr={1} />
<QuestionOutlineIcon display={['none', 'inline']} mr={1} />
</MyTooltip>
)}
{children}
</Flex>
);
const RenderBody = ({ flowOutputList }: { flowOutputList: FlowOutputItemType[] }) => {
const RenderOutput = ({ flowOutputList }: { flowOutputList: FlowOutputItemType[] }) => {
return (
<>
{flowOutputList.map(
......@@ -44,4 +44,4 @@ const RenderBody = ({ flowOutputList }: { flowOutputList: FlowOutputItemType[] }
);
};
export default React.memo(RenderBody);
export default RenderOutput;
client/src/pages/app/detail/components/AdEdit/components/render/SourceHandle.tsx
......@@ -14,8 +14,8 @@ const SourceHandle = ({ handleKey, valueType, ...props }: Props) => {
() =>
valueType
? FlowValueTypeStyle[valueType]
: (FlowValueTypeStyle[FlowValueTypeEnum.other] as any),
[]
: (FlowValueTypeStyle[FlowValueTypeEnum.any] as any),
[valueType]
);
return (
......
client/src/pages/app/detail/components/AdEdit/components/render/TargetHandle.tsx
......@@ -15,7 +15,7 @@ const TargetHandle = ({ handleKey, valueType, onConnect, ...props }: Props) => {
() =>
valueType
? FlowValueTypeStyle[valueType]
: (FlowValueTypeStyle[FlowValueTypeEnum.other] as any),
: (FlowValueTypeStyle[FlowValueTypeEnum.any] as any),
[]
);
......
client/src/pages/app/detail/components/AdEdit/index.tsx
......@@ -132,7 +132,7 @@ const AppEdit = ({ app, fullScreen, onFullScreen }: Props) => {
connected: item.type !== FlowInputItemTypeEnum.target
})),
outputs: item.data.outputs.map((item) => ({
key: item.key,
...item,
targets: [] as FlowOutputTargetItemType[]
}))
}));
......@@ -254,7 +254,11 @@ const AppEdit = ({ app, fullScreen, onFullScreen }: Props) => {
title: t('app.Connection is invalid')
});
}
if (sourceType !== targetType) {
if (
sourceType !== FlowValueTypeEnum.any &&
targetType !== FlowValueTypeEnum.any &&
sourceType !== targetType
) {
return toast({
status: 'warning',
title: t('app.Connection type is different')
......@@ -280,6 +284,7 @@ const AppEdit = ({ app, fullScreen, onFullScreen }: Props) => {
const { mutate: onclickSave, isLoading } = useRequest({
mutationFn: () => {
console.log(flow2AppModules(), '====');
return updateAppDetail(app._id, {
modules: flow2AppModules()
});
......
client/src/service/moduleDispatch/agent/extract.ts
......@@ -96,7 +96,6 @@ export async function dispatchContentExtract({
return {};
}
})();
console.log(adaptMessages, arg);
// auth fields
let success = !extractKeys.find((item) => !arg[item.key]);
......@@ -109,6 +108,7 @@ export async function dispatchContentExtract({
}
}
}
console.log(arg, '====');
const tokens = response.data.usage?.total_tokens || 0;
......@@ -116,6 +116,7 @@ export async function dispatchContentExtract({
[ContextExtractEnum.success]: success ? true : undefined,
[ContextExtractEnum.failed]: success ? undefined : true,
[ContextExtractEnum.fields]: arg,
...arg,
[TaskResponseKeyEnum.responseData]: {
moduleName: ChatModuleEnum.Extract,
price: userOpenaiAccount?.key ? 0 : countModelPrice({ model: agentModel, tokens }),
......
client/src/service/utils/chat/saveChat.ts
......@@ -36,7 +36,7 @@ export async function saveChat({
if (chatHistory) {
promise.push(
Chat.findOneAndUpdate(
{ chatId },
{ chatId, userId },
{
$push: {
content: {
......
client/src/types/app.d.ts
......@@ -64,13 +64,12 @@ export type VariableItemType = {
/* app module */
export type AppModuleInputItemType = { key: string; value?: any; connected?: boolean };
export type AppModuleOutputItemType = { key: string; targets: FlowOutputTargetItemType[] };
export type AppModuleItemType = {
moduleId: string;
position?: XYPosition;
flowType: `${FlowModuleTypeEnum}`;
inputs: AppModuleInputItemType[];
outputs: AppModuleOutputItemType[];
outputs: FlowOutputItemType[];
};
export type AppItemType = {
......
client/src/types/flow.d.ts
......@@ -39,10 +39,10 @@ export type FlowOutputTargetItemType = {
};
export type FlowOutputItemType = {
key: string; // 字段名
label: string;
label?: string;
description?: string;
valueType?: `${FlowValueTypeEnum}`;
type: `${FlowOutputItemTypeEnum}`;
type?: `${FlowOutputItemTypeEnum}`;
targets: FlowOutputTargetItemType[];
};
......
client/src/utils/adapt.ts
......@@ -73,6 +73,10 @@ export const appModule2FlowNode = ({
const template =
ModuleTemplatesFlat.find((template) => template.flowType === item.flowType) || EmptyModule;
const mergeOutputs = item.outputs.concat(
template.outputs.filter((output) => !item.outputs.find((item) => item.key === output.key))
);
// replace item data
const moduleItem: FlowModuleItemType = {
...item,
......@@ -85,14 +89,14 @@ export const appModule2FlowNode = ({
value: itemInput.value
};
}),
outputs: template.outputs.map((templateOutput) => {
// 合并 template 和数据库，文案以 template 为准
outputs: mergeOutputs.map((output) => {
// unChange outputs
const itemOutput =
item.outputs.find((item) => item.key === templateOutput.key) || templateOutput;
const templateOutput = template.outputs.find((item) => item.key === output.key);
return {
...templateOutput,
targets: itemOutput.targets || []
...(templateOutput ? templateOutput : output),
targets: output.targets || []
};
}),
onChangeNode,
......@@ -131,5 +135,6 @@ export const appModule2FlowEdge = ({
})
)
);
return edges;
};
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