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
35 changes: 35 additions & 0 deletions src/gateway/env.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,39 @@ describe('buildEnvVars', () => {
TELEGRAM_BOT_TOKEN: 'tg',
});
});

it('handles trailing slash in AI_GATEWAY_BASE_URL for OpenAI', () => {
const env = createMockEnv({
AI_GATEWAY_API_KEY: 'sk-gateway-key',
AI_GATEWAY_BASE_URL: 'https://gateway.ai.cloudflare.com/v1/123/my-gw/openai/',
});
const result = buildEnvVars(env);
expect(result.OPENAI_API_KEY).toBe('sk-gateway-key');
expect(result.OPENAI_BASE_URL).toBe('https://gateway.ai.cloudflare.com/v1/123/my-gw/openai');
expect(result.AI_GATEWAY_BASE_URL).toBe('https://gateway.ai.cloudflare.com/v1/123/my-gw/openai');
expect(result.ANTHROPIC_API_KEY).toBeUndefined();
});

it('handles trailing slash in AI_GATEWAY_BASE_URL for Anthropic', () => {
const env = createMockEnv({
AI_GATEWAY_API_KEY: 'sk-gateway-key',
AI_GATEWAY_BASE_URL: 'https://gateway.ai.cloudflare.com/v1/123/my-gw/anthropic/',
});
const result = buildEnvVars(env);
expect(result.ANTHROPIC_API_KEY).toBe('sk-gateway-key');
expect(result.ANTHROPIC_BASE_URL).toBe('https://gateway.ai.cloudflare.com/v1/123/my-gw/anthropic');
expect(result.AI_GATEWAY_BASE_URL).toBe('https://gateway.ai.cloudflare.com/v1/123/my-gw/anthropic');
expect(result.OPENAI_API_KEY).toBeUndefined();
});

it('handles multiple trailing slashes in AI_GATEWAY_BASE_URL', () => {
const env = createMockEnv({
AI_GATEWAY_API_KEY: 'sk-gateway-key',
AI_GATEWAY_BASE_URL: 'https://gateway.ai.cloudflare.com/v1/123/my-gw/openai///',
});
const result = buildEnvVars(env);
expect(result.OPENAI_API_KEY).toBe('sk-gateway-key');
expect(result.OPENAI_BASE_URL).toBe('https://gateway.ai.cloudflare.com/v1/123/my-gw/openai');
expect(result.AI_GATEWAY_BASE_URL).toBe('https://gateway.ai.cloudflare.com/v1/123/my-gw/openai');
});
});
12 changes: 7 additions & 5 deletions src/gateway/env.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ import type { MoltbotEnv } from '../types';
export function buildEnvVars(env: MoltbotEnv): Record<string, string> {
const envVars: Record<string, string> = {};

const isOpenAIGateway = env.AI_GATEWAY_BASE_URL?.endsWith('/openai');
// Normalize the base URL by removing trailing slashes
const normalizedBaseUrl = env.AI_GATEWAY_BASE_URL?.replace(/\/+$/, '');
const isOpenAIGateway = normalizedBaseUrl?.endsWith('/openai');

// AI Gateway vars take precedence
// Map to the appropriate provider env var based on the gateway endpoint
Expand All @@ -30,13 +32,13 @@ export function buildEnvVars(env: MoltbotEnv): Record<string, string> {
}

// Pass base URL (used by start-moltbot.sh to determine provider)
if (env.AI_GATEWAY_BASE_URL) {
envVars.AI_GATEWAY_BASE_URL = env.AI_GATEWAY_BASE_URL;
if (normalizedBaseUrl) {
envVars.AI_GATEWAY_BASE_URL = normalizedBaseUrl;
// Also set the provider-specific base URL env var
if (isOpenAIGateway) {
envVars.OPENAI_BASE_URL = env.AI_GATEWAY_BASE_URL;
envVars.OPENAI_BASE_URL = normalizedBaseUrl;
} else {
envVars.ANTHROPIC_BASE_URL = env.AI_GATEWAY_BASE_URL;
envVars.ANTHROPIC_BASE_URL = normalizedBaseUrl;
}
} else if (env.ANTHROPIC_BASE_URL) {
envVars.ANTHROPIC_BASE_URL = env.ANTHROPIC_BASE_URL;
Expand Down
2 changes: 1 addition & 1 deletion start-moltbot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ if (process.env.SLACK_BOT_TOKEN && process.env.SLACK_APP_TOKEN) {
// Usage: Set AI_GATEWAY_BASE_URL or ANTHROPIC_BASE_URL to your endpoint like:
// https://gateway.ai.cloudflare.com/v1/{account_id}/{gateway_id}/anthropic
// https://gateway.ai.cloudflare.com/v1/{account_id}/{gateway_id}/openai
const baseUrl = process.env.AI_GATEWAY_BASE_URL || process.env.ANTHROPIC_BASE_URL || '';
const baseUrl = (process.env.AI_GATEWAY_BASE_URL || process.env.ANTHROPIC_BASE_URL || '').replace(/\/+$/, '');
const isOpenAI = baseUrl.endsWith('/openai');
if (isOpenAI) {
Expand Down