Skip to content

Commit dbd08e5

Browse files
committed
Promote service_tier / user_id / store to canonical Config (extensions burn-down)
Three cross-provider concepts graduate from provider-syntax smuggling in config.extensions to typed Config fields: service_tier (open value namespace - OpenAI + Anthropic, Gemini raises), user_id (OpenAI safety_identifier, chat dialect user, Anthropic metadata.user_id, Gemini raises), store (OpenAI + Gemini verbatim, Anthropic raises). Never a silent drop; extensions still win on collision (passthrough precedence). The prompt_cache_key/retention cases needed NO new surface - CacheConfig already spoke them; their fixtures were the only debt. Wire equality proven by the contract request direction: all rewritten cases build their frozen bodies unchanged.
1 parent dea94fe commit dbd08e5

7 files changed

Lines changed: 165 additions & 0 deletions

File tree

‎lm15/providers/anthropic.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -487,6 +487,19 @@ def _payload(self, request: Request, stream: bool) -> dict[str, Any]:
487487
}
488488
if request.config.response_format:
489489
payload["output_config"] = _response_format_to_anthropic_output_config(request.config.response_format)
490+
# Promoted cross-provider knobs (changes/2026-09-01-extensions-burn-down):
491+
# user_id rides Anthropic's metadata.user_id; store has no Anthropic
492+
# wire field — raise, never silently drop.
493+
if request.config.service_tier is not None:
494+
payload["service_tier"] = request.config.service_tier
495+
if request.config.user_id is not None:
496+
payload["metadata"] = {"user_id": request.config.user_id}
497+
if request.config.store is not None:
498+
raise UnsupportedFeatureError(
499+
"anthropic: config.store is not supported — the Messages API has no "
500+
"response-storage opt-out field (OpenAI and Gemini carry it)",
501+
provider=self.provider,
502+
)
490503
if request.config.extensions:
491504
passthrough = {k: v for k, v in request.config.extensions.items() if k != "prompt_caching"}
492505
payload.update(passthrough)

‎lm15/providers/gemini.py‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -615,6 +615,25 @@ def _payload(self, request: Request, *, apply_cache: bool = True) -> dict[str, A
615615
if use_cache:
616616
self._apply_prompt_cache(request, payload)
617617

618+
# Promoted cross-provider knobs (changes/2026-09-01-extensions-burn-down):
619+
# store maps verbatim (same wire key as OpenAI, verified live);
620+
# service_tier and user_id have no Gemini wire field — raise, never
621+
# silently drop.
622+
if request.config.store is not None:
623+
payload["store"] = request.config.store
624+
if request.config.service_tier is not None:
625+
raise UnsupportedFeatureError(
626+
"gemini: config.service_tier is not supported — GenerateContent has no "
627+
"service-tier field (OpenAI and Anthropic carry it)",
628+
provider=self.provider,
629+
)
630+
if request.config.user_id is not None:
631+
raise UnsupportedFeatureError(
632+
"gemini: config.user_id is not supported — GenerateContent has no "
633+
"end-user attribution field (OpenAI and Anthropic carry it)",
634+
provider=self.provider,
635+
)
636+
618637
if extensions:
619638
passthrough = {k: v for k, v in extensions.items() if k not in {"prompt_caching", "output"}}
620639
payload.update(passthrough)

‎lm15/providers/openai.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,18 @@ def _payload(self, request: Request, stream: bool) -> dict[str, Any]:
592592
if compat.routing is not None:
593593
payload["provider"] = compat.routing
594594

595+
# Promoted cross-provider knobs (changes/2026-09-01-extensions-burn-down):
596+
# canonical spelling in, provider spelling out. user_id maps to
597+
# safety_identifier — OpenAI's current end-user attribution field
598+
# (`user` is the deprecated legacy spelling; still available verbatim
599+
# through extensions).
600+
if request.config.service_tier is not None:
601+
payload["service_tier"] = request.config.service_tier
602+
if request.config.user_id is not None:
603+
payload["safety_identifier"] = request.config.user_id
604+
if request.config.store is not None:
605+
payload["store"] = request.config.store
606+
595607
if request.config.extensions:
596608
reserved = {
597609
"prompt_caching",

‎lm15/providers/openai_chat.py‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,18 @@ def _payload(self, request: Request, stream: bool) -> dict[str, Any]:
362362
if compat.routing is not None:
363363
payload["provider"] = compat.routing
364364

365+
# Promoted cross-provider knobs (changes/2026-09-01-extensions-burn-down):
366+
# Chat Completions spellings — user_id rides the dialect's `user`
367+
# field (safety_identifier is Responses-only). Servers that do not
368+
# implement a field reject it themselves; the dialect adapter cannot
369+
# know each compat server's support statically.
370+
if request.config.service_tier is not None:
371+
payload["service_tier"] = request.config.service_tier
372+
if request.config.user_id is not None:
373+
payload["user"] = request.config.user_id
374+
if request.config.store is not None:
375+
payload["store"] = request.config.store
376+
365377
if request.config.extensions:
366378
reserved = {
367379
"prompt_caching",

‎lm15/serde.py‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,9 @@ def config_to_dict(c: Config) -> dict[str, Any]:
414414
"tool_choice": tool_choice_to_dict(c.tool_choice) if c.tool_choice else None,
415415
"reasoning": reasoning_to_dict(c.reasoning) if c.reasoning else None,
416416
"cache": cache_config_to_dict(c.cache) if c.cache else None,
417+
"service_tier": c.service_tier,
418+
"user_id": c.user_id,
419+
"store": c.store, # False is data (opt-out), not emptiness — emitted
417420
"extensions": c.extensions,
418421
})
419422

@@ -446,6 +449,9 @@ def config_from_dict(d: dict[str, Any]) -> Config:
446449
tool_choice=tool_choice_from_dict(tool_choice) if tool_choice is not None else None,
447450
reasoning=reasoning_from_dict(reasoning) if reasoning is not None else None,
448451
cache=cache_config_from_dict(cache) if cache is not None else None,
452+
service_tier=d.get("service_tier"),
453+
user_id=d.get("user_id"),
454+
store=d.get("store"),
449455
extensions=d.get("extensions"),
450456
)
451457

‎lm15/types.py‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1730,6 +1730,17 @@ class Config:
17301730
tool_choice: ToolChoice | None = None
17311731
reasoning: Reasoning | None = None
17321732
cache: CacheConfig | None = None
1733+
# Cross-provider knobs promoted from extensions (2026-09-01 burn-down):
1734+
# service_tier is an OPEN string namespace — the tier concept is shared
1735+
# (OpenAI, Anthropic), the value vocabulary is provider-owned, like
1736+
# `voice`. user_id is an opaque end-user identifier for abuse
1737+
# attribution (OpenAI safety_identifier, Anthropic metadata.user_id).
1738+
# store opts a request out of (or into) provider-side response storage
1739+
# (OpenAI and Gemini, same wire key). Providers whose wire cannot carry
1740+
# a set knob RAISE — never silently drop.
1741+
service_tier: str | None = None
1742+
user_id: str | None = None
1743+
store: bool | None = None
17331744
extensions: Extensions | None = None
17341745

17351746
def __post_init__(self) -> None:
@@ -1758,6 +1769,10 @@ def __post_init__(self) -> None:
17581769
raise TypeError("reasoning must be a Reasoning")
17591770
if self.cache is not None and not isinstance(self.cache, CacheConfig):
17601771
raise TypeError("cache must be a CacheConfig")
1772+
_validate_optional_text(self.service_tier, field_name="Config.service_tier", allow_empty=False)
1773+
_validate_optional_text(self.user_id, field_name="Config.user_id", allow_empty=False)
1774+
if self.store is not None and not isinstance(self.store, bool):
1775+
raise TypeError("Config.store must be a bool or None")
17611776
_validate_json_field(self, "response_format")
17621777
_validate_extensions_field(self)
17631778

‎tests/test_promoted_config.py‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
"""Promoted config knobs (the 2026-09-01 extensions burn-down).
2+
3+
service_tier / user_id / store graduated from provider-syntax smuggling
4+
in config.extensions to canonical Config fields. Wire equality for the
5+
promoted spellings is pinned by the contract's request direction (the
6+
rewritten cases build the same frozen bodies); these tests pin the
7+
mapping table and the no-silent-drop raises.
8+
"""
9+
from __future__ import annotations
10+
11+
import pytest
12+
13+
from lm15 import Config, Message, Request, UnsupportedFeatureError
14+
from lm15.providers import AnthropicLM, GeminiLM, OpenAILM
15+
from lm15.providers.openai_chat import OpenAIChatLM
16+
from lm15.serde import config_from_dict, config_to_dict
17+
from lm15.testing import FakeTransport
18+
19+
20+
def req(**config) -> Request:
21+
return Request(model="m", messages=(Message.user("hi"),), config=Config(**config))
22+
23+
24+
def payload(lm, request):
25+
return lm._payload(request, stream=False) if not isinstance(lm, GeminiLM) else lm._payload(request)
26+
27+
28+
# ─── Mapping table ───────────────────────────────────────────────────
29+
30+
def test_openai_spellings() -> None:
31+
lm = OpenAILM(api_key="k", transport=FakeTransport([]))
32+
body = payload(lm, req(service_tier="flex", user_id="end-user-7", store=False))
33+
assert body["service_tier"] == "flex"
34+
assert body["safety_identifier"] == "end-user-7" # current field; `user` is the deprecated spelling
35+
assert body["store"] is False
36+
assert "user" not in body and "user_id" not in body
37+
38+
39+
def test_openai_chat_spellings() -> None:
40+
lm = OpenAIChatLM(api_key="k", transport=FakeTransport([]))
41+
body = lm._payload(req(service_tier="default", user_id="end-user-7", store=True), stream=False)
42+
assert body["service_tier"] == "default"
43+
assert body["user"] == "end-user-7" # Chat Completions dialect spelling
44+
assert body["store"] is True
45+
46+
47+
def test_anthropic_spellings_and_store_raises() -> None:
48+
lm = AnthropicLM(api_key="k", transport=FakeTransport([]))
49+
body = lm._payload(req(service_tier="standard_only", user_id="u-1"), stream=False)
50+
assert body["service_tier"] == "standard_only"
51+
assert body["metadata"] == {"user_id": "u-1"}
52+
with pytest.raises(UnsupportedFeatureError, match="store"):
53+
lm._payload(req(store=False), stream=False)
54+
55+
56+
def test_gemini_store_maps_and_others_raise() -> None:
57+
lm = GeminiLM(api_key="k", transport=FakeTransport([]))
58+
assert lm._payload(req(store=False))["store"] is False
59+
with pytest.raises(UnsupportedFeatureError, match="service_tier"):
60+
lm._payload(req(service_tier="auto"))
61+
with pytest.raises(UnsupportedFeatureError, match="user_id"):
62+
lm._payload(req(user_id="u-1"))
63+
64+
65+
def test_extensions_still_win_over_promoted_fields() -> None:
66+
# Passthrough precedence is the existing rule: extensions apply last.
67+
lm = OpenAILM(api_key="k", transport=FakeTransport([]))
68+
body = payload(lm, req(service_tier="flex", extensions={"service_tier": "priority"}))
69+
assert body["service_tier"] == "priority"
70+
71+
72+
# ─── Type + serde ────────────────────────────────────────────────────
73+
74+
def test_config_validation() -> None:
75+
with pytest.raises(ValueError):
76+
Config(service_tier="")
77+
with pytest.raises(ValueError):
78+
Config(user_id="")
79+
with pytest.raises(TypeError):
80+
Config(store="yes")
81+
82+
83+
def test_serde_roundtrip_and_false_survives() -> None:
84+
cfg = Config(service_tier="flex", user_id="u-1", store=False)
85+
d = config_to_dict(cfg)
86+
assert d == {"service_tier": "flex", "user_id": "u-1", "store": False}
87+
assert config_from_dict(d) == cfg
88+
assert config_to_dict(Config()) == {} # all-default still collapses

0 commit comments

Comments
 (0)