AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-07-31 23:42:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: support select-type variables in Metadata Filtering (#17440 (#17445)

Browse Source
This commit is contained in:
Marcelo Díaz 2025-04-07 23:15:07 -04:00 committed by GitHub
parent 7b7ac7a495
commit d796fcc0e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/app/components/app/configuration/dataset-config/index.tsx
View File

@ -270,7 +270,7 @@ const DatasetConfig: FC = () => {
handleMetadataModelChange={handleMetadataModelChange} handleMetadataModelChange={handleMetadataModelChange}
handleMetadataCompletionParamsChange={handleMetadataCompletionParamsChange} handleMetadataCompletionParamsChange={handleMetadataCompletionParamsChange}
isCommonVariable isCommonVariable
availableCommonStringVars={promptVariablesToSelect.filter(item => item.type === MetadataFilteringVariableType.string)} availableCommonStringVars={promptVariablesToSelect.filter(item => item.type === MetadataFilteringVariableType.string || item.type === MetadataFilteringVariableType.select)}
availableCommonNumberVars={promptVariablesToSelect.filter(item => item.type === MetadataFilteringVariableType.number)} availableCommonNumberVars={promptVariablesToSelect.filter(item => item.type === MetadataFilteringVariableType.number)}
/> />
</div> </div>

8
web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/condition-list/condition-item.tsx
View File

@ -77,7 +77,9 @@ const ConditionItem = ({
const valueAndValueMethod = useMemo(() => { const valueAndValueMethod = useMemo(() => {
if ( if (
(currentMetadata?.type === MetadataFilteringVariableType.string || currentMetadata?.type === MetadataFilteringVariableType.number) (currentMetadata?.type === MetadataFilteringVariableType.string
|| currentMetadata?.type === MetadataFilteringVariableType.number
|| currentMetadata?.type === MetadataFilteringVariableType.select)
&& typeof condition.value === 'string' && typeof condition.value === 'string'
) { ) {
const regex = isCommonVariable ? COMMON_VARIABLE_REGEX : VARIABLE_REGEX const regex = isCommonVariable ? COMMON_VARIABLE_REGEX : VARIABLE_REGEX
@ -140,7 +142,9 @@ const ConditionItem = ({
</div> </div>
<div className='border-t border-t-divider-subtle'> <div className='border-t border-t-divider-subtle'>
{ {
!comparisonOperatorNotRequireValue(condition.comparison_operator) && currentMetadata?.type === MetadataFilteringVariableType.string && ( !comparisonOperatorNotRequireValue(condition.comparison_operator)
&& (currentMetadata?.type === MetadataFilteringVariableType.string
|| currentMetadata?.type === MetadataFilteringVariableType.select) && (
<ConditionString <ConditionString
valueMethod={localValueMethod} valueMethod={localValueMethod}
onValueMethodChange={handleValueMethodChange} onValueMethodChange={handleValueMethodChange}

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

@ -22,6 +22,7 @@ export const isComparisonOperatorNeedTranslate = (operator?: ComparisonOperator)
export const getOperators = (type?: MetadataFilteringVariableType) => { export const getOperators = (type?: MetadataFilteringVariableType) => {
switch (type) { switch (type) {
case MetadataFilteringVariableType.string: case MetadataFilteringVariableType.string:
case MetadataFilteringVariableType.select:
return [ return [
ComparisonOperator.is, ComparisonOperator.is,
ComparisonOperator.isNot, ComparisonOperator.isNot,

2
web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/metadata-icon.tsx
View File

@ -18,7 +18,7 @@ const MetadataIcon = ({
return ( return (
<> <>
{ {
type === MetadataFilteringVariableType.string && ( (type === MetadataFilteringVariableType.string || type === MetadataFilteringVariableType.select) && (
<RiTextSnippet className={cn('h-3.5 w-3.5', className)} /> <RiTextSnippet className={cn('h-3.5 w-3.5', className)} />
) )
} }

1
web/app/components/workflow/nodes/knowledge-retrieval/types.ts
View File

@ -80,6 +80,7 @@ export enum MetadataFilteringVariableType {
string = 'string', string = 'string',
number = 'number', number = 'number',
time = 'time', time = 'time',
select = 'select',
} }
export type MetadataFilteringCondition = { export type MetadataFilteringCondition = {