Code

feature/elastic search pull request#181

Code

Merged

AdrianAlcolea merged 95 commits intodevelopaiondemand/AIOD-rest-api:developfrom feature/elastic_searchaiondemand/AIOD-rest-api:feature/elastic_searchCopy head branch name to clipboardNov 28, 2023

+1,777-17

Commits

Commits on Aug 14, 2023

• First approach to use the elasticsearch service

  

  Adrián

  authored and

  Adrián

  committed
  1c9bbae

  Copy full SHA for 1c9bbae

• elasticsearch query example

  AdrianAlcolea

  committed
  eb73469

  Copy full SHA for eb73469

• elasticsearch query complete example

  AdrianAlcolea

  committed
  8bd8115

  Copy full SHA for 8bd8115

Commits on Aug 16, 2023

• Elasticsearch setup configured

  AdrianAlcolea

  committed
  2e7934b

  Copy full SHA for 2e7934b

• Remove .DS_Store and add it to dockerignore

  AdrianAlcolea

  committed
  5ba4a7c

  Copy full SHA for 5ba4a7c

Commits on Aug 17, 2023

• Merge branch 'develop' of https://github.com/aiondemand/AIOD-rest-api into feature/elastic_search

  josvandervelde

  committed
  fcdc19c

  Copy full SHA for fcdc19c

Commits on Aug 23, 2023

• Merge branch 'develop' of https://github.com/aiondemand/AIOD-rest-api into feature/elastic_search

  josvandervelde

  committed
  22e8577

  Copy full SHA for 22e8577

• Created an elastic search endpoint. It isnt working yet

  josvandervelde

  committed
  6d665bb

  Copy full SHA for 6d665bb

• Just to test the new database

  AdrianAlcolea

  committed
  1123335

  Copy full SHA for 1123335

• To rebase develop

  AdrianAlcolea

  committed
  80b9c3c

  Copy full SHA for 80b9c3c

• Working but not up-to-date with develop branch

  AdrianAlcolea

  committed
  30d6eda

  Copy full SHA for 30d6eda

• Service working. Need to get up-to-date with develop

  AdrianAlcolea

  committed
  28e58fc

  Copy full SHA for 28e58fc

Commits on Aug 24, 2023

• Resolved merge conflicts with develop

  josvandervelde

  committed
  a93fa89

  Copy full SHA for a93fa89

• Some bugfixes for the connectors

  josvandervelde

  committed
  f2aa463

  Copy full SHA for f2aa463

• Deleting docker images in clean script

  josvandervelde

  committed
  f2893f4

  Copy full SHA for f2893f4

• Fixed issues with authentication

  josvandervelde

  committed
  3d17c8c

  Copy full SHA for 3d17c8c

• Publication search seems to work. TODO: test cases and other resourcse

  josvandervelde

  committed
  575faaf

  Copy full SHA for 575faaf

• platform and platform_identifier changed from aiod_entry to each instance

  AdrianAlcolea

  committed
  afdb897

  Copy full SHA for afdb897

• Created testcase for publication search

  josvandervelde

  committed
  895a8d2

  Copy full SHA for 895a8d2

• Made ElasticSearch router generic, implemented it for dataset

  josvandervelde

  committed
  4a2e0f9

  Copy full SHA for 4a2e0f9

• Logstash configured for dataset, experiment, ml_model, publication, and service

  AdrianAlcolea

  committed
  d6ce8e9

  Copy full SHA for d6ce8e9

• Logstash configured for dataset, experiment, ml_model, publication, and service

  AdrianAlcolea

  committed
  5fb737b

  Copy full SHA for 5fb737b

• Logstash waits until fill-db-with-examples ends

  AdrianAlcolea

  committed
  0275144

  Copy full SHA for 0275144

• Resolved merge conflicts with develop

  josvandervelde

  committed
  ccc1ffd

  Copy full SHA for ccc1ffd

Commits on Aug 30, 2023

• take src from develop

  AdrianAlcolea

  committed
  5de434c

  Copy full SHA for 5de434c

• Copied entire develop branch

  AdrianAlcolea

  committed
  5ff4498

  Copy full SHA for 5ff4498

• Logstash configuration readapted to new names

  AdrianAlcolea

  committed
  cae4321

  Copy full SHA for cae4321

• Logstash configuration readapted to new names

  AdrianAlcolea

  committed
  80aef7d

  Copy full SHA for 80aef7d

• Merged with develop

  AdrianAlcolea

  committed
  ca2f44c

  Copy full SHA for ca2f44c

Commits on Aug 31, 2023

• added ai4experiments to platform names

  AdrianAlcolea

  committed
  69ffa34

  Copy full SHA for 69ffa34

Commits on Sep 5, 2023

• Copied initial search routers to start creating them

  AdrianAlcolea

  committed
  ba49bbb

  Copy full SHA for ba49bbb

Commits on Sep 6, 2023

• Examples of ml_model, dataset and experiment used to insert ai4experiment data

  AdrianAlcolea

  committed
  ce08b0a

  Copy full SHA for ce08b0a

• Descriptions of the ai4experiment data improved

  AdrianAlcolea

  committed
  84686ea

  Copy full SHA for 84686ea

Commits on Sep 13, 2023

• platform added to mappings

  AdrianAlcolea

  committed
  7802496

  Copy full SHA for 7802496

• elasticsearch query example completed

  AdrianAlcolea

  committed
  fdee2b7

  Copy full SHA for fdee2b7

• First version of search service working

  AdrianAlcolea

  committed
  2c3e9d7

  Copy full SHA for 2c3e9d7

Commits on Sep 14, 2023

• Search router tests implemented

  AdrianAlcolea

  committed
  0280c26

  Copy full SHA for 0280c26

Commits on Sep 27, 2023

• Merge with develop

  AdrianAlcolea

  committed
  106d8c0

  Copy full SHA for 106d8c0

Commits on Sep 28, 2023

• Search fields selection added

  AdrianAlcolea

  committed
  a0cc086

  Copy full SHA for a0cc086

Commits on Oct 10, 2023

• Added search for event, news, ortganisation and project

  AdrianAlcolea

  committed
  97b361c

  Copy full SHA for 97b361c

Commits on Oct 17, 2023

• Added routers for event, news, organisation and project

  AdrianAlcolea

  committed
  e69620c

  Copy full SHA for e69620c

• merged with develop

  AdrianAlcolea

  committed
  511b779

  Copy full SHA for 511b779

Commits on Oct 23, 2023

• merged with develop

  AdrianAlcolea

  committed
  ee4858c

  Copy full SHA for ee4858c

• Logstash names changed

  AdrianAlcolea

  committed
  3e5d5f4

  Copy full SHA for 3e5d5f4

Commits on Oct 26, 2023

• added logstash_config.py, just for having it there

  AdrianAlcolea

  committed
  2146a3d

  Copy full SHA for 2146a3d

• Pagination changed to actual pages

  AdrianAlcolea

  committed
  f964457

  Copy full SHA for f964457

• Pagination changed to actual pages

  AdrianAlcolea

  committed
  0fe2fe1

  Copy full SHA for 0fe2fe1

Commits on Oct 31, 2023

• Application areas added to elasticsearch resuts

  AdrianAlcolea

  committed
  464c270

  Copy full SHA for 464c270

Commits on Nov 6, 2023

• merged with develop

  AdrianAlcolea

  committed
  8289131

  Copy full SHA for 8289131

Commits on Nov 8, 2023

• First version with deletion

  AdrianAlcolea

  committed
  85ba925

  Copy full SHA for 85ba925

• merged with develop

  AdrianAlcolea

  committed
  cbe2a82

  Copy full SHA for cbe2a82

Commits on Nov 9, 2023

• Prepared to be merged with develop

  AdrianAlcolea

  committed
  0865424

  Copy full SHA for 0865424

• merged with develop

  AdrianAlcolea

  committed
  518036c

  Copy full SHA for 518036c

Commits on Nov 10, 2023

• pull request modifications

  AdrianAlcolea

  committed
  92038e7

  Copy full SHA for 92038e7

Commits on Nov 11, 2023

• pull request modifications

  AdrianAlcolea

  committed
  9b1fd52

  Copy full SHA for 9b1fd52

• merged with develop

  AdrianAlcolea

  committed
  f1df999

  Copy full SHA for f1df999

• pull request modifications

  AdrianAlcolea

  committed
  74ac4f0

  Copy full SHA for 74ac4f0

Commits on Nov 13, 2023

• Combined search with sql queries in process

  AdrianAlcolea

  committed
  7c20576

  Copy full SHA for 7c20576

• merged with develop

  AdrianAlcolea

  committed
  88150dd

  Copy full SHA for 88150dd

• Search functionality combined with optional SQL statment to retrieve everything

  AdrianAlcolea

  committed
  0aeaf25

  Copy full SHA for 0aeaf25

Commits on Nov 15, 2023

• Elasticsearch and logstash configuration integrated in src

  AdrianAlcolea

  committed
  05c6814

  Copy full SHA for 05c6814

• merged with develop

  AdrianAlcolea

  committed
  a96e9f6

  Copy full SHA for a96e9f6

• Search router tests actualised

  AdrianAlcolea

  committed
  92b05cf

  Copy full SHA for 92b05cf

• Search router tests actualised

  AdrianAlcolea

  committed
  22d8df2

  Copy full SHA for 22d8df2

• Search router tests actualised

  AdrianAlcolea

  committed
  03868c3

  Copy full SHA for 03868c3

Commits on Nov 20, 2023

• pre-commit passed

  AdrianAlcolea

  committed
  e9f14be

  Copy full SHA for e9f14be

• All test passed and working. Not merged with develop

  AdrianAlcolea

  committed
  4821f67

  Copy full SHA for 4821f67

• huggingface connector test to its original state

  AdrianAlcolea

  committed
  8c65397

  Copy full SHA for 8c65397

• back to commented huggingface connector

  AdrianAlcolea

  committed
  120f97a

  Copy full SHA for 120f97a

• Fixing unittests by making sure Elasticsearch instance can also be created when ES_USER and ES_PASSWORD env vars are empty; used the style of PR #199

  josvandervelde

  committed
  3e5c446

  Copy full SHA for 3e5c446

• Merge branch 'develop' of https://github.com/aiondemand/AIOD-rest-api into feature/elastic_search

  josvandervelde

  committed
  9bdd974

  Copy full SHA for 9bdd974

• clean logstash configuration

  AdrianAlcolea

  committed
  3daef84

  Copy full SHA for 3daef84

• clean logstash configuration

  AdrianAlcolea

  committed
  7e0861a

  Copy full SHA for 7e0861a

• clean logstash configuration

  AdrianAlcolea

  committed
  649325d

  Copy full SHA for 649325d

• clean logstash configuration

  AdrianAlcolea

  committed
  f4739e9

  Copy full SHA for f4739e9

• clean logstash configuration

  AdrianAlcolea

  committed
  985949d

  Copy full SHA for 985949d

• clean logstash configuration

  AdrianAlcolea

  committed
  ae2ac9e

  Copy full SHA for ae2ac9e

Commits on Nov 24, 2023

• logstash config files generated with jinja2

  AdrianAlcolea

  committed
  cc8c22f

  Copy full SHA for cc8c22f

• logstash config files generated with jinja2

  AdrianAlcolea

  committed
  b73c011

  Copy full SHA for b73c011

• Logstash config files generated with jinja2. All test passed, but not merged with develop.

  AdrianAlcolea

  committed
  6ae492d

  Copy full SHA for 6ae492d

• Resolved merge conflicts with develop

  josvandervelde

  committed
  eaf3451

  Copy full SHA for eaf3451

Commits on Nov 25, 2023

• Second round of pull request comments

  AdrianAlcolea

  committed
  ca5c137

  Copy full SHA for ca5c137

• Second round of pull request comments

  AdrianAlcolea

  committed
  4f17532

  Copy full SHA for 4f17532

• Second round of pull request comments

  AdrianAlcolea

  committed
  b60c9aa

  Copy full SHA for b60c9aa

• Second round of pull request comments

  AdrianAlcolea

  committed
  7c2106f

  Copy full SHA for 7c2106f

• Second round of pull request comments

  AdrianAlcolea

  committed
  0e13852

  Copy full SHA for 0e13852

Commits on Nov 27, 2023

• Created data/elasticsearch/.gitkeep to make sure it exists with the right permissions

  josvandervelde

  committed
  453b1cd

  Copy full SHA for 453b1cd

• Deleted autogenerated file logstash/config/logstash.yml

  josvandervelde

  committed
  6767136

  Copy full SHA for 6767136

• cleanup

  josvandervelde

  committed
  defc100

  Copy full SHA for defc100

• Making sure docker compose up works even if generated files do not exist; added logging; simplified file names

  josvandervelde

  committed
  5f79f0d

  Copy full SHA for 5f79f0d

• Make sure data folders are always created with correct permissions (this was by accident removed in commit cc8c22f)

  josvandervelde

  committed
  58b2514

  Copy full SHA for 58b2514

• Added default logstash configuration

  josvandervelde

  committed
  0d6bd3b

  Copy full SHA for 0d6bd3b

• Fixed docker compose

  josvandervelde

  committed
  82b049a

  Copy full SHA for 82b049a

• Using FastAPI input validation

  josvandervelde

  committed
  85c76b5

  Copy full SHA for 85c76b5

• Made status nullable, so that we can return an empty status in the search_router

  josvandervelde

  committed
  3adc54b

  Copy full SHA for 3adc54b