Fixes for multiple responses, chat request and checks on responses

ChatRequestBuilder.go

@@ -10,7 +10,7 @@ type ChatRequestBuilder struct {
 	Format   *string   `json:"format"`
 	Images   []string  `json:"images"`
 	Raw      *bool     `json:"raw"`
-	Messages []Message `json:"message"`
+	Messages []Message `json:"messages"`
 
 	Options *Options `json:"options"`
 }

ModelFileBuilder.go

@@ -24,6 +24,16 @@ type Parameter struct {
 	Value string
 }
 
+// WithName sets the new model's name for this request.
+//
+// Parameters:
+//   - v: The model name.
+func (c *CreateModelFunc) WithName(v string) func(*ModelFileBuilder) {
+	return func(r *ModelFileBuilder) {
+		r.Name = &v
+	}
+}
+
 // WithStream passes a function to allow reading stream types.
 //
 // Parameters:

functions.go

@@ -3,6 +3,7 @@ package ollama
 import (
 	"bytes"
 	json2 "encoding/json"
+	"fmt"
 	"io"
 )
 
@@ -152,8 +153,13 @@ func (o *Ollama) newChatFunc() ChatFunc {
 				final.Done = r.Done
 			}
 
-			final.Message.Content = pointer(*final.Message.Content + *r.Message.Content)
-			final.Message.Images = append(final.Message.Images, r.Message.Images...)
+			if r.Message.Content != nil {
+				final.Message.Content = pointer(*final.Message.Content + *r.Message.Content)
+			}
+
+			if r.Message.Images != nil && len(r.Message.Images) > 0 {
+				final.Message.Images = append(final.Message.Images, r.Message.Images...)
+			}
 
 			if i == len(resp)-1 {
 				final.TotalDuration = r.TotalDuration
@@ -423,7 +429,13 @@ func (o *Ollama) newPullModelFunc() PullModelFunc {
 
 		final := &StatusResponse{}
 		for _, r := range resp {
-			final.Status += r.Status + "\n"
+			if len(r.Status) != 0 {
+				final.Status += r.Status + "\n"
+			}
+
+			if len(r.Error) != 0 {
+				final.Error += r.Error + "\n"
+			}
 		}
 
 		return final, nil

ollama.go

@@ -100,48 +100,32 @@ func (o *Ollama) Do(path string, data interface{}, maxBufferSize int, streamFunc
 	}
 	defer resp.Body.Close()
 
-	if streamFunc != nil {
-		var res [][]byte
-		var buffer bytes.Buffer
-
-		for {
-			buf := make([]byte, maxBufferSize)
-			n, err := resp.Body.Read(buf)
-			if err != nil && err != io.EOF {
-				return nil, err
-			}
-
-			if n == 0 {
-				break
-			}
+	var res [][]byte
+	var buffer bytes.Buffer
+
+	for {
+		buf := make([]byte, maxBufferSize)
+		n, err := resp.Body.Read(buf)
+		if err != nil && err != io.EOF {
+			return nil, err
+		}
 
-			chunk := buf[:n]
+		if n == 0 {
+			break
+		}
 
+		bigChunk := splitJSONObjects(buf[:n])
+		for _, chunk := range bigChunk {
 			res = append(res, chunk)
 			buffer.Write(chunk)
-			streamFunc(chunk)
-		}
 
-		//// Process buffered data to handle complete JSON objects
-		//decoder := json.NewDecoder(resp.Body)
-		//for buffer.Len() > 0 {
-		//	var jsonObj map[string]interface{}
-		//	err := decoder.Decode(&jsonObj)
-		//	if err != nil {
-		//		if err == io.EOF {
-		//			break
-		//		}
-		//		return nil, err
-		//	}
-		//	// Here you can handle each JSON object as needed
-		//	fmt.Printf("JSON object: %v\n", jsonObj)
-		//}
-
-		return res, nil
+			if streamFunc != nil {
+				streamFunc(chunk)
+			}
+		}
 	}
 
-	b, err := io.ReadAll(resp.Body)
-	return [][]byte{b}, nil
+	return res, nil
 }
 
 // Request performs an HTTP request to the Ollama API.

responses.go

@@ -44,4 +44,5 @@ type ShowModelInfoResponse struct {
 // StatusResponse represents the API response for endpoint that return status updates.
 type StatusResponse struct {
 	Status string `json:"status"`
+	Error  string `json:"error"`
 }

utils.go

@@ -30,3 +30,36 @@ func buildUrl(baseUrl, path string) string {
 	url += path
 	return url
 }
+
+func splitJSONObjects(data []byte) [][]byte {
+	var results [][]byte
+	var stack []byte
+	var start, end int
+	var inString bool
+
+	for i := 0; i < len(data); i++ {
+		switch data[i] {
+		case '{':
+			if !inString {
+				if len(stack) == 0 {
+					start = i
+				}
+				stack = append(stack, '{')
+			}
+		case '}':
+			if !inString {
+				stack = stack[:len(stack)-1]
+				if len(stack) == 0 {
+					end = i + 1
+					results = append(results, data[start:end])
+				}
+			}
+		case '"':
+			if i == 0 || data[i-1] != '\\' {
+				inString = !inString
+			}
+		}
+	}
+
+	return results
+}