Merge 0c79afd069 into bb33335dd4

api/core/app/app_config/entities.py

@@ -148,6 +148,8 @@ SupportedComparisonOperator = Literal[
     "is not",
     "empty",
     "not empty",
+    "in",
+    "not in",
     # for number
     "=",
     "≠",

api/core/rag/entities/metadata_entities.py

@@ -13,6 +13,8 @@ SupportedComparisonOperator = Literal[
     "is not",
     "empty",
     "not empty",
+    "in",
+    "not in",
     # for number
     "=",
     "≠",

api/core/workflow/nodes/knowledge_retrieval/entities.py

@@ -74,6 +74,8 @@ SupportedComparisonOperator = Literal[
     "is not",
     "empty",
     "not empty",
+    "in",
+    "not in",
     # for number
     "=",
     "≠",

api/core/workflow/nodes/knowledge_retrieval/knowledge_retrieval_node.py

@@ -603,6 +603,18 @@ class KnowledgeRetrievalNode(BaseNode):
                         **{key: metadata_name, key_value: f"%{value}"}
                     )
                 )
+            case "in":
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} = any(string_to_array(:{key_value},',')")).params(
+                        **{key: metadata_name, key_value: f"{value}"}
+                    )
+                )
+            case "not in":
+                filters.append(
+                    (text(f"documents.doc_metadata ->> :{key} != all(string_to_array(:{key_value},',')")).params(
+                        **{key: metadata_name, key_value: f"{value}"}
+                    )
+                )
             case "=" | "is":
                 if isinstance(value, str):
                     filters.append(Document.doc_metadata[metadata_name] == f'"{value}"')

web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/utils.ts

@@ -32,6 +32,8 @@ export const getOperators = (type?: MetadataFilteringVariableType) => {
         ComparisonOperator.endWith,
         ComparisonOperator.empty,
         ComparisonOperator.notEmpty,
+        ComparisonOperator.in,
+        ComparisonOperator.notIn,
       ]
     case MetadataFilteringVariableType.number:
       return [

web/i18n/zh-Hans/workflow.ts

@@ -592,8 +592,8 @@ const translation = {
         'not empty': '不为空',
         'null': '空',
         'not null': '不为空',
-        'in': '是',
-        'not in': '不是',
+        'in': '在',
+        'not in': '不在',
         'all of': '全部是',
         'exists': '存在',
         'not exists': '不存在',