Update dev branch with latest changes

Author: Mateusz

src/core/domain/anthropic_tools.py

@@ -77,7 +77,7 @@ def model_dump(self, **kwargs) -> dict[str, Any]:
 
 
 def convert_anthropic_tool_to_openai(
-    anthropic_tool: dict[str, Any] | AnthropicToolDefinition
+    anthropic_tool: dict[str, Any] | AnthropicToolDefinition,
 ) -> OpenAIToolDefinition:
     """
     Convert an Anthropic tool definition to OpenAI format using Pydantic models.

src/core/services/backend_service.py

@@ -510,9 +510,7 @@ async def call_completion(
                     session = None
 
             request_session_id = (
-                request.extra_body.get("session_id")
-                if request.extra_body
-                else None
+                request.extra_body.get("session_id") if request.extra_body else None
             )
             if (
                 session is None

tests/unit/core/test_backend_service_enhanced.py

@@ -767,21 +767,20 @@ async def test_simple_failover(self, service_with_simple_failover, chat_request)
             headers={},
         )
 
-        # Mock get_or_create_backend to return the appropriate backend
-        original_get_or_create = service_with_simple_failover._get_or_create_backend
-
-        async def mock_get_or_create(backend_type):
+        # Mock the factory's ensure_backend method to return the appropriate backend
+        async def mock_ensure_backend(backend_type, config, translation_service):
             if backend_type == BackendType.OPENAI:
                 return primary_backend
             elif backend_type == BackendType.OPENROUTER:
                 return fallback_backend
-            return await original_get_or_create(backend_type)
+            else:
+                raise ValueError(f"Unexpected backend type: {backend_type}")
 
         # Act
         with patch.object(
-            service_with_simple_failover,
-            "_get_or_create_backend",
-            side_effect=mock_get_or_create,
+            service_with_simple_failover._factory,
+            "ensure_backend",
+            side_effect=mock_ensure_backend,
         ):
             response = await service_with_simple_failover.call_completion(chat_request)
 
@@ -823,24 +822,23 @@ async def test_complex_failover_first_attempt(
         client3 = httpx.AsyncClient()
         second_fallback = MockBackend(client3)
 
-        # Mock get_or_create_backend
-        original_get_or_create = service_with_complex_failover._get_or_create_backend
-
-        async def mock_get_or_create(backend_type):
+        # Mock the factory's ensure_backend method to return the appropriate backend
+        async def mock_ensure_backend(backend_type, config, translation_service):
             if backend_type == BackendType.OPENAI:
                 return primary_backend
             elif backend_type == BackendType.ANTHROPIC:
                 return first_fallback
             elif backend_type == BackendType.OPENROUTER:
                 return second_fallback
-            return await original_get_or_create(backend_type)
+            else:
+                raise ValueError(f"Unexpected backend type: {backend_type}")
 
         # Act
         with (
             patch.object(
-                service_with_complex_failover,
-                "_get_or_create_backend",
-                side_effect=mock_get_or_create,
+                service_with_complex_failover._factory,
+                "ensure_backend",
+                side_effect=mock_ensure_backend,
             ),
             patch(
                 "src.core.domain.configuration.backend_config.BackendConfiguration"
@@ -912,24 +910,23 @@ async def test_complex_failover_second_attempt(
             headers={},
         )
 
-        # Mock get_or_create_backend
-        original_get_or_create = service_with_complex_failover._get_or_create_backend
-
-        async def mock_get_or_create(backend_type):
+        # Mock the factory's ensure_backend method to return the appropriate backend
+        async def mock_ensure_backend(backend_type, config, translation_service):
             if backend_type == BackendType.OPENAI:
                 return primary_backend
             elif backend_type == BackendType.ANTHROPIC:
                 return first_fallback
             elif backend_type == BackendType.OPENROUTER:
                 return second_fallback
-            return await original_get_or_create(backend_type)
+            else:
+                raise ValueError(f"Unexpected backend type: {backend_type}")
 
         # Act
         with (
             patch.object(
-                service_with_complex_failover,
-                "_get_or_create_backend",
-                side_effect=mock_get_or_create,
+                service_with_complex_failover._factory,
+                "ensure_backend",
+                side_effect=mock_ensure_backend,
             ),
             patch(
                 "src.core.domain.configuration.backend_config.BackendConfiguration"
@@ -997,24 +994,23 @@ async def test_complex_failover_all_fail(
             "Second failover error"
         )
 
-        # Mock get_or_create_backend
-        original_get_or_create = service_with_complex_failover._get_or_create_backend
-
-        async def mock_get_or_create(backend_type):
+        # Mock the factory's ensure_backend method to return the appropriate backend
+        async def mock_ensure_backend(backend_type, config, translation_service):
             if backend_type == BackendType.OPENAI:
                 return primary_backend
             elif backend_type == BackendType.ANTHROPIC:
                 return first_fallback
             elif backend_type == BackendType.OPENROUTER:
                 return second_fallback
-            return await original_get_or_create(backend_type)
+            else:
+                raise ValueError(f"Unexpected backend type: {backend_type}")
 
         # Act
         with (
             patch.object(
-                service_with_complex_failover,
-                "_get_or_create_backend",
-                side_effect=mock_get_or_create,
+                service_with_complex_failover._factory,
+                "ensure_backend",
+                side_effect=mock_ensure_backend,
             ),
             patch(
                 "src.core.domain.configuration.backend_config.BackendConfiguration"

tests/unit/test_cli.py

@@ -12,7 +12,7 @@
 
 
 def _unwrap_config(
-    result: AppConfig | tuple[AppConfig, ParameterResolution]
+    result: AppConfig | tuple[AppConfig, ParameterResolution],
 ) -> AppConfig:
     return result[0] if isinstance(result, tuple) else result
 

tests/unit/test_performance_tracker.py

@@ -1,7 +1,6 @@
 import logging
 
 import pytest
-
 from src.performance_tracker import (
     PerformanceMetrics,
     track_phase,
@@ -15,10 +14,10 @@ def __init__(self, values: list[float]) -> None:
         self._last = values[-1]
 
     def __call__(self) -> float:
-        try:
+        from contextlib import suppress
+
+        with suppress(StopIteration):
             self._last = next(self._iterator)
-        except StopIteration:
-            pass
         return self._last
 
 
@@ -34,7 +33,9 @@ def end_phase(self) -> None:
         self.ended += 1
 
 
-def test_performance_metrics_phase_tracking_and_finalize(monkeypatch: pytest.MonkeyPatch) -> None:
+def test_performance_metrics_phase_tracking_and_finalize(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
     time_stub = TimeStub([1.0, 4.0, 5.0])
     monkeypatch.setattr("src.performance_tracker.time.time", time_stub)
 
@@ -81,7 +82,9 @@ def test_performance_metrics_log_summary_logs_breakdown_and_overhead(
     assert "overhead=2.500s" in caplog.text
 
 
-def test_track_request_performance_context_manager_logs_on_exit(monkeypatch: pytest.MonkeyPatch) -> None:
+def test_track_request_performance_context_manager_logs_on_exit(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
     called: list[PerformanceMetrics] = []
 
     def fake_log_summary(self: PerformanceMetrics) -> None:
@@ -99,9 +102,8 @@ def fake_log_summary(self: PerformanceMetrics) -> None:
 def test_track_phase_context_manager_ensures_end_called_on_exception() -> None:
     dummy = DummyMetrics()
 
-    with pytest.raises(RuntimeError):
-        with track_phase(dummy, "phase-one"):
-            raise RuntimeError("boom")
+    with pytest.raises(RuntimeError), track_phase(dummy, "phase-one"):
+        raise RuntimeError("boom")
 
     assert dummy.started == ["phase-one"]
     assert dummy.ended == 1

tests/unit/zai_connector_tests/test_domain_to_connector.py

@@ -37,14 +37,13 @@ async def zai_backend_fixture(
     }
 
     # Add models endpoint mock that can be reused for health checks
-    for _ in range(3):  # Allow multiple calls for health checks
-        httpx_mock.add_response(
-            url=f"{TEST_ZAI_API_BASE_URL}/models",
-            method="GET",
-            json=mock_models,
-            status_code=200,
-            headers={"Content-Type": "application/json"},
-        )
+    httpx_mock.add_response(
+        url=f"{TEST_ZAI_API_BASE_URL}/models",
+        method="GET",
+        json=mock_models,
+        status_code=200,
+        headers={"Content-Type": "application/json"},
+    )
 
     client = httpx.AsyncClient()
     try: