refactoring

math-tutor/backend/test/test_llm_provider.py

@@ -81,6 +81,7 @@ if importlib.util.find_spec("mcp") is None:
 
 from app import config
 from app.deterministic_services import llm_client
+from app.deterministic_services import llm_tool_client
 from app.deterministic_services import tool_log_context
 from app.deterministic_services.orchestrators import orchestrator_tutor
 from app.deterministic_services.orchestrators.orchestrator_base import ChatState
@@ -219,7 +220,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ), patch.object(
             llm_client, "_chat_openai_compatible", return_value=expected
         ) as openai_chat, patch.object(
-            llm_client, "_run_tool_chat_sync"
+            llm_client, "run_tool_chat_sync"
         ) as tool_chat, patch.object(
             llm_client, "_chat_mistral"
         ) as mistral_chat, patch.object(
@@ -246,7 +247,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ), patch.object(
             llm_client, "_record_call", side_effect=lambda result, tokens=None: result
         ), patch.object(
-            llm_client, "_run_tool_chat_sync", return_value=expected
+            llm_client, "run_tool_chat_sync", return_value=expected
         ) as tool_chat, patch.object(
             llm_client, "_chat_openai_compatible"
         ) as openai_chat:
@@ -271,7 +272,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ), patch.object(
             llm_client, "_chat_openai_compatible", return_value=expected
         ) as compatible_chat, patch.object(
-            llm_client, "_run_tool_chat_sync"
+            llm_client, "run_tool_chat_sync"
         ) as tool_chat, patch.object(
             llm_client, "_chat_mistral"
         ) as mistral_chat, patch.object(
@@ -298,7 +299,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ), patch.object(
             llm_client, "_record_call", side_effect=lambda result, tokens=None: result
         ), patch.object(
-            llm_client, "_run_tool_chat_sync", return_value=expected
+            llm_client, "run_tool_chat_sync", return_value=expected
         ) as tool_chat, patch.object(
             llm_client, "_chat_openai_compatible"
         ) as compatible_chat:
@@ -323,7 +324,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ), patch.object(
             llm_client, "_chat_openai_compatible"
         ) as openai_chat, patch.object(
-            llm_client, "_run_tool_chat_sync"
+            llm_client, "run_tool_chat_sync"
         ) as tool_chat, patch.object(
             llm_client, "_chat_mistral", return_value=expected
         ) as mistral_chat, patch.object(
@@ -350,7 +351,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ), patch.object(
             llm_client, "_record_call", side_effect=lambda result, tokens=None: result
         ), patch.object(
-            llm_client, "_run_tool_chat_sync"
+            llm_client, "run_tool_chat_sync"
         ) as tool_chat, patch.object(
             llm_client, "_chat_mistral", return_value=expected
         ) as mistral_chat:
@@ -374,7 +375,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ) as openai_chat, patch.object(
             llm_client, "_chat_mistral"
         ) as mistral_chat, patch.object(
-            llm_client, "_run_tool_chat_sync"
+            llm_client, "run_tool_chat_sync"
         ) as tool_chat, patch.object(
             llm_client, "_chat_ollama", return_value=expected
         ) as ollama_chat:
@@ -396,7 +397,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ), patch.object(
             llm_client, "_record_call", side_effect=lambda result, tokens=None: result
         ), patch.object(
-            llm_client, "_run_tool_chat_sync", return_value=expected
+            llm_client, "run_tool_chat_sync", return_value=expected
         ) as tool_chat, patch.object(
             llm_client, "_chat_ollama"
         ) as ollama_chat:
@@ -453,7 +454,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ) as ensure_quota, patch.object(
             llm_client, "_record_call", side_effect=lambda result, tokens=None: result
         ) as record_call, patch.object(
-            llm_client, "_run_tool_chat_sync", return_value=expected
+            llm_client, "run_tool_chat_sync", return_value=expected
         ):
             result = llm_client.chat(MESSAGES)
 
@@ -470,7 +471,7 @@ class LLMClientProviderTest(unittest.TestCase):
         ) as ensure_quota, patch.object(
             llm_client, "_record_call", side_effect=lambda result, tokens=None: result
         ) as record_call, patch.object(
-            llm_client, "_run_tool_chat_sync", side_effect=RuntimeError("boom")
+            llm_client, "run_tool_chat_sync", side_effect=RuntimeError("boom")
         ):
             with self.assertRaisesRegex(RuntimeError, "boom"):
                 llm_client.chat(MESSAGES)
@@ -482,12 +483,12 @@ class LLMClientProviderTest(unittest.TestCase):
 class LLMClientToolHelpersTest(unittest.TestCase):
     def test_extract_structured_tool_output_prefers_structured_content(self) -> None:
         result = _FakeToolResult(structured_content={"answer": 42})
-        self.assertEqual(llm_client._extract_structured_tool_output(result), {"answer": 42})
+        self.assertEqual(llm_tool_client._extract_structured_tool_output(result), {"answer": 42})
 
     def test_extract_structured_tool_output_joins_text_blocks(self) -> None:
         blocks = [types.SimpleNamespace(text="a"), types.SimpleNamespace(text="b")]
         result = _FakeToolResult(content=blocks)
-        self.assertEqual(llm_client._extract_structured_tool_output(result), "a\nb")
+        self.assertEqual(llm_tool_client._extract_structured_tool_output(result), "a\nb")
 
     def test_run_provider_chat_appends_tool_trace_to_active_log(self) -> None:
         active_log: list[dict] = []
@@ -551,8 +552,8 @@ class LLMClientToolHelpersTest(unittest.TestCase):
             async def fake_with_mcp_session(mcp_settings, handler, http_client=None):
                 return await handler(_FakeSession([]), [])
 
-            with patch.object(llm_client, "_with_mcp_session", side_effect=fake_with_mcp_session):
-                result = await llm_client._run_openai_compatible_tool_loop(
+            with patch.object(llm_tool_client, "with_mcp_session", side_effect=fake_with_mcp_session):
+                result = await llm_tool_client._run_openai_compatible_tool_loop(
                     MESSAGES,
                     settings,
                     openai_client=fake_client,
@@ -597,8 +598,8 @@ class LLMClientToolHelpersTest(unittest.TestCase):
             async def fake_with_mcp_session(mcp_settings, handler, http_client=None):
                 return await handler(session, [fake_tool])
 
-            with patch.object(llm_client, "_with_mcp_session", side_effect=fake_with_mcp_session):
-                result = await llm_client._run_openai_compatible_tool_loop(
+            with patch.object(llm_tool_client, "with_mcp_session", side_effect=fake_with_mcp_session):
+                result = await llm_tool_client._run_openai_compatible_tool_loop(
                     MESSAGES,
                     settings,
                     openai_client=fake_client,
@@ -653,8 +654,8 @@ class LLMClientToolHelpersTest(unittest.TestCase):
             async def fake_with_mcp_session(mcp_settings, handler, http_client=None):
                 return await handler(session, fake_tools)
 
-            with patch.object(llm_client, "_with_mcp_session", side_effect=fake_with_mcp_session):
-                result = await llm_client._run_openai_compatible_tool_loop(
+            with patch.object(llm_tool_client, "with_mcp_session", side_effect=fake_with_mcp_session):
+                result = await llm_tool_client._run_openai_compatible_tool_loop(
                     MESSAGES,
                     settings,
                     openai_client=fake_client,