alihan/llm-promptfoo
1
0
Fork 0
mirror of https://github.com/promptfoo/promptfoo.git synced 2023-08-15 01:10:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

clean up usage of getApiKey

Browse Source
This commit is contained in:
Ian Webster
2023-08-14 10:48:10 -07:00
parent 9d59b4c3ed
commit c3e2d8b4a9
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/providers/openai.ts
View File

@@ -31,7 +31,7 @@ class OpenAiGenericProvider implements ApiProvider {
constructor(modelName: string, apiKey?: string) { constructor(modelName: string, apiKey?: string) {
this.modelName = modelName; this.modelName = modelName;
this.apiKey = apiKey || process.env.OPENAI_API_KEY; this.apiKey = apiKey;
this.apiHost = process.env.OPENAI_API_HOST || DEFAULT_OPENAI_HOST; this.apiHost = process.env.OPENAI_API_HOST || DEFAULT_OPENAI_HOST;
} }
@@ -49,7 +49,7 @@ class OpenAiGenericProvider implements ApiProvider {
} }
getApiKey(options?: OpenAiCompletionOptions): string | undefined { getApiKey(options?: OpenAiCompletionOptions): string | undefined {
return options?.apiKey || this.apiKey; return options?.apiKey || this.apiKey || process.env.OPENAI_API_KEY;
} }
// @ts-ignore: Prompt is not used in this implementation // @ts-ignore: Prompt is not used in this implementation
@@ -60,7 +60,7 @@ class OpenAiGenericProvider implements ApiProvider {
export class OpenAiEmbeddingProvider extends OpenAiGenericProvider { export class OpenAiEmbeddingProvider extends OpenAiGenericProvider {
async callEmbeddingApi(text: string): Promise<ProviderEmbeddingResponse> { async callEmbeddingApi(text: string): Promise<ProviderEmbeddingResponse> {
if (!this.apiKey) { if (!this.getApiKey()) {
throw new Error('OpenAI API key must be set for similarity comparison'); throw new Error('OpenAI API key must be set for similarity comparison');
} }
@@ -148,7 +148,7 @@ export class OpenAiCompletionProvider extends OpenAiGenericProvider {
} }
async callApi(prompt: string, options?: OpenAiCompletionOptions): Promise<ProviderResponse> { async callApi(prompt: string, options?: OpenAiCompletionOptions): Promise<ProviderResponse> {
if (!this.apiKey) { if (!this.getApiKey(options)) {
throw new Error( throw new Error(
'OpenAI API key is not set. Set OPENAI_API_KEY environment variable or pass it as an argument to the constructor.', 'OpenAI API key is not set. Set OPENAI_API_KEY environment variable or pass it as an argument to the constructor.',
); );
@@ -256,7 +256,7 @@ export class OpenAiChatCompletionProvider extends OpenAiGenericProvider {
} }
async callApi(prompt: string, options?: OpenAiCompletionOptions): Promise<ProviderResponse> { async callApi(prompt: string, options?: OpenAiCompletionOptions): Promise<ProviderResponse> {
if (!this.apiKey) { if (!this.getApiKey(options)) {
throw new Error( throw new Error(
'OpenAI API key is not set. Set OPENAI_API_KEY environment variable or pass it as an argument to the constructor.', 'OpenAI API key is not set. Set OPENAI_API_KEY environment variable or pass it as an argument to the constructor.',
); );