From a9f083785a7e961a291e5366013fc89c0b801b01 Mon Sep 17 00:00:00 2001
From: tanaka takashi <isazaka@gmail.com>
Date: Sun, 16 Aug 2026 21:34:13 +0900
Subject: refactor: streamline chat flow and improve diagnostics

Store server.log inside OLLAMA_WEB_DATA_DIR and manage the ollama-web file handler through the Starlette lifespan. Close and detach the handler on shutdown to prevent duplicate records and Windows file locks when applications are recreated.

Stop converting DuckDuckGo provider failures into empty search results. Record a query-safe traceback, re-raise the original exception, and let ToolRegistry expose the exception type and message as a tool error without adding or spoofing Referer headers.

Remove the unused non-streaming chat_with_tools implementation and its private helpers. Move capability, options, standard tool, MCP tool, and final tools=[] regression coverage onto the production streaming path.

Add integration coverage for data/server.log placement, handler cleanup, repeated lifespans, and provider 403 diagnostics. Update the Unreleased changelog entry.

Validated with 118 tests, Ruff, mypy, diff checks, real DuckDuckGo searches, successful result-page fetches, and observable 401/403 responses from sites that reject automated retrieval.
---
 tests/test_settings.py | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'tests/test_settings.py')

diff --git a/tests/test_settings.py b/tests/test_settings.py
index 0f334f4..d19f64d 100644
--- a/tests/test_settings.py
+++ b/tests/test_settings.py
@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
+from types import SimpleNamespace
 from typing import Any
 
 import pytest
@@ -151,24 +152,28 @@ def test_options_are_forwarded_to_tool_and_final_rounds(monkeypatch: pytest.Monk
         def __init__(self) -> None:
             self.calls: list[dict[str, Any]] = []
 
-        def chat(self, **kwargs: Any) -> dict[str, Any]:
+        def chat(self, **kwargs: Any) -> list[SimpleNamespace]:
             self.calls.append(kwargs)
             if len(self.calls) == 1:
-                return {
-                    "message": {
-                        "role": "assistant",
-                        "content": "",
-                        "tool_calls": [{"function": {"name": "missing_tool", "arguments": {}}}],
-                    }
-                }
-            return {"message": {"role": "assistant", "content": "done"}}
+                return [
+                    SimpleNamespace(
+                        message={
+                            "role": "assistant",
+                            "content": "",
+                            "tool_calls": [
+                                {"function": {"name": "missing_tool", "arguments": {}}}
+                            ],
+                        }
+                    )
+                ]
+            return [SimpleNamespace(message={"content": "done"})]
 
     client = FakeClient()
     monkeypatch.setattr(llm, "get_client", lambda _host=None: client)
     monkeypatch.setattr(llm, "MAX_TOOL_ROUNDS", 1)
     options = {"temperature": 0.8, "num_ctx": 8192, "top_p": 0.9}
     events = list(
-        llm.chat_with_tools(
+        llm.stream_chat_with_tools(
             [Message(role="user", content="hello")],
             "test-model",
             capabilities={"tools"},
-- 
cgit v1.2.3