feat(ai): pass provider-resolved env to APIs

This commit is contained in:
Mario Zechner
2026-06-23 13:39:39 +02:00
parent 5a8ea0bc81
commit 2cbce395fb
7 changed files with 97 additions and 5 deletions
+3 -1
View File
@@ -1,4 +1,4 @@
import type { Api, ImagesApi, ImagesModel, Model } from "../types.ts";
import type { Api, ImagesApi, ImagesModel, Model, ProviderEnv } from "../types.ts";
import type { OAuthCredentials } from "../utils/oauth/types.ts";
/**
@@ -78,6 +78,8 @@ export interface AuthContext {
/** Result of resolving auth for a model. */
export interface AuthResult {
auth: ModelAuth;
/** Provider-scoped environment/config values resolved from credentials and ambient context. */
env?: ProviderEnv;
/** Human-readable label for status UI: "ANTHROPIC_API_KEY", "OAuth", "~/.aws/credentials". */
source?: string;
}
+4 -2
View File
@@ -192,11 +192,13 @@ class ImagesModelsImpl implements MutableImagesModels {
const requestModel = auth.baseUrl ? { ...model, baseUrl: auth.baseUrl } : model;
// Explicit request options win per-field; headers merge per header.
// Explicit request options win per-field; headers/env merge per key.
const apiKey = options?.apiKey ?? auth.apiKey;
const headers = auth.headers || options?.headers ? { ...auth.headers, ...options?.headers } : undefined;
const env =
resolution.env || options?.env ? { ...(resolution.env ?? {}), ...(options?.env ?? {}) } : undefined;
return await provider.generateImages(requestModel, context, { ...options, apiKey, headers });
return await provider.generateImages(requestModel, context, { ...options, apiKey, headers, env });
} catch (error) {
return {
api: model.api,
+3 -2
View File
@@ -236,10 +236,11 @@ class ModelsImpl implements MutableModels {
const requestModel = auth.baseUrl ? { ...model, baseUrl: auth.baseUrl } : model;
// Explicit request options win per-field; headers merge per header.
// Explicit request options win per-field; headers/env merge per key.
const apiKey = options?.apiKey ?? auth.apiKey;
const headers = auth.headers || options?.headers ? { ...auth.headers, ...options?.headers } : undefined;
const requestOptions = { ...options, apiKey, headers } as TOptions;
const env = resolution.env || options?.env ? { ...(resolution.env ?? {}), ...(options?.env ?? {}) } : undefined;
const requestOptions = { ...options, apiKey, headers, env } as TOptions;
return { requestModel, requestOptions };
}
+5
View File
@@ -239,6 +239,11 @@ export interface ProviderImages {
export interface ImagesOptions {
signal?: AbortSignal;
apiKey?: string;
/**
* Provider-scoped environment values. These take precedence over process.env for
* provider configuration such as endpoint placeholders and proxy variables.
*/
env?: ProviderEnv;
/**
* Optional callback for inspecting or replacing provider payloads before sending.
* Return undefined to keep the payload unchanged.