Merge conflict commit

This commit is contained in:
dmahan93 2026-03-09 23:13:43 -05:00
commit f198c1738e
13 changed files with 579 additions and 14 deletions

View file

@ -8,6 +8,16 @@ For automatic token and logprob tracking, see the [ManagedServer Guide](MANAGED_
> **Note:** OpenAI endpoints do not support token IDs/logprobs required for ManagedServer. Set `ATROPOS_ALLOW_DUMMY_MANAGED_SERVER=1` to use a placeholder implementation for testing/evaluation. See [OpenAI Endpoint Limitations](MANAGED_SERVER.md#openai-endpoint-limitations) for details.
### Normalized `get_logprobs` API
`ManagedServer` and supported server backends expose a normalized `get_logprobs(...)` interface so callers can consume a single schema:
- `prompt_tokens`
- `prompt_topk_token_ids`
- `prompt_topk_logprobs`
Backends are expected to return real prompt top-k arrays (`[pos][k]`) matching this schema.
## Tool Call Support
ManagedServer supports OpenAI-style tool calling via vLLM's tool parsers. Pass `tool_parser` at init: