Skip to content

Commit a584890

Browse files
authored
Merge pull request #2151 from lidge-jun/codex/absorb-fastwire-native-chat
fix(chat): apply the Fast capability gate to the native passthrough
2 parents 9a78015 + ef7efac commit a584890

5 files changed

Lines changed: 466 additions & 22 deletions

File tree

‎src/adapters/openai-chat.ts‎

Lines changed: 41 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,15 @@ import { buildNonOpenAIToolCatalogNudgeForTools, shouldInjectNonOpenAIToolCatalo
1414
import { openRouterProviderPayload, resolveOpenRouterRouting } from "../providers/openrouter-routing";
1515
import {
1616
canForwardForeignServiceTierForChatModel,
17+
fastPolicyForModel,
1718
supportsServiceTierForModel,
1819
} from "../providers/service-tier";
1920
import {
2021
canonicalFastTierMarker,
2122
createAdapterTierMetadata,
23+
decideTier,
2224
type AdapterTierMetadata,
25+
type ResolvedFastPolicy,
2326
} from "../providers/fastwire";
2427
import { openaiChatCompletionsUrl } from "./openai-chat-url";
2528
import { stripResponsesOnlyEncryptedMarker } from "./responses-tool-schema";
@@ -96,6 +99,8 @@ export function buildOpenAIChatPassthroughRequest(
9699
rawBody: Record<string, unknown>,
97100
modelId: string,
98101
stream: boolean,
102+
fastPolicy: ResolvedFastPolicy = fastPolicyForModel(provider, modelId, undefined, "chat"),
103+
fastMode?: boolean,
99104
): AdapterRequest {
100105
const { url, headers, hasCredential } = openAIChatTransport(provider);
101106

@@ -123,7 +128,16 @@ export function buildOpenAIChatPassthroughRequest(
123128
// `<listed>:<tag>` siblings the operator never opted out, silently returning prose.
124129
if (provider.noStructuredOutputModels?.includes(modelId)) delete body.response_format;
125130

126-
if (provider.chatServiceTier && rawBody.service_tier !== undefined) {
131+
// Run the same complete Fast policy as the translated Chat path, including explicit
132+
// fastMode and foreign-tier handling. On inherited canonical Fast, the passthrough still
133+
// retains the caller's exact spelling; forced Fast uses the policy-owned wire value.
134+
const callerTier = typeof rawBody.service_tier === "string" ? rawBody.service_tier : undefined;
135+
const tierDecision = decideTier(fastPolicy, fastMode, callerTier);
136+
if (tierDecision.kind === "set") {
137+
body.service_tier = fastMode === undefined && canonicalFastTierMarker(callerTier) !== undefined
138+
? callerTier
139+
: tierDecision.value;
140+
} else if (tierDecision.kind === "forward-caller" && rawBody.service_tier !== undefined) {
127141
body.service_tier = rawBody.service_tier;
128142
}
129143
if (provider.promptCacheKey && rawBody.prompt_cache_key !== undefined) {
@@ -1299,6 +1313,26 @@ function thinkingBudgetForEffort(parsed: OcxParsedRequest, reasoningEffort: stri
12991313
return fraction === undefined ? undefined : Math.max(1, Math.floor(maxBudget * fraction));
13001314
}
13011315

1316+
function canSerializeOpenAIChatServiceTier(
1317+
provider: OcxProviderConfig,
1318+
modelId: string,
1319+
serviceTier: unknown,
1320+
tierDecision?: OcxParsedRequest["options"]["tierDecision"],
1321+
): boolean {
1322+
if (serviceTier === undefined) return false;
1323+
if (tierDecision !== undefined) {
1324+
return tierDecision.kind === "set" || tierDecision.kind === "forward-caller";
1325+
}
1326+
// No decision from the router means this call did not go through the tier state machine, so
1327+
// ask that machine rather than re-deriving a looser answer beside it. The previous fallback
1328+
// returned true whenever foreign forwarding was allowed at all, which let a caller tier
1329+
// reach the wire in cases `decideTier` would have dropped — the two paths disagreeing is
1330+
// precisely the bug, so there is now only one authority.
1331+
const callerTier = typeof serviceTier === "string" ? serviceTier : undefined;
1332+
const decision = decideTier(fastPolicyForModel(provider, modelId, undefined, "chat"), undefined, callerTier);
1333+
return decision.kind === "set" || decision.kind === "forward-caller";
1334+
}
1335+
13021336
export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAdapter {
13031337
return {
13041338
name: "openai-chat",
@@ -1321,13 +1355,12 @@ export function createOpenAIChatAdapter(provider: OcxProviderConfig): ProviderAd
13211355
// unclassified Chat routes remain behind the caller-forwarding opt-in.
13221356
const serviceTier = parsed.options.serviceTier;
13231357
const tierDecision = parsed.options.tierDecision;
1324-
const callerCanonicalFast = canonicalFastTierMarker(serviceTier) !== undefined;
1325-
const callerTierForwardAllowed = canForwardForeignServiceTierForChatModel(provider, parsed.modelId);
1326-
const canonicalFastCapability = callerCanonicalFast
1327-
&& supportsServiceTierForModel(provider, parsed.modelId) === true;
1328-
const canSerializeServiceTier = tierDecision?.kind === "set"
1329-
|| tierDecision?.kind === "forward-caller"
1330-
|| (tierDecision === undefined && (callerTierForwardAllowed || canonicalFastCapability));
1358+
const canSerializeServiceTier = canSerializeOpenAIChatServiceTier(
1359+
provider,
1360+
parsed.modelId,
1361+
serviceTier,
1362+
tierDecision,
1363+
);
13311364
if (canSerializeServiceTier && serviceTier !== undefined) {
13321365
body.service_tier = serviceTier;
13331366
}

‎src/server/chat-native.ts‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import {
2727
rateLimitRetryPolicyFor,
2828
rotateProviderTransportOn429,
2929
} from "../providers/key-failover";
30+
import { fastPolicyForModel } from "../providers/service-tier";
3031
import type { RouteResult } from "../router";
3132
import type { OcxConfig, OcxProviderConfig } from "../types";
3233
import { fetchWithHeaderTimeout, providerFetch, safeHostLabel } from "./responses/fetch-helpers";
@@ -154,8 +155,16 @@ export async function handleNativeChatCompletions(options: HandleNativeChatOptio
154155
translatorBudget.chargeRetained(bytes, { kind: "request_copies" });
155156
retainedRequestBytes = bytes;
156157
};
158+
const buildActiveRequest = () => buildOpenAIChatPassthroughRequest(
159+
activeProvider,
160+
options.chatBody,
161+
route.modelId,
162+
requestedStream,
163+
fastPolicyForModel(activeProvider, route.modelId, route.providerName, "chat"),
164+
config.fastMode,
165+
);
157166
try {
158-
activeRequest = buildOpenAIChatPassthroughRequest(activeProvider, options.chatBody, route.modelId, requestedStream);
167+
activeRequest = buildActiveRequest();
159168
retainRequest(activeRequest);
160169
} catch (error) {
161170
releaseRetainedRequest();
@@ -222,7 +231,7 @@ export async function handleNativeChatCompletions(options: HandleNativeChatOptio
222231
activeProvider = rotated;
223232
activeAdapter = createOpenAIChatAdapter(activeProvider);
224233
releaseRetainedRequest();
225-
activeRequest = buildOpenAIChatPassthroughRequest(activeProvider, options.chatBody, route.modelId, requestedStream);
234+
activeRequest = buildActiveRequest();
226235
retainRequest(activeRequest);
227236
response = await send(activeRequest, "key-429");
228237
}

‎tests/fastwire-characterization-wire.test.ts‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { afterEach, describe, expect, spyOn, test } from "bun:test";
22
import { buildOpenAIChatPassthroughRequest } from "../src/adapters/openai-chat";
33
import { chatCompletionsToResponsesBody } from "../src/chat/inbound";
4+
import { fastPolicyForModel } from "../src/providers/service-tier";
45
import * as adapterResolveModule from "../src/server/adapter-resolve";
56
import type { RequestLogContext } from "../src/server/request-log";
67
import { handleResponses } from "../src/server/responses/core";
@@ -364,27 +365,30 @@ describe("FastWire characterization: rawBody observation point", () => {
364365
});
365366

366367
describe("FastWire characterization: known bugs", () => {
367-
test("characterization (known bug): native chat passthrough ignores exact-model false", () => {
368+
test("characterization: native chat passthrough honors exact-model false", () => {
369+
// FastWire #1886 native-chat policy fix: exact-model false now strips the caller tier.
370+
const provider: OcxProviderConfig = {
371+
adapter: "openai-chat",
372+
baseUrl: "https://native-chat.example.test/v1",
373+
authMode: "key",
374+
apiKey: "sk-test",
375+
supportsServiceTier: true,
376+
chatServiceTier: true,
377+
modelSupportsServiceTier: { model: false },
378+
};
368379
const request = buildOpenAIChatPassthroughRequest(
369-
{
370-
adapter: "openai-chat",
371-
baseUrl: "https://native-chat.example.test/v1",
372-
authMode: "key",
373-
apiKey: "sk-test",
374-
supportsServiceTier: true,
375-
chatServiceTier: true,
376-
modelSupportsServiceTier: { model: false },
377-
},
380+
provider,
378381
{
379382
model: "model",
380383
messages: [{ role: "user", content: "ping" }],
381384
service_tier: "flex",
382385
},
383386
"model",
384387
false,
388+
fastPolicyForModel(provider, "model", "native-chat", "chat"),
385389
);
386390
const body = JSON.parse(request.body) as Record<string, unknown>;
387-
expect(body.service_tier).toBe("flex");
391+
expect(body).not.toHaveProperty("service_tier");
388392
});
389393

390394
test("characterization: chat-to-responses conversion preserves service_tier", () => {

0 commit comments

Comments
 (0)