diff --git a/dashboard/src/locales/en.json b/dashboard/src/locales/en.json
index 6e55a88754..26bd625c08 100644
--- a/dashboard/src/locales/en.json
+++ b/dashboard/src/locales/en.json
@@ -3731,7 +3731,7 @@
"fetchModelsMerged": "Added {{count}} new models to list (existing ones unchanged)",
"fetchModelsNoNew": "No new models to add",
"fetchModelsFailed": "Failed to fetch models: {{error}}",
- "fetchModelsUnsupportedKind": "Auto-fetch is only supported for OpenAI-compatible providers",
+ "fetchModelsUnsupportedKind": "Auto-fetch is only supported for OpenAI and Anthropic providers",
"customModelsLabel": "Models",
"customModelsHint": "Fetched models are off by default — enable, test, edit, or remove; or add manually",
"onnxLocalService": "Local ONNX embedding",
diff --git a/dashboard/src/locales/zh.json b/dashboard/src/locales/zh.json
index 74e95645b8..5994b6af82 100644
--- a/dashboard/src/locales/zh.json
+++ b/dashboard/src/locales/zh.json
@@ -3730,7 +3730,7 @@
"fetchModelsMerged": "已新增 {{count}} 个模型到列表(已有模型保持不变)",
"fetchModelsNoNew": "没有可新增的模型",
"fetchModelsFailed": "获取模型失败:{{error}}",
- "fetchModelsUnsupportedKind": "仅 OpenAI 兼容供应商支持自动获取模型列表",
+ "fetchModelsUnsupportedKind": "仅 OpenAI 和 Anthropic 供应商支持自动获取模型列表",
"customModelsLabel": "模型",
"customModelsHint": "获取后默认未启用,可开启开关、测试、编辑或删除;也可手动添加",
"onnxLocalService": "本地 ONNX Embedding",
diff --git a/dashboard/src/pages/Settings/Models/components/modals/CustomProviderModal.tsx b/dashboard/src/pages/Settings/Models/components/modals/CustomProviderModal.tsx
index a0ffc164cf..ee19104996 100644
--- a/dashboard/src/pages/Settings/Models/components/modals/CustomProviderModal.tsx
+++ b/dashboard/src/pages/Settings/Models/components/modals/CustomProviderModal.tsx
@@ -124,7 +124,8 @@ export function CustomProviderModal({
const handleFetchModels = async () => {
try {
const values = await form.validateFields(["kind", "api_key", "base_url"]);
- if ((values.kind as string) !== "openai") {
+ const currentKind = String(values.kind || "").toLowerCase();
+ if (currentKind !== "openai" && currentKind !== "anthropic") {
message.warning(t("models.fetchModelsUnsupportedKind"));
return;
}
@@ -135,7 +136,7 @@ export function CustomProviderModal({
}
setFetchingModels(true);
const result = await fetchProviderModels({
- kind: "openai",
+ kind: currentKind,
api_key: apiKey,
base_url: (values.base_url as string | undefined)?.trim() || null,
});
@@ -333,7 +334,7 @@ export function CustomProviderModal({
- {kind === "openai" && (
+ {(kind === "openai" || kind === "anthropic") && (
}
@@ -404,7 +405,7 @@ export function CustomProviderModal({
>
{t("models.testConnection")}
- {kind === "openai" && (
+ {(kind === "openai" || kind === "anthropic") && (
}
diff --git a/dashboard/src/pages/Settings/Models/components/modals/PresetProviderModal.tsx b/dashboard/src/pages/Settings/Models/components/modals/PresetProviderModal.tsx
index 568e124169..5b017424d6 100644
--- a/dashboard/src/pages/Settings/Models/components/modals/PresetProviderModal.tsx
+++ b/dashboard/src/pages/Settings/Models/components/modals/PresetProviderModal.tsx
@@ -129,8 +129,12 @@ export function PresetProviderModal({
return;
}
setFetchingModels(true);
+ const kind =
+ preset.protocol === "anthropic" || preset.id.includes("anthropic")
+ ? "anthropic"
+ : "openai";
const result = await fetchProviderModels({
- kind: "openai",
+ kind,
api_key: key,
base_url: values.base_url?.trim() || preset.base_url,
name: preset.id,
diff --git a/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx b/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx
index f0c846b296..73eed3e26e 100644
--- a/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx
+++ b/dashboard/src/pages/Settings/Models/components/modals/ProviderConfigModal.tsx
@@ -934,8 +934,10 @@ export function ProviderConfigModal({
}
const values = form.getFieldsValue();
- const kind = (values.kind as string | undefined) ?? provider.kind;
- if (kind !== "openai") {
+ const currentKind = String(
+ (values.kind as string | undefined) ?? provider.kind ?? "",
+ ).toLowerCase();
+ if (currentKind !== "openai" && currentKind !== "anthropic") {
message.warning(t("models.fetchModelsUnsupportedKind"));
return;
}
@@ -949,7 +951,7 @@ export function ProviderConfigModal({
setFetchingModels(true);
const result = await fetchProviderModels({
- kind: "openai",
+ kind: currentKind,
api_key: apiKey,
base_url: draftBaseUrl || provider.base_url,
name: provider.name,
diff --git a/src/octop/__init__.py b/src/octop/__init__.py
index 6f22143331..e1f642771e 100644
--- a/src/octop/__init__.py
+++ b/src/octop/__init__.py
@@ -9,3 +9,15 @@
# httpx 0.28 treats NO_PROXY CIDR as an exact IP (see issue #1347). Patch once
# at import so CLI, ``octop run``, and in-process harness clients all honor it.
install_httpx_cidr_no_proxy()
+
+# langchain-anthropic 1.7.x crashes on message_delta events carrying dict-shaped
+# context_management from recent Anthropic API updates. Patch once at import.
+try:
+ from octop.infra.agents.providers.anthropic_compat import (
+ patch_langchain_anthropic_context_management,
+ )
+
+ patch_langchain_anthropic_context_management()
+except Exception:
+ pass
+
diff --git a/src/octop/api/routers/providers.py b/src/octop/api/routers/providers.py
index aec8d645b9..3bde67d373 100644
--- a/src/octop/api/routers/providers.py
+++ b/src/octop/api/routers/providers.py
@@ -28,6 +28,7 @@
from octop.infra.agents.providers.model_flags import is_local_runtime_provider
from octop.infra.agents.providers.presets import load_provider_presets
from octop.infra.agents.providers.probe import (
+ fetch_anthropic_models,
fetch_openai_compatible_models,
make_probe_provider_row,
parse_provider_extra,
@@ -490,23 +491,25 @@ async def admin_test_provider_draft(
)
-@admin_router.post("/fetch-models", summary="List models from an OpenAI-compatible draft")
+@admin_router.post("/fetch-models", summary="List models from a provider draft")
async def admin_fetch_provider_models(
body: ProviderFetchModelsBody,
request: Request,
_: Any = Depends(require_permission("providers")),
) -> dict[str, Any]:
- """Fetch remote model ids via OpenAI-compatible ``GET /models`` (openai kind only)."""
- if body.kind != "openai":
+ """Fetch remote model ids via GET /models (OpenAI-compatible or Anthropic)."""
+ kind = (body.kind or "").strip().lower()
+ if kind not in ("openai", "anthropic"):
return {
"ok": False,
- "error": "fetch models is only supported for openai-compatible providers",
+ "error": "fetch models is only supported for openai and anthropic providers",
}
api_key = (body.api_key or "").strip()
if not api_key:
return {"ok": False, "error": "api_key is required"}
draft = SimpleNamespace(extra_json=body.extra_json)
- return await fetch_openai_compatible_models(
+ fetcher = fetch_anthropic_models if kind == "anthropic" else fetch_openai_compatible_models
+ return await fetcher(
base_url=(body.base_url or "").strip() or None,
api_key=api_key,
extra_headers=provider_headers(draft) or None,
diff --git a/src/octop/infra/agents/providers/__init__.py b/src/octop/infra/agents/providers/__init__.py
index d68df63931..dd1edad956 100644
--- a/src/octop/infra/agents/providers/__init__.py
+++ b/src/octop/infra/agents/providers/__init__.py
@@ -1,5 +1,8 @@
"""DB-backed LLM provider catalog and harness factory sync."""
+from octop.infra.agents.providers.anthropic_compat import (
+ patch_langchain_anthropic_context_management,
+)
from octop.infra.agents.providers.harness_factory import sync_providers_to_harness
from octop.infra.agents.providers.host_factory import HostModelFactory
from octop.infra.agents.providers.store import (
@@ -13,5 +16,7 @@
"AutoRouteCandidate",
"HostModelFactory",
"ProviderStore",
+ "patch_langchain_anthropic_context_management",
"sync_providers_to_harness",
]
+
diff --git a/src/octop/infra/agents/providers/anthropic_compat.py b/src/octop/infra/agents/providers/anthropic_compat.py
new file mode 100644
index 0000000000..bef84c96ab
--- /dev/null
+++ b/src/octop/infra/agents/providers/anthropic_compat.py
@@ -0,0 +1,114 @@
+"""Upstream compatibility patches for langchain-anthropic / anthropic SDK.
+
+Fixes an AttributeError crash in ``langchain_anthropic.chat_models`` during streaming:
+when Anthropic returns a ``message_delta`` event carrying ``context_management``
+(an unannounced or newly introduced field on the raw API response), the anthropic
+SDK stores it in ``__pydantic_extra__`` as a plain ``dict`` rather than a pydantic
+model because the non-beta ``RawMessageDeltaEvent`` type does not declare the field.
+
+``ChatAnthropic._make_message_chunk_from_anthropic_event`` then unconditionally calls
+``context_management.model_dump()``, raising:
+ AttributeError: 'dict' object has no attribute 'model_dump'
+
+This patch wraps ``_make_message_chunk_from_anthropic_event`` (or normalizes the
+field on the event) so dicts pass through safely while pydantic models continue to
+call ``model_dump()``.
+"""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+logger = logging.getLogger(__name__)
+
+_PATCHED_ATTR = "_octop_anthropic_compat_applied"
+
+
+def _dump_or_dict(value: Any) -> Any:
+ """Return dict representation whether *value* is a pydantic model or already a dict."""
+ if value is None:
+ return None
+ dump = getattr(value, "model_dump", None)
+ if callable(dump):
+ try:
+ return dump()
+ except TypeError:
+ return dump(mode="json")
+ if isinstance(value, dict):
+ return dict(value)
+ return value
+
+
+def patch_langchain_anthropic_context_management() -> bool:
+ """Monkey-patch ChatAnthropic._make_message_chunk_from_anthropic_event if present."""
+ try:
+ import langchain_anthropic.chat_models as mod
+ except ImportError:
+ return False
+
+ chat_cls = getattr(mod, "ChatAnthropic", None)
+ if chat_cls is None:
+ return False
+
+ if getattr(chat_cls, _PATCHED_ATTR, False):
+ return True
+
+ original_make = getattr(chat_cls, "_make_message_chunk_from_anthropic_event", None)
+ if not callable(original_make):
+ return False
+
+ def _safe_make_message_chunk_from_anthropic_event(
+ self: Any,
+ event: Any,
+ *args: Any,
+ **kwargs: Any,
+ ) -> Any:
+ # If the event carries a dict-shaped context_management, adapt it so
+ # .model_dump() won't crash if called, OR let original run if it's already a model.
+ cm = getattr(event, "context_management", None)
+ if isinstance(cm, dict) and not hasattr(cm, "model_dump"):
+ # Provide a dummy model_dump method on the dict, or swap to an object
+ # that implements model_dump. Subclassing dict is cleanest.
+ class _DictWithModelDump(dict):
+ def model_dump(self, *a: Any, **kw: Any) -> dict[str, Any]:
+ return dict(self)
+
+ try:
+ object.__setattr__(event, "context_management", _DictWithModelDump(cm))
+ except (AttributeError, TypeError):
+ # Event might be frozen; fall through to wrapped call
+ pass
+
+ try:
+ return original_make(self, event, *args, **kwargs)
+ except AttributeError as exc:
+ if "model_dump" not in str(exc):
+ raise
+ # Fallback path if the attribute could not be replaced on event:
+ # temporarily suppress the failure by creating a proxy or catching it.
+ # Usually the above object.__setattr__ succeeds because BaseModel allows
+ # mutating __dict__/__pydantic_extra__.
+ logger.warning(
+ "ChatAnthropic._make_message_chunk_from_anthropic_event hit model_dump error, adapting: %s",
+ exc,
+ )
+ # Re-read context_management and replace it in event.__dict__ or __pydantic_extra__
+ extra = getattr(event, "__pydantic_extra__", None)
+ if isinstance(extra, dict) and "context_management" in extra:
+ val = extra["context_management"]
+ if isinstance(val, dict):
+ class _D(dict):
+ def model_dump(self, *a: Any, **kw: Any) -> dict[str, Any]:
+ return dict(self)
+ extra["context_management"] = _D(val)
+ return original_make(self, event, *args, **kwargs)
+ raise
+
+ setattr(chat_cls, "_make_message_chunk_from_anthropic_event", _safe_make_message_chunk_from_anthropic_event)
+ setattr(chat_cls, _PATCHED_ATTR, True)
+ logger.debug("Applied ChatAnthropic context_management stream patch")
+ return True
+
+
+__all__ = ["patch_langchain_anthropic_context_management"]
diff --git a/src/octop/infra/agents/providers/probe.py b/src/octop/infra/agents/providers/probe.py
index 1b9d0614f7..7b5cc61d28 100644
--- a/src/octop/infra/agents/providers/probe.py
+++ b/src/octop/infra/agents/providers/probe.py
@@ -18,6 +18,7 @@
logger = logging.getLogger(__name__)
_DEFAULT_OPENAI_BASE_URL = "https://api.openai.com/v1"
+_DEFAULT_ANTHROPIC_BASE_URL = "https://api.anthropic.com/v1"
_FETCH_MODELS_TIMEOUT_S = 30.0
_EMBEDDING_PROBE_TEXT = "ping"
@@ -376,3 +377,77 @@ async def fetch_openai_compatible_models(
models.append({"id": mid, "name": mid})
models.sort(key=lambda m: m["id"])
return {"ok": True, "models": models}
+
+
+async def fetch_anthropic_models(
+ *,
+ base_url: str | None,
+ api_key: str,
+ extra_headers: dict[str, str] | None = None,
+ locale: str = "en",
+ provider_name: str | None = None,
+) -> dict[str, Any]:
+ """List models via Anthropic's ``GET {base}/models`` endpoint."""
+ root = (base_url or "").strip().rstrip("/") or _DEFAULT_ANTHROPIC_BASE_URL
+ url = f"{root}/models"
+ headers: dict[str, str] = {
+ "x-api-key": api_key,
+ "anthropic-version": "2023-06-01",
+ }
+ extra_headers = ensure_opencode_session_header(provider_name, extra_headers, base_url=base_url)
+ if extra_headers:
+ headers.update(extra_headers)
+ try:
+ async with httpx.AsyncClient(timeout=_FETCH_MODELS_TIMEOUT_S) as client:
+ response = await client.get(url, headers=headers)
+ except Exception as exc:
+ logger.info(
+ "provider fetch-models (anthropic) failed for %s: %r (%s)",
+ url,
+ exc,
+ type(exc).__name__,
+ )
+ return {"ok": False, "error": _friendly_probe_error(exc, locale=locale)}
+
+ if response.status_code >= 400:
+ detail = response.text.strip()
+ if len(detail) > 300:
+ detail = detail[:300] + "…"
+ error = f"HTTP {response.status_code}"
+ if detail:
+ error = f"{error}: {detail}"
+ return {"ok": False, "error": _friendly_probe_error(error, locale=locale)}
+
+ try:
+ payload = response.json()
+ except Exception:
+ return {
+ "ok": False,
+ "error": "response is not valid JSON (expected Anthropic /models)",
+ }
+
+ data = payload.get("data") if isinstance(payload, dict) else None
+ if not isinstance(data, list):
+ return {
+ "ok": False,
+ "error": "response is not valid Anthropic models payload (expected {data: [{id, display_name, …}]})",
+ }
+
+ models: list[dict[str, str]] = []
+ seen: set[str] = set()
+ for item in data:
+ if not isinstance(item, dict):
+ continue
+ mid = item.get("id")
+ if not isinstance(mid, str) or not mid.strip():
+ continue
+ mid = mid.strip()
+ if mid in seen:
+ continue
+ seen.add(mid)
+ display_name = item.get("display_name")
+ name = display_name.strip() if isinstance(display_name, str) and display_name.strip() else mid
+ models.append({"id": mid, "name": name})
+ models.sort(key=lambda m: m["id"])
+ return {"ok": True, "models": models}
+
diff --git a/tests/integration/test_provider_fetch_models.py b/tests/integration/test_provider_fetch_models.py
index 9d63566316..3e3d754144 100644
--- a/tests/integration/test_provider_fetch_models.py
+++ b/tests/integration/test_provider_fetch_models.py
@@ -23,21 +23,49 @@ async def test_admin_fetch_models_requires_api_key(env: Any) -> None:
assert "api_key" in body["error"]
-async def test_admin_fetch_models_rejects_non_openai_kind(env: Any) -> None:
+async def test_admin_fetch_models_rejects_unsupported_kind(env: Any) -> None:
client, _srv, auth = env
r = await client.post(
"/api/admin/providers/fetch-models",
headers=auth,
json={
- "kind": "anthropic",
+ "kind": "unsupported-kind",
"api_key": "sk-test",
- "base_url": "https://api.anthropic.com",
+ "base_url": "https://api.example.com",
},
)
assert r.status_code == 200
body = r.json()
assert body["ok"] is False
- assert "openai" in body["error"].lower()
+ assert "openai" in body["error"].lower() and "anthropic" in body["error"].lower()
+
+
+async def test_admin_fetch_models_anthropic_dispatched(env: Any) -> None:
+ client, _srv, auth = env
+ fake = {
+ "ok": True,
+ "models": [{"id": "claude-3-7-sonnet", "name": "Claude 3.7 Sonnet"}],
+ }
+ with patch(
+ "octop.api.routers.providers.fetch_anthropic_models",
+ new=AsyncMock(return_value=fake),
+ ) as mocked:
+ r = await client.post(
+ "/api/admin/providers/fetch-models",
+ headers=auth,
+ json={
+ "kind": "anthropic",
+ "api_key": "sk-ant-test",
+ "base_url": "https://api.anthropic.com/v1",
+ },
+ )
+ assert r.status_code == 200, r.text
+ assert r.json() == fake
+ mocked.assert_awaited_once()
+ kwargs = mocked.await_args.kwargs
+ assert kwargs["api_key"] == "sk-ant-test"
+ assert kwargs["base_url"] == "https://api.anthropic.com/v1"
+
async def test_admin_fetch_models_success(env: Any) -> None:
diff --git a/tests/unit/agents/test_anthropic_compat.py b/tests/unit/agents/test_anthropic_compat.py
new file mode 100644
index 0000000000..819ea01668
--- /dev/null
+++ b/tests/unit/agents/test_anthropic_compat.py
@@ -0,0 +1,45 @@
+"""Tests for langchain-anthropic context_management stream patch."""
+
+from __future__ import annotations
+
+from unittest.mock import MagicMock
+
+from octop.infra.agents.providers.anthropic_compat import (
+ patch_langchain_anthropic_context_management,
+)
+
+
+def test_patch_adapts_dict_context_management() -> None:
+ """Verify that a message_delta event with dict-shaped context_management does not crash."""
+ patch_langchain_anthropic_context_management()
+
+ from langchain_anthropic.chat_models import ChatAnthropic
+
+ chat = ChatAnthropic(model="claude-3-7-sonnet-20250219", api_key="mock-key")
+
+ # Construct an event mimicking what Anthropic API returns on final message_delta
+ event = MagicMock()
+ event.type = "message_delta"
+ event.usage = MagicMock()
+ event.usage.input_tokens = 10
+ event.usage.output_tokens = 5
+ event.usage.cache_creation_input_tokens = 0
+ event.usage.cache_read_input_tokens = 0
+ event.delta = MagicMock()
+ event.delta.stop_reason = "end_turn"
+ event.delta.stop_sequence = None
+ event.delta.container = None
+ # Crucial: context_management is a plain dict (no model_dump method)
+ event.context_management = {"edits": []}
+
+ # Calling _make_message_chunk_from_anthropic_event must succeed without AttributeError
+ chunk, _ = chat._make_message_chunk_from_anthropic_event(
+ event,
+ stream_usage=True,
+ coerce_content_to_string=False,
+ block_start_event=None,
+ )
+
+ assert chunk is not None
+ assert chunk.response_metadata.get("context_management") == {"edits": []}
+ assert chunk.response_metadata.get("stop_reason") == "end_turn"
diff --git a/tests/unit/test_provider_fetch_models.py b/tests/unit/test_provider_fetch_models.py
index c5a8d90ef4..9c21158648 100644
--- a/tests/unit/test_provider_fetch_models.py
+++ b/tests/unit/test_provider_fetch_models.py
@@ -238,3 +238,67 @@ async def test_fetch_models_server_error_friendly() -> None:
assert result["ok"] is False
assert "temporarily unavailable" in result["error"].lower()
assert "503" not in result["error"]
+
+
+@pytest.mark.asyncio
+async def test_fetch_anthropic_models_success() -> None:
+ from octop.infra.agents.providers.probe import fetch_anthropic_models
+
+ response = _mock_response(
+ 200,
+ {
+ "data": [
+ {
+ "type": "model",
+ "id": "claude-3-7-sonnet-20250219",
+ "display_name": "Claude 3.7 Sonnet",
+ "created_at": "2025-02-19T00:00:00Z",
+ },
+ {
+ "type": "model",
+ "id": "claude-3-5-haiku-20241022",
+ "display_name": "Claude 3.5 Haiku",
+ "created_at": "2024-10-22T00:00:00Z",
+ },
+ ]
+ },
+ )
+ mock_client = AsyncMock()
+ mock_client.get = AsyncMock(return_value=response)
+ mock_client.__aenter__ = AsyncMock(return_value=mock_client)
+ mock_client.__aexit__ = AsyncMock(return_value=None)
+
+ with patch("octop.infra.agents.providers.probe.httpx.AsyncClient", return_value=mock_client):
+ result = await fetch_anthropic_models(
+ base_url="https://api.anthropic.com/v1",
+ api_key="sk-ant-test",
+ )
+
+ assert result["ok"] is True
+ assert result["models"] == [
+ {"id": "claude-3-5-haiku-20241022", "name": "Claude 3.5 Haiku"},
+ {"id": "claude-3-7-sonnet-20250219", "name": "Claude 3.7 Sonnet"},
+ ]
+ mock_client.get.assert_awaited_once()
+ args, kwargs = mock_client.get.await_args
+ assert args[0] == "https://api.anthropic.com/v1/models"
+ assert kwargs["headers"]["x-api-key"] == "sk-ant-test"
+ assert kwargs["headers"]["anthropic-version"] == "2023-06-01"
+
+
+@pytest.mark.asyncio
+async def test_fetch_anthropic_models_defaults_base_url() -> None:
+ from octop.infra.agents.providers.probe import fetch_anthropic_models
+
+ response = _mock_response(200, {"data": []})
+ mock_client = AsyncMock()
+ mock_client.get = AsyncMock(return_value=response)
+ mock_client.__aenter__ = AsyncMock(return_value=mock_client)
+ mock_client.__aexit__ = AsyncMock(return_value=None)
+
+ with patch("octop.infra.agents.providers.probe.httpx.AsyncClient", return_value=mock_client):
+ result = await fetch_anthropic_models(base_url=None, api_key="sk-ant-test")
+
+ assert result["ok"] is True
+ assert mock_client.get.await_args.args[0] == "https://api.anthropic.com/v1/models"
+