diff --git a/src/commands/openai-chat.ts b/src/commands/openai-chat.ts index dc21975..57c94c0 100644 --- a/src/commands/openai-chat.ts +++ b/src/commands/openai-chat.ts @@ -39,7 +39,7 @@ export class OpenAIChat extends ChatCommand { const chatMessages = messageParts.map(part => { const content = []; content.push({ - type: "input_text", + type: part.bot ? "output_text" : "input_text", text: (Environment.USE_NAMES_IN_PROMPT && !part.bot ? `MESSAGE FROM USER "${part.name}":\n` : "") + part.content, }); diff --git a/src/common/environment.ts b/src/common/environment.ts index 479252b..3bdaf44 100644 --- a/src/common/environment.ts +++ b/src/common/environment.ts @@ -39,6 +39,7 @@ export class Environment { static MISTRAL_API_KEY?: string; static MISTRAL_MODEL: string; + static OPENAI_BASE_URL?: string; static OPENAI_API_KEY?: string; static OPENAI_MODEL: string; @@ -79,6 +80,7 @@ export class Environment { Environment.MISTRAL_API_KEY = process.env.MISTRAL_API_KEY; Environment.MISTRAL_MODEL = process.env.MISTRAL_MODEL || "mistral-small-latest"; + Environment.OPENAI_BASE_URL = process.env.OPENAI_BASE_URL; Environment.OPENAI_API_KEY = process.env.OPENAI_API_KEY; Environment.OPENAI_MODEL = process.env.OPENAI_MODEL || "gpt-4.1-nano"; } diff --git a/src/index.ts b/src/index.ts index fab901b..740e9b1 100644 --- a/src/index.ts +++ b/src/index.ts @@ -92,7 +92,7 @@ export let botUser: User; export const googleAi = new GoogleGenAI({apiKey: Environment.GEMINI_API_KEY}); export const mistralAi = new Mistral({apiKey: Environment.MISTRAL_API_KEY}); -export const openAi = new OpenAI({apiKey: Environment.OPENAI_API_KEY}); +export const openAi = new OpenAI({apiKey: Environment.OPENAI_API_KEY, baseURL: Environment.OPENAI_BASE_URL}); export const ollama = new Ollama({ host: Environment.OLLAMA_ADDRESS,