Merge branch 'feat/workflow-continue-on-error' into deploy/dev

langgenius · Dec 6, 2024 · 7f1f063 · 7f1f063
2 parents 83a1efc + 449c3dc
commit 7f1f063
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 4 deletions.
diff --git a/web/app/components/workflow/nodes/_base/components/editor/base.tsx b/web/app/components/workflow/nodes/_base/components/editor/base.tsx
@@ -33,6 +33,7 @@ type Props = {
   }[]
   showFileList?: boolean
   showCodeGenerator?: boolean
+  tip?: JSX.Element
 }
 
 const Base: FC<Props> = ({
@@ -49,6 +50,7 @@ const Base: FC<Props> = ({
   fileList = [],
   showFileList,
   showCodeGenerator = false,
+  tip,
 }) => {
   const ref = useRef<HTMLDivElement>(null)
   const {
@@ -100,6 +102,7 @@ const Base: FC<Props> = ({
             </div>
           </div>
         </div>
+        {tip && <div className='px-1 py-0.5'>{tip}</div>}
         <PromptEditorHeightResizeWrap
           height={isExpand ? editorExpandHeight : editorContentHeight}
           minHeight={editorContentMinHeight}

diff --git a/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx b/web/app/components/workflow/nodes/_base/components/editor/code-editor/index.tsx
@@ -34,6 +34,7 @@ export type Props = {
   onGenerated?: (value: string) => void
   showCodeGenerator?: boolean
   className?: string
+  tip?: JSX.Element
 }
 
 export const languageMap = {
@@ -69,6 +70,7 @@ const CodeEditor: FC<Props> = ({
   onGenerated,
   showCodeGenerator = false,
   className,
+  tip,
 }) => {
   const [isFocus, setIsFocus] = React.useState(false)
   const [isMounted, setIsMounted] = React.useState(false)
@@ -211,6 +213,7 @@ const CodeEditor: FC<Props> = ({
             fileList={fileList as any}
             showFileList={showFileList}
             showCodeGenerator={showCodeGenerator}
+            tip={tip}
           >
             {main}
           </Base>

diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip.tsx b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip.tsx
@@ -1,17 +1,33 @@
+import { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
 import { RiAlertFill } from '@remixicon/react'
+import { ErrorHandleTypeEnum } from './types'
 
 type ErrorHandleTipProps = {
-  text: string
+  type?: ErrorHandleTypeEnum
 }
 const ErrorHandleTip = ({
-  text,
+  type,
 }: ErrorHandleTipProps) => {
+  const { t } = useTranslation()
+
+  const text = useMemo(() => {
+    if (type === ErrorHandleTypeEnum.failBranch)
+      return t('workflow.nodes.common.errorHandle.failBranch.inLog')
+
+    if (type === ErrorHandleTypeEnum.defaultValue)
+      return t('workflow.nodes.common.errorHandle.defaultValue.inLog')
+  }, [])
+
+  if (!type)
+    return null
+
   return (
     <div
       className='relative flex p-2 pr-[52px] rounded-lg border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-xs'
     >
       <div
-        className='absolute inset-0 opacity-40'
+        className='absolute inset-0 opacity-40 rounded-lg'
         style={{
           background: 'linear-gradient(92deg, rgba(247, 144, 9, 0.25) 0%, rgba(255, 255, 255, 0.00) 100%)',
         }}

diff --git a/web/app/components/workflow/run/node.tsx b/web/app/components/workflow/run/node.tsx
@@ -19,6 +19,7 @@ import CodeEditor from '@/app/components/workflow/nodes/_base/components/editor/
 import Button from '@/app/components/base/button'
 import { CodeLanguage } from '@/app/components/workflow/nodes/code/types'
 import type { IterationDurationMap, NodeTracing } from '@/types/workflow'
+import ErrorHandleTip from '@/app/components/workflow/nodes/_base/components/error-handle/error-handle-tip'
 
 type Props = {
   className?: string
@@ -215,6 +216,7 @@ const NodePanel: FC<Props> = ({
                   language={CodeLanguage.json}
                   value={nodeInfo.outputs}
                   isJSONStringifyBeauty
+                  tip={<ErrorHandleTip type={nodeInfo.execution_metadata?.error_strategy} />}
                 />
               </div>
             )}

diff --git a/web/app/components/workflow/run/status.tsx b/web/app/components/workflow/run/status.tsx
@@ -105,6 +105,10 @@ const StatusPanel: FC<ResultProps> = ({
         <>
           <div className='my-2 h-[0.5px] bg-divider-subtle'/>
           <div className='system-xs-regular text-text-destructive'>{error}</div>
+          <div className='my-2 h-[0.5px] bg-divider-subtle'/>
+          <div className='system-xs-regular text-text-destructive'>
+            {t('workflow.nodes.common.errorHandle.partialSucceeded.tip', { num: exceptionCounts })}
+          </div>
         </>
       )}
       {

diff --git a/web/types/workflow.ts b/web/types/workflow.ts
@@ -7,6 +7,7 @@ import type {
   Node,
 } from '@/app/components/workflow/types'
 import type { TransferMethod } from '@/types/app'
+import type { ErrorHandleTypeEnum } from '@/app/components/workflow/nodes/_base/components/error-handle/types'
 
 export type NodeTracing = {
   id: string
@@ -22,7 +23,7 @@ export type NodeTracing = {
   parallel_run_id?: string
   error?: string
   elapsed_time: number
-  execution_metadata: {
+  execution_metadata?: {
     total_tokens: number
     total_price: number
     currency: string
@@ -34,6 +35,7 @@ export type NodeTracing = {
     parent_parallel_start_node_id?: string
     parallel_mode_run_id?: string
     iteration_duration_map?: IterationDurationMap
+    error_strategy?: ErrorHandleTypeEnum
   }
   metadata: {
     iterator_length: number