Fix o1 in openai native

This commit is contained in:
Saoud Rizwan
2024-10-18 07:56:15 -04:00
parent cbf942e700
commit 9052528d2b

View File

@@ -23,29 +23,31 @@ export class OpenAiNativeHandler implements ApiHandler {
} }
async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream { async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
let systemPromptMessage: OpenAI.Chat.ChatCompletionMessageParam
let temperature = 0
switch (this.getModel().id) { switch (this.getModel().id) {
case "o1-preview": case "o1-preview":
case "o1-mini": case "o1-mini": {
systemPromptMessage = { role: "user", content: systemPrompt } // o1 doesnt support streaming, non-1 temp, or system prompt
temperature = 1 const response = await this.client.chat.completions.create({
break model: this.getModel().id,
default: messages: [{ role: "user", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
systemPromptMessage = { role: "system", content: systemPrompt } })
temperature = 0 yield {
type: "text",
text: response.choices[0]?.message.content || "",
} }
yield {
const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [ type: "usage",
systemPromptMessage, inputTokens: response.usage?.prompt_tokens || 0,
...convertToOpenAiMessages(messages), outputTokens: response.usage?.completion_tokens || 0,
] }
break
}
default: {
const stream = await this.client.chat.completions.create({ const stream = await this.client.chat.completions.create({
model: this.getModel().id, model: this.getModel().id,
// max_completion_tokens: this.getModel().info.maxTokens, // max_completion_tokens: this.getModel().info.maxTokens,
temperature, temperature: 0,
messages: openAiMessages, messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
stream: true, stream: true,
stream_options: { include_usage: true }, stream_options: { include_usage: true },
}) })
@@ -69,6 +71,8 @@ export class OpenAiNativeHandler implements ApiHandler {
} }
} }
} }
}
}
getModel(): { id: OpenAiNativeModelId; info: ModelInfo } { getModel(): { id: OpenAiNativeModelId; info: ModelInfo } {
const modelId = this.options.apiModelId const modelId = this.options.apiModelId