Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions lib/server/provider-config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,37 @@ function loadEnvSection(
// ---------------------------------------------------------------------------

const DEFAULT_FILENAME = 'server-providers.yml';
const OPENAI_IMAGE_PROVIDER_ID = 'openai-image';

/** Cache keyed by YAML filename (empty string = default file). */
const _configs: Map<string, ServerConfig> = new Map();

function applyOpenAIImageFallback(
imageConfig: Record<string, ServerProviderEntry>,
yamlImageSection: Record<string, Partial<ServerProviderEntry>> | undefined,
): Record<string, ServerProviderEntry> {
if (imageConfig[OPENAI_IMAGE_PROVIDER_ID]) return imageConfig;

const apiKey = process.env.OPENAI_API_KEY;
if (!apiKey) return imageConfig;

const yamlOpenAIImage = yamlImageSection?.[OPENAI_IMAGE_PROVIDER_ID];
imageConfig[OPENAI_IMAGE_PROVIDER_ID] = {
apiKey,
baseUrl:
yamlOpenAIImage?.baseUrl || process.env.IMAGE_OPENAI_BASE_URL || process.env.OPENAI_BASE_URL,
models: yamlOpenAIImage?.models,
proxy: yamlOpenAIImage?.proxy,
};
return imageConfig;
}

function buildConfig(yamlData: YamlData): ServerConfig {
const image = applyOpenAIImageFallback(
loadEnvSection(IMAGE_ENV_MAP, yamlData.image),
yamlData.image,
);

return {
providers: loadEnvSection(LLM_ENV_MAP, yamlData.providers, {
keylessProviders: new Set(['ollama']),
Expand All @@ -218,7 +244,7 @@ function buildConfig(yamlData: YamlData): ServerConfig {
}),
asr: loadEnvSection(ASR_ENV_MAP, yamlData.asr),
pdf: loadEnvSection(PDF_ENV_MAP, yamlData.pdf, { requiresBaseUrl: true }),
image: loadEnvSection(IMAGE_ENV_MAP, yamlData.image),
image,
video: loadEnvSection(VIDEO_ENV_MAP, yamlData.video),
webSearch: loadEnvSection(WEB_SEARCH_ENV_MAP, yamlData['web-search']),
};
Expand Down Expand Up @@ -361,11 +387,12 @@ export function resolvePDFBaseUrl(providerId: string, clientBaseUrl?: string): s
// Public API — Image Generation
// ---------------------------------------------------------------------------

export function getServerImageProviders(): Record<string, { baseUrl?: string }> {
export function getServerImageProviders(): Record<string, { models?: string[]; baseUrl?: string }> {
const cfg = getConfig();
const result: Record<string, { baseUrl?: string }> = {};
const result: Record<string, { models?: string[]; baseUrl?: string }> = {};
for (const [id, entry] of Object.entries(cfg.image)) {
result[id] = {};
if (entry.models && entry.models.length > 0) result[id].models = entry.models;
if (entry.baseUrl) result[id].baseUrl = entry.baseUrl;
}
return result;
Expand Down
14 changes: 14 additions & 0 deletions tests/server/provider-config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,20 @@ pdf:
});

describe('image and video provider metadata', () => {
it('uses standard OpenAI env vars for OpenAI image generation fallback', async () => {
vi.stubEnv('OPENAI_API_KEY', 'sk-openai');
vi.stubEnv('OPENAI_BASE_URL', 'https://proxy.example.com/v1');
const { getServerImageProviders, resolveImageApiKey, resolveImageBaseUrl } =
await import('@/lib/server/provider-config');

const providers = getServerImageProviders();
expect(providers['openai-image']).toEqual({
baseUrl: 'https://proxy.example.com/v1',
});
expect(resolveImageApiKey('openai-image')).toBe('sk-openai');
expect(resolveImageBaseUrl('openai-image')).toBe('https://proxy.example.com/v1');
});

it('maps IMAGE_OPENAI and exposes image baseUrl', async () => {
vi.stubEnv('IMAGE_OPENAI_API_KEY', 'sk-openai-image');
vi.stubEnv('IMAGE_OPENAI_BASE_URL', 'https://proxy.example.com/v1');
Expand Down
Loading