git.iko.soy/crush
on main help sign in
fix: assistant message
71bca98Kujtim Hoxha
internal/llm/provider/openai.go+11−28
compare with main
unifiedsplit
@@ -125,33 +125,7 @@ func (o *openaiClient) convertMessages(messages []message.Message) (openaiMessag
125 Role: "assistant",
125 Role: "assistant",
126 }
126 }
127
127
128− hasContent := false
129− if msg.Content().String() != "" {
130− hasContent = true
131− textBlock := openai.ChatCompletionContentPartTextParam{Text: msg.Content().String()}
132− if cache && !o.providerOptions.disableCache && isAnthropicModel {
133− textBlock.SetExtraFields(map[string]any{
134− "cache_control": map[string]string{
135− "type": "ephemeral",
136− },
137− })
138− }
139− assistantMsg.Content = openai.ChatCompletionAssistantMessageParamContentUnion{
140− OfArrayOfContentParts: []openai.ChatCompletionAssistantMessageParamContentArrayOfContentPartUnion{
141− {
142− OfText: &textBlock,
143− },
144− },
145− }
146− if !isAnthropicModel {
147− assistantMsg.Content = openai.ChatCompletionAssistantMessageParamContentUnion{
148− OfString: param.NewOpt(msg.Content().String()),
149− }
150− }
151− }
152−
153 if len(msg.ToolCalls()) > 0 {
128 if len(msg.ToolCalls()) > 0 {
154− hasContent = true
155 assistantMsg.ToolCalls = make([]openai.ChatCompletionMessageToolCallParam, len(msg.ToolCalls()))
129 assistantMsg.ToolCalls = make([]openai.ChatCompletionMessageToolCallParam, len(msg.ToolCalls()))
156 for i, call := range msg.ToolCalls() {
130 for i, call := range msg.ToolCalls() {
157 assistantMsg.ToolCalls[i] = openai.ChatCompletionMessageToolCallParam{
131 assistantMsg.ToolCalls[i] = openai.ChatCompletionMessageToolCallParam{
@@ -164,10 +138,19 @@ func (o *openaiClient) convertMessages(messages []message.Message) (openaiMessag
164 }
138 }
165 }
139 }
166 }
140 }
167− if !hasContent {
141+ if msg.Content().String() != "" {
168− continue
142+ assistantMsg.Content = openai.ChatCompletionAssistantMessageParamContentUnion{
143+ OfString: param.NewOpt(msg.Content().Text),
144+ }
169 }
145 }
170
146
147+ if cache && !o.providerOptions.disableCache && isAnthropicModel {
148+ assistantMsg.SetExtraFields(map[string]any{
149+ "cache_control": map[string]string{
150+ "type": "ephemeral",
151+ },
152+ })
153+ }
171 openaiMessages = append(openaiMessages, openai.ChatCompletionMessageParamUnion{
154 openaiMessages = append(openaiMessages, openai.ChatCompletionMessageParamUnion{
172 OfAssistant: &assistantMsg,
155 OfAssistant: &assistantMsg,
173 })
156 })