Fix escaping issue in filterExpression for RedisVectorStore file name filtering

Author: kmw10693

spring-ai-vector-store/src/main/java/org/springframework/ai/vectorstore/SearchRequest.java

@@ -17,15 +17,14 @@
 package org.springframework.ai.vectorstore;
 
 import java.util.Objects;
+import java.util.Map;
 
 import org.springframework.ai.document.Document;
 import org.springframework.ai.vectorstore.filter.Filter;
 import org.springframework.ai.vectorstore.filter.FilterExpressionBuilder;
 import org.springframework.ai.vectorstore.filter.FilterExpressionTextParser;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
 
 /**
  * Similarity search request. Use the {@link SearchRequest#builder()} to create the
@@ -61,6 +60,8 @@ public class SearchRequest {
 	@Nullable
 	private Filter.Expression filterExpression;
 
+	private static final Map<Character, String> ESCAPE_TEXT = Map.of('\\', "\\\\", '.', "\\.");
+
 	/**
 	 * Copy an existing {@link SearchRequest.Builder} instance.
 	 * @param originalSearchRequest {@link SearchRequest} instance to copy.
@@ -193,7 +194,7 @@ public Builder similarityThresholdAll() {
 		/**
 		 * Retrieves documents by query embedding similarity and matching the filters.
 		 * Value of 'null' means that no metadata filters will be applied to the search.
-		 *
+		 * <p>
 		 * For example if the {@link Document#getMetadata()} schema is:
 		 *
 		 * <pre>{@code
@@ -205,7 +206,7 @@ public Builder similarityThresholdAll() {
 		 * "isActive": <Boolean>
 		 * &#125;
 		 * }</pre>
-		 *
+		 * <p>
 		 * you can constrain the search result to only UK countries with isActive=true and
 		 * year equal or greater 2020. You can build this such metadata filter
 		 * programmatically like this:
@@ -217,10 +218,10 @@ public Builder similarityThresholdAll() {
 		 * 				new Expression(GTE, new Key("year"), new Value(2020)),
 		 * 				new Expression(EQ, new Key("isActive"), new Value(true))));
 		 * }</pre>
-		 *
+		 * <p>
 		 * The {@link Filter.Expression} is portable across all vector stores.<br/>
-		 *
-		 *
+		 * <p>
+		 * <p>
 		 * The {@link FilterExpressionBuilder} is a DSL creating expressions
 		 * programmatically:
 		 *
@@ -232,7 +233,7 @@ public Builder similarityThresholdAll() {
 		 * 			b.gte("year", 2020),
 		 * 			b.eq("isActive", true)));
 		 * }</pre>
-		 *
+		 * <p>
 		 * The {@link FilterExpressionTextParser} converts textual, SQL like filter
 		 * expression language into {@link Filter.Expression}:
 		 *
@@ -262,21 +263,21 @@ public Builder filterExpression(@Nullable Filter.Expression expression) {
 		 * "isActive": <Boolean>
 		 * &#125;
 		 * }</pre>
-		 *
+		 * <p>
 		 * then you can constrain the search result with metadata filter expressions like:
 		 *
 		 * <pre>{@code
 		 * country == 'UK' && year >= 2020 && isActive == true
 		 * Or
 		 * country == 'BG' && (city NOT IN ['Sofia', 'Plovdiv'] || price < 134.34)
 		 * }</pre>
-		 *
+		 * <p>
 		 * This ensures that the response contains only embeddings that match the
 		 * specified filer criteria. <br/>
-		 *
+		 * <p>
 		 * The declarative, SQL like, filter syntax is portable across all vector stores
 		 * supporting the filter search feature.<br/>
-		 *
+		 * <p>
 		 * The {@link FilterExpressionTextParser} is used to convert the text filter
 		 * expression into {@link Filter.Expression}.
 		 * @param textExpression declarative, portable, SQL like, metadata filter syntax.
@@ -290,14 +291,24 @@ public Builder filterExpression(@Nullable String textExpression) {
 		}
 
 		private String escapeTextExpression(String expression) {
-			Pattern pattern = Pattern.compile("'([^']*)'");
-			Matcher matcher = pattern.matcher(expression);
-			StringBuffer sb = new StringBuffer();
-			while (matcher.find()) {
-				String content = matcher.group(1).replace("\\", "\\\\").replace(".", "\\.");
-				matcher.appendReplacement(sb, "'" + content + "'");
+			StringBuilder sb = new StringBuilder(expression.length() + 8);
+			boolean inQuote = false;
+
+			for (int i = 0; i < expression.length(); i++) {
+				char ch = expression.charAt(i);
+
+				if (ch == '\'') {
+					inQuote = !inQuote;
+					sb.append(ch);
+				}
+				else if (inQuote) {
+					sb.append(ESCAPE_TEXT.getOrDefault(ch, String.valueOf(ch)));
+				}
+				else {
+					sb.append(ch);
+				}
 			}
-			matcher.appendTail(sb);
+
 			return sb.toString();
 		}