Merge branch 'feat/plugins' into dev/plugin-deploy

web/app/components/workflow/nodes/_base/components/agent-strategy-selector.tsx

@@ -20,6 +20,7 @@ import { useStrategyInfo } from '../../agent/use-config'
 import { SwitchPluginVersion } from './switch-plugin-version'
 import PluginList from '@/app/components/workflow/block-selector/market-place-plugin/list'
 import { useMarketplacePlugins } from '@/app/components/plugins/marketplace/hooks'
+import { ToolTipContent } from '@/app/components/base/tooltip/content'
 
 const NotFoundWarn = (props: {
   title: ReactNode,
@@ -178,7 +179,10 @@ export const AgentStrategySelector = memo((props: AgentStrategySelectorProps) =>
           }
           {showSwitchVersion && <SwitchPluginVersion
             uniqueIdentifier={'langgenius/openai:12'}
-            tooltip={t('workflow.nodes.agent.switchToNewVersion')}
+            tooltip={<ToolTipContent
+              title={t('workflow.nodes.agent.unsupportedStrategy')}>
+              {t('workflow.nodes.agent.strategyNotFoundDescAndSwitchVersion')}
+            </ToolTipContent>}
             onChange={() => {
               // TODO: refresh all strategies
             }}

web/app/components/workflow/nodes/_base/components/switch-plugin-version.tsx

@@ -4,20 +4,22 @@ import Badge from '@/app/components/base/badge'
 import Tooltip from '@/app/components/base/tooltip'
 import PluginVersionPicker from '@/app/components/plugins/update-plugin/plugin-version-picker'
 import { RiArrowLeftRightLine } from '@remixicon/react'
+import type { ReactNode } from 'react'
 import { type FC, useCallback, useState } from 'react'
-import cn from '@/utils/classnames'
 import UpdateFromMarketplace from '@/app/components/plugins/update-plugin/from-market-place'
 import { useBoolean } from 'ahooks'
 import { useCheckInstalled } from '@/service/use-plugins'
+import cn from '@/utils/classnames'
 
 export type SwitchPluginVersionProps = {
   uniqueIdentifier: string
-  tooltip?: string
+  tooltip?: ReactNode
   onChange?: (version: string) => void
+  className?: string
 }
 
 export const SwitchPluginVersion: FC<SwitchPluginVersionProps> = (props) => {
-  const { uniqueIdentifier, tooltip, onChange } = props
+  const { uniqueIdentifier, tooltip, onChange, className } = props
   const [pluginId] = uniqueIdentifier.split(':')
   const [isShow, setIsShow] = useState(false)
   const [isShowUpdateModal, { setTrue: showUpdateModal, setFalse: hideUpdateModal }] = useBoolean(false)
@@ -33,8 +35,13 @@ export const SwitchPluginVersion: FC<SwitchPluginVersionProps> = (props) => {
     pluginDetails.refetch()
     onChange?.(targetVersion!)
   }, [hideUpdateModal, onChange, pluginDetails, targetVersion])
+
+  const targetUniqueIdentifier = (() => {
+    if (!targetVersion || !pluginDetail) return uniqueIdentifier
+    return uniqueIdentifier.replaceAll(pluginDetail.version, targetVersion)
+  })()
   return <Tooltip popupContent={!isShow && !isShowUpdateModal && tooltip} triggerMethod='hover'>
-    <div className='w-fit'>
+    <div className={cn('w-fit', className)}>
       {isShowUpdateModal && pluginDetail && <UpdateFromMarketplace
         payload={{
           originalPackageInfo: {
@@ -42,7 +49,7 @@ export const SwitchPluginVersion: FC<SwitchPluginVersionProps> = (props) => {
             payload: pluginDetail.declaration,
           },
           targetPackageInfo: {
-            id: uniqueIdentifier,
+            id: targetUniqueIdentifier,
             version: targetVersion!,
           },
         }}

web/app/components/workflow/nodes/_base/components/variable/utils.ts

@@ -319,16 +319,13 @@ const formatItem = (
     case BlockEnum.Agent: {
       const payload = data as AgentNodeType
       const outputs: Var[] = []
-      Object.keys(payload.output_schema.properties).forEach((outputKey) => {
+      Object.keys(payload.output_schema?.properties || {}).forEach((outputKey) => {
         const output = payload.output_schema.properties[outputKey]
         outputs.push({
           variable: outputKey,
           type: output.type === 'array'
             ? `Array[${output.items?.type.slice(0, 1).toLocaleUpperCase()}${output.items?.type.slice(1)}]` as VarType
             : `${output.type.slice(0, 1).toLocaleUpperCase()}${output.type.slice(1)}` as VarType,
-          // TODO: is this required?
-          // @ts-expect-error todo added
-          description: output.description,
         })
       })
       res.vars = [

web/app/components/workflow/nodes/agent/node.tsx

@@ -111,7 +111,7 @@ const AgentNode: FC<NodeProps<AgentNodeType>> = (props) => {
         return <ModelSelector
           key={model.param}
           modelList={modelList}
-          triggerClassName='bg-workflow-block-parma-bg'
+          triggerClassName='bg-workflow-block-parma-bg !h-6 !rounded-md'
           defaultModel={
             'provider' in model
               ? {

web/app/components/workflow/nodes/llm/node.tsx

@@ -25,6 +25,7 @@ const Node: FC<NodeProps<LLMNodeType>> = ({
         <ModelSelector
           defaultModel={{ provider, model: modelId }}
           modelList={textGenerationModelList}
+          triggerClassName='!h-6 !rounded-md'
           readonly
         />
       )}

web/app/components/workflow/nodes/parameter-extractor/node.tsx

@@ -21,6 +21,7 @@ const Node: FC<NodeProps<ParameterExtractorNodeType>> = ({
         <ModelSelector
           defaultModel={{ provider, model: modelId }}
           modelList={textGenerationModelList}
+          triggerClassName='!h-6 !rounded-md'
           readonly
         />
       )}

web/app/components/workflow/nodes/question-classifier/node.tsx

@@ -32,6 +32,7 @@ const Node: FC<NodeProps<QuestionClassifierNodeType>> = (props) => {
       {hasSetModel && (
         <ModelSelector
           defaultModel={{ provider, model: modelId }}
+          triggerClassName='!h-6 !rounded-md'
           modelList={textGenerationModelList}
           readonly
         />