[DAGE-115] RRE Vector Search Doctor refactor

Author: nicolo-rinaldi

rre-tools/docs/approximate_search_evaluator/README.md

@@ -22,7 +22,7 @@ The parameters needed are:
 > - **collection_name**: Name of the search engine index/collection (e.g., "testcore", the one used in Docker containers)
 > - **search_engine_url**: URL of the search engine (e.g., "http://localhost:8983/solr/")
 > - **search_engine_version** (Optional): to see supported releases, take a look at 
-> [constants.py](../../src/rre_tools/approximate_search_evaluator/constants.py). By defaults, uses the latest version supported:
+> [constants.py](../../src/rre_tools/vector_search_doctor/approximate_search_evaluator/constants.py). By defaults, uses the latest version supported:
 > (9.9.0 for Solr and 7.4.2 for Elasticsearch)
 > - id_field (Optional): id field for the unique key. Defaults to "id" for Solr and "_id" for Elasticsearch search
 > search engines

rre-tools/pyproject.toml

@@ -45,8 +45,8 @@ addopts = "-v --tb=short"
 
 [project.scripts]
 dataset_generator = "rre_tools.dataset_generator.main:main"
-embedding_model_evaluator = "rre_tools.embedding_model_evaluator.main:main"
-approximate_search_evaluator = "rre_tools.approximate_search_evaluator.main:main"
+embedding_model_evaluator = "rre_tools.vector_search_doctor.embedding_model_evaluator.main:main"
+approximate_search_evaluator = "rre_tools.vector_search_doctor.approximate_search_evaluator.main:main"
 
 
 [build-system]

rre-tools/src/rre_tools/approximate_search_evaluator/__init__.py

@@ -0,0 +1,8 @@
+from rre_tools.vector_search_doctor.approximate_search_evaluator.config import Config
+from rre_tools.vector_search_doctor.approximate_search_evaluator.constants import SOLR_SUPPORTED_VERSIONS, ELASTICSEARCH_SUPPORTED_VERSIONS
+
+__all__ = [
+    "Config",
+    "SOLR_SUPPORTED_VERSIONS",
+    "ELASTICSEARCH_SUPPORTED_VERSIONS",
+]

rre-tools/src/rre_tools/embedding_model_evaluator/custom_mteb_tasks/__init__.py

@@ -6,7 +6,7 @@
 
 import yaml
 from pydantic import BaseModel, Field, FilePath, HttpUrl, model_validator
-from rre_tools.approximate_search_evaluator.constants import ELASTICSEARCH_SUPPORTED_VERSIONS, SOLR_SUPPORTED_VERSIONS
+from rre_tools.vector_search_doctor.approximate_search_evaluator.constants import ELASTICSEARCH_SUPPORTED_VERSIONS, SOLR_SUPPORTED_VERSIONS
 
 log = logging.getLogger(__name__)
 

…ls/embedding_model_evaluator/__init__.py …e_tools/vector_search_doctor/__init__.pyrre-tools/src/rre_tools/embedding_model_evaluator/__init__.py renamed to rre-tools/src/rre_tools/vector_search_doctor/__init__.py rre-tools/src/rre_tools/embedding_model_evaluator/__init__.py renamed to rre-tools/src/rre_tools/vector_search_doctor/__init__.py

@@ -10,7 +10,7 @@
 from rre_tools.shared.data_store import DataStore
 from rre_tools.shared.logger import setup_logging
 from rre_tools.shared.writers import WriterConfig
-from rre_tools.approximate_search_evaluator.config import Config
+from rre_tools.vector_search_doctor.approximate_search_evaluator.config import Config
 
 log = logging.getLogger(__name__)
 
@@ -91,7 +91,7 @@ def run_rre_evaluate(eval_folder : Path) -> None:
     """
     Run `mvn rre:evaluate` inside rre-evaluator-solr-external folder.
     """
-    eval_dir = Path(__file__).parent.parent.parent.parent / eval_folder
+    eval_dir = Path(__file__).parent.parent.parent.parent.parent / eval_folder
     subprocess.run(
         ["mvn", "rre:evaluate"],
         cwd=eval_dir,