Use Claude Code, Codex, VSCode, Pi, and OpenCode (and 6 other harnesses) for free (1.3B+ free tokens) from your terminal, app, IDE, or phone, and now from the browser with native browser sessions (multi-harness + multi-model) like OpenClaw (voice supported + ToS friendly)
Python
fix: accept system role messages
Alishahryar1cebdc02a3203
diff --git a/api/models/anthropic.py b/api/models/anthropic.pyindex 1d418df4..7f38a2ca 100644--- a/api/models/anthropic.py+++ b/api/models/anthropic.py@@ -3,7 +3,7 @@from enum import StrEnumfrom typing import Any, Literal-from pydantic import BaseModel, ConfigDict, Field+from pydantic import BaseModel, ConfigDict, Field, model_validator# =============================================================================@@ -88,6 +88,56 @@ class SystemContent(_AnthropicBlockBase):text: str+def _text_system_block(text: str) -> dict[str, str]:+ return {"type": "text", "text": text}+++def _merge_system_values(existing: Any, additions: list[Any]) -> Any:+ values = [existing] if existing is not None else []+ values.extend(additions)++ if all(isinstance(value, str) for value in values):+ return "\n\n".join(value for value in values if value)++ blocks: list[Any] = []+ for value in values:+ if isinstance(value, str):+ blocks.append(_text_system_block(value))+ elif isinstance(value, list):+ blocks.extend(value)+ else:+ blocks.append(value)+ return blocks+++def _normalize_system_role_messages(data: Any) -> Any:+ if not isinstance(data, dict):+ return data++ messages = data.get("messages")+ if not isinstance(messages, list):+ return data++ system_contents: list[Any] = []+ normalized_messages: list[Any] = []+ for message in messages:+ role = message.get("role") if isinstance(message, dict) else None+ if role == Role.system:+ system_contents.append(message.get("content", ""))+ continue+ normalized_messages.append(message)++ if not system_contents:+ return data++ normalized = dict(data)+ normalized["messages"] = normalized_messages+ normalized["system"] = _merge_system_values(+ normalized.get("system"), system_contents+ )+ return normalized++# =============================================================================# Message Types# =============================================================================@@ -132,6 +182,11 @@ class ThinkingConfig(BaseModel):class MessagesRequest(BaseModel):model_config = ConfigDict(extra="allow")+ @model_validator(mode="before")+ @classmethod+ def normalize_system_role_messages(cls, data: Any) -> Any:+ return _normalize_system_role_messages(data)+model: str# Internal routing / debug: accepted on parse but not serialized to providers.original_model: str | None = Field(default=None, exclude=True)@@ -160,6 +215,11 @@ class MessagesRequest(BaseModel):class TokenCountRequest(BaseModel):model_config = ConfigDict(extra="allow")+ @model_validator(mode="before")+ @classmethod+ def normalize_system_role_messages(cls, data: Any) -> Any:+ return _normalize_system_role_messages(data)+model: stroriginal_model: str | None = Field(default=None, exclude=True)resolved_provider_model: str | None = Field(default=None, exclude=True)diff --git a/tests/api/test_api.py b/tests/api/test_api.pyindex ee3784f1..cc48c812 100644--- a/tests/api/test_api.py+++ b/tests/api/test_api.py@@ -95,6 +95,29 @@ def test_create_message_stream(client: TestClient):assert b"message_start" in content or b"event:" in content+def test_create_message_accepts_system_role_messages(client: TestClient):+ """Create message accepts latest-client system messages."""+ mock_provider.stream_response = _mock_stream_response+ _stream_response_calls.clear()+ payload = {+ "model": "claude-3-sonnet",+ "messages": [+ {"role": "user", "content": "context"},+ {"role": "system", "content": "system prompt"},+ {"role": "user", "content": "Hi"},+ ],+ "max_tokens": 100,+ "stream": True,+ }++ response = client.post("/v1/messages", json=payload)++ assert response.status_code == 200+ routed_request = _stream_response_calls[0][0][0]+ assert [message.role for message in routed_request.messages] == ["user", "user"]+ assert routed_request.system == "system prompt"++def test_model_mapping(client: TestClient):# Test Haiku mapping_stream_response_calls.clear()diff --git a/tests/api/test_models_validators.py b/tests/api/test_models_validators.pyindex 20393a48..023d7f40 100644--- a/tests/api/test_models_validators.py+++ b/tests/api/test_models_validators.py@@ -11,6 +11,78 @@ def test_messages_request_parses_without_model_mapping_side_effects():assert request.model == "claude-3-opus"+def test_messages_request_normalizes_system_role_messages():+ request = MessagesRequest.model_validate(+ {+ "model": "claude-3-opus",+ "max_tokens": 100,+ "messages": [+ {"role": "user", "content": "first"},+ {"role": "system", "content": "system prompt"},+ {"role": "user", "content": "second"},+ ],+ }+ )++ assert [message.role for message in request.messages] == ["user", "user"]+ assert request.system == "system prompt"+++def test_messages_request_merges_system_role_messages_with_existing_system():+ request = MessagesRequest.model_validate(+ {+ "model": "claude-3-opus",+ "max_tokens": 100,+ "system": "existing system",+ "messages": [+ {"role": "system", "content": "message system"},+ {"role": "user", "content": "hello"},+ ],+ }+ )++ assert len(request.messages) == 1+ assert request.system == "existing system\n\nmessage system"+++def test_messages_request_preserves_system_block_cache_control_when_normalizing():+ request = MessagesRequest.model_validate(+ {+ "model": "claude-3-opus",+ "max_tokens": 100,+ "system": [+ {+ "type": "text",+ "text": "existing system",+ "cache_control": {"type": "ephemeral"},+ }+ ],+ "messages": [+ {+ "role": "system",+ "content": [+ {+ "type": "text",+ "text": "message system",+ "cache_control": {"type": "ephemeral"},+ }+ ],+ },+ {"role": "user", "content": "hello"},+ ],+ }+ )++ assert len(request.messages) == 1+ assert isinstance(request.system, list)+ assert [block.text for block in request.system] == [+ "existing system",+ "message system",+ ]+ assert request.system[0].model_dump()["cache_control"] == {"type": "ephemeral"}+ assert request.system[1].model_dump()["cache_control"] == {"type": "ephemeral"}++def test_messages_request_ignores_internal_routing_fields_when_supplied():request = MessagesRequest.model_validate({@@ -35,6 +107,22 @@ def test_token_count_request_parses_without_model_mapping_side_effects():assert request.model == "claude-3-sonnet"+def test_token_count_request_normalizes_system_role_messages():+ request = TokenCountRequest.model_validate(+ {+ "model": "claude-3-sonnet",+ "messages": [+ {"role": "system", "content": "counting system"},+ {"role": "user", "content": "hello"},+ ],+ }+ )++ assert len(request.messages) == 1+ assert request.messages[0].role == "user"+ assert request.system == "counting system"++def test_messages_request_preserves_thinking_signature():request = MessagesRequest.model_validate({