refactor(ai): remove dead option/schema helpers and use knownString (#57607)

This commit is contained in:
Aiden Cline
2026-10-20 22:51:23 -05:00
committed by GitHub
Unverified
parent b991ba894d
commit c9b5a9ff7f
8 changed files with 17 additions and 61 deletions
+3 -5
View File
@@ -16,7 +16,7 @@ const Options = Schema.Struct({
clearThinking: Schema.optional(Schema.Boolean),
thinking: Schema.optional(
Schema.Struct({
type: Schema.declare<"adaptive" | "disabled" | (string & {})>(Schema.is(Schema.String)),
type: ProviderShared.knownString<"adaptive" | "disabled">(),
}),
),
toolStream: Schema.optional(Schema.Boolean),
@@ -24,7 +24,7 @@ const Options = Schema.Struct({
repetitionPenalty: Schema.optional(Schema.Number),
responseFormat: Schema.optional(
Schema.Struct({
type: Schema.declare<"text" | "json_object" | "json_schema" | (string & {})>(Schema.is(Schema.String)),
type: ProviderShared.knownString<"text" | "json_object" | "json_schema">(),
json_schema: Schema.optional(JsonObject),
}),
),
@@ -32,9 +32,7 @@ const Options = Schema.Struct({
searchOptions: Schema.optional(
Schema.Struct({
forced_search: Schema.optional(Schema.Boolean),
search_strategy: Schema.optional(
Schema.declare<"turbo" | "max" | "agent" | "agent_max" | (string & {})>(Schema.is(Schema.String)),
),
search_strategy: Schema.optional(ProviderShared.knownString<"turbo" | "max" | "agent" | "agent_max">()),
enable_search_extension: Schema.optional(Schema.Boolean),
}),
),
@@ -9,7 +9,7 @@ const Options = Schema.Struct({
effort: Schema.optional(OpenResponsesOptions.ReasoningEffort),
thinking: Schema.optional(
Schema.Struct({
type: Schema.declare<"enabled" | "disabled" | (string & {})>(Schema.is(Schema.String)),
type: ProviderShared.knownString<"enabled" | "disabled">(),
budgetTokens: Schema.optional(Schema.Int),
budget_tokens: Schema.optional(Schema.Int),
}),
+3 -3
View File
@@ -25,7 +25,7 @@ import {
import { classifyProviderFailure } from "../provider-error.js"
import { isRecord, JsonObject, optionalArray, optionalNull, ProviderShared } from "./shared.js"
import { cacheControl } from "./utils/cache.js"
import { OpenAIOptions } from "./utils/openai-options.js"
import { OpenResponsesOptions } from "./utils/open-responses-options.js"
import { Lifecycle } from "./utils/lifecycle.js"
import { ToolStream } from "./utils/tool-stream.js"
@@ -181,7 +181,7 @@ export const bodyFields = {
stream_options: Schema.optional(Schema.Struct({ include_usage: Schema.Boolean })),
store: Schema.optional(Schema.Boolean),
prompt_cache_key: Schema.optional(Schema.String),
reasoning_effort: Schema.optional(OpenAIOptions.OpenAIReasoningEffort),
reasoning_effort: Schema.optional(OpenResponsesOptions.ReasoningEffort),
tool_stream: Schema.optional(Schema.Boolean),
max_completion_tokens: Schema.optional(Schema.Number),
max_tokens: Schema.optional(Schema.Number),
@@ -757,7 +757,7 @@ const detectZaiToolStream = (provider: string, baseURL: string | undefined, mode
}
const lowerOptions = (request: LLMRequest, supportsStore: boolean) => {
const options = OpenAIOptions.resolve(request)
const options = OpenResponsesOptions.resolve(request)
// Default off: strict providers 400 on unknown body fields, so only send
// the key where compatibility explicitly allows it. Header-based affinity
// (x-session-affinity, x-grok-conv-id, ...) is unaffected.
@@ -1,15 +1,12 @@
import { Schema } from "effect"
import { ReasoningEffort, ReasoningEfforts, type LLMRequest } from "../../schema/index.js"
import { lenient } from "../shared.js"
import { lenient, ProviderShared } from "../shared.js"
export { ReasoningEffort, ReasoningEfforts }
export const TextVerbosities = ["low", "medium", "high"] as const
export type TextVerbosity = (typeof TextVerbosities)[number] | (string & {})
export const TextVerbosity = Schema.declare<TextVerbosity>(
(value): value is TextVerbosity => typeof value === "string",
{ title: "TextVerbosity" },
)
export const TextVerbosity = ProviderShared.knownString<(typeof TextVerbosities)[number]>()
export const ResponseIncludables = [
"file_search_call.results",
@@ -25,18 +22,13 @@ export type ResponseIncludable = (typeof ResponseIncludables)[number] | (string
export const ServiceTiers = ["auto", "default", "flex", "priority"] as const
export type ServiceTier = (typeof ServiceTiers)[number] | (string & {})
export const ServiceTier = Schema.declare<ServiceTier>((value): value is ServiceTier => typeof value === "string", {
title: "ServiceTier",
})
export const ServiceTier = ProviderShared.knownString<(typeof ServiceTiers)[number]>()
export const Truncations = ["auto", "disabled"] as const
export type Truncation = (typeof Truncations)[number]
export const TextVerbositySchema = TextVerbosity
export const ResponseIncludableSchema = Schema.declare<ResponseIncludable>(
(value): value is ResponseIncludable => typeof value === "string",
{ title: "ResponseIncludable" },
)
export const ResponseIncludableSchema = ProviderShared.knownString<(typeof ResponseIncludables)[number]>()
export const ServiceTierSchema = ServiceTier
export const TruncationSchema = Schema.Literals(Truncations)
@@ -1,25 +0,0 @@
import { OpenResponsesOptions } from "./open-responses-options.js"
export const OpenAIReasoningEfforts = OpenResponsesOptions.ReasoningEfforts
export type OpenAIReasoningEffort = OpenResponsesOptions.ReasoningEffort
export const OpenAITextVerbosities = OpenResponsesOptions.TextVerbosities
export type OpenAITextVerbosity = OpenResponsesOptions.TextVerbosity
// Mirrors OpenAI's `ResponseIncludable` union from the official SDK. Keep this
// in lockstep with `openai-node/src/resources/responses/responses.ts`.
export const OpenAIResponseIncludables = OpenResponsesOptions.ResponseIncludables
export type OpenAIResponseIncludable = OpenResponsesOptions.ResponseIncludable
// Mirrors OpenAI's `ServiceTier` union from the official SDK.
export const OpenAIServiceTiers = [...OpenResponsesOptions.ServiceTiers, "scale", "fast", "ultrafast"] as const
export type OpenAIServiceTier = (typeof OpenAIServiceTiers)[number] | (string & {})
export const OpenAIReasoningEffort = OpenResponsesOptions.ReasoningEffort
export const OpenAITextVerbosity = OpenResponsesOptions.TextVerbosity
export const OpenAIResponseIncludable = OpenResponsesOptions.ResponseIncludableSchema
export const OpenAIServiceTier = OpenResponsesOptions.ServiceTierSchema
export const isReasoningEffort = (effort: unknown): effort is OpenAIReasoningEffort => typeof effort === "string"
export const resolve = OpenResponsesOptions.resolve
export * as OpenAIOptions from "./openai-options.js"
@@ -43,9 +43,6 @@ const moonshot = (schema: JsonSchema): JsonSchema => {
return isRecord(projected) ? projected : {}
}
const openAI = (schema: JsonSchema): JsonSchema => schema
const responses = openAI
const gemini = GeminiJsonSchema.normalize
const MODEL_NAMES = [
@@ -106,7 +103,5 @@ const tools = (entries: LLMRequest["tools"], model: LanguageModel): LLMRequest["
export const ToolSchemaProjection = {
gemini,
moonshot,
openAI,
responses,
tools,
} as const
+6 -3
View File
@@ -1,9 +1,12 @@
import { mergeProviderOptions, type ProviderOptions } from "../schema/index.js"
import type { OpenAIServiceTier } from "../protocols/utils/openai-options.js"
import type { Options } from "../protocols/utils/open-responses-options.js"
import type { Options, ResponseIncludable, ServiceTier } from "../protocols/utils/open-responses-options.js"
import type { ContextManagement } from "../protocols/openai-responses.js"
export type { OpenAIResponseIncludable, OpenAIServiceTier } from "../protocols/utils/openai-options.js"
// Mirrors OpenAI's `ResponseIncludable` union from the official SDK. Keep this
// in lockstep with `openai-node/src/resources/responses/responses.ts`.
export type OpenAIResponseIncludable = ResponseIncludable
// Mirrors OpenAI's `ServiceTier` union from the official SDK.
export type OpenAIServiceTier = ServiceTier | "scale" | "fast" | "ultrafast"
export type OpenAIOptionsInput = Omit<Options, "serviceTier"> & {
/** Advanced in-band compaction. The caller owns checkpoint persistence and recovery. */
-7
View File
@@ -644,13 +644,6 @@ export function compact(request: LLMRequest, options?: EndpointCompactOptions |
})
}
export const streamRequest = (request: LLMRequest, options?: StreamOptions) =>
Stream.unwrap(
Effect.gen(function* () {
return (yield* Service).stream(request, options)
}),
)
export const layer: Layer.Layer<Service, never, RequestExecutor.Service> = Layer.effect(
Service,
Effect.gen(function* () {