Skip to content
Open
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
12 changes: 10 additions & 2 deletions src/core/embedding.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
*/

import OpenAI from 'openai';
import { loadConfig } from './config.ts';

const MODEL = 'text-embedding-3-large';
const DIMENSIONS = 1536;
Expand All @@ -18,10 +19,17 @@ const MAX_DELAY_MS = 120000;
const BATCH_SIZE = 100;

let client: OpenAI | null = null;
let clientApiKey: string | undefined;

export function resolveApiKey(): string | undefined {
return process.env.OPENAI_API_KEY || loadConfig()?.openai_api_key;
}

function getClient(): OpenAI {
if (!client) {
client = new OpenAI();
const apiKey = resolveApiKey();
if (!client || clientApiKey !== apiKey) {
client = apiKey ? new OpenAI({ apiKey }) : new OpenAI();
clientApiKey = apiKey;
}
return client;
}
Expand Down
66 changes: 66 additions & 0 deletions test/embedding-config.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import { describe, test, expect } from 'bun:test';
import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'fs';
import { join } from 'path';
import { tmpdir } from 'os';

function runResolveApiKey(homeDir: string, env: Record<string, string | undefined> = {}) {
const proc = Bun.spawnSync({
cmd: [
process.execPath,
'--eval',
`import { resolveApiKey } from './src/core/embedding.ts'; console.log(resolveApiKey() ?? '');`,
],
cwd: '/Users/basitmustafa/Documents/GitHub/upstream/gbrain',
env: {
...process.env,
HOME: homeDir,
OPENAI_API_KEY: env.OPENAI_API_KEY,
},
stdout: 'pipe',
stderr: 'pipe',
});

return {
exitCode: proc.exitCode,
stdout: new TextDecoder().decode(proc.stdout).trim(),
stderr: new TextDecoder().decode(proc.stderr).trim(),
};
}

describe('embedding config', () => {
test('uses config openai_api_key when env var is absent', () => {
const homeDir = mkdtempSync(join(tmpdir(), 'gbrain-config-test-'));
try {
mkdirSync(join(homeDir, '.gbrain'), { recursive: true });
writeFileSync(
join(homeDir, '.gbrain', 'config.json'),
JSON.stringify({ engine: 'postgres', openai_api_key: 'config-key' }),
);

const result = runResolveApiKey(homeDir);
expect(result.exitCode).toBe(0);
expect(result.stderr).toBe('');
expect(result.stdout).toBe('config-key');
} finally {
rmSync(homeDir, { recursive: true, force: true });
}
});

test('prefers OPENAI_API_KEY env var over config openai_api_key', () => {
const homeDir = mkdtempSync(join(tmpdir(), 'gbrain-config-test-'));
try {
mkdirSync(join(homeDir, '.gbrain'), { recursive: true });
writeFileSync(
join(homeDir, '.gbrain', 'config.json'),
JSON.stringify({ engine: 'postgres', openai_api_key: 'config-key' }),
);

const result = runResolveApiKey(homeDir, { OPENAI_API_KEY: 'env-key' });
expect(result.exitCode).toBe(0);
expect(result.stderr).toBe('');
expect(result.stdout).toBe('env-key');
} finally {
rmSync(homeDir, { recursive: true, force: true });
}
});
});