Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion slm_server/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,14 @@
ChatCompletionTool,
ChatCompletionToolChoiceOption,
)
from pydantic import BaseModel, ConfigDict, Field, conlist, model_validator
from pydantic import (
BaseModel,
ConfigDict,
Field,
conlist,
field_validator,
model_validator,
)


# ---------------------------------------------------------------------------
Expand Down Expand Up @@ -93,6 +100,27 @@ class ChatCompletionRequest(BaseModel):
default=None, description="Number of top log probabilities to return"
)

@field_validator("messages", mode="before")
@classmethod
def _normalize_assistant_content(cls, v: Any) -> Any:
"""Allow ``content: null`` on assistant messages (OpenAI spec compat).

llama-cpp's TypedDict defines ``content: NotRequired[str]`` which
rejects ``None`` when the key is present. The OpenAI spec allows
``null`` on assistant messages that carry ``tool_calls``, and
langchain-openai sends it that way, so we normalise here.
"""
if isinstance(v, list):
for msg in v:
if (
isinstance(msg, dict)
and msg.get("role") == "assistant"
and "content" in msg
and msg["content"] is None
):
msg["content"] = ""
return v

@model_validator(mode="after")
def _default_tool_choice_auto(self) -> Self:
"""Match OpenAI: default to "auto" when tools are present."""
Expand Down