Skip to content

Include instructions param in OpenAILanguageModel #20

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

Merged
mattt merged 3 commits into from
Nov 5, 2025
Merged

Include instructions param in OpenAILanguageModel #20

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2afb38
Set instructions param in OpenAILanguageModel
twocentstudios Nov 5, 2025
1a4f75b
Don't check for empty string
twocentstudios Nov 5, 2025
0808738
Don't check for empty string
twocentstudios Nov 5, 2025
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
23 changes: 16 additions & 7 deletions Sources/AnyLanguageModel/Models/OpenAILanguageModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,11 @@ public struct OpenAILanguageModel: LanguageModel {
fatalError("OpenAILanguageModel only supports generating String content")
}

let messages = [
OpenAIMessage(role: .user, content: .text(prompt.description))
]
var messages: [OpenAIMessage] = []
if let instructions = session.instructions {
messages.append(OpenAIMessage(role: .system, content: .text(instructions.description)))
}
messages.append(OpenAIMessage(role: .user, content: .text(prompt.description)))

// Convert tools if any are available in the session
let openAITools: [OpenAITool]? = {
Expand Down Expand Up @@ -231,9 +233,11 @@ public struct OpenAILanguageModel: LanguageModel {
fatalError("OpenAILanguageModel only supports generating String content")
}

let messages = [
OpenAIMessage(role: .user, content: .text(prompt.description))
]
var messages: [OpenAIMessage] = []
if let instructions = session.instructions {
messages.append(OpenAIMessage(role: .system, content: .text(instructions.description)))
}
messages.append(OpenAIMessage(role: .user, content: .text(prompt.description)))

// Convert tools if any are available in the session
let openAITools: [OpenAITool]? = {
Expand Down Expand Up @@ -435,7 +439,8 @@ private enum Responses {
options: GenerationOptions,
stream: Bool
) -> JSONValue {
// Extract the user message content for the input parameter
// Extract the system and user message content for the request
let systemMessage = messages.first { $0.role == .system }
let userMessage = messages.first { $0.role == .user }
let inputText = if case .text(let text) = userMessage?.content { text } else { "" }

Expand All @@ -445,6 +450,10 @@ private enum Responses {
"stream": .bool(stream),
]

if case .text(let instructions) = systemMessage?.content {
body["instructions"] = .string(instructions)
}

if let tools {
body["tools"] = .array(tools.map { $0.jsonValue(for: .responses) })
}
Expand Down