shumengya/sproutclaw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ai): trust requested Codex service tier (#3307)

Browse Source
This commit is contained in:
Markus Ylisiurunen
2026-04-17 02:50:04 +03:00
committed by GitHub
parent e9808b5854
commit 2cdac7382a
3 changed files with 108 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/ai/src/providers/openai-codex-responses.ts
View File

@@ -385,6 +385,16 @@ function applyServiceTierPricing(usage: Usage, serviceTier: ResponseCreateParams
usage.cost.total = usage.cost.input + usage.cost.output + usage.cost.cacheRead + usage.cost.cacheWrite;
}
function resolveCodexServiceTier(
responseServiceTier: ResponseCreateParamsStreaming["service_tier"] | undefined,
requestServiceTier: ResponseCreateParamsStreaming["service_tier"] | undefined,
): ResponseCreateParamsStreaming["service_tier"] | undefined {
if (responseServiceTier === "default" && (requestServiceTier === "flex" || requestServiceTier === "priority")) {
return requestServiceTier;
}
return responseServiceTier ?? requestServiceTier;
}
function resolveCodexUrl(baseUrl?: string): string {
const raw = baseUrl && baseUrl.trim().length > 0 ? baseUrl : DEFAULT_CODEX_BASE_URL;
const normalized = raw.replace(/\/+$/, "");
@@ -413,6 +423,7 @@ async function processStream(
): Promise<void> {
await processResponsesStream(mapCodexEvents(parseSSE(response)), output, stream, model, {
serviceTier: options?.serviceTier,
resolveServiceTier: resolveCodexServiceTier,
applyServiceTierPricing,
});
}
@@ -847,6 +858,7 @@ async function processWebSocketStream(
stream.push({ type: "start", partial: output });
await processResponsesStream(mapCodexEvents(parseWebSocket(socket, options?.signal)), output, stream, model, {
serviceTier: options?.serviceTier,
resolveServiceTier: resolveCodexServiceTier,
applyServiceTierPricing,
});
if (options?.signal?.aborted) {

8
packages/ai/src/providers/openai-responses-shared.ts
View File

@@ -65,6 +65,10 @@ function parseTextSignature(
export interface OpenAIResponsesStreamOptions {
serviceTier?: ResponseCreateParamsStreaming["service_tier"];
resolveServiceTier?: (
responseServiceTier: ResponseCreateParamsStreaming["service_tier"] | undefined,
requestServiceTier: ResponseCreateParamsStreaming["service_tier"] | undefined,
) => ResponseCreateParamsStreaming["service_tier"] | undefined;
applyServiceTierPricing?: (
usage: Usage,
serviceTier: ResponseCreateParamsStreaming["service_tier"] | undefined,
@@ -491,7 +495,9 @@ export async function processResponsesStream<TApi extends Api>(
}
calculateCost(model, output.usage);
if (options?.applyServiceTierPricing) {
const serviceTier = response?.service_tier ?? options.serviceTier;
const serviceTier = options.resolveServiceTier
? options.resolveServiceTier(response?.service_tier, options.serviceTier)
: (response?.service_tier ?? options.serviceTier);
options.applyServiceTierPricing(output.usage, serviceTier);
}
// Map status to stop reason