feat(provider): 完成阶段E协议适配、国内预设与模型路由

backend/app/providers/ollama.py

@@ -1,16 +1,22 @@
-from uuid import uuid4
 import json
-from collections.abc import AsyncIterator
-from datetime import datetime, timezone
+from contextlib import aclosing
+from uuid import uuid4
 
 import httpx
 
-from app.contracts import ModelCapability, ModelEvent, ModelEventType, ModelInfo, ModelRequest
+from app.contracts import MessageRole, ModelCapability, ModelEventType, ModelInfo, ModelRequest
 from app.providers.base import ProviderError, ProviderToolCall, ProviderTurn
-from app.providers.http_base import TurnStreamingMixin, decode_tool_arguments
+from app.providers.tool_names import mapped_tool_names
+from app.providers.http_base import (
+    EventStreamingMixin, HTTPProviderMixin, UsageTracker, decode_tool_arguments,
+    invalid_response, list_value, object_value, string_value, truncated_stream,
+)
 
 
-class OllamaProvider(TurnStreamingMixin):
+class OllamaProvider(EventStreamingMixin, HTTPProviderMixin):
+    stream_path = "/api/chat"
+    stream_format = "jsonl"
+
     def __init__(
         self,
         base_url: str = "http://127.0.0.1:11434",
@@ -21,126 +27,55 @@ class OllamaProvider(TurnStreamingMixin):
         self.timeout_seconds = timeout_seconds
         self.transport = transport
 
+    @mapped_tool_names
     async def complete(self, request: ModelRequest) -> ProviderTurn:
-        messages = []
-        if request.system:
-            messages.append({"role": "system", "content": request.system})
-        for message in request.messages:
-            item: dict[str, object] = {
-                "role": message.role.value,
-                "content": message.content,
-            }
-            if message.tool_calls:
-                item["tool_calls"] = [
-                    {
-                        "function": {
-                            "name": call.name,
-                            "arguments": call.arguments,
-                        }
-                    }
-                    for call in message.tool_calls
-                ]
-            messages.append(item)
-        payload: dict[str, object] = {
-            "model": request.model,
-            "messages": messages,
-            "stream": False,
-        }
-        if request.tools:
-            payload["tools"] = [
-                {
-                    "type": "function",
-                    "function": {
-                        "name": tool.name,
-                        "description": tool.description,
-                        "parameters": tool.parameters,
-                    },
-                }
-                for tool in request.tools
-            ]
-        data = await self._request("POST", "/api/chat", json=payload)
-        message = data.get("message") or {}
-        tool_calls = []
-        for raw_call in message.get("tool_calls") or []:
-            function = raw_call.get("function") or {}
-            tool_calls.append(
-                ProviderToolCall(
-                    tool_call_id=raw_call.get("id") or f"call_{uuid4().hex}",
-                    name=function.get("name") or "",
-                    arguments=decode_tool_arguments(function.get("arguments", {})),
-                )
-            )
-        return ProviderTurn(
-            text=message.get("content") or None,
-            tool_calls=tool_calls,
-            input_tokens=int(data.get("prompt_eval_count") or 0),
-            output_tokens=int(data.get("eval_count") or 0),
+        data = await self._request("POST", self.stream_path, json=self._chat_payload(request, stream=False))
+        message = object_value(data.get("message"))
+        calls = [self._tool_call(raw) for raw in list_value(message.get("tool_calls", []))]
+        content = message.get("content")
+        if content is not None:
+            content = string_value(content)
+        return ProviderTurn(text=content or None, tool_calls=calls,
+                            **UsageTracker("prompt_eval_count", "eval_count").update(data))
+
+    @staticmethod
+    def _tool_call(raw: object) -> ProviderToolCall:
+        call = object_value(raw)
+        function = object_value(call.get("function"))
+        return ProviderToolCall(
+            tool_call_id=string_value(call.get("id") or f"call_{uuid4().hex}"),
+            name=string_value(function.get("name"), nonempty=True),
+            arguments=decode_tool_arguments(function.get("arguments", {})),
         )
 
-    async def list_models(self) -> list[ModelInfo]:
-        data = await self._request("GET", "/api/tags")
-        return [
-            ModelInfo(
-                model=item["name"],
-                display_name=item.get("name", ""),
-                capabilities=[ModelCapability.chat, ModelCapability.streaming],
-            )
-            for item in data.get("models", [])
-            if isinstance(item, dict) and item.get("name")
-        ]
-
-    async def stream(self, request: ModelRequest) -> AsyncIterator[ModelEvent]:
-        payload = self._chat_payload(request, stream=True)
-        sequence = 0
-
-        def event(kind: ModelEventType, data: dict | None = None) -> ModelEvent:
-            nonlocal sequence
-            item = ModelEvent(
-                event=kind, sequence=sequence, data=data or {},
-                timestamp=datetime.now(timezone.utc),
-            )
-            sequence += 1
-            return item
-
-        try:
-            async for data in self._stream_json(payload):
-                message = data.get("message") or {}
+    async def _events(self, request: ModelRequest):
+        usage = UsageTracker("prompt_eval_count", "eval_count")
+        async with aclosing(self._stream_json(self._chat_payload(request, stream=True))) as chunks:
+            async for data in chunks:
+                message = object_value(data.get("message", {}))
                 if message.get("thinking"):
-                    yield event(ModelEventType.thinking_delta, {"text": message["thinking"]})
+                    yield ModelEventType.thinking_delta, {"text": string_value(message["thinking"])}
                 if message.get("content"):
-                    yield event(ModelEventType.text_delta, {"text": message["content"]})
-                for raw_call in message.get("tool_calls") or []:
-                    function = raw_call.get("function") or {}
-                    call_id = raw_call.get("id") or f"call_{uuid4().hex}"
-                    yield event(
-                        ModelEventType.tool_call_start,
-                        {"tool_call_id": call_id, "name": function.get("name") or ""},
-                    )
-                    yield event(
-                        ModelEventType.tool_call_delta,
-                        {
-                            "tool_call_id": call_id,
-                            "arguments_delta": json.dumps(
-                                function.get("arguments") or {}, ensure_ascii=False
-                            ),
-                        },
-                    )
-                    yield event(ModelEventType.tool_call_end, {"tool_call_id": call_id})
-                if data.get("done"):
-                    yield event(
-                        ModelEventType.usage,
-                        {
-                            "input_tokens": int(data.get("prompt_eval_count") or 0),
-                            "output_tokens": int(data.get("eval_count") or 0),
-                        },
-                    )
-            yield event(ModelEventType.done)
-        except ProviderError as exc:
-            yield event(ModelEventType.error, {"code": exc.code, "message": exc.message})
-            yield event(ModelEventType.done)
+                    yield ModelEventType.text_delta, {"text": string_value(message["content"])}
+                for raw in list_value(message.get("tool_calls", [])):
+                    call = self._tool_call(raw)
+                    yield ModelEventType.tool_call_start, {"tool_call_id": call.tool_call_id, "name": call.name}
+                    yield ModelEventType.tool_call_delta, {
+                        "tool_call_id": call.tool_call_id,
+                        "arguments_delta": json.dumps(call.arguments, ensure_ascii=False),
+                    }
+                    yield ModelEventType.tool_call_end, {"tool_call_id": call.tool_call_id}
+                if "done" in data and not isinstance(data["done"], bool):
+                    raise invalid_response()
+                if "prompt_eval_count" in data or "eval_count" in data or data.get("done"):
+                    yield ModelEventType.usage, usage.update(data)
+                if data.get("done") is True:
+                    return
+        raise truncated_stream()
 
     def _chat_payload(self, request: ModelRequest, *, stream: bool) -> dict[str, object]:
         messages = []
+        names: dict[str, str] = {}
         if request.system:
             messages.append({"role": "system", "content": request.system})
         for message in request.messages:
@@ -150,53 +85,49 @@ class OllamaProvider(TurnStreamingMixin):
                     {"function": {"name": call.name, "arguments": call.arguments}}
                     for call in message.tool_calls
                 ]
+                names.update({call.tool_call_id: call.name for call in message.tool_calls})
+            if message.role == MessageRole.tool:
+                name = message.name or names.get(message.tool_call_id or "")
+                if name:
+                    item["tool_name"] = name
             messages.append(item)
         payload: dict[str, object] = {
-            "model": request.model, "messages": messages, "stream": stream
+            "model": request.model, "messages": messages, "stream": stream,
         }
         if request.tools:
             payload["tools"] = [
-                {
-                    "type": "function",
-                    "function": {
-                        "name": tool.name,
-                        "description": tool.description,
-                        "parameters": tool.parameters,
-                    },
-                }
-                for tool in request.tools
+                {"type": "function", "function": {
+                    "name": tool.name, "description": tool.description, "parameters": tool.parameters,
+                }} for tool in request.tools
             ]
+        options = {}
+        if request.temperature is not None:
+            options["temperature"] = request.temperature
+        if request.max_tokens is not None:
+            options["num_predict"] = request.max_tokens
+        if options:
+            payload["options"] = options
+        if request.response_format:
+            format_ = request.response_format
+            if format_.get("type") == "json_object":
+                payload["format"] = "json"
+            elif format_.get("type") == "json_schema":
+                payload["format"] = object_value(object_value(format_.get("json_schema")).get("schema"))
+            else:
+                payload["format"] = format_
         return payload
 
-    async def _stream_json(self, payload: dict[str, object]) -> AsyncIterator[dict]:
-        try:
-            async with httpx.AsyncClient(
-                timeout=self.timeout_seconds, transport=self.transport
-            ) as client:
-                async with client.stream(
-                    "POST", f"{self.base_url}/api/chat", json=payload
-                ) as response:
-                    response.raise_for_status()
-                    async for line in response.aiter_lines():
-                        if not line.strip():
-                            continue
-                        try:
-                            data = json.loads(line)
-                        except json.JSONDecodeError as exc:
-                            raise ProviderError(
-                                "PROVIDER_INVALID_RESPONSE", "Ollama returned invalid JSONL."
-                            ) from exc
-                        if isinstance(data, dict):
-                            yield data
-        except httpx.TimeoutException as exc:
-            raise ProviderError("PROVIDER_TIMEOUT", "Ollama request timed out.") from exc
-        except httpx.HTTPStatusError as exc:
-            raise ProviderError(
-                "MODEL_NOT_FOUND" if exc.response.status_code == 404 else "PROVIDER_UNAVAILABLE",
-                f"Ollama returned HTTP {exc.response.status_code}.",
-            ) from exc
-        except httpx.HTTPError as exc:
-            raise ProviderError("PROVIDER_UNAVAILABLE", "Ollama is unavailable.") from exc
+    async def list_models(self) -> list[ModelInfo]:
+        data = await self._request("GET", "/api/tags")
+        return [
+            ModelInfo(
+                model=string_value(item["name"]), display_name=item["name"],
+                capabilities=([ModelCapability.embedding] if "embed" in item["name"].lower()
+                              else [ModelCapability.chat, ModelCapability.streaming]),
+            )
+            for item in list_value(data.get("models"))
+            if isinstance(item, dict) and isinstance(item.get("name"), str) and item["name"]
+        ]
 
     async def test_connection(self, model: str | None = None) -> tuple[bool, str]:
         try:
@@ -206,24 +137,3 @@ class OllamaProvider(TurnStreamingMixin):
         if model and model not in {item.model for item in models}:
             return False, f"Model is not installed: {model}"
         return True, f"Connected; discovered {len(models)} local model(s)."
-
-    async def _request(self, method: str, path: str, **kwargs) -> dict:
-        try:
-            async with httpx.AsyncClient(
-                timeout=self.timeout_seconds, transport=self.transport
-            ) as client:
-                response = await client.request(method, f"{self.base_url}{path}", **kwargs)
-                response.raise_for_status()
-                data = response.json()
-        except httpx.TimeoutException as exc:
-            raise ProviderError("PROVIDER_TIMEOUT", "Ollama request timed out.") from exc
-        except httpx.HTTPStatusError as exc:
-            raise ProviderError(
-                "MODEL_NOT_FOUND" if exc.response.status_code == 404 else "PROVIDER_UNAVAILABLE",
-                f"Ollama returned HTTP {exc.response.status_code}.",
-            ) from exc
-        except (httpx.HTTPError, ValueError) as exc:
-            raise ProviderError("PROVIDER_UNAVAILABLE", "Ollama is unavailable.") from exc
-        if not isinstance(data, dict):
-            raise ProviderError("PROVIDER_INVALID_RESPONSE", "Ollama returned non-object JSON.")
-        return data