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

langgenius · Dec 5, 2024 · 946375c · 946375c
2 parents 8517b62 + ec507a1
commit 946375c
Show file tree

Hide file tree

Showing 15 changed files with 36 additions and 22 deletions.
diff --git a/api/commands.py b/api/commands.py
@@ -259,15 +259,15 @@ def migrate_knowledge_vector_database():
     skipped_count = 0
     total_count = 0
     vector_type = dify_config.VECTOR_STORE
-    upper_colletion_vector_types = {
+    upper_collection_vector_types = {
         VectorType.MILVUS,
         VectorType.PGVECTOR,
         VectorType.RELYT,
         VectorType.WEAVIATE,
         VectorType.ORACLE,
         VectorType.ELASTICSEARCH,
     }
-    lower_colletion_vector_types = {
+    lower_collection_vector_types = {
         VectorType.ANALYTICDB,
         VectorType.CHROMA,
         VectorType.MYSCALE,
@@ -307,7 +307,7 @@ def migrate_knowledge_vector_database():
                         continue
                 collection_name = ""
                 dataset_id = dataset.id
-                if vector_type in upper_colletion_vector_types:
+                if vector_type in upper_collection_vector_types:
                     collection_name = Dataset.gen_collection_name_by_id(dataset_id)
                 elif vector_type == VectorType.QDRANT:
                     if dataset.collection_binding_id:
@@ -323,7 +323,7 @@ def migrate_knowledge_vector_database():
                     else:
                         collection_name = Dataset.gen_collection_name_by_id(dataset_id)
 
-                elif vector_type in lower_colletion_vector_types:
+                elif vector_type in lower_collection_vector_types:
                     collection_name = Dataset.gen_collection_name_by_id(dataset_id).lower()
                 else:
                     raise ValueError(f"Vector store {vector_type} is not supported.")

diff --git a/api/core/app/apps/README.md b/api/core/app/apps/README.md
@@ -2,7 +2,7 @@
 
 Due to the presence of tasks in App Runner that require long execution times, such as LLM generation and external requests, Flask-Sqlalchemy's strategy for database connection pooling is to allocate one connection (transaction) per request. This approach keeps a connection occupied even during non-DB tasks, leading to the inability to acquire new connections during high concurrency requests due to multiple long-running tasks.
 
-Therefore, the database operations in App Runner and Task Pipeline must ensure connections are closed immediately after use, and it's better to pass IDs rather than Model objects to avoid deattach errors.
+Therefore, the database operations in App Runner and Task Pipeline must ensure connections are closed immediately after use, and it's better to pass IDs rather than Model objects to avoid detach errors.
 
 Examples:
 

diff --git a/api/core/model_runtime/docs/zh_Hans/interfaces.md b/api/core/model_runtime/docs/zh_Hans/interfaces.md
@@ -91,7 +91,7 @@ class XinferenceProvider(Provider):
       """
   ```
 
-  也可以直接抛出对应Erros，并做如下定义，这样在之后的调用中可以直接抛出`InvokeConnectionError`等异常。
+  也可以直接抛出对应 Errors，并做如下定义，这样在之后的调用中可以直接抛出`InvokeConnectionError`等异常。
 
     ```python
     @property

diff --git a/api/core/model_runtime/model_providers/bedrock/rerank/_position.yaml b/api/core/model_runtime/model_providers/bedrock/rerank/_position.yaml
@@ -1,2 +1,2 @@
 - amazon.rerank-v1
-- cohere.rerank-v3-5:0
+- cohere.rerank-v3-5
diff --git a/...rs/bedrock/rerank/amazon.rerank-v1:0.yaml → ...ders/bedrock/rerank/amazon.rerank-v1.yaml b/...rs/bedrock/rerank/amazon.rerank-v1:0.yaml → ...ders/bedrock/rerank/amazon.rerank-v1.yaml
diff --git a/.../bedrock/rerank/cohere.rerank-v3-5:0.yaml → ...rs/bedrock/rerank/cohere.rerank-v3-5.yaml b/.../bedrock/rerank/cohere.rerank-v3-5:0.yaml → ...rs/bedrock/rerank/cohere.rerank-v3-5.yaml
diff --git a/api/core/tools/provider/builtin/wolframalpha/tools/wolframalpha.py b/api/core/tools/provider/builtin/wolframalpha/tools/wolframalpha.py
@@ -61,7 +61,7 @@ def _invoke(
                 params["input"] = query
             else:
                 finished = True
-                if "souces" in response_data["queryresult"]:
+                if "sources" in response_data["queryresult"]:
                     return self.create_link_message(response_data["queryresult"]["sources"]["url"])
                 elif "pods" in response_data["queryresult"]:
                     result = response_data["queryresult"]["pods"][0]["subpods"][0]["plaintext"]

diff --git a/api/core/workflow/nodes/if_else/if_else_node.py b/api/core/workflow/nodes/if_else/if_else_node.py
@@ -24,7 +24,7 @@ def _run(self) -> NodeRunResult:
         """
         node_inputs: dict[str, list] = {"conditions": []}
 
-        process_datas: dict[str, list] = {"condition_results": []}
+        process_data: dict[str, list] = {"condition_results": []}
 
         input_conditions = []
         final_result = False
@@ -40,7 +40,7 @@ def _run(self) -> NodeRunResult:
                         operator=case.logical_operator,
                     )
 
-                    process_datas["condition_results"].append(
+                    process_data["condition_results"].append(
                         {
                             "group": case.model_dump(),
                             "results": group_result,
@@ -65,23 +65,23 @@ def _run(self) -> NodeRunResult:
 
                 selected_case_id = "true" if final_result else "false"
 
-                process_datas["condition_results"].append(
+                process_data["condition_results"].append(
                     {"group": "default", "results": group_result, "final_result": final_result}
                 )
 
             node_inputs["conditions"] = input_conditions
 
         except Exception as e:
             return NodeRunResult(
-                status=WorkflowNodeExecutionStatus.FAILED, inputs=node_inputs, process_data=process_datas, error=str(e)
+                status=WorkflowNodeExecutionStatus.FAILED, inputs=node_inputs, process_data=process_data, error=str(e)
             )
 
         outputs = {"result": final_result, "selected_case_id": selected_case_id}
 
         data = NodeRunResult(
             status=WorkflowNodeExecutionStatus.SUCCEEDED,
             inputs=node_inputs,
-            process_data=process_datas,
+            process_data=process_data,
             edge_source_handle=selected_case_id or "false",  # Use case ID or 'default'
             outputs=outputs,
         )

diff --git a/api/core/workflow/nodes/variable_assigner/v2/exc.py b/api/core/workflow/nodes/variable_assigner/v2/exc.py
@@ -7,8 +7,8 @@
 
 
 class OperationNotSupportedError(VariableOperatorNodeError):
-    def __init__(self, *, operation: Operation, varialbe_type: str):
-        super().__init__(f"Operation {operation} is not supported for type {varialbe_type}")
+    def __init__(self, *, operation: Operation, variable_type: str):
+        super().__init__(f"Operation {operation} is not supported for type {variable_type}")
 
 
 class InputTypeNotSupportedError(VariableOperatorNodeError):

diff --git a/api/core/workflow/nodes/variable_assigner/v2/node.py b/api/core/workflow/nodes/variable_assigner/v2/node.py
@@ -45,7 +45,7 @@ def _run(self) -> NodeRunResult:
 
                 # Check if operation is supported
                 if not helpers.is_operation_supported(variable_type=variable.value_type, operation=item.operation):
-                    raise OperationNotSupportedError(operation=item.operation, varialbe_type=variable.value_type)
+                    raise OperationNotSupportedError(operation=item.operation, variable_type=variable.value_type)
 
                 # Check if variable input is supported
                 if item.input_type == InputType.VARIABLE and not helpers.is_variable_input_supported(
@@ -156,4 +156,4 @@ def _handle_item(
             case Operation.DIVIDE:
                 return variable.value / value
             case _:
-                raise OperationNotSupportedError(operation=operation, varialbe_type=variable.value_type)
+                raise OperationNotSupportedError(operation=operation, variable_type=variable.value_type)
diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-on-panel.tsx b/web/app/components/workflow/nodes/_base/components/error-handle/error-handle-on-panel.tsx
@@ -15,6 +15,7 @@ import type {
   Node,
 } from '@/app/components/workflow/types'
 import Split from '@/app/components/workflow/nodes/_base/components/split'
+import Tooltip from '@/app/components/base/tooltip'
 
 type ErrorHandleProps = Pick<Node, 'id' | 'data'>
 const ErrorHandle = ({
@@ -27,7 +28,7 @@ const ErrorHandle = ({
     collapsed,
     setCollapsed,
     handleErrorHandleTypeChange,
-  } = useErrorHandle(id)
+  } = useErrorHandle(id, data)
   const { handleFormChange } = useDefaultValue(id)
 
   const getHandleErrorHandleTypeChange = useCallback((data: CommonNodeType) => {
@@ -52,8 +53,11 @@ const ErrorHandle = ({
           onCollapse={setCollapsed}
           trigger={
             <div className='grow flex items-center justify-between pr-4'>
-              <div className='system-sm-semibold-uppercase text-text-secondary'>
-                {t('workflow.nodes.common.errorHandle.title')}
+              <div className='flex items-center'>
+                <div className='mr-0.5 system-sm-semibold-uppercase text-text-secondary'>
+                  {t('workflow.nodes.common.errorHandle.title')}
+                </div>
+                <Tooltip popupContent={t('workflow.nodes.common.errorHandle.tip')} />
               </div>
               <ErrorHandleTypeSelector
                 value={error_strategy || ErrorHandleTypeEnum.none}

diff --git a/web/app/components/workflow/nodes/_base/components/error-handle/hooks.ts b/web/app/components/workflow/nodes/_base/components/error-handle/hooks.ts
@@ -1,5 +1,6 @@
 import {
   useCallback,
+  useMemo,
   useState,
 } from 'react'
 import { ErrorHandleTypeEnum } from './types'
@@ -62,8 +63,15 @@ export const useDefaultValue = (
 
 export const useErrorHandle = (
   id: string,
+  data: CommonNodeType,
 ) => {
-  const [collapsed, setCollapsed] = useState(true)
+  const initCollapsed = useMemo(() => {
+    if (data.error_strategy === ErrorHandleTypeEnum.none)
+      return true
+
+    return false
+  }, [data.error_strategy])
+  const [collapsed, setCollapsed] = useState(initCollapsed)
   const { handleNodeDataUpdateWithSyncDraft } = useNodeDataUpdate()
   const { handleEdgeDeleteByDeleteBranch } = useEdgesInteractions()
 

diff --git a/web/app/components/workflow/nodes/variable-assigner/components/node-variable-item.tsx b/web/app/components/workflow/nodes/variable-assigner/components/node-variable-item.tsx
@@ -33,7 +33,7 @@ const NodeVariableItem = ({
   const { t } = useTranslation()
   return (
     <div className={cn(
-      'relative flex items-center p-[3px] pl-[5px] gap-1 self-stretch rounded-md bg-workflow-block-param-bg',
+      'relative flex items-center p-[3px] pl-[5px] gap-1 self-stretch rounded-md bg-workflow-block-parma-bg',
       showBorder && '!bg-black/[0.02]',
       className,
     )}>

diff --git a/web/i18n/en-US/workflow.ts b/web/i18n/en-US/workflow.ts
@@ -305,6 +305,7 @@ const translation = {
       },
       errorHandle: {
         title: 'Error Handling',
+        tip: 'Exception handling strategy, triggered when a node encounters an exception.',
         none: {
           title: 'None',
           desc: 'The node will stop running if an exception occurs and is not handled',

diff --git a/web/i18n/zh-Hans/workflow.ts b/web/i18n/zh-Hans/workflow.ts
@@ -305,6 +305,7 @@ const translation = {
       },
       errorHandle: {
         title: '异常处理',
+        tip: '配置异常处理策略，当节点发生异常时触发。',
         none: {
           title: '无',
           desc: '当发生异常且未处理时，节点将停止运行',