plugin usage

packages/global/core/workflow/type/index.d.ts

@@ -63,7 +63,7 @@ export type TemplateMarketListItemType = {
 // system plugin
 export type SystemPluginTemplateItemType = WorkflowTemplateType & {
   customWorkflow?: string;
-  associatedPlugin?: Omit<SystemPluginListItemType, 'workflow'>;
+  associatedPlugin?: SystemPluginListItemType;
   userGuide?: string;
 
   templateType: string;

packages/global/core/workflow/type/node.d.ts

@@ -85,6 +85,7 @@ export type NodeTemplateListItemType = {
   author?: string;
   unique?: boolean; // 唯一的
   currentCost?: number; // 当前积分消耗
+  hasTokenFee?: boolean; // 是否配置积分
   instructions?: string; // 使用说明
 };
 

packages/service/core/app/plugin/controller.ts

@@ -78,7 +78,8 @@ export async function getChildAppPreviewNode({
         version: version.versionId,
         originCost: 0,
         currentCost: 0,
-        hasTokenFee: false
+        hasTokenFee: false,
+        pluginOrder: 0
       };
     } else {
       return getSystemPluginTemplateById(pluginId);
@@ -163,7 +164,8 @@ export async function getChildAppRuntimeById(
         version: item?.pluginData?.nodeVersion || defaultNodeVersion,
         originCost: 0,
         currentCost: 0,
-        hasTokenFee: false
+        hasTokenFee: false,
+        pluginOrder: 0
       };
     } else {
       return getSystemPluginTemplateById(pluginId);

packages/service/core/app/plugin/type.d.ts

@@ -23,7 +23,7 @@ export type SystemPluginConfigSchemaType = {
     weight?: number;
     workflow: WorkflowTemplateBasicType;
     templateType: string;
-    associatedPlugin: Omit<SystemPluginListItemType, 'workflow'>;
+    associatedPlugin: SystemPluginListItemType;
     userGuide: string;
   };
 };

packages/service/core/app/plugin/utils.ts

@@ -1,22 +1,29 @@
-import { PluginRuntimeType } from '@fastgpt/global/core/workflow/runtime/type';
 import { ChatNodeUsageType } from '@fastgpt/global/support/wallet/bill/type';
-import { splitCombinePluginId } from './controller';
-import { PluginSourceEnum } from '@fastgpt/global/core/plugin/constants';
+import { SystemPluginTemplateItemType } from '@fastgpt/global/core/workflow/type';
 
 /* 
-  1. Commercial plugin: n points per times
-  2. Other plugin: sum of children points
+  Plugin points calculation:
+  1. Return 0 if error
+  2. Add configured points if commercial plugin
+  3. Add sum of child nodes points
 */
-export const computedPluginUsage = async (
-  plugin: PluginRuntimeType,
-  childrenUsage: ChatNodeUsageType[]
-) => {
-  // const { source } = await splitCombinePluginId(plugin.id);
+export const computedPluginUsage = async ({
+  plugin,
+  childrenUsage,
+  error
+}: {
+  plugin?: SystemPluginTemplateItemType;
+  childrenUsage: ChatNodeUsageType[];
+  error?: boolean;
+}) => {
+  if (error) {
+    return 0;
+  }
 
-  // Commercial plugin: n points per times
-  // if (source === PluginSourceEnum.commercial) {
-  //   return plugin.currentCost ?? 0;
-  // }
+  let tokenFee = 0;
+  if (plugin && plugin.hasTokenFee) {
+    tokenFee = plugin.currentCost ?? 0;
+  }
 
-  return childrenUsage.reduce((sum, item) => sum + (item.totalPoints || 0), 0);
+  return tokenFee + childrenUsage.reduce((sum, item) => sum + (item.totalPoints || 0), 0);
 };

packages/service/core/workflow/dispatch/plugin/run.ts

@@ -123,7 +123,7 @@ export const dispatchRunPlugin = async (props: RunPluginProps): Promise<RunPlugi
   }
 
   const usagePoints = await computedPluginUsage({
-    plugin,
+    plugin: pluginTemplate,
     childrenUsage: flowUsages,
     error: !!output?.pluginOutput?.error
   });

packages/web/components/common/Icon/constants.ts

@@ -66,7 +66,6 @@ export const iconPaths = {
   'common/paused': () => import('./icons/common/paused.svg'),
   'common/playFill': () => import('./icons/common/playFill.svg'),
   'common/playLight': () => import('./icons/common/playLight.svg'),
-  'common/pluginFill': () => import('./icons/common/pluginFill.svg'),
   'common/publishFill': () => import('./icons/common/publishFill.svg'),
   'common/refreshLight': () => import('./icons/common/refreshLight.svg'),
   'common/resultLight': () => import('./icons/common/resultLight.svg'),
@@ -347,8 +346,6 @@ export const iconPaths = {
   'price/right': () => import('./icons/price/right.svg'),
   save: () => import('./icons/save.svg'),
   stop: () => import('./icons/stop.svg'),
-  store: () => import('./icons/store.svg'),
-  storeFill: () => import('./icons/storeFill.svg'),
   'support/account/loginoutLight': () => import('./icons/support/account/loginoutLight.svg'),
   'support/account/plans': () => import('./icons/support/account/plans.svg'),
   'support/account/promotionLight': () => import('./icons/support/account/promotionLight.svg'),

packages/web/i18n/en/common.json

@@ -232,7 +232,6 @@
   "common.request_more": "Click to Load More",
   "common.speech.error tip": "Speech to Text Failed",
   "common.speech.not support": "Your Browser Does Not Support Speech Input",
-  "common.store": "Store",
   "common.submit_success": "Submitted Successfully",
   "common.submitted": "Submitted",
   "common.support": "Support",

packages/web/i18n/zh-CN/common.json

@@ -232,7 +232,6 @@
   "common.request_more": "点击加载更多",
   "common.speech.error tip": "语音转文字失败",
   "common.speech.not support": "您的浏览器不支持语音输入",
-  "common.store": "商城",
   "common.submit_success": "提交成功",
   "common.submitted": "已提交",
   "common.support": "支持",