Skip to content
Merged
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
6 changes: 6 additions & 0 deletions model/atlascloud/atlascloud.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,9 @@ func (s *atlasStream) Recv() (*model.Response, error) {
return nil, io.EOF
}
var chunk struct {
Error *struct {
Message string `json:"message"`
} `json:"error"`
Choices []struct {
Delta struct {
Content string `json:"content"`
Expand All @@ -368,6 +371,9 @@ func (s *atlasStream) Recv() (*model.Response, error) {
if err := json.Unmarshal([]byte(data), &chunk); err != nil {
return nil, fmt.Errorf("failed to parse stream chunk: %w", err)
}
if chunk.Error != nil {
return nil, fmt.Errorf("stream: %s", chunk.Error.Message)
}
if len(chunk.Choices) > 0 && chunk.Choices[0].Delta.Content != "" {
return &model.Response{Reply: chunk.Choices[0].Delta.Content}, nil
}
Expand Down
6 changes: 6 additions & 0 deletions model/internal/openaiapi/stream.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ func (s *StreamReader) Recv() (*model.Response, error) {
return nil, io.EOF
}
var chunk struct {
Error *struct {
Message string `json:"message"`
} `json:"error"`
Choices []struct {
FinishReason string `json:"finish_reason"`
Delta struct {
Expand All @@ -91,6 +94,9 @@ func (s *StreamReader) Recv() (*model.Response, error) {
if err := json.Unmarshal([]byte(data), &chunk); err != nil {
return nil, fmt.Errorf("failed to parse stream chunk: %w", err)
}
if chunk.Error != nil {
return nil, fmt.Errorf("stream: %s", chunk.Error.Message)
}
response := &model.Response{}
if len(chunk.Choices) > 0 {
choice := chunk.Choices[0]
Expand Down
65 changes: 65 additions & 0 deletions model/internal/openaiapi/stream_errors_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package openaiapi_test

import (
"context"
"errors"
"io"
"net/http"
"net/http/httptest"
"strings"
"testing"

"go-micro.dev/v6/model"
_ "go-micro.dev/v6/model/atlascloud"
_ "go-micro.dev/v6/model/groq"
_ "go-micro.dev/v6/model/litellm"
_ "go-micro.dev/v6/model/minimax"
_ "go-micro.dev/v6/model/mistral"
_ "go-micro.dev/v6/model/openai"
_ "go-micro.dev/v6/model/openrouter"
_ "go-micro.dev/v6/model/together"
)

func TestStreamProvidersPropagateSSEErrors(t *testing.T) {
providers := []string{"atlascloud", "groq", "litellm", "minimax", "mistral", "openai", "openrouter", "together"}
for _, provider := range providers {
t.Run(provider, func(t *testing.T) {
for _, afterContent := range []bool{false, true} {
name := "before_content"
if afterContent {
name = "after_content"
}
t.Run(name, func(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "text/event-stream")
if afterContent {
_, _ = io.WriteString(w, "data: {\"choices\":[{\"delta\":{\"content\":\"partial\"}}]}\n\n")
_, _ = io.WriteString(w, "data: {\"error\":{\"message\":\"upstream overloaded\",\"code\":502},\"choices\":[{\"delta\":{},\"finish_reason\":\"error\"}]}\n\n")
} else {
_, _ = io.WriteString(w, "data: {\"error\":{\"message\":\"upstream overloaded\",\"code\":502}}\n\n")
}
_, _ = io.WriteString(w, "data: [DONE]\n\n")
}))
defer server.Close()

m := model.New(provider, model.WithAPIKey("test-key"), model.WithBaseURL(server.URL))
stream, err := m.Stream(context.Background(), &model.Request{Prompt: "Hello"})
if err != nil {
t.Fatalf("Stream returned error before reading the SSE event: %v", err)
}
defer stream.Close()
if afterContent {
chunk, err := stream.Recv()
if err != nil || chunk.Reply != "partial" {
t.Fatalf("first chunk = %#v, %v; want partial", chunk, err)
}
}
response, err := stream.Recv()
if response != nil || err == nil || errors.Is(err, io.EOF) || !strings.Contains(err.Error(), "upstream overloaded") {
t.Fatalf("Recv = %#v, %v; want the provider error", response, err)
}
})
}
})
}
}
6 changes: 6 additions & 0 deletions model/openai/openai.go
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,9 @@ func (s *openAIStream) Recv() (*model.Response, error) {
return nil, io.EOF
}
var chunk struct {
Error *struct {
Message string `json:"message"`
} `json:"error"`
Choices []struct {
FinishReason string `json:"finish_reason"`
Delta struct {
Expand All @@ -137,6 +140,9 @@ func (s *openAIStream) Recv() (*model.Response, error) {
if err := json.Unmarshal([]byte(data), &chunk); err != nil {
return nil, fmt.Errorf("failed to parse stream chunk: %w", err)
}
if chunk.Error != nil {
return nil, fmt.Errorf("stream: %s", chunk.Error.Message)
}
response := &model.Response{}
if len(chunk.Choices) > 0 {
choice := chunk.Choices[0]
Expand Down
Loading