Add Cypher 25 SEARCH clause for vector retrievers#488
Open
oskarhane wants to merge 13 commits intoneo4j:mainfrom
Open
Add Cypher 25 SEARCH clause for vector retrievers#488oskarhane wants to merge 13 commits intoneo4j:mainfrom
oskarhane wants to merge 13 commits intoneo4j:mainfrom
Conversation
… detection + supports_search_clause Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…ication for SEARCH-compatible predicates Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…query builder Add _build_search_clause_vector_query() to neo4j_queries.py generating MATCH...SEARCH...SCORE Cypher with optional WHERE from FilterClassification. 8 unit tests covering no-filter, with-predicates, escaping, clause ordering. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…perties to create_vector_index Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…lause routing into vector retrievers VectorRetriever and VectorCypherRetriever now detect Neo4j 2026.01+ and route to SEARCH clause query builder when filters are compatible (or absent). Falls back to procedure path on older versions or incompatible filters with warning log. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…lause into hybrid retrievers
Add SEARCH clause routing to HybridRetriever and HybridCypherRetriever.
Uses SEARCH for both vector and fulltext via CALL () { UNION } on 2026.01+.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…ker-compose for e2e tests Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
… tests for SEARCH clause Add 23 tests covering hybrid SEARCH query builders + routing logic for all 4 retrievers (SEARCH path vs procedure path). 940 tests pass, 95% coverage. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…TH clause order Add 6 E2E tests for SEARCH clause vector search against Neo4j 2026.02. Fix create_vector_index: WITH clause must come before OPTIONS in Neo4j 2026. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…ause + filterable properties Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- Hybrid SEARCH clause now uses VECTOR INDEX for vector + procedure for fulltext (SEARCH doesn't support FULLTEXT INDEX) - Vector retrievers catch PropertyNotFound and fall back to procedure when filtered properties aren't declared as filterable on the index - CI matrix: test on both neo4j:5-enterprise and neo4j:latest (2026.x) - SEARCH clause e2e tests marked with @pytest.mark.search_clause Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
SEARCH ... WHEREclause for in-index filtered ANN searchfilterable_propertiesparam tocreate_vector_index()forWITH [n.prop]clauseCloses #485
Test plan
🤖 Generated with Claude Code