🐛(backend) increase default timeout and nextcloud timeout (#214)

Author: ChristopherSpelt

backend/app/clients/base.py

@@ -15,10 +15,11 @@ class BaseAPIClient:
 
     service_name: str
 
-    def __init__(self, http_client: httpx.AsyncClient, base_url: str, token: str) -> None:
+    def __init__(self, http_client: httpx.AsyncClient, base_url: str, token: str, timeout: float | None = None) -> None:
         self.client = http_client
         self.base_url = base_url.rstrip("/")
         self.token = token
+        self.timeout = timeout
 
     def _build_url(self, path: str) -> str:
         """Build full URL from base and path."""
@@ -38,11 +39,13 @@ async def _get_resource_with_headers[T](
         """Get resource and return both data and response headers."""
         try:
             url = self._build_url(path)
-            response = await self.client.get(
-                url,
-                params=params or {},
-                headers=self._auth_headers(),
-            )
+            kwargs: dict[str, Any] = {
+                "params": params or {},
+                "headers": self._auth_headers(),
+            }
+            if self.timeout is not None:
+                kwargs["timeout"] = self.timeout
+            response = await self.client.get(url, **kwargs)
 
             if response.status_code != 200:
                 raise ExternalServiceError(
@@ -54,6 +57,9 @@ async def _get_resource_with_headers[T](
             validated = TypeAdapter(model_type).validate_python(data)
             return validated, dict(response.headers)
 
+        except httpx.TimeoutException:
+            logger.exception(f"Timeout calling {self.service_name} API")
+            raise
         except httpx.HTTPError as e:
             logger.exception(f"HTTP error calling {self.service_name} API")
             raise ExternalServiceError(self.service_name, f"HTTP error: {e}") from e

backend/app/core/http_clients.py

@@ -8,7 +8,7 @@
 
 logger = logging.getLogger(__name__)
 
-DEFAULT_TIMEOUT = 2.0
+DEFAULT_TIMEOUT = 5.0
 DEFAULT_MAX_RETRIES = 2
 
 

backend/app/routes/ocs.py

@@ -21,7 +21,7 @@ async def get_ocs_client(request: Request, http_client: HTTPClient) -> OCSClient
 
     token = await get_token(request, settings.OCS_AUDIENCE)
 
-    return OCSClient(http_client, settings.OCS_URL, token)
+    return OCSClient(http_client, settings.OCS_URL, token, timeout=10.0)
 
 
 @router.get("/activities", response_model=FileActivityResponse)

backend/tests/clients/test_ocs.py

@@ -47,6 +47,21 @@ def test_init(self, mock_http_client: AsyncMock, client: OCSClient) -> None:
         assert client.client is mock_http_client
         assert client.base_url == "https://nextcloud.example.com"
         assert client.token == "test-token"
+        assert client.timeout is None
+
+    def test_init_with_custom_timeout(self, mock_http_client: AsyncMock) -> None:
+        """Test OCSClient initialization with custom timeout."""
+        client = OCSClient(
+            http_client=mock_http_client,
+            base_url="https://nextcloud.example.com",
+            token="test-token",
+            timeout=10.0,
+        )
+        assert client.timeout == 10.0
+
+    def test_init_timeout_is_none_by_default(self, client: OCSClient) -> None:
+        """Test that timeout defaults to None."""
+        assert client.timeout is None
 
     def test_init_strips_trailing_slash(self, mock_http_client: AsyncMock) -> None:
         """Test that trailing slash is stripped from base_url."""
@@ -183,6 +198,39 @@ async def test_search_files_no_results(self, client: OCSClient, mock_http_client
 
         assert result == []
 
+    async def test_default_timeout_uses_client_default(self, client: OCSClient, mock_http_client: AsyncMock) -> None:
+        """Test that default timeout (None) does not pass timeout kwarg, preserving client default."""
+        mock_response = create_mock_response(status_code=200, json_data={"ocs": {"data": {"entries": []}}})
+        mock_http_client.get.return_value = mock_response
+
+        await client.search_files(term="test")
+
+        call_kwargs = mock_http_client.get.call_args[1]
+        assert "timeout" not in call_kwargs
+
+    async def test_custom_timeout_passes_value(self, mock_http_client: AsyncMock) -> None:
+        """Test that custom timeout passes timeout value to client.get()."""
+        client = OCSClient(
+            http_client=mock_http_client,
+            base_url="https://nextcloud.example.com",
+            token="test-token",
+            timeout=10.0,
+        )
+        mock_response = create_mock_response(status_code=200, json_data={"ocs": {"data": {"entries": []}}})
+        mock_http_client.get.return_value = mock_response
+
+        await client.search_files(term="test")
+
+        call_kwargs = mock_http_client.get.call_args[1]
+        assert call_kwargs["timeout"] == 10.0
+
+    async def test_timeout_exception_is_reraised(self, client: OCSClient, mock_http_client: AsyncMock) -> None:
+        """Test that httpx.TimeoutException is re-raised, not wrapped as ExternalServiceError."""
+        mock_http_client.get.side_effect = httpx.ReadTimeout("read timed out")
+
+        with pytest.raises(httpx.TimeoutException):
+            await client.search_files(term="test")
+
     async def test_get_file_activities_single_file(self, client: OCSClient, mock_http_client: AsyncMock) -> None:
         """Test file activities with a single file per activity."""
         mock_response = create_mock_response(