Merge pull request #287 from tisnik/lcore-381-new-unit-tests

LCORE-381: new unit tests for client.py and models endpoints

Author: tisnik

tests/unit/app/endpoints/test_models.py

@@ -1,11 +1,11 @@
 """Unit tests for the /models REST API endpoint."""
 
-from unittest.mock import Mock
-
 import pytest
 
 from fastapi import HTTPException, Request, status
 
+from llama_stack_client import APIConnectionError
+
 from app.endpoints.models import models_endpoint_handler
 from configuration import AppConfig
 
@@ -142,7 +142,7 @@ def test_models_endpoint_handler_unable_to_retrieve_models_list(mocker):
     cfg.init_from_dict(config_dict)
 
     # Mock the LlamaStack client
-    mock_client = Mock()
+    mock_client = mocker.Mock()
     mock_client.models.list.return_value = []
     mock_lsc = mocker.patch("client.LlamaStackClientHolder.get_client")
     mock_lsc.return_value = mock_client
@@ -157,3 +157,50 @@ def test_models_endpoint_handler_unable_to_retrieve_models_list(mocker):
     )
     response = models_endpoint_handler(request)
     assert response is not None
+
+
+def test_models_endpoint_llama_stack_connection_error(mocker):
+    """Test the model endpoint when LlamaStack connection fails."""
+    # configuration for tests
+    config_dict = {
+        "name": "foo",
+        "service": {
+            "host": "localhost",
+            "port": 8080,
+            "auth_enabled": False,
+            "workers": 1,
+            "color_log": True,
+            "access_log": True,
+        },
+        "llama_stack": {
+            "api_key": "xyzzy",
+            "url": "http://x.y.com:1234",
+            "use_as_library_client": False,
+        },
+        "user_data_collection": {
+            "feedback_enabled": False,
+        },
+        "customization": None,
+    }
+
+    # mock LlamaStackClientHolder to raise APIConnectionError
+    # when models.list() method is called
+    mock_client = mocker.Mock()
+    mock_client.models.list.side_effect = APIConnectionError(request=None)
+    mock_client_holder = mocker.patch("app.endpoints.models.LlamaStackClientHolder")
+    mock_client_holder.return_value.get_client.return_value = mock_client
+
+    cfg = AppConfig()
+    cfg.init_from_dict(config_dict)
+
+    request = Request(
+        scope={
+            "type": "http",
+            "headers": [(b"authorization", b"Bearer invalid-token")],
+        }
+    )
+
+    with pytest.raises(HTTPException) as e:
+        models_endpoint_handler(request)
+        assert e.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
+        assert e.detail["response"] == "Unable to connect to Llama Stack"

tests/unit/test_client.py

@@ -6,6 +6,32 @@
 from models.config import LlamaStackConfiguration
 
 
+def test_client_get_client_method() -> None:
+    """Test how get_client method works for unitialized client."""
+
+    client = LlamaStackClientHolder()
+
+    with pytest.raises(
+        RuntimeError,
+        match="LlamaStackClient has not been initialised. Ensure 'load\\(..\\)' has been called.",
+    ):
+        client.get_client()
+
+
+def test_async_client_get_client_method() -> None:
+    """Test how get_client method works for unitialized client."""
+    client = AsyncLlamaStackClientHolder()
+
+    with pytest.raises(
+        RuntimeError,
+        match=(
+            "AsyncLlamaStackClient has not been initialised. "
+            "Ensure 'load\\(..\\)' has been called."
+        ),
+    ):
+        client.get_client()
+
+
 def test_get_llama_stack_library_client() -> None:
     """Test if Llama Stack can be initialized in library client mode."""
     cfg = LlamaStackConfiguration(
@@ -18,6 +44,9 @@ def test_get_llama_stack_library_client() -> None:
     client.load(cfg)
     assert client is not None
 
+    ls_client = client.get_client()
+    assert ls_client is not None
+
 
 def test_get_llama_stack_remote_client() -> None:
     """Test if Llama Stack can be initialized in remove client (server) mode."""
@@ -31,6 +60,9 @@ def test_get_llama_stack_remote_client() -> None:
     client.load(cfg)
     assert client is not None
 
+    ls_client = client.get_client()
+    assert ls_client is not None
+
 
 def test_get_llama_stack_wrong_configuration() -> None:
     """Test if configuration is checked before Llama Stack is initialized."""
@@ -61,6 +93,9 @@ async def test_get_async_llama_stack_library_client() -> None:
     await client.load(cfg)
     assert client is not None
 
+    ls_client = client.get_client()
+    assert ls_client is not None
+
 
 async def test_get_async_llama_stack_remote_client() -> None:
     """Test the initialization of asynchronous Llama Stack client in server mode."""
@@ -74,6 +109,9 @@ async def test_get_async_llama_stack_remote_client() -> None:
     await client.load(cfg)
     assert client is not None
 
+    ls_client = client.get_client()
+    assert ls_client is not None
+
 
 async def test_get_async_llama_stack_wrong_configuration() -> None:
     """Test if configuration is checked before Llama Stack is initialized."""