fix: Fixed GH3577, Fixed the error in the PgVectorFilterExpressionConverter when parsing nested And and Or expressions, and added corresponding unit tests.

Signed-off-by: Sun Yuhan <[email protected]>

Author: sunyuhan1998

vector-stores/spring-ai-pgvector-store/src/main/java/org/springframework/ai/vectorstore/pgvector/PgVectorFilterExpressionConverter.java

@@ -25,26 +25,26 @@
 import org.springframework.ai.vectorstore.filter.converter.AbstractFilterExpressionConverter;
 
 /**
- * Converts {@link Expression} into PgVector metadata filter expression format.
- * (https://www.postgresql.org/docs/current/functions-json.html)
+ * Converts {@link Expression} into PgVector metadata filter expression format. (<a href=
+ * "https://www.postgresql.org/docs/current/functions-json.html">functions-json</a>)
  *
  * @author Muthukumaran Navaneethakrishnan
  * @author Christian Tzolov
+ * @author Sun Yuhan
  */
 public class PgVectorFilterExpressionConverter extends AbstractFilterExpressionConverter {
 
 	@Override
 	protected void doExpression(Expression expression, StringBuilder context) {
-		if (expression.type() == Filter.ExpressionType.IN) {
-			handleIn(expression, context);
-		}
-		else if (expression.type() == Filter.ExpressionType.NIN) {
-			handleNotIn(expression, context);
-		}
-		else {
-			this.convertOperand(expression.left(), context);
-			context.append(getOperationSymbol(expression));
-			this.convertOperand(expression.right(), context);
+		switch (expression.type()) {
+			case IN -> handleIn(expression, context);
+			case NIN -> handleNotIn(expression, context);
+			case AND, OR -> handleAndOr(expression, context);
+			default -> {
+				this.convertOperand(expression.left(), context);
+				context.append(getOperationSymbol(expression));
+				this.convertOperand(expression.right(), context);
+			}
 		}
 	}
 
@@ -77,6 +77,14 @@ private void handleNotIn(Expression expression, StringBuilder context) {
 		context.append(")");
 	}
 
+	private void handleAndOr(Expression expression, StringBuilder context) {
+		context.append("(");
+		this.convertOperand(expression.left(), context);
+		context.append(getOperationSymbol(expression));
+		this.convertOperand(expression.right(), context);
+		context.append(")");
+	}
+
 	private String getOperationSymbol(Expression exp) {
 		switch (exp.type()) {
 			case AND:

vector-stores/spring-ai-pgvector-store/src/test/java/org/springframework/ai/vectorstore/pgvector/PgVectorFilterExpressionConverterTests.java

@@ -119,4 +119,16 @@ public void testComplexIdentifiers() {
 		assertThat(vectorExpr).isEqualTo("$.\"country 1 2 3\" == \"BG\"");
 	}
 
+	@Test
+	public void testAndAndOrNesting() {
+		Expression eq1 = new Expression(EQ, new Key("id"), new Value("1"));
+		Expression eq2 = new Expression(EQ, new Key("id"), new Value("2"));
+		Expression eqTom = new Expression(EQ, new Key("name"), new Value("tom"));
+		Expression or = new Expression(OR, eq1, eq2);
+		Expression and = new Expression(AND, or, eqTom);
+
+		String vectorExpr = this.converter.convertExpression(and);
+		assertThat(vectorExpr).isEqualTo("(($.id == \"1\" || $.id == \"2\") && $.name == \"tom\")");
+	}
+
 }