Skip to content

Fixed GH-3577, Fixed the error in the PgVectorFilterExpressionConverter when parsing expressions. #3580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixed GH-3577, Fixed the error in the PgVectorFilterExpressionConverter when parsing expressions. #3580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 20 additions & 12 deletions ...n/java/org/springframework/ai/vectorstore/pgvector/PgVectorFilterExpressionConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}

Expand Down Expand Up @@ -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:
Expand Down
12 changes: 12 additions & 0 deletions ...a/org/springframework/ai/vectorstore/pgvector/PgVectorFilterExpressionConverterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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\")");
}

}
Loading