Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 20 additions & 4 deletions providers/openai/language_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -568,9 +568,13 @@ func (o languageModel) Stream(ctx context.Context, call fantasy.Call) (fantasy.S
// can't infer a tool-call turn. Surface as a retryable error so
// the retry middleware re-runs the step.
if finishReason == "" && mappedFinishReason != fantasy.FinishReasonToolCalls {
err := ctx.Err()
if err == nil {
err = fantasy.NewIncompleteStreamError()
}
yield(fantasy.StreamPart{
Type: fantasy.StreamPartTypeError,
Error: fantasy.NewIncompleteStreamError(),
Error: err,
})
return
}
Expand Down Expand Up @@ -868,8 +872,8 @@ func (o languageModel) streamObjectWithJSONMode(ctx context.Context, call fantas
var lastParsedObject any
var usage fantasy.Usage
var finishReason fantasy.FinishReason
var sawFinishReason bool
var providerMetadata fantasy.ProviderMetadata
var streamErr error

for stream.Next() {
chunk := stream.Current()
Expand All @@ -884,6 +888,7 @@ func (o languageModel) streamObjectWithJSONMode(ctx context.Context, call fantas
choice := chunk.Choices[0]
if choice.FinishReason != "" {
finishReason = o.mapFinishReasonFunc(choice.FinishReason)
sawFinishReason = true
}

if choice.Delta.Content != "" {
Expand Down Expand Up @@ -928,10 +933,21 @@ func (o languageModel) streamObjectWithJSONMode(ctx context.Context, call fantas

err := stream.Err()
if err != nil && !errors.Is(err, io.EOF) {
streamErr = toProviderErr(err)
yield(fantasy.ObjectStreamPart{
Type: fantasy.ObjectStreamPartTypeError,
Error: streamErr,
Error: toProviderErr(err),
})
return
}

if !sawFinishReason {
err := ctx.Err()
if err == nil {
err = fantasy.NewIncompleteStreamError()
}
yield(fantasy.ObjectStreamPart{
Type: fantasy.ObjectStreamPartTypeError,
Error: err,
})
return
}
Expand Down
Loading
Loading