f111297af1
CustomProfile did not override supported_reasoning_efforts, so on the Responses transport a custom:<name> relay fell through to the OpenAI per-model ladder (codex_supported_efforts) and a configured effort=max was silently clamped to xhigh — while the same provider over chat-completions forwarded max unchanged, because that path already clamps onto OPENAI_COMPAT_WIRE_EFFORTS. Declare the same wire set from the profile so the two transports agree: max survives, ultra still clamps down to max, and the official OpenAI backend ladder (gpt-5.5 rejecting max) is untouched. Fixes #114249
87 lines
4.1 KiB
Python
87 lines
4.1 KiB
Python
"""Custom / Ollama (local) provider profile: any endpoint registered as
|
|
provider="custom" (Ollama, vLLM, llama.cpp, GLM-5.2 on ARK, …)."""
|
|
|
|
from typing import Any
|
|
from urllib.parse import urlparse
|
|
|
|
from agent.reasoning_effort import OPENAI_COMPAT_WIRE_EFFORTS, clamp_effort
|
|
from providers import register_provider
|
|
from providers.base import ProviderProfile
|
|
|
|
|
|
def _looks_like_ollama_endpoint(base_url: str | None) -> bool:
|
|
"""True only for explicit Ollama signatures (port 11434 or an ``ollama`` host label).
|
|
``think`` is Ollama-native; strict hosts (Mistral, Groq) 422 on it, and
|
|
arbitrary localhost may be llama.cpp / vLLM / LM Studio."""
|
|
raw = (base_url or "").strip()
|
|
if not raw:
|
|
return False
|
|
parsed = urlparse(raw if "://" in raw else f"//{raw}")
|
|
try: # urlparse raises ValueError on malformed ports ("host:99999"); treat as not-Ollama.
|
|
if parsed.port == 11434:
|
|
return True
|
|
except ValueError:
|
|
return False
|
|
host = (parsed.hostname or "").lower().rstrip(".")
|
|
return bool(host) and (host == "ollama.com" or host.endswith(".ollama.com") or "ollama" in host.split("."))
|
|
|
|
|
|
class CustomProfile(ProviderProfile):
|
|
"""Custom/Ollama local provider — think=false and num_ctx support."""
|
|
|
|
def supported_reasoning_efforts(self, model: str | None) -> tuple[str, ...]:
|
|
"""The OpenAI-compat wire set, mirroring this profile's own chat-completions clamp.
|
|
|
|
Without this declaration the Responses transport clamps onto the OpenAI
|
|
per-model ladder (``codex_supported_efforts``), where ``max`` is gpt-5.6-only —
|
|
so a custom relay's model had a configured ``max`` silently demoted to
|
|
``xhigh`` while the same provider over chat-completions forwarded ``max``
|
|
unchanged (#114249). A custom endpoint's vocabulary is undiscoverable, so
|
|
the widest OpenAI-compat set is the honest ceiling; ``ultra`` still clamps
|
|
to ``max`` via the shared ``clamp_effort`` policy.
|
|
"""
|
|
return OPENAI_COMPAT_WIRE_EFFORTS
|
|
|
|
def build_api_kwargs_extras(
|
|
self, *, reasoning_config: dict | None = None, ollama_num_ctx: int | None = None, **ctx: Any
|
|
) -> tuple[dict[str, Any], dict[str, Any]]:
|
|
extra_body: dict[str, Any] = {}
|
|
top_level: dict[str, Any] = {}
|
|
if ollama_num_ctx:
|
|
extra_body["options"] = {"num_ctx": ollama_num_ctx}
|
|
# disabled -> top-level reasoning_effort="none" (Ollama's /v1 ignores
|
|
# extra_body.think) plus think=False only on Ollama URLs; enabled+effort ->
|
|
# top-level reasoning_effort clamped to the OpenAI-compat wire (GLM/ARK,
|
|
# vLLM and SGLang all top out at "max"; "ultra" verbatim 400s); enabled
|
|
# without effort -> omit so the server default applies. Never emit
|
|
# think=True (Ollama-only flag).
|
|
if reasoning_config and isinstance(reasoning_config, dict):
|
|
effort = (reasoning_config.get("effort") or "").strip().lower()
|
|
if effort == "none" or reasoning_config.get("enabled", True) is False:
|
|
# See #14820.
|
|
top_level["reasoning_effort"] = "none"
|
|
if _looks_like_ollama_endpoint(ctx.get("base_url")):
|
|
extra_body["think"] = False
|
|
elif effort:
|
|
top_level["reasoning_effort"] = clamp_effort(effort, OPENAI_COMPAT_WIRE_EFFORTS)
|
|
return extra_body, top_level
|
|
|
|
def fetch_models(
|
|
self, *, api_key: str | None = None, base_url: str | None = None, timeout: float = 8.0
|
|
) -> list[str] | None:
|
|
"""base_url is user-configured; fetch only if set."""
|
|
if not (base_url or self.base_url):
|
|
return None
|
|
return super().fetch_models(api_key=api_key, base_url=base_url, timeout=timeout)
|
|
|
|
|
|
custom = CustomProfile(
|
|
name="custom", aliases=("ollama", "local", "vllm", "llamacpp", "llama.cpp", "llama-cpp"),
|
|
env_vars=(), # No fixed key — custom endpoint
|
|
base_url="", # User-configured
|
|
# An arbitrary client ceiling can exceed a local server's actual output limit.
|
|
# The endpoint owns its generation default.
|
|
)
|
|
|
|
register_provider(custom)
|