4.8.15 test (labring#3246)

* o1 config * perf: system plugin code
c121914yu · Nov 27, 2024 · 3930191 · 3930191
1 parent d0a9ffd
commit 3930191
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 82 deletions.
diff --git a/docSite/content/zh-cn/docs/development/configuration.md b/docSite/content/zh-cn/docs/development/configuration.md
@@ -95,9 +95,7 @@ weight: 708
       "customExtractPrompt": "",
       "defaultSystemChatPrompt": "",
       "defaultConfig": {
-        "temperature": 1,
-        "max_tokens": null,
-        "stream": false
+        "temperature": 1
       }
     },
     {
@@ -122,9 +120,7 @@ weight: 708
       "customExtractPrompt": "",
       "defaultSystemChatPrompt": "",
       "defaultConfig": {
-        "temperature": 1,
-        "max_tokens": null,
-        "stream": false
+        "temperature": 1
       }
     }
   ],

diff --git a/docSite/content/zh-cn/docs/development/upgrading/4811.md b/docSite/content/zh-cn/docs/development/upgrading/4811.md
@@ -38,11 +38,7 @@ weight: 813
     "customExtractPrompt": "",
     "defaultSystemChatPrompt": "",
     "defaultConfig": {
-        "temperature": 1,
-        "stream": false
-    },
-    "fieldMap": {
-        "max_tokens": "max_completion_tokens"
+        "temperature": 1
     }
 },
 {
@@ -67,11 +63,7 @@ weight: 813
     "customExtractPrompt": "",
     "defaultSystemChatPrompt": "",
     "defaultConfig": {
-        "temperature": 1,
-        "stream": false
-    },
-    "fieldMap": {
-        "max_tokens": "max_completion_tokens"
+        "temperature": 1
     }
 }
 ```

diff --git a/packages/global/core/plugin/type.d.ts b/packages/global/core/plugin/type.d.ts
@@ -49,5 +49,4 @@ export type PluginRuntimeType = {
   edges: StoreEdgeItemType[];
   currentCost?: number;
   hasTokenFee?: boolean;
-  pluginOrder?: number;
 };
diff --git a/packages/service/core/app/plugin/controller.ts b/packages/service/core/app/plugin/controller.ts
@@ -42,10 +42,28 @@ const getSystemPluginTemplateById = async (
   const item = getSystemPluginTemplates().find((plugin) => plugin.id === pluginId);
   if (!item) return Promise.reject('plugin not found');
 
-  return cloneDeep(item);
+  const plugin = cloneDeep(item);
+
+  if (plugin.associatedPluginId) {
+    // TODO: check is system plugin
+
+    const app = await MongoApp.findById(plugin.associatedPluginId).lean();
+    if (!app) return Promise.reject('plugin not found');
+
+    const version = await getAppLatestVersion(plugin.associatedPluginId, app);
+    if (!version.versionId) return Promise.reject('App version not found');
+
+    plugin.workflow = {
+      nodes: version.nodes,
+      edges: version.edges,
+      chatConfig: version.chatConfig
+    };
+  }
+
+  return plugin;
 };
 
-/* format plugin modules to plugin preview module */
+/* Format plugin to workflow preview node data */
 export async function getChildAppPreviewNode({
   id
 }: {
@@ -86,20 +104,6 @@ export async function getChildAppPreviewNode({
     }
   })();
 
-  if (app.associatedPluginId) {
-    const item = await MongoApp.findById(app.associatedPluginId).lean();
-    if (!item) return Promise.reject('plugin not found');
-
-    const version = await getAppLatestVersion(app.associatedPluginId, item);
-
-    if (!version.versionId) return Promise.reject('App version not found');
-    app.workflow = {
-      nodes: version.nodes,
-      edges: version.edges,
-      chatConfig: version.chatConfig
-    };
-  }
-
   const isPlugin = !!app.workflow.nodes.find(
     (node) => node.flowNodeType === FlowNodeTypeEnum.pluginInput
   );
@@ -167,38 +171,6 @@ export async function getChildAppRuntimeById(
         hasTokenFee: false,
         pluginOrder: 0
       };
-    } else if (source === PluginSourceEnum.commercial) {
-      const pluginTemplate = getSystemPluginTemplates().find((plugin) => plugin.id === pluginId);
-      if (!pluginTemplate?.associatedPluginId) return Promise.reject('plugin not found');
-
-      const item = await MongoApp.findById(pluginTemplate.associatedPluginId).lean();
-      if (!item) return Promise.reject('plugin not found');
-
-      const version = await getAppVersionById({
-        appId: pluginTemplate.associatedPluginId,
-        versionId,
-        app: item
-      });
-
-      return {
-        id: String(item._id),
-        teamId: String(item.teamId),
-        name: item.name,
-        avatar: item.avatar,
-        intro: item.intro,
-        showStatus: true,
-        workflow: {
-          nodes: version.nodes,
-          edges: version.edges,
-          chatConfig: version.chatConfig
-        },
-        templateType: FlowNodeTemplateTypeEnum.teamApp,
-        version: pluginTemplate.version,
-        originCost: pluginTemplate.originCost,
-        currentCost: pluginTemplate.currentCost,
-        hasTokenFee: pluginTemplate.hasTokenFee,
-        pluginOrder: pluginTemplate.pluginOrder
-      };
     } else {
       return getSystemPluginTemplateById(pluginId);
     }
@@ -213,7 +185,6 @@ export async function getChildAppRuntimeById(
     currentCost: app.currentCost,
     nodes: app.workflow.nodes,
     edges: app.workflow.edges,
-    hasTokenFee: app.hasTokenFee,
-    pluginOrder: app.pluginOrder
+    hasTokenFee: app.hasTokenFee
   };
 }
diff --git a/packages/service/support/permission/app/auth.ts b/packages/service/support/permission/app/auth.ts
@@ -34,6 +34,8 @@ export const authPluginByTmbId = async ({
 
     return app;
   }
+
+  // commercial custom plugin already checked in "getSystemPluginTemplateById"
 };
 
 export const authAppByTmbId = async ({

diff --git a/projects/app/data/config.json b/projects/app/data/config.json
@@ -80,11 +80,7 @@
       "customExtractPrompt": "",
       "defaultSystemChatPrompt": "",
       "defaultConfig": {
-        "temperature": 1,
-        "stream": false
-      },
-      "fieldMap": {
-        "max_tokens": "max_completion_tokens"
+        "temperature": 1
       }
     },
     {
@@ -109,11 +105,7 @@
       "customExtractPrompt": "",
       "defaultSystemChatPrompt": "",
       "defaultConfig": {
-        "temperature": 1,
-        "stream": false
-      },
-      "fieldMap": {
-        "max_tokens": "max_completion_tokens"
+        "temperature": 1
       }
     }
   ],

diff --git a/projects/app/src/components/Layout/navbar.tsx b/projects/app/src/components/Layout/navbar.tsx
@@ -66,7 +66,7 @@ const Navbar = ({ unread }: { unread: number }) => {
   );
 
   const itemStyles: BoxProps & LinkProps = {
-    my: 3,
+    my: 2,
     display: 'flex',
     flexDirection: 'column',
     alignItems: 'center',

diff --git a/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx b/projects/app/src/pages/app/detail/components/WorkflowComponents/Flow/NodeTemplatesModal.tsx
@@ -51,7 +51,6 @@ import { LoopStartNode } from '@fastgpt/global/core/workflow/template/system/loo
 import { LoopEndNode } from '@fastgpt/global/core/workflow/template/system/loop/loopEnd';
 import { NodeInputKeyEnum, NodeOutputKeyEnum } from '@fastgpt/global/core/workflow/constants';
 import { WorkflowNodeEdgeContext } from '../context/workflowInitContext';
-import { defaultGroup } from '@/pages/toolkit';
 import CostTooltip from '@/components/core/app/plugin/CostTooltip';
 
 type ModuleTemplateListProps = {
@@ -306,7 +305,7 @@ const NodeTemplatesModal = ({ isOpen, onClose }: ModuleTemplateListProps) => {
           {/* Search */}
           {(templateType === TemplateTypeEnum.teamPlugin ||
             templateType === TemplateTypeEnum.systemPlugin) && (
-            <Flex mt={2} alignItems={'center'} h={10}>
+            <Flex mt={2} alignItems={'center'} h={8}>
               <InputGroup mr={4} h={'full'}>
                 <InputLeftElement h={'full'} alignItems={'center'} display={'flex'}>
                   <MyIcon name={'common/searchLight'} w={'16px'} color={'myGray.500'} ml={3} />
@@ -440,8 +439,7 @@ const RenderList = React.memo(function RenderList({
         list: copy.filter((item) => item.list.length > 0)
       }
     ];
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [templates, parentId]);
+  }, [type, templates, pluginGroups]);
 
   const onAddNode = useCallback(
     async ({