Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: allow setting OPENAI_API_BASE #1886

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −1
Open

feat: allow setting OPENAI_API_BASE #1886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .env.dev.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ S3_REGION=

# Prompt playground
OPENAI_API_KEY=""
OPENAI_API_BASE="https://api.openai.com/v1"
ANTHROPIC_API_KEY=""

# Set during docker build of application
Expand Down
1 change: 1 addition & 0 deletions .env.local.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ SALT="salt"

# Prompt playground
OPENAI_API_KEY=""
OPENAI_API_BASE="https://api.openai.com/v1"
ANTHROPIC_API_KEY=""

# Redis
Expand Down
1 change: 1 addition & 0 deletions .env.prod.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ LANGFUSE_CSP_ENFORCE_HTTPS="true"

# Prompt playground
# OPENAI_API_KEY=""
# OPENAI_API_BASE="https://api.openai.com/v1"
# ANTHROPIC_API_KEY=""

# Betterstack
Expand Down
6 changes: 5 additions & 1 deletion packages/shared/src/server/llm/fetchLLMCompletion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type LLMCompletionParams = {
functionCall?: LLMFunctionCall;
callbacks?: BaseCallbackHandler[];
apiKey?: string;
apiBase?: string;
};

type FetchLLMCompletionParams = LLMCompletionParams & {
Expand Down Expand Up @@ -57,7 +58,7 @@ export async function fetchLLMCompletion(
params: FetchLLMCompletionParams
): Promise<string | IterableReadableStream<Uint8Array> | unknown> {
// the apiKey must never be printed to the console
const { messages, modelParams, streaming, callbacks, apiKey } = params;
const { messages, modelParams, streaming, callbacks, apiKey, apiBase } = params;
const finalMessages = messages.map((message) => {
if (message.role === ChatMessageRole.User)
return new HumanMessage(message.content);
Expand All @@ -84,6 +85,9 @@ export async function fetchLLMCompletion(
temperature: modelParams.temperature,
maxTokens: modelParams.max_tokens,
topP: modelParams.top_p,
configuration: {
baseURL: apiBase,
},
callbacks,
});
} else {
Expand Down
1 change: 1 addition & 0 deletions web/src/ee/features/playground/server/chatCompletionHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export default async function chatCompletionHandler(req: NextRequest) {
modelParams.provider === "openai"
? env.OPENAI_API_KEY
: env.ANTHROPIC_API_KEY,
apiBase: env.OPENAI_API_BASE,
});

return new StreamingTextResponse(stream);
Expand Down
2 changes: 2 additions & 0 deletions web/src/env.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ export const env = createEnv({
LANGFUSE_WORKER_PASSWORD: z.string().optional(),
// Prompt playground
OPENAI_API_KEY: z.string().optional(),
OPENAI_API_BASE: z.string().optional(),
ANTHROPIC_API_KEY: z.string().optional(),
TURNSTILE_SECRET_KEY: z.string().optional(),
},
Expand Down Expand Up @@ -173,6 +174,7 @@ export const env = createEnv({
LANGFUSE_WORKER_PASSWORD: process.env.LANGFUSE_WORKER_PASSWORD,
// Prompt playground
OPENAI_API_KEY: process.env.OPENAI_API_KEY,
OPENAI_API_BASE: process.env.OPENAI_API_BASE,
ANTHROPIC_API_KEY: process.env.ANTHROPIC_API_KEY,
TURNSTILE_SECRET_KEY: process.env.TURNSTILE_SECRET_KEY,
NEXT_PUBLIC_TURNSTILE_SITE_KEY: process.env.NEXT_PUBLIC_TURNSTILE_SITE_KEY,
Expand Down
1 change: 1 addition & 0 deletions worker/src/eval-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
fetchLLMCompletion,
singleFilter,
tableColumnsToSqlFilterAndPrefix,
tracesTableCols,

Check warning on line 11 in worker/src/eval-service.ts

View workflow job for this annotation

GitHub Actions / lint 

'tracesTableCols' is defined but never used
variableMappingList,
TraceUpsertEvent,
EvalModelNames,
Expand Down Expand Up @@ -279,6 +279,7 @@
completion = await fetchLLMCompletion({
streaming: false,
apiKey: decrypt(apiKey.secret_key), // decrypt the secret key
// apiBase: apiKey.api_base,
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would require changing some of the database stuff. Leaving it commented out for now so you can decide. =)

messages: [{ role: ChatMessageRole.System, content: prompt }],
modelParams: {
provider: provider,
Expand Down