Skip to content

fix: stream handle #950

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

Closed
linhaojun857 wants to merge 1 commit into from
Closed

fix: stream handle #950

Show file tree
Hide file tree
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
44 changes: 33 additions & 11 deletions stream_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,12 @@ import (
)

var (
headerData = []byte("data: ")
errorPrefix = []byte(`data: {"error":`)
dataField = []byte("data")
errorPrefix = []byte(`{"error":`)
)

const (
splitParts = 2
)

type streamable interface {
Expand Down Expand Up @@ -55,13 +59,14 @@ func (stream *streamReader[T]) RecvRaw() ([]byte, error) {
//nolint:gocognit
func (stream *streamReader[T]) processLines() ([]byte, error) {
var (
emptyMessagesCount uint
hasErrorPrefix bool
emptyMessagesCount uint
dataFieldNotFound bool
valueHasErrorPrefix bool
)

for {
rawLine, readErr := stream.reader.ReadBytes('\n')
if readErr != nil || hasErrorPrefix {
if readErr != nil || valueHasErrorPrefix {
respErr := stream.unmarshalError()
if respErr != nil {
return nil, fmt.Errorf("error, %w", respErr.Error)
Expand All @@ -70,12 +75,28 @@ func (stream *streamReader[T]) processLines() ([]byte, error) {
}

noSpaceLine := bytes.TrimSpace(rawLine)
if bytes.HasPrefix(noSpaceLine, errorPrefix) {
hasErrorPrefix = true

var value []byte

split := bytes.SplitN(noSpaceLine, []byte(":"), splitParts)

if len(split) != splitParts || !bytes.Equal(split[0], dataField) {
dataFieldNotFound = true
} else {
value = split[1]

if bytes.HasPrefix(value, []byte(" ")) {
value = value[1:]
}

if bytes.HasPrefix(value, errorPrefix) {
valueHasErrorPrefix = true
}
}
if !bytes.HasPrefix(noSpaceLine, headerData) || hasErrorPrefix {
if hasErrorPrefix {
noSpaceLine = bytes.TrimPrefix(noSpaceLine, headerData)

if dataFieldNotFound || valueHasErrorPrefix {
if valueHasErrorPrefix {
noSpaceLine = value
}
writeErr := stream.errAccumulator.Write(noSpaceLine)
if writeErr != nil {
Expand All @@ -85,11 +106,12 @@ func (stream *streamReader[T]) processLines() ([]byte, error) {
if emptyMessagesCount > stream.emptyMessagesLimit {
return nil, ErrTooManyEmptyStreamMessages
}
dataFieldNotFound = false

continue
}

noPrefixLine := bytes.TrimPrefix(noSpaceLine, headerData)
noPrefixLine := value
if string(noPrefixLine) == "[DONE]" {
stream.isFinished = true
return nil, io.EOF
Expand Down
13 changes: 13 additions & 0 deletions stream_reader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,16 @@ func TestStreamReaderRecvRaw(t *testing.T) {
t.Fatalf("Did not return raw line: %v", string(rawLine))
}
}

func TestStreamReaderRecvRawWithNoSpaceInFieldAndValue(t *testing.T) {
stream := &streamReader[ChatCompletionStreamResponse]{
reader: bufio.NewReader(bytes.NewReader([]byte("data:{\"key\": \"value\"}\n"))),
}
rawLine, err := stream.RecvRaw()
if err != nil {
t.Fatalf("Did not return raw line: %v", err)
}
if !bytes.Equal(rawLine, []byte("{\"key\": \"value\"}")) {
t.Fatalf("Did not return raw line: %v", string(rawLine))
}
}
Loading