Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Align agent view filter validation with rendered and rollup values https://github.com/siyuan-note/siyuan/issues/20206

Daniel2b02f86fde35
diff --git a/kernel/mcp/tools/database_view.go b/kernel/mcp/tools/database_view.go
index 6dcada8856..bc36f2fceb 100644
--- a/kernel/mcp/tools/database_view.go
+++ b/kernel/mcp/tools/database_view.go
@@ -201,7 +201,7 @@ func databaseValidateViewFilterNode(attrView *av.AttributeView, filter *av.ViewF
if "" == strings.TrimSpace(key.RenderTemplate) {
return fmt.Errorf("rendered filtering requires a display template: %s", filter.Column)
}
- filterType = av.KeyTypeText
+ filterType = av.KeyTypeTemplate
}
if !databaseFilterOperatorAllowed(filterType, filter.Operator) {
return fmt.Errorf("operator %q is not supported for field %s", filter.Operator, filter.Column)
@@ -211,11 +211,17 @@ func databaseValidateViewFilterNode(attrView *av.AttributeView, filter *av.ViewF
return fmt.Errorf("filter value is required for field %s", filter.Column)
}
if nil != filter.Value && filter.Value.Type != "" && filter.Value.Type != key.Type &&
- !(filter.ValueSource == av.ValueSourceRendered && filter.Value.Type == av.KeyTypeText) {
+ !(filter.ValueSource == av.ValueSourceRendered &&
+ (filter.Value.Type == av.KeyTypeTemplate || filter.Value.Type == av.KeyTypeText)) {
return fmt.Errorf("filter value type does not match field %s", filter.Column)
}
+ dateType := key.Type
+ if dateType == av.KeyTypeRollup && nil != filter.Value && nil != filter.Value.Rollup &&
+ 0 < len(filter.Value.Rollup.Contents) && nil != filter.Value.Rollup.Contents[0] {
+ dateType = filter.Value.Rollup.Contents[0].Type
+ }
if (nil != filter.RelativeDate || nil != filter.RelativeDate2 || filter.DateEndpoint != "") &&
- key.Type != av.KeyTypeDate && key.Type != av.KeyTypeCreated && key.Type != av.KeyTypeUpdated {
+ dateType != av.KeyTypeDate && dateType != av.KeyTypeCreated && dateType != av.KeyTypeUpdated {
return fmt.Errorf("date options require a date field: %s", filter.Column)
}
if filter.DateEndpoint != "" && filter.DateEndpoint != av.DateEndpointStart && filter.DateEndpoint != av.DateEndpointEnd {
diff --git a/kernel/mcp/tools/database_view_test.go b/kernel/mcp/tools/database_view_test.go
index 536f40804e..1ccc88c7be 100644
--- a/kernel/mcp/tools/database_view_test.go
+++ b/kernel/mcp/tools/database_view_test.go
@@ -42,8 +42,10 @@ func TestDatabaseViewActionsAndArguments(t *testing.T) {
func TestDatabaseViewConfigurationValidation(t *testing.T) {
attrView := &av.AttributeView{KeyValues: []*av.KeyValues{
{Key: &av.Key{ID: "text", Type: av.KeyTypeText}},
+ {Key: &av.Key{ID: "rendered", Type: av.KeyTypeNumber, RenderTemplate: "{{.Number}}"}},
{Key: &av.Key{ID: "checkbox", Type: av.KeyTypeCheckbox}},
{Key: &av.Key{ID: "date", Type: av.KeyTypeDate}},
+ {Key: &av.Key{ID: "rollup", Type: av.KeyTypeRollup}},
{Key: &av.Key{ID: "select", Type: av.KeyTypeSelect}},
}}
valid := []*av.ViewFilter{{Combination: av.FilterCombinationAnd, Filters: []*av.ViewFilter{
@@ -57,10 +59,29 @@ func TestDatabaseViewConfigurationValidation(t *testing.T) {
if err := databaseValidateViewFilters(attrView, valid); nil != err {
t.Fatalf("nested filter should be valid: %v", err)
}
+ for _, rendered := range []*av.ViewFilter{
+ {Column: "rendered", ValueSource: av.ValueSourceRendered, Operator: av.FilterOperatorIsGreater,
+ Value: &av.Value{Type: av.KeyTypeTemplate, Template: &av.ValueTemplate{Content: "100"}}},
+ {Column: "rendered", ValueSource: av.ValueSourceRendered, Operator: av.FilterOperatorIsLessOrEqual,
+ Value: &av.Value{Type: av.KeyTypeText, Text: &av.ValueText{Content: "100"}}},
+ } {
+ if err := databaseValidateViewFilters(attrView, []*av.ViewFilter{rendered}); nil != err {
+ t.Fatalf("rendered filter should match the frontend format: %v", err)
+ }
+ }
+ rollupDate := &av.ViewFilter{Column: "rollup", Operator: av.FilterOperatorIsBetween,
+ Value: &av.Value{Type: av.KeyTypeRollup, Rollup: &av.ValueRollup{Contents: []*av.Value{{Type: av.KeyTypeDate}}}},
+ RelativeDate: &av.RelativeDate{Count: 7, Unit: av.RelativeDateUnitDay, Direction: av.RelativeDateDirectionAfter}}
+ if err := databaseValidateViewFilters(attrView, []*av.ViewFilter{rollupDate}); nil != err {
+ t.Fatalf("date rollup should allow relative dates: %v", err)
+ }
for _, invalid := range []*av.ViewFilter{
{Column: "missing", Operator: av.FilterOperatorContains},
{Column: "text", Operator: av.FilterOperatorIsBetween},
{Column: "text", Operator: av.FilterOperatorContains, Value: &av.Value{Type: av.KeyTypeNumber}},
+ {Column: "rollup", Operator: av.FilterOperatorIsBetween,
+ Value: &av.Value{Type: av.KeyTypeRollup, Rollup: &av.ValueRollup{Contents: []*av.Value{{Type: av.KeyTypeNumber}}}},
+ RelativeDate: &av.RelativeDate{Count: 7, Unit: av.RelativeDateUnitDay, Direction: av.RelativeDateDirectionAfter}},
{Combination: "xor", Filters: valid},
} {
if err := databaseValidateViewFilters(attrView, []*av.ViewFilter{invalid}); nil == err {