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.

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

Jump to bottom

feature/elastic search pull request #181

Merged
merged 95 commits into from
Nov 28, 2023
Merged

feature/elastic search pull request #181

merged 95 commits into from
Nov 28, 2023

Conversation

AdrianAlcolea
Copy link
Collaborator

First elesticsearch service pull request

Adrián and others added 30 commits August 14, 2023 12:46
First approach to use the elasticsearch service
1c9bbae
@AdrianAlcolea
elasticsearch query example
eb73469
@AdrianAlcolea
elasticsearch query complete example
8bd8115
@AdrianAlcolea
Elasticsearch setup configured
2e7934b
@AdrianAlcolea
Remove .DS_Store and add it to dockerignore
5ba4a7c
@josvandervelde
Merge branch 'develop' of https://github.com/aiondemand/AIOD-rest-api …
fcdc19c 
…into feature/elastic_search
@josvandervelde
Merge branch 'develop' of https://github.com/aiondemand/AIOD-rest-api …
22e8577 
…into feature/elastic_search
@josvandervelde
Created an elastic search endpoint. It isnt working yet
6d665bb
@AdrianAlcolea
Just to test the new database
1123335
@AdrianAlcolea
To rebase develop
80b9c3c
@AdrianAlcolea
Working but not up-to-date with develop branch
30d6eda
@AdrianAlcolea
Service working. Need to get up-to-date with develop
28e58fc
@josvandervelde
Resolved merge conflicts with develop
a93fa89
@josvandervelde
Some bugfixes for the connectors
f2aa463
@josvandervelde
Deleting docker images in clean script
f2893f4
@josvandervelde
Fixed issues with authentication
3d17c8c
@josvandervelde
Publication search seems to work. TODO: test cases and other resourcse
575faaf
@AdrianAlcolea
platform and platform_identifier changed from aiod_entry to each inst…
afdb897 
…ance
@josvandervelde
Created testcase for publication search
895a8d2
@josvandervelde
Made ElasticSearch router generic, implemented it for dataset
4a2e0f9
@AdrianAlcolea
Logstash configured for dataset, experiment, ml_model, publication, a…
d6ce8e9 
…nd service
@AdrianAlcolea
Logstash configured for dataset, experiment, ml_model, publication, a…
5fb737b 
…nd service
@AdrianAlcolea
Logstash waits until fill-db-with-examples ends
0275144
@josvandervelde
Resolved merge conflicts with develop
ccc1ffd
@AdrianAlcolea
take src from develop
5de434c
@AdrianAlcolea
Copied entire develop branch
5ff4498
@AdrianAlcolea
Logstash configuration readapted to new names
cae4321
@AdrianAlcolea
Logstash configuration readapted to new names
80aef7d
@AdrianAlcolea
Merged with develop
ca2f44c
@AdrianAlcolea
added ai4experiments to platform names
69ffa34
andrejridzik
andrejridzik reviewed Nov 21, 2023
View reviewed changes
src/routers/search_router.py Outdated Show resolved Hide resolved
src/routers/search_router.py Outdated Show resolved Hide resolved
src/routers/search_router.py Outdated Show resolved Hide resolved
josvandervelde
josvandervelde suggested changes Nov 24, 2023
View reviewed changes
README.md Outdated Show resolved Hide resolved
docker-compose.yaml Show resolved Hide resolved
logstash/pipeline/sql/init_dataset.sql Outdated Show resolved Hide resolved
src/tests/routers/search_routers/test_search_routers.py Outdated Show resolved Hide resolved
src/routers/search_router.py Outdated Show resolved Hide resolved
src/setup/logstash_setup/config_file_template.py Outdated Show resolved Hide resolved
src/setup/es_setup/definitions.py Show resolved Hide resolved
src/setup/logstash_setup/generate_logstash_config_files.py Outdated Show resolved Hide resolved
docker-compose.yaml Outdated Show resolved Hide resolved
.gitignore Show resolved Hide resolved
AdrianAlcolea and others added 14 commits November 25, 2023 02:38
@AdrianAlcolea
Second round of pull request comments
ca5c137
@AdrianAlcolea
Second round of pull request comments
4f17532
@AdrianAlcolea
Second round of pull request comments
b60c9aa
@AdrianAlcolea
Second round of pull request comments
7c2106f
@AdrianAlcolea
Second round of pull request comments
0e13852
@josvandervelde
Created data/elasticsearch/.gitkeep to make sure it exists with the r…
453b1cd 
…ight permissions
@josvandervelde
Deleted autogenerated file logstash/config/logstash.yml
6767136
@josvandervelde
cleanup
defc100
@josvandervelde
Making sure docker compose up works even if generated files do not ex…
5f79f0d 
…ist; added logging; simplified file names
@josvandervelde
Make sure data folders are always created with correct permissions (t…
58b2514 
…his was by accident removed in commit cc8c22f)
@josvandervelde
Added default logstash configuration
0d6bd3b
@josvandervelde
Fixed docker compose
82b049a
@josvandervelde
Using FastAPI input validation
85c76b5
@josvandervelde
Made status nullable, so that we can return an empty status in the se…
3adc54b 
…arch_router
josvandervelde
josvandervelde approved these changes Nov 27, 2023
View reviewed changes
Copy link

@josvandervelde josvandervelde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Adrian!
It took some time, but I think it looks good now. Please take a look at my last changes, and let me know if you have any comments!

@AdrianAlcolea AdrianAlcolea merged commit 7155396 into develop Nov 28, 2023
2 checks passed
@josvandervelde josvandervelde deleted the feature/elastic_search branch November 28, 2023 10:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrejridzik andrejridzik andrejridzik left review comments

@josvandervelde josvandervelde josvandervelde approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AdrianAlcolea @josvandervelde @andrejridzik