Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions api/src/api/request/pipeline.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ function addFilter(query, filter) {
result.bool.filter.push(...filter);
} else if (result.neural) {
const boolFilter = { bool: { filter: filter } };
if (result.neural.filter) {
boolFilter.bool.filter.push(result.neural.filter);
}
const neuralField = Object.keys(result.neural)[0];
if (result.neural[neuralField].filter) {
boolFilter.bool.filter.push(result.neural[neuralField].filter);
}
result.neural[neuralField].filter = boolFilter;
} else if (result.hybrid) {
result.hybrid.queries = result.hybrid.queries.map((subQuery) =>
Expand Down
51 changes: 51 additions & 0 deletions api/test/unit/api/request/pipeline.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,57 @@ describe("RequestPipeline", () => {
});
});

describe("neural", () => {
it("applies the filter to a neural query", () => {
event.userToken = new ApiToken();
requestBody.query = {
neural: {
embedding: {
query_text:
"Do you have any materials related to testing the request pipeline?",
model_id: "MODEL_ID",
k: 5,
},
},
};
pipeline = new RequestPipeline(requestBody);
const result = pipeline.authFilter(event);
expect(result.searchContext.size).to.eq(50);
expect(result.searchContext.query.neural.embedding).to.deep.include(
requestBody.query.neural.embedding
);
expect(
result.searchContext.query.neural.embedding.filter.bool.filter.length
).to.eq(2);
});

it("adds to an existing neural query filter", () => {
event.userToken = new ApiToken();
requestBody.query = {
neural: {
embedding: {
filter: {
term: { "visibility.keyword": "Public" },
},
query_text:
"Do you have any materials related to testing the request pipeline?",
model_id: "MODEL_ID",
k: 5,
},
},
};
pipeline = new RequestPipeline(requestBody);
const result = pipeline.authFilter(event);
expect(result.searchContext.size).to.eq(50);
expect(result.searchContext.query.neural.embedding).to.deep.include(
requestBody.query.neural.embedding
);
expect(
result.searchContext.query.neural.embedding.filter.bool.filter.length
).to.eq(3);
});
});

describe("hybrid", () => {
it("applies the filter to all subqueries", () => {
event.userToken = new ApiToken();
Expand Down
Loading