Bennett/null filters (#13)

Author: bamo

filter.go

@@ -44,6 +44,9 @@ func (bf *BaseFilter) tpuf_SerializeFilter() interface{} {
 }
 
 func (f *BaseFilter) MarshalJSON() ([]byte, error) {
+	if f == nil {
+		return []byte("null"), nil
+	}
 	return json.Marshal(f.tpuf_SerializeFilter())
 }
 
@@ -55,15 +58,21 @@ type AndFilter struct {
 func (af *AndFilter) tpuf_SerializeFilter() interface{} {
 	serialized := make([]interface{}, 2)
 	serialized[0] = "And"
-	subFilters := make([]interface{}, len(af.Filters))
-	for i, filter := range af.Filters {
-		subFilters[i] = filter.tpuf_SerializeFilter()
+	subFilters := make([]interface{}, 0, len(af.Filters))
+	for _, filter := range af.Filters {
+		if filter == nil {
+			continue
+		}
+		subFilters = append(subFilters, filter.tpuf_SerializeFilter())
 	}
 	serialized[1] = subFilters
 	return serialized
 }
 
 func (f *AndFilter) MarshalJSON() ([]byte, error) {
+	if f == nil {
+		return []byte("null"), nil
+	}
 	return json.Marshal(f.tpuf_SerializeFilter())
 }
 
@@ -75,14 +84,20 @@ type OrFilter struct {
 func (of *OrFilter) tpuf_SerializeFilter() interface{} {
 	serialized := make([]interface{}, 2)
 	serialized[0] = "Or"
-	subFilters := make([]interface{}, len(of.Filters))
-	for i, filter := range of.Filters {
-		subFilters[i] = filter.tpuf_SerializeFilter()
+	subFilters := make([]interface{}, 0, len(of.Filters))
+	for _, filter := range of.Filters {
+		if filter == nil {
+			continue
+		}
+		subFilters = append(subFilters, filter.tpuf_SerializeFilter())
 	}
 	serialized[1] = subFilters
 	return serialized
 }
 
 func (f *OrFilter) MarshalJSON() ([]byte, error) {
+	if f == nil {
+		return []byte("null"), nil
+	}
 	return json.Marshal(f.tpuf_SerializeFilter())
 }

filter_test.go

@@ -105,6 +105,25 @@ func TestMarshalFilter(t *testing.T) {
 			},
 			expected: `["And",[["id","In",[1,2,3]],["key1","Eq","one"],["filename","NotGlob","/vendor/**"],["Or",[["filename","Glob","**.tsx"],["filename","Glob","**.js"]]]]]`,
 		},
+		{
+			name: "And filter with nil subfilter",
+			filter: &tpuf.AndFilter{
+				Filters: []tpuf.Filter{
+					&tpuf.BaseFilter{
+						Attribute: "attr1",
+						Operator:  tpuf.OpEq,
+						Value:     "value1",
+					},
+					nil,
+					&tpuf.BaseFilter{
+						Attribute: "attr2",
+						Operator:  tpuf.OpGt,
+						Value:     10,
+					},
+				},
+			},
+			expected: `["And",[["attr1","Eq","value1"],["attr2","Gt",10]]]`,
+		},
 	}
 
 	for _, tt := range tests {

query_test.go

@@ -99,6 +99,28 @@ func TestQuery(t *testing.T) {
 				{ID: "2", Dist: 0},
 			},
 		},
+		{
+			name:      "nil filter",
+			namespace: "test-namespace",
+			request: &tpuf.QueryRequest{
+				Filters: nil,
+				TopK:    2,
+			},
+			httpResponse: &http.Response{
+				StatusCode: http.StatusOK,
+				Body: io.NopCloser(bytes.NewBufferString(`[
+					{"id":"1","dist":0},
+					{"id":"2","dist":0}
+				]`)),
+			},
+			expectedMethod: http.MethodPost,
+			expectedURL:    "https://api.turbopuffer.com/v1/vectors/test-namespace/query",
+			expectedBody:   `{"top_k":2}`,
+			expectedResult: []*tpuf.QueryResult{
+				{ID: "1", Dist: 0},
+				{ID: "2", Dist: 0},
+			},
+		},
 		{
 			name:      "query error",
 			namespace: "test-namespace",