Removed automatic args prefixing

Author: htemelski-redis

search_commands.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strconv"
-	"strings"
 
 	"github.com/redis/go-redis/v9/internal"
 	"github.com/redis/go-redis/v9/internal/proto"
@@ -2592,13 +2591,7 @@ func (c cmdable) FTHybridWithArgs(ctx context.Context, index string, options *FT
 		if len(options.Load) > 0 {
 			args = append(args, "LOAD", len(options.Load))
 			for _, field := range options.Load {
-				// Redis requires field names in LOAD to be prefixed with '@' (or '$' for JSON paths).
-				if strings.HasPrefix(field, "@") || strings.HasPrefix(field, "&") {
-					args = append(args, field)
-					continue
-				}
-				// If the field doesn't have a preffix, asume its a string and add '@'
-				args = append(args, "@"+field)
+				args = append(args, field)
 			}
 		}
 
@@ -2623,12 +2616,7 @@ func (c cmdable) FTHybridWithArgs(ctx context.Context, index string, options *FT
 		if len(options.SortBy) > 0 {
 			sortByOptions := []interface{}{}
 			for _, sortBy := range options.SortBy {
-				// Redis requires field names in SORTBY to be prefixed with '@' (or '$' for JSON paths)
-				fieldName := sortBy.FieldName
-				if fieldName != "" && fieldName[0] != '@' && fieldName[0] != '$' {
-					fieldName = "@" + fieldName
-				}
-				sortByOptions = append(sortByOptions, fieldName)
+				sortByOptions = append(sortByOptions, sortBy.FieldName)
 				if sortBy.Asc && sortBy.Desc {
 					cmd := newFTHybridCmd(ctx, options, args...)
 					cmd.SetErr(fmt.Errorf("FT.HYBRID: ASC and DESC are mutually exclusive"))

search_test.go

@@ -3429,7 +3429,7 @@ var _ = Describe("FT.HYBRID Commands", func() {
 					VectorData:  &redis.VectorFP32{Val: encodeFloat32Vector([]float32{1, 2, 2, 3})},
 				},
 			},
-			Load:        []string{"description", "color", "price", "size", "__score"},
+			Load:        []string{"@description", "@color", "@price", "@size", "@__score"},
 			LimitOffset: 0,
 			Limit:       3,
 		}
@@ -3463,7 +3463,7 @@ var _ = Describe("FT.HYBRID Commands", func() {
 					Filter:      "@price:[15 16] @size:[10 11]",
 				},
 			},
-			Load: []string{"description", "color", "price", "size", "__score"},
+			Load: []string{"@description", "@color", "@price", "@size", "@__score"},
 		}
 
 		cmd := client.FTHybridWithArgs(ctx, "hybrid_idx", options)
@@ -3614,7 +3614,7 @@ var _ = Describe("FT.HYBRID Commands", func() {
 					VectorData:  &redis.VectorFP32{Val: encodeFloat32Vector([]float32{1, 2, 7, 6})},
 				},
 			},
-			Load: []string{"description", "color", "price", "size", "__score"},
+			Load: []string{"@description", "@color", "@price", "@size", "@__score"},
 			Apply: []redis.FTHybridApply{
 				{
 					Expression: "@price - (@price * 0.1)",
@@ -3680,16 +3680,16 @@ var _ = Describe("FT.HYBRID Commands", func() {
 					VectorData:  &redis.VectorFP32{Val: encodeFloat32Vector([]float32{1, 2, 7, 6})},
 				},
 			},
-			Load: []string{"color", "price"},
+			Load: []string{"@color", "@price"},
 			Apply: []redis.FTHybridApply{
 				{
 					Expression: "@price - (@price * 0.1)",
 					AsField:    "price_discount",
 				},
 			},
 			SortBy: []redis.FTSearchSortBy{
-				{FieldName: "price_discount", Desc: true},
-				{FieldName: "color", Asc: true},
+				{FieldName: "@price_discount", Desc: true},
+				{FieldName: "@color", Asc: true},
 			},
 			LimitOffset: 0,
 			Limit:       5,