Skip to content

Fix tool message content format for DeepSeek API compatibility #99

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

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

Fix tool message content format for DeepSeek API compatibility #99

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 39 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 @@ -514,9 +514,19 @@ public struct OpenAILanguageModel: LanguageModel {
for invocation in invocations {
let output = invocation.output
entries.append(.toolOutput(output))
let toolSegments: [Transcript.Segment] = output.segments
let blocks = convertSegmentsToOpenAIBlocks(toolSegments)
messages.append(OpenAIMessage(role: .tool(id: invocation.call.id), content: .blocks(blocks)))
// Convert tool output segments to plain text for DeepSeek API compatibility
let toolContent = output.segments.map { segment -> String in
switch segment {
case .text(let textSegment): return textSegment.content
case .structure(let structuredSegment):
switch structuredSegment.content.kind {
case .string(let text): return text
default: return structuredSegment.content.jsonString
}
case .image: return "<image>"
}
}.joined()
messages.append(OpenAIMessage(role: .tool(id: invocation.call.id), content: .text(toolContent)))
}
continue
}
Expand Down Expand Up @@ -579,9 +589,19 @@ public struct OpenAILanguageModel: LanguageModel {
for invocation in invocations {
let output = invocation.output
entries.append(.toolOutput(output))
let toolSegments: [Transcript.Segment] = output.segments
let blocks = convertSegmentsToOpenAIBlocks(toolSegments)
messages.append(OpenAIMessage(role: .tool(id: invocation.call.id), content: .blocks(blocks)))
// Convert tool output segments to plain text for DeepSeek API compatibility
let toolContent = output.segments.map { segment -> String in
switch segment {
case .text(let textSegment): return textSegment.content
case .structure(let structuredSegment):
switch structuredSegment.content.kind {
case .string(let text): return text
default: return structuredSegment.content.jsonString
}
case .image: return "<image>"
}
}.joined()
messages.append(OpenAIMessage(role: .tool(id: invocation.call.id), content: .text(toolContent)))
}
continue
}
Expand Down Expand Up @@ -1165,10 +1185,22 @@ extension Transcript {
)
)
case .toolOutput(let toolOutput):
// Convert tool output segments to plain text for DeepSeek API compatibility
let toolContent = toolOutput.segments.map { segment -> String in
switch segment {
case .text(let textSegment): return textSegment.content
case .structure(let structuredSegment):
switch structuredSegment.content.kind {
case .string(let text): return text
default: return structuredSegment.content.jsonString
}
case .image: return "<image>"
}
}.joined()
messages.append(
.init(
role: .tool(id: toolOutput.id),
content: .blocks(convertSegmentsToOpenAIBlocks(toolOutput.segments))
content: .text(toolContent)
)
)
}
Expand Down