fix: add --distance-metric support to DiskANN embedding server and remove obsolete macOS ABI test markers

- Add --distance-metric parameter to diskann_embedding_server.py for consistency with other backends
- Remove pytest.skip and pytest.xfail markers for macOS C++ ABI issues as they have been fixed
- Fix test assertions to handle SearchResult objects correctly
- All tests now pass on macOS with the C++ ABI compatibility fixes
This commit is contained in:
Andy Lee
2025-07-28 14:49:51 -07:00
parent 8c988cf98b
commit ab339886dd
4 changed files with 60 additions and 26 deletions

View File

@@ -20,6 +20,8 @@ def test_data_dir():
def test_main_cli_simulated(test_data_dir):
"""Test main_cli with simulated LLM."""
with tempfile.TemporaryDirectory() as temp_dir:
# Use a subdirectory that doesn't exist yet to force index creation
index_dir = Path(temp_dir) / "test_index"
cmd = [
sys.executable,
"examples/main_cli_example.py",
@@ -30,7 +32,7 @@ def test_main_cli_simulated(test_data_dir):
"--embedding-mode",
"sentence-transformers",
"--index-dir",
temp_dir,
str(index_dir),
"--data-dir",
str(test_data_dir),
"--query",
@@ -56,6 +58,8 @@ def test_main_cli_simulated(test_data_dir):
def test_main_cli_openai(test_data_dir):
"""Test main_cli with OpenAI embeddings."""
with tempfile.TemporaryDirectory() as temp_dir:
# Use a subdirectory that doesn't exist yet to force index creation
index_dir = Path(temp_dir) / "test_index_openai"
cmd = [
sys.executable,
"examples/main_cli_example.py",
@@ -66,7 +70,7 @@ def test_main_cli_openai(test_data_dir):
"--embedding-mode",
"openai",
"--index-dir",
temp_dir,
str(index_dir),
"--data-dir",
str(test_data_dir),
"--query",
@@ -92,7 +96,6 @@ def test_main_cli_openai(test_data_dir):
)
@pytest.mark.xfail(sys.platform == "darwin", reason="May fail on macOS due to C++ ABI issues")
def test_main_cli_error_handling(test_data_dir):
"""Test main_cli with invalid parameters."""
with tempfile.TemporaryDirectory() as temp_dir: