Updating tests to seperate concerns from providers

Author: tomsmoker

backend/tests/conftest.py

@@ -1,31 +1,29 @@
-import os
-from unittest.mock import AsyncMock, MagicMock
+from unittest.mock import AsyncMock
 
 import pytest
 from fastapi.testclient import TestClient
 
 from app import main
 from app.core.config import Settings, get_settings
+from app.models.query_core import Chunk
+from app.schemas.query_api import QueryResult
 from app.services.document_service import DocumentService
-from app.services.embedding.openai_embedding_service import (
-    OpenAIEmbeddingService,
-)
-from app.services.llm.factory import CompletionServiceFactory
-from app.services.llm.openai_llm_service import OpenAICompletionService
+from app.services.embedding.base import EmbeddingService
+from app.services.llm.base import CompletionService
 from app.services.vector_db.base import VectorDBService
-from app.services.vector_db.factory import VectorDBFactory
 
 
 def get_settings_override():
     return Settings(
         testing=True,
-        database_url=os.environ.get("DATABASE_TEST_URL"),
+        database_url="test_db_url",
         chunk_size=1000,
         chunk_overlap=200,
         loader="test_loader",
         vector_db_provider="test_vector_db",
-        llm_provider="test_llm",
-        openai_api_key="test_api_key",
+        llm_provider="test_provider",
+        embedding_provider="test_provider",
+        openai_api_key=None,
         embedding_model="test_embedding_model",
         dimensions=1536,
         llm_model="test_llm_model",
@@ -37,16 +35,6 @@ def test_settings():
     return get_settings_override()
 
 
-@pytest.fixture(scope="session")
-def mock_openai_client():
-    return MagicMock()
-
-
-@pytest.fixture(scope="session")
-def mock_openai_embeddings():
-    return MagicMock()
-
-
 @pytest.fixture(scope="session")
 def test_app(test_settings):
     main.app.dependency_overrides[get_settings] = lambda: test_settings
@@ -61,45 +49,64 @@ def client(test_app):
 
 
 @pytest.fixture(scope="session")
-def mock_vector_db_service(mock_embeddings_service):
-    service = AsyncMock(spec=VectorDBService)
-    service.embedding_service = mock_embeddings_service
+def mock_embeddings_service(test_settings):
+    service = AsyncMock(spec=EmbeddingService)
+    service.get_embeddings.return_value = [[0.1, 0.2, 0.3]]
+    service.settings = test_settings
+    service.model = test_settings.embedding_model
     return service
 
 
 @pytest.fixture(scope="session")
-def mock_embeddings_service():
-    service = AsyncMock(spec=OpenAIEmbeddingService)
-    service.get_embeddings.return_value = [0.1, 0.2, 0.3]
+def mock_llm_service(test_settings):
+    service = AsyncMock(spec=CompletionService)
+    service.settings = test_settings
+    service.model = test_settings.llm_model
+
+    # Create a mock response that matches test expectations
+    mock_response = QueryResult(
+        answer="The capital of France is Paris.",
+        chunks=[Chunk(content="Paris is the capital of France.", page=1)],
+    )
+
+    # Update the mock methods to return the same response
+    service.generate_completion = AsyncMock(return_value=mock_response)
+    service.generate_response = AsyncMock(return_value=mock_response)
     return service
 
 
 @pytest.fixture(scope="session")
-def mock_llm_service():
-    service = AsyncMock(spec=OpenAICompletionService)
-    service.client = MagicMock()
-    service.generate_completion.return_value = "Mocked completion"
+def mock_vector_db_service(
+    mock_embeddings_service, mock_llm_service, test_settings
+):
+    service = AsyncMock(spec=VectorDBService)
+    service.embedding_service = mock_embeddings_service
+    service.llm_service = mock_llm_service
+    service.settings = test_settings
     return service
 
 
-@pytest.fixture
-def mock_factories(mock_llm_service, mock_vector_db_service):
+@pytest.fixture(scope="session")
+def document_service(test_settings, mock_vector_db_service, mock_llm_service):
+    return DocumentService(
+        mock_vector_db_service, mock_llm_service, test_settings
+    )
+
+
+@pytest.fixture(scope="session", autouse=True)
+def mock_dependencies(
+    mock_embeddings_service, mock_llm_service, mock_vector_db_service
+):
+    """Mock dependencies for API endpoints only"""
     with pytest.MonkeyPatch.context() as m:
+        # Only mock the embedding and LLM factories
         m.setattr(
-            CompletionServiceFactory,
-            "create_service",
-            lambda *args, **kwargs: mock_llm_service,
+            "app.services.embedding.factory.EmbeddingServiceFactory.create_service",
+            lambda *args, **kwargs: mock_embeddings_service,
         )
         m.setattr(
-            VectorDBFactory,
-            "create_vector_db_service",
-            lambda *args, **kwargs: mock_vector_db_service,
+            "app.services.llm.factory.CompletionServiceFactory.create_service",
+            lambda *args, **kwargs: mock_llm_service,
         )
+        # Don't mock the vector DB factory as we want to test it
         yield
-
-
-@pytest.fixture(scope="session")
-def document_service(test_settings, mock_vector_db_service, mock_llm_service):
-    return DocumentService(
-        mock_vector_db_service, mock_llm_service, test_settings
-    )

backend/tests/test_endpoint_graph.py

@@ -1,27 +1,16 @@
+# test_endpoint_graph.py
 import json
 from unittest.mock import AsyncMock, MagicMock, patch
 
 import pytest
 from fastapi import status
-from fastapi.testclient import TestClient
 
-from app.core.config import Settings
 from app.models.document import Document
 from app.models.graph import GraphChunk, Node, Relation, Triple
 from app.models.table import Column, Row, TablePrompt
 from app.schemas.graph_api import ExportTriplesResponseSchema
 
 
-@pytest.fixture
-def mock_openai_client():
-    return MagicMock()
-
-
-@pytest.fixture
-def mock_openai_embeddings():
-    return MagicMock()
-
-
 @pytest.fixture
 def mock_generate_schema():
     return AsyncMock()
@@ -32,16 +21,6 @@ def mock_generate_triples():
     return AsyncMock()
 
 
-@pytest.fixture
-def client():
-    with patch("app.core.dependencies.get_settings") as mock_get_settings:
-        mock_get_settings.return_value = Settings(openai_api_key=None)
-        from app.main import app
-
-        with TestClient(app) as test_client:
-            yield test_client
-
-
 def create_test_prompt():
     return TablePrompt(
         entityType="test",
@@ -166,6 +145,7 @@ def test_export_triples_success(
         ],
     )
 
+    # Remove the patch for openai.OpenAI since it's mocked globally
     with (
         patch(
             "app.api.v1.endpoints.graph.get_llm_service",
@@ -178,7 +158,6 @@ def test_export_triples_success(
             "app.api.v1.endpoints.graph.generate_triples",
             mock_generate_triples,
         ),
-        patch("openai.OpenAI", return_value=mock_llm_service.client),
     ):
         response = client.post(
             "/api/v1/graph/export-triples", json=request_data
@@ -300,7 +279,6 @@ def test_export_triples_unexpected_error(
         patch(
             "app.api.v1.endpoints.graph.generate_schema", mock_generate_schema
         ),
-        patch("openai.OpenAI", return_value=mock_llm_service.client),
     ):
         response = client.post(
             "/api/v1/graph/export-triples", json=request_data