Updates

Author: djthorpe

README.md

@@ -72,7 +72,7 @@ func main() {
 }
 ```
 
-For Mistral models, you can use:
+For [Mistral](https://pkg.go.dev/github.com/mutablelogic/go-llm/pkg/mistral) models, you can use:
 
 ```go
 import (
@@ -89,6 +89,9 @@ func main() {
 }
 ```
 
+You can append options to the agent creation to set the client/server communication options,
+such as user agent strings, timeouts, debugging, rate limiting, adding custom headers, etc. See [here](https://pkg.go.dev/github.com/mutablelogic/go-client#readme-basic-usage) for more information.
+
 ### Chat Sessions
 
 You create a **chat session** with a model as follows,
@@ -100,7 +103,7 @@ import (
 
 func session(ctx context.Context, agent llm.Agent) error {
   // Create a new chat session
-  session := agent.Model("claude-3-5-haiku-20241022").Context()
+  session := agent.Model(context.TODO(), "claude-3-5-haiku-20241022").Context()
 
   // Repeat forever
   for {
@@ -109,12 +112,28 @@ func session(ctx context.Context, agent llm.Agent) error {
       return err
     }
 
-    // Print the response
-    fmt.Println(session.Text())
+    // Print the response for the zero'th completion
+    fmt.Println(session.Text(0))
   }
 }
 ```
 
+### Embedding Generation
+
+TODO
+
+### Attachments & Image Caption Generation
+
+TODO
+
+### Streaming
+
+TODO
+
+### Tool Support
+
+TODO
+
 ## Options
 
 You can add options to sessions, or to prompts. Different providers and models support

pkg/mistral/chat_completion.go

@@ -21,13 +21,6 @@ type Response struct {
 	Metrics `json:"usage,omitempty"`
 }
 
-// Response variation
-type Choice struct {
-	Index   uint64      `json:"index"`
-	Message MessageMeta `json:"message"`
-	Reason  string      `json:"finish_reason,omitempty"`
-}
-
 // Metrics
 type Metrics struct {
 	InputTokens  uint64 `json:"prompt_tokens,omitempty"`

pkg/mistral/message.go

@@ -3,8 +3,18 @@ package mistral
 ///////////////////////////////////////////////////////////////////////////////
 // TYPES
 
+// Possible completions
+type Completions []Completion
+
+// Completion Variation
+type Completion struct {
+	Index   uint64  `json:"index"`
+	Message Message `json:"message"`
+	Reason  string  `json:"finish_reason,omitempty"`
+}
+
 // Message with text or object content
-type MessageMeta struct {
+type Message struct {
 	Role    string `json:"role"` // assistant, user, tool, system
 	Prefix  bool   `json:"prefix,omitempty"`
 	Content any    `json:"content,omitempty"`
@@ -30,7 +40,7 @@ type Image string
 ///////////////////////////////////////////////////////////////////////////////
 // LIFECYCLE
 
-// Return a Content object with text content
+// Return a Content object with text content (either in "text" or "prediction" field)
 func NewContent(t, v, p string) *Content {
 	content := new(Content)
 	content.Type = t
@@ -51,25 +61,29 @@ func NewTextContent(v string) *Content {
 ///////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
-// Return the text content
-func (m MessageMeta) Text() string {
-	if text, ok := m.Content.(string); ok {
-		return text
+// Return the number of completions
+func (c Completions) Num() int {
+	return len(c)
+}
+
+// Return the role of the completion
+func (c Completions) Role() string {
+	// The role should be the same for all completions, let's use the first one
+	if len(c) == 0 {
+		return ""
 	}
-	return ""
+	return c[0].Message.Role
 }
 
-/*
-	if arr, ok := m.Content.([]Content); ok {
-	if len(m.Content) == 0 {
+// Return the text content for a specific completion
+func (c Completions) Text(index int) string {
+	if index < 0 || index >= len(c) {
 		return ""
 	}
-	var text []string
-	for _, content := range m.Content {
-		if content.Type == "text" && content.Text != nil {
-			text = append(text, string(*content.Text))
-		}
+	completion := c[index].Message
+	if text, ok := completion.Content.(string); ok {
+		return text
 	}
-	return strings.Join(text, "\n")
+	// Will the text be in other forms?
+	return ""
 }
-*/

pkg/mistral/session.go

@@ -1,20 +1,20 @@
 package mistral
 
 import (
-	// Packages
 	"context"
 	"encoding/json"
 
+	// Packages
 	llm "github.com/mutablelogic/go-llm"
 )
 
 //////////////////////////////////////////////////////////////////
 // TYPES
 
 type session struct {
-	model *model         // The model used for the session
-	opts  []llm.Opt      // Options to apply to the session
-	seq   []*MessageMeta // Sequence of messages
+	model *model // The model used for the session
+	opts  []llm.Opt // Options to apply to the session
+	seq   []*Message // Sequence of messages
 }
 
 var _ llm.Context = (*session)(nil)
@@ -67,6 +67,16 @@ func (session session) String() string {
 //////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
+// Return the number of completions
+func (session *session) Num() int {
+	if len(session.seq) == 0 {
+		return 0
+	}
+	message := session.seq[len(session.seq)-1]
+	message.
+	return session.seq[len(session.seq)-1].Role
+}
+
 // Return the role of the last message
 func (session *session) Role() string {
 	if len(session.seq) == 0 {
@@ -76,7 +86,7 @@ func (session *session) Role() string {
 }
 
 // Return the text of the last message
-func (session *session) Text() string {
+func (session *session) Text(index int) string {
 	if len(session.seq) == 0 {
 		return ""
 	}
@@ -85,7 +95,7 @@ func (session *session) Text() string {
 }
 
 // Return the text of the last message
-func (session *session) ToolCalls() []llm.ToolCall {
+func (session *session) ToolCalls(index int) []llm.ToolCall {
 	return nil
 }