Skip to content

OpenAILanguageModel + SystemLanguageModel tools calling support #49

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 19 commits into from
Dec 11, 2025
Merged

OpenAILanguageModel + SystemLanguageModel tools calling support #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
4bdfbd9
Add basic support for proper tool support response to OpenAILanguageM…
airy10 Nov 24, 2025
c9dab2a
Add support for Tool calling with Apple models
airy10 Nov 25, 2025
842e875
Add "description" support for the tools parameters
airy10 Nov 25, 2025
72672ab
Merge branch 'mattt:main' into apple-tools-support
airy10 Nov 25, 2025
ef89ec5
Fix ALM->FoundationModels schema conversion + empty "description" of …
airy10 Nov 28, 2025
f23a7a9
Fix function calling for both Chat Completion and Responses - Add the…
airy10 Dec 3, 2025
9c2568c
Update Sources/AnyLanguageModel/Models/OpenAILanguageModel.swift
airy10 Dec 3, 2025
214dd1a
Update Sources/AnyLanguageModel/Models/OpenAILanguageModel.swift
airy10 Dec 3, 2025
2449b05
Switch to using JSONSchema to convert tools schemas to FoundationMode…
airy10 Dec 4, 2025
c2d9939
Fix compiler warnings
mattt Dec 11, 2025
5d5ec0c
swift format -i --recursive .
mattt Dec 11, 2025
0fe7dde
Fix OpenAI withTools() test failure
mattt Dec 11, 2025
0972398
Fix OpenAI tool calling logic and tests
mattt Dec 11, 2025
f229708
Refactor dynamic schema convesion to be top-level functions
mattt Dec 11, 2025
5b70123
Change AnyToolWrapper APIs to be nonpublic
mattt Dec 11, 2025
ed8df20
Refactor call(arguments:) and make it nonpublic
mattt Dec 11, 2025
b982331
Make callFunction fileprivate
mattt Dec 11, 2025
96dd1de
Remove unused, private SystemLanguageModelError
mattt Dec 11, 2025
c665f67
Add test coverage of dynamic schema conversion
mattt Dec 11, 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/GenerationSchema.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,14 +408,15 @@ public struct GenerationSchema: Sendable, Codable, CustomDebugStringConvertible
private static func convertDynamic(
_ dynamic: DynamicGenerationSchema,
nameMap: [String: DynamicGenerationSchema],
defs: inout [String: Node]
defs: inout [String: Node],
dynamicProp: DynamicGenerationSchema.Property? = nil
) throws -> Node {
switch dynamic.body {
case .object(let name, let desc, let properties):
var props: [String: Node] = [:]
var required: Set<String> = []
for prop in properties {
props[prop.name] = try convertDynamic(prop.schema, nameMap: nameMap, defs: &defs)
props[prop.name] = try convertDynamic(prop.schema, nameMap: nameMap, defs: &defs, dynamicProp: prop)
if !prop.isOptional {
required.insert(prop.name)
}
Expand Down Expand Up @@ -452,20 +453,28 @@ public struct GenerationSchema: Sendable, Codable, CustomDebugStringConvertible

case .array(let item, let min, let max):
let itemNode = try convertDynamic(item, nameMap: nameMap, defs: &defs)
return .array(ArrayNode(description: nil, items: itemNode, minItems: min, maxItems: max))
return .array(
ArrayNode(description: dynamicProp?.description, items: itemNode, minItems: min, maxItems: max)
)

case .scalar(let scalar):
switch scalar {
case .bool:
return .boolean
case .string:
return .string(StringNode(description: nil, pattern: nil, enumChoices: nil))
return .string(StringNode(description: dynamicProp?.description, pattern: nil, enumChoices: nil))
case .number:
return .number(NumberNode(description: nil, minimum: nil, maximum: nil, integerOnly: false))
return .number(
NumberNode(description: dynamicProp?.description, minimum: nil, maximum: nil, integerOnly: false)
)
case .integer:
return .number(NumberNode(description: nil, minimum: nil, maximum: nil, integerOnly: true))
return .number(
NumberNode(description: dynamicProp?.description, minimum: nil, maximum: nil, integerOnly: true)
)
case .decimal:
return .number(NumberNode(description: nil, minimum: nil, maximum: nil, integerOnly: false))
return .number(
NumberNode(description: dynamicProp?.description, minimum: nil, maximum: nil, integerOnly: false)
)
}

case .reference(let name):
Expand Down
Loading