4.8 preview (#1288)

* Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * perf: workflow ux * system config * Newflow (#89) * docs: Add doc for Xinference (#1266) Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * perf: workflow ux * system config * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * Revert "lafAccount add pat & re request when token invalid (#76)" (#77) This reverts commit 83d85dfe37adcaef4833385ea52ee79fd84720be. * rename code * move code * update flow * input type selector * perf: workflow runtime * feat: node adapt newflow * feat: adapt plugin * feat: 360 connection * check workflow * perf: flow 性能 * change plugin input type (#81) * change plugin input type * plugin label mode * perf: nodecard * debug * perf: debug ui * connection ui * change workflow ui (#82) * feat: workflow debug * adapt openAPI for new workflow (#83) * adapt openAPI for new workflow * i18n * perf: plugin debug * plugin input ui * delete * perf: global variable select * fix rebase * perf: workflow performance * feat: input render type icon * input icon * adapt flow (#84) * adapt newflow * temp * temp * fix * feat: app schedule trigger * feat: app schedule trigger * perf: schedule ui * feat: ioslatevm run js code * perf: workflow varialbe table ui * feat: adapt simple mode * feat: adapt input params * output * feat: adapt tamplate * fix: ts * add if-else module (#86) * perf: worker * if else node * perf: tiktoken worker * fix: ts * perf: tiktoken * fix if-else node (#87) * fix if-else node * type * fix * perf: audio render * perf: Parallel worker * log * perf: if else node * adapt plugin * prompt * perf: reference ui * reference ui * handle ux * template ui and plugin tool * adapt v1 workflow * adapt v1 workflow completions * perf: time variables * feat: workflow keyboard shortcuts * adapt v1 workflow * update workflow example doc (#88) * fix: simple mode select tool --------- Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com> * doc * perf: extract node * extra node field * update plugin version * doc * variable * change doc & fix prompt editor (#90) * fold workflow code * value type label --------- Signed-off-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: Carson Yang <yangchuansheng33@gmail.com> Co-authored-by: heheer <71265218+newfish-cmyk@users.noreply.github.com>
2025-07-24 22:03:54 +00:00 · 2024-04-25 17:51:20 +08:00
parent b08d81f887
commit 439c819ff1
505 changed files with 23570 additions and 18215 deletions
--- a/projects/app/src/pages/plugin/edit/Header.tsx
+++ b/projects/app/src/pages/plugin/edit/Header.tsx
@@ -7,17 +7,22 @@ import { useCopyData } from '@/web/common/hooks/useCopyData';
 import dynamic from 'next/dynamic';
 import MyIcon from '@fastgpt/web/components/common/Icon';
 import MyTooltip from '@/components/MyTooltip';
-import { getFlowStore } from '@/components/core/module/Flow/FlowProvider';
-import { filterExportModules, flowNode2Modules } from '@/components/core/module/utils';
+import { filterExportModules, flowNode2StoreNodes } from '@/components/core/workflow/utils';
 import { putUpdatePlugin } from '@/web/core/plugin/api';
-import { FlowNodeTypeEnum } from '@fastgpt/global/core/module/node/constant';
-import { ModuleItemType } from '@fastgpt/global/core/module/type';
+import { StoreNodeItemType } from '@fastgpt/global/core/workflow/type/index.d';
 import { useToast } from '@fastgpt/web/hooks/useToast';
-import { ModuleOutputKeyEnum } from '@fastgpt/global/core/module/constants';
-import MyMenu from '@/components/MyMenu';
+import MyMenu from '@fastgpt/web/components/common/MyMenu';
+import {
+  getWorkflowStore,
+  useFlowProviderStore
+} from '@/components/core/workflow/Flow/FlowProvider';
+import { StoreEdgeItemType } from '@fastgpt/global/core/workflow/type/edge';
+import {
+  checkWorkflowNodeAndConnection,
+  filterSensitiveNodesData
+} from '@/web/core/workflow/utils';

-const ImportSettings = dynamic(() => import('@/components/core/module/Flow/ImportSettings'));
-const PreviewPlugin = dynamic(() => import('./Preview'));
+const ImportSettings = dynamic(() => import('@/components/core/workflow/Flow/ImportSettings'));

 type Props = { plugin: PluginItemSchema; onClose: () => void };

@@ -26,92 +31,31 @@ const Header = ({ plugin, onClose }: Props) => {
  const { t } = useTranslation();
  const { toast } = useToast();
  const { copyData } = useCopyData();
+  const { edges, onUpdateNodeError } = useFlowProviderStore();
  const { isOpen: isOpenImport, onOpen: onOpenImport, onClose: onCloseImport } = useDisclosure();
-  const [previewModules, setPreviewModules] = React.useState<ModuleItemType[]>();

-  const flow2ModulesAndCheck = useCallback(async () => {
-    const { nodes, edges } = await getFlowStore();
+  const flowData2StoreDataAndCheck = useCallback(async () => {
+    const { nodes } = await getWorkflowStore();
+    const checkResults = checkWorkflowNodeAndConnection({ nodes, edges });
+    if (!checkResults) {
+      const storeNodes = flowNode2StoreNodes({ nodes, edges });

-    const modules = flowNode2Modules({ nodes, edges });
-
-    // check required connect
-    for (let i = 0; i < modules.length; i++) {
-      const item = modules[i];
-
-      // update custom input connected
-      if (item.flowType === FlowNodeTypeEnum.pluginInput) {
-        item.inputs.forEach((item) => {
-          item.connected = true;
-        });
-        if (
-          item.outputs.find(
-            (output) =>
-              output.key !== ModuleOutputKeyEnum.pluginStart && output.targets.length === 0
-          )
-        ) {
-          toast({
-            status: 'warning',
-            title: t('module.Plugin input must connect')
-          });
-          return false;
-        }
-      }
-      if (
-        item.flowType === FlowNodeTypeEnum.pluginOutput &&
-        item.inputs.find((input) => !input.connected)
-      ) {
-        toast({
-          status: 'warning',
-          title: t('core.module.Plugin output must connect')
-        });
-        return false;
-      }
-
-      if (
-        item.inputs.find((input) => {
-          if (!input.required || input.connected) return false;
-          if (input.value === undefined || input.value === '' || input.value?.length === 0) {
-            return true;
-          }
-          return false;
-        })
-      ) {
-        toast({
-          status: 'warning',
-          title: `【${item.name}】存在未填或未连接参数`
-        });
-        return false;
-      }
-    }
-
-    // plugin must have input
-    const pluginInputModule = modules.find(
-      (item) => item.flowType === FlowNodeTypeEnum.pluginInput
-    );
-
-    if (!pluginInputModule) {
+      return storeNodes;
+    } else {
+      checkResults.forEach((nodeId) => onUpdateNodeError(nodeId, true));
      toast({
        status: 'warning',
-        title: t('module.Plugin input is required')
+        title: t('core.workflow.Check Failed')
      });
-      return false;
    }
-    if (pluginInputModule.inputs.length < 1) {
-      toast({
-        status: 'warning',
-        title: t('module.Plugin input is not value')
-      });
-      return false;
-    }
-
-    return modules;
-  }, [t, toast]);
+  }, [edges, onUpdateNodeError, t, toast]);

  const { mutate: onclickSave, isLoading } = useRequest({
-    mutationFn: (modules: ModuleItemType[]) => {
+    mutationFn: ({ nodes, edges }: { nodes: StoreNodeItemType[]; edges: StoreEdgeItemType[] }) => {
      return putUpdatePlugin({
        id: plugin._id,
-        modules
+        modules: nodes,
+        edges
      });
    },
    successToast: '保存配置成功',
@@ -158,15 +102,25 @@ const Header = ({ plugin, onClose }: Props) => {
              label: t('app.Export Configs'),
              icon: 'export',
              onClick: async () => {
-                const modules = await flow2ModulesAndCheck();
-                if (modules) {
-                  copyData(filterExportModules(modules), t('app.Export Config Successful'));
+                const data = await flowData2StoreDataAndCheck();
+                if (data) {
+                  copyData(
+                    JSON.stringify(
+                      {
+                        nodes: filterSensitiveNodesData(data.nodes),
+                        edges: data.edges
+                      },
+                      null,
+                      2
+                    ),
+                    t('app.Export Config Successful')
+                  );
                }
              }
            }
          ]}
        />
-        <MyTooltip label={t('module.Preview Plugin')}>
+        {/* <MyTooltip label={t('module.Preview Plugin')}>
          <IconButton
            mr={[3, 5]}
            icon={<MyIcon name={'core/modules/previewLight'} w={['14px', '16px']} />}
@@ -174,19 +128,19 @@ const Header = ({ plugin, onClose }: Props) => {
            aria-label={'save'}
            variant={'whitePrimary'}
            onClick={async () => {
-              const modules = await flow2ModulesAndCheck();
+              const modules = await flowData2StoreDataAndCheck();
              if (modules) {
                setPreviewModules(modules);
              }
            }}
          />
-        </MyTooltip>
+        </MyTooltip> */}
        <Button
          size={'sm'}
          isLoading={isLoading}
          leftIcon={<MyIcon name={'common/saveFill'} w={['14px', '16px']} />}
          onClick={async () => {
-            const modules = await flow2ModulesAndCheck();
+            const modules = await flowData2StoreDataAndCheck();
            if (modules) {
              onclickSave(modules);
            }
@@ -196,13 +150,6 @@ const Header = ({ plugin, onClose }: Props) => {
        </Button>
      </Flex>
      {isOpenImport && <ImportSettings onClose={onCloseImport} />}
-      {!!previewModules && (
-        <PreviewPlugin
-          plugin={plugin}
-          modules={previewModules}
-          onClose={() => setPreviewModules(undefined)}
-        />
-      )}
    </>
  );
 };