From 51626eee903ea31fde7f41deb6a3430c939d9d90 Mon Sep 17 00:00:00 2001 From: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Date: Tue, 20 Oct 2026 22:39:02 -0500 Subject: [PATCH] refactor(ai): tighten EvaluationRequest typing and deduplicate request normalization (#57601) --- packages/ai/src/experimental/evaluation.ts | 25 ++++++++-------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/packages/ai/src/experimental/evaluation.ts b/packages/ai/src/experimental/evaluation.ts index 7c56d1ceac9..06d656c67b6 100644 --- a/packages/ai/src/experimental/evaluation.ts +++ b/packages/ai/src/experimental/evaluation.ts @@ -108,14 +108,11 @@ export type EvaluationOptions = Record export interface EvaluationRoute { readonly id: string - readonly evaluate: ( - request: EvaluationRequestFor, - execute: Execute, - ) => Effect.Effect + evaluate(request: EvaluationRequestFor, execute: Execute): Effect.Effect } export class EvaluationModel { - declare protected readonly _Options: (options: Options) => Options + declare protected readonly _Options: Options readonly id: ModelID readonly provider: ProviderID readonly route: EvaluationRoute @@ -182,14 +179,14 @@ export type EvaluationRequestFor< } export type EvaluationRequestInput< - Model extends object = EvaluationModel, + Model extends EvaluationModel = EvaluationModel, Questions extends EvaluationQuestions = EvaluationQuestions, > = Omit[0], "model" | "questions" | "options" | "http"> & { readonly model: Model readonly questions: Questions readonly options?: NoInfer> readonly http?: HttpOptions.Input -} & (Model extends EvaluationModel> ? unknown : never) +} export class EvaluationRounding extends Schema.Class("Evaluation.Rounding")({ probabilityDecimals: Schema.optional(Schema.Int), @@ -208,26 +205,26 @@ export type EvaluationResponseFor = Omit< readonly answers: AnswersFor } -export function request( +export function request( input: EvaluationRequestInput, ): EvaluationRequestFor, Questions> export function request(input: EvaluationRequest): EvaluationRequest +export function request(input: EvaluationRequest | EvaluationRequestInput): EvaluationRequest export function request(input: EvaluationRequest | EvaluationRequestInput) { if (input instanceof EvaluationRequest) return input return new EvaluationRequest({ ...input, - model: input.model as unknown as EvaluationModel, http: HttpOptions.make(input.http), }) } -export function run( +export function run( input: EvaluationRequestInput, ): Effect.Effect, AIError, Service> export function run(input: EvaluationRequest): Effect.Effect export function run(input: EvaluationRequest | EvaluationRequestInput) { return Effect.try({ - try: () => (input instanceof EvaluationRequest ? input : request(input)), + try: () => request(input), catch: (cause) => new AIError({ reason: new InvalidRequestError({ @@ -235,11 +232,7 @@ export function run(input: EvaluationRequest | EvaluationRequestInput) { cause, }), }), - }).pipe( - Effect.flatMap((request) => - EvaluationClient.evaluate(request as EvaluationRequestFor), - ), - ) + }).pipe(Effect.flatMap(EvaluationClient.evaluate)) } export const Evaluation = {