refactor(cli)!: drop legacy reranker configs.

Author: Davidyz

src/vectorcode/subcommands/query/__init__.py

@@ -14,7 +14,10 @@
     get_collection,
     verify_ef,
 )
-from vectorcode.subcommands.query.reranker import get_reranker
+from vectorcode.subcommands.query.reranker import (
+    RerankerError,
+    get_reranker,
+)
 
 logger = logging.getLogger(name=__name__)
 
@@ -170,7 +173,11 @@ async def query(configs: Config) -> int:
             )
             configs.include = [QueryInclude.path, QueryInclude.document]
 
-    structured_result = await build_query_results(collection, configs)
+    try:
+        structured_result = await build_query_results(collection, configs)
+    except RerankerError:  # pragma: nocover
+        # error logs should be handled where they're raised
+        return 1
 
     if configs.pipe:
         print(json.dumps(structured_result))

src/vectorcode/subcommands/query/reranker/__init__.py

@@ -18,6 +18,14 @@
 }
 
 
+class RerankerError(Exception):
+    pass
+
+
+class RerankerInitialisationError(RerankerError):
+    pass
+
+
 def add_reranker(cls):
     """
     This is a class decorator that allows you to add a custom reranker that can be
@@ -69,8 +77,5 @@ def get_reranker(configs: Config) -> RerankerBase:
     if not configs.reranker:
         return NaiveReranker(configs)
     else:
-        configs.reranker_params.update({"model_name_or_path": configs.reranker})
-        configs.reranker = "CrossEncoderReranker"
-        return CrossEncoderReranker(
-            configs,
-        )
+        logger.error(f"{configs.reranker} is not a valid reranker type!")
+        raise RerankerInitialisationError()

tests/subcommands/query/test_query.py

@@ -12,6 +12,9 @@
     get_query_result_files,
     query,
 )
+from vectorcode.subcommands.query.reranker import (
+    RerankerError,
+)
 
 
 @pytest.fixture
@@ -203,9 +206,7 @@ async def test_get_query_result_files_with_query_exclude(mock_collection, mock_c
 
 
 @pytest.mark.asyncio
-async def test_get_query_result_files_with_cross_encoder_reranker(
-    mock_collection, mock_config
-):
+async def test_get_query_reranker_initialisation_error(mock_collection, mock_config):
     # Configure to use CrossEncoder reranker
     mock_config.reranker = "cross-encoder/model-name"
 
@@ -216,13 +217,9 @@ async def test_get_query_result_files_with_cross_encoder_reranker(
         mock_reranker_instance.rerank = AsyncMock(return_value=["file1.py", "file2.py"])
         MockCrossEncoder.return_value = mock_reranker_instance
 
-        # Call the function
-        result = await get_query_result_files(mock_collection, mock_config)
-
-        # Check CrossEncoder was used correctly
-        MockCrossEncoder.assert_called_once()
-        # Check the result
-        assert result == ["file1.py", "file2.py"]
+        with pytest.raises(RerankerError):
+            # Call the function
+            await get_query_result_files(mock_collection, mock_config)
 
 
 @pytest.mark.asyncio