Skip to content
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.

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

Aggregation updates #832

Open
wants to merge 45 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
6916910
Use features vector for kNN queries #5823
StepanBrychta Nov 14, 2024
b40f7d1
Update config and test documents #5823
StepanBrychta Nov 14, 2024
06d2198
Merge branch 'main' into Use-features-vector-for-kNN-queries
StepanBrychta Nov 18, 2024
afd15ec
JSON formatting changes #5823
StepanBrychta Nov 18, 2024
ed20650
Update expected responses #5823
StepanBrychta Nov 18, 2024
d9014ff
Refactor aggregation parser #5825
StepanBrychta Nov 20, 2024
6afef72
Apply auto-formatting rules
weco-bot Nov 20, 2024
2cfc7d5
Refactor aggregations #5825
StepanBrychta Nov 22, 2024
ed71af6
Apply auto-formatting rules
weco-bot Nov 22, 2024
dafa6c8
Bug fixes #5825
StepanBrychta Nov 22, 2024
faeb386
Update unit tests #5825
StepanBrychta Nov 25, 2024
f1f3aac
Merge branch 'main' into Aggregation-updates
StepanBrychta Nov 25, 2024
3d8fa13
Remove conflicted test documents #5825
StepanBrychta Nov 26, 2024
ad48316
Merge branch 'Use-features-vector-for-kNN-queries' into Aggregation-u…
StepanBrychta Nov 26, 2024
e7f763c
Add comments #5825
StepanBrychta Nov 26, 2024
4cd967e
Apply auto-formatting rules
weco-bot Nov 26, 2024
87bda29
Apply auto-formatting rules
weco-bot Nov 26, 2024
2997d30
Apply auto-formatting rules
weco-bot Nov 26, 2024
58e564c
Merge branch 'Aggregation-updates' of https://github.com/wellcomecoll…
StepanBrychta Nov 26, 2024
c12a980
Apply auto-formatting rules
weco-bot Nov 26, 2024
2557c3f
Merge branch 'Aggregation-updates' of https://github.com/wellcomecoll…
StepanBrychta Nov 26, 2024
498bbea
Merge branch 'Aggregation-updates' of https://github.com/wellcomecoll…
StepanBrychta Nov 26, 2024
ac98ec1
Apply auto-formatting rules
weco-bot Nov 26, 2024
77c4a52
Merge branch 'Aggregation-updates' of https://github.com/wellcomecoll…
StepanBrychta Nov 26, 2024
bbbe98c
Merge branch 'Aggregation-updates' of https://github.com/wellcomecoll…
StepanBrychta Nov 26, 2024
55afb4e
Explicitly set field type to 'nested' #5825
StepanBrychta Nov 26, 2024
f32eead
Aggregations refactoring #5825
StepanBrychta Nov 27, 2024
9eafe21
Apply auto-formatting rules
weco-bot Nov 27, 2024
63957de
Update tests #5825
StepanBrychta Nov 28, 2024
a01bc52
Apply auto-formatting rules
weco-bot Dec 2, 2024
b0ed1e3
Update tests #5825
StepanBrychta Dec 2, 2024
eab08b3
Apply auto-formatting rules
weco-bot Dec 2, 2024
5da4c19
Simplify AggregationsBuilder #5825
StepanBrychta Dec 2, 2024
3d88f3f
Apply auto-formatting rules
weco-bot Dec 2, 2024
1b568f9
Add comments #5825
StepanBrychta Dec 2, 2024
d70bce9
Apply auto-formatting rules
weco-bot Dec 2, 2024
42428f3
Add unfiltered self aggregations #5825
StepanBrychta Dec 2, 2024
ed6fbc5
Apply auto-formatting rules
weco-bot Dec 2, 2024
3893dab
Add comments #5825
StepanBrychta Dec 3, 2024
eee437a
Apply auto-formatting rules
weco-bot Dec 3, 2024
6bdbdfd
Add aggregation pairings for new filters #5825
StepanBrychta Dec 3, 2024
28b011f
Make filters and aggregation names consistent #5825
StepanBrychta Dec 3, 2024
97cd732
Apply auto-formatting rules
weco-bot Dec 3, 2024
0b00044
Bug fix & comments #5825
StepanBrychta Dec 3, 2024
153c8a6
Remove ID from filterable paths #5825
StepanBrychta Dec 3, 2024
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
2 changes: 1 addition & 1 deletion common/search/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.3"

services:
elasticsearch:
image: "docker.elastic.co/elasticsearch/elasticsearch:8.4.0"
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
ports:
- "9200:9200"
- "9300:9300"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package weco.api.search.models.index
import io.circe.Json

case class IndexedImage(display: Json, vectorValues: Json) {
lazy val reducedFeatures: Seq[Float] =
lazy val features: Seq[Float] =
vectorValues.hcursor
.downField("reducedFeatures")
.downField("features")
.as[Seq[Float]]
.right
.get
Expand Down
Loading
Loading