fix tests and remove unnessacry cls

src/quartapp/app.py

@@ -1,7 +1,6 @@
 import logging
 from collections.abc import AsyncGenerator
-from dataclasses import asdict, is_dataclass
-from json import JSONEncoder, dumps
+from json import dumps
 from pathlib import Path
 from typing import Any
 
@@ -17,20 +16,13 @@
 )
 
 
-class CustomJSONEncoder(JSONEncoder):
-    def default(self, o: Any) -> Any:
-        if is_dataclass(o):
-            return asdict(o)
-        return super().default(o)
-
-
 async def format_as_ndjson(r: AsyncGenerator[RetrievalResponse | Message, None]) -> AsyncGenerator[str, None]:
     """
     Format the response as NDJSON
     """
     try:
         async for event in r:
-            yield dumps(event.to_dict(), ensure_ascii=False, cls=CustomJSONEncoder) + "\n"
+            yield dumps(event.to_dict(), ensure_ascii=False) + "\n"
     except Exception as error:
         logging.exception("Exception while generating response stream: %s", error)
         yield dumps({"error": str(error)}, ensure_ascii=False) + "\n"

tests/conftest.py

@@ -1,6 +1,7 @@
 from dataclasses import dataclass
 from unittest.mock import AsyncMock, MagicMock, patch
 
+import langchain_core
 import mongomock
 import pytest
 import pytest_asyncio
@@ -47,25 +48,14 @@ def approaches_base_mock():
 
     # Mock Vector Store
     mock_vector_store = MagicMock()
-    mock_retriever = MagicMock()
     mock_document = Document(
         page_content='{"name": "test", "description": "test", "price": "5.0USD", "category": "test"}'
     )
-    mock_retriever.ainvoke = AsyncMock(return_value=[mock_document])  # Assume there is always a response
-    mock_vector_store.as_retriever.return_value = mock_retriever
+    mock_vector_store.as_retriever.return_value.ainvoke = AsyncMock(return_value=[mock_document])
 
     # Mock Chat
     mock_chat = MagicMock()
 
-    @dataclass
-    class MockContent:
-        content: str
-
-    mock_content = MockContent(content="content")
-
-    mock_chat.__or__ = MagicMock()
-    mock_chat.__or__.return_value.ainvoke = AsyncMock(return_value=mock_content)
-
     # Mock Data Collection
     mock_mongo_document = {"textContent": mock_document.page_content, "source": "test"}
     mock_data_collection = MagicMock()
@@ -167,6 +157,24 @@ def setup_data_collection_mock(monkeypatch):
     return _mock
 
 
+@pytest.fixture(autouse=True)
+def mock_runnable_or(monkeypatch):
+    """Mock langchain_core.runnables.base.Runnable.__or__."""
+
+    @dataclass
+    class MockContent:
+        content: str
+
+    or_return = MagicMock()
+    or_return.ainvoke = AsyncMock(return_value=MockContent(content="content"))
+    or_mock = MagicMock()
+    or_mock.return_value = or_return
+    monkeypatch.setattr(
+        langchain_core.runnables.base.Runnable, langchain_core.runnables.base.Runnable.__or__.__name__, or_mock
+    )
+    return or_mock
+
+
 @pytest_asyncio.fixture
 async def app_mock(app_config_mock):
     """Create a test app with the test config mock."""