[DAGE-20] improvement of Dockerfile (similar to Naz implementation) and updated README.md file

Author: nicolo-rinaldi

rre-dataset-generator/README.md

@@ -89,13 +89,37 @@ Depending on your Docker version, you may need to use `docker compose` instead o
 If you have Docker Compose v1 installed, use:
 
 ```bash
-docker-compose up --build
+docker-compose -f docker-compose-solr.yml up --build
 ```
 If you have Docker Compose v2 installed, use:
 ```bash
-docker compose up --build
+docker compose -f docker-compose-solr.yml up --build
 ```
 
 This will start 2 services:
  - `solr`, available at http://localhost:8983/solr
- - `solr-init`, loads documents from solr/data/dataset.json only if Solr doesn't index any documents.
+ - `solr-init`, loads documents from solr-init/data/dataset.json only if Solr doesn't index any documents.
+
+##### Running Elasticsearch (Standalone)
+
+
+Similarly to Solr, to run a local Elasticsearch test environment using docker-compose:
+```bash
+cd tests/integration/
+```
+
+Depending on your Docker version, you may need to use `docker compose` instead of `docker-compose`.
+If you have Docker Compose v1 installed, use:
+
+```bash
+docker-compose -f docker-compose-elasticsearch.yml up --build 
+```
+If you have Docker Compose v2 installed, use:
+```bash
+docker compose -f docker-compose-elasticsearch.yml up --build
+```
+
+This will start 2 services:
+ - `elasticsearch`, available at http://localhost:9200
+ - `elasticsearch-init`, loads documents from elasticsearch-init/data/dataset.jsonl only if Elasticsearch doesn't have 
+any documents in the index.

rre-dataset-generator/src/search_engine/elasticsearch_search_engine.py

@@ -95,7 +95,6 @@ def _search(self, payload: Dict[str, Any]) -> List[Document]:
                 log.debug("Elasticsearch query successful.")
                 log.debug(f"URL: {search_url}")
                 log.debug(f"Payload: {payload}")
-                # log.debug(f"Response: {response.json()}")
                 raw_docs = response.json()['hits']['hits']
                 reformat_raw_doc = []
                 for doc in raw_docs:

rre-dataset-generator/src/search_engine/solr_search_engine.py

@@ -108,7 +108,6 @@ def _search(self, payload: Dict[str, Any]) -> List[Document]:
                 log.debug("Solr query successful.")
                 log.debug(f"URL: {search_url}")
                 log.debug(f"Payload: {payload}")
-                # log.debug(f"Response: {response.json()}")
                 raw_docs = response.json()['response']['docs']
                 reformat_raw_doc = []
                 for doc in raw_docs:

rre-dataset-generator/tests/integration/elasticsearch-init/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:9.0.4
+FROM curlimages/curl:8.14.1
 
 COPY data/dataset.jsonl /opt/rre-dataset-generator/data/dataset.jsonl
 COPY --chmod=777 elasticsearch-init.sh /opt/rre-dataset-generator/elasticsearch-init.sh

rre-dataset-generator/tests/integration/elasticsearch-init/elasticsearch-init.sh

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 CLUSTER="http://elasticsearch:9200"
-INDEX="testindex"
+INDEX="testcore"
 ENDPOINT="$CLUSTER/$INDEX"
 
 echo "[INFO] Waiting for Elasticsearch..."

rre-dataset-generator/tests/unit/resources/elasticsearch_good_config.yaml

@@ -1,6 +1,6 @@
 query_template: '{ "query": { "match": { "message": "#$query##" } } }'
 search_engine_type: "elasticsearch"
-search_engine_collection_endpoint: 'http://localhost:9200/testindex/'
+search_engine_collection_endpoint: 'http://localhost:9200/testcore/'
 doc_number: 100
 doc_fields:
   - "title"