Updated llm

Author: djthorpe

cmd/agent/main.go

@@ -44,9 +44,10 @@ type CLI struct {
 	Globals
 
 	// Agents, Models and Tools
-	Agents   ListAgentsCmd `cmd:"" help:"Return a list of agents"`
-	Models   ListModelsCmd `cmd:"" help:"Return a list of models"`
-	Generate GenerateCmd   `cmd:"" help:"Generate a response"`
+	Agents   ListAgentsCmd    `cmd:"" help:"Return a list of agents"`
+	Models   ListModelsCmd    `cmd:"" help:"Return a list of models"`
+	Download DownloadModelCmd `cmd:"" help:"Download a model"`
+	Generate GenerateCmd      `cmd:"" help:"Generate a response"`
 }
 
 ////////////////////////////////////////////////////////////////////////////////

cmd/agent/models.go

@@ -7,6 +7,7 @@ import (
 	// Packages
 	llm "github.com/mutablelogic/go-llm"
 	agent "github.com/mutablelogic/go-llm/pkg/agent"
+	ollama "github.com/mutablelogic/go-llm/pkg/ollama"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -18,6 +19,11 @@ type ListModelsCmd struct {
 
 type ListAgentsCmd struct{}
 
+type DownloadModelCmd struct {
+	Agent string `arg:"" help:"Agent name"`
+	Model string `arg:"" help:"Model name"`
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // PUBLIC METHODS
 
@@ -49,9 +55,43 @@ func (*ListAgentsCmd) Run(globals *Globals) error {
 	})
 }
 
+func (cmd *DownloadModelCmd) Run(globals *Globals) error {
+	return runagent(globals, func(ctx context.Context, client llm.Agent) error {
+		agent := getagent(client, cmd.Agent)
+		if agent == nil {
+			return fmt.Errorf("No agents found with name %q", cmd.Agent)
+		}
+		// Download the model
+		switch agent.Name() {
+		case "ollama":
+			model, err := agent.(*ollama.Client).PullModel(ctx, cmd.Model)
+			if err != nil {
+				return err
+			}
+			fmt.Println(model)
+		default:
+			return fmt.Errorf("Agent %q does not support model download", agent.Name())
+		}
+		return nil
+	})
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // PRIVATE METHODS
 
 func runagent(globals *Globals, fn func(ctx context.Context, agent llm.Agent) error) error {
 	return fn(globals.ctx, globals.agent)
 }
+
+func getagent(client llm.Agent, name string) llm.Agent {
+	agent, ok := client.(*agent.Agent)
+	if !ok {
+		return nil
+	}
+	for _, agent := range agent.Agents() {
+		if agent.Name() == name {
+			return agent
+		}
+	}
+	return nil
+}

context.go

@@ -16,6 +16,6 @@ type Context interface {
 	// Generate a response from a user prompt (with attachments)
 	FromUser(context.Context, string, ...Opt) (Context, error)
 
-	// Generate a response from a tool result
-	FromTool(context.Context, ...any) (Context, error)
+	// Generate a response from a tool, passing the call identifier or funtion name, and the result
+	FromTool(context.Context, string, any) (Context, error)
 }

go.mod

@@ -4,13 +4,15 @@ go 1.23.5
 
 require (
 	github.com/alecthomas/kong v1.7.0
-	github.com/mutablelogic/go-client v1.0.9
-	github.com/stretchr/testify v1.9.0
+	github.com/mutablelogic/go-client v1.0.10
+	github.com/stretchr/testify v1.10.0
+	golang.org/x/term v0.28.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/djthorpe/go-errors v1.0.3 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -10,12 +10,16 @@ github.com/djthorpe/go-errors v1.0.3 h1:GZeMPkC1mx2vteXLI/gvxZS0Ee9zxzwD1mcYyKU5
 github.com/djthorpe/go-errors v1.0.3/go.mod h1:HtfrZnMd6HsX75Mtbv9Qcnn0BqOrrFArvCaj3RMnZhY=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/mutablelogic/go-client v1.0.9 h1:Eh4sjQOFDldP/L3IizqkcOD3WigZR+u1VaHTUM4ujYw=
-github.com/mutablelogic/go-client v1.0.9/go.mod h1:VLyB8j8IBJSK/FXvvqhmq93PRWDKkyLu8R7V2Vudb6A=
+github.com/mutablelogic/go-client v1.0.10 h1:d4t8irXlGNQrQS/+FoUht+1RnjL9lBaf1e2UasN3ifE=
+github.com/mutablelogic/go-client v1.0.10/go.mod h1:XbG8KGo2Efi7PGxXs7rhYxYhLeXL6aCSo6sz0mVchiw=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
-github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
+golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

model.go

@@ -10,4 +10,8 @@ type Model interface {
 	// Return am empty session context object for the model,
 	// setting session options
 	Context(...Opt) (Context, error)
+
+	// Convenience method to create a session context object
+	// with a user prompt, which panics on error
+	MustUserPrompt(string, ...Opt) Context
 }

pkg/agent/agent.go

@@ -56,12 +56,12 @@ func (m model) String() string {
 // PUBLIC METHODS
 
 // Return a list of agent names
-func (a *Agent) Agents() []string {
-	var keys []string
-	for k := range a.agents {
-		keys = append(keys, k)
+func (a *Agent) Agents() []llm.Agent {
+	var result []llm.Agent
+	for _, v := range a.agents {
+		result = append(result, v)
 	}
-	return keys
+	return result
 }
 
 // Return a list of tool names
@@ -75,7 +75,11 @@ func (a *Agent) Tools() []string {
 
 // Return a comma-separated list of agent names
 func (a *Agent) Name() string {
-	return strings.Join(a.Agents(), ",")
+	var keys []string
+	for key := range a.agents {
+		keys = append(keys, key)
+	}
+	return strings.Join(keys, ",")
 }
 
 // Return the models from all agents

pkg/ollama/chat.go

@@ -15,12 +15,11 @@ import (
 
 // Chat Response
 type Response struct {
-	Model     string         `json:"model"`
-	CreatedAt time.Time      `json:"created_at"`
-	Message   MessageMeta    `json:"message"`
-	Done      bool           `json:"done"`
-	Reason    string         `json:"done_reason,omitempty"`
-	Context   []*MessageMeta `json:"-"`
+	Model     string      `json:"model"`
+	CreatedAt time.Time   `json:"created_at"`
+	Message   MessageMeta `json:"message"`
+	Done      bool        `json:"done"`
+	Reason    string      `json:"done_reason,omitempty"`
 	Metrics
 }
 
@@ -58,20 +57,16 @@ type reqChat struct {
 	KeepAlive *time.Duration         `json:"keep_alive,omitempty"`
 }
 
-func (ollama *Client) Chat(ctx context.Context, model string, prompt llm.Context, opts ...llm.Opt) (*Response, error) {
+func (ollama *Client) Chat(ctx context.Context, prompt llm.Context, opts ...llm.Opt) (*Response, error) {
 	// Apply options
 	opt, err := apply(opts...)
 	if err != nil {
 		return nil, err
 	}
 
-	// Make a new sequence of messages
-	seq := make([]*MessageMeta, len(prompt.(*session).seq))
-	copy(seq, prompt.(*session).seq)
-
 	// Request
 	req, err := client.NewJSONRequest(reqChat{
-		Model:     model,
+		Model:     prompt.(*session).model.Name(),
 		Messages:  prompt.(*session).seq,
 		Tools:     opt.tools,
 		Format:    opt.format,
@@ -84,20 +79,34 @@ func (ollama *Client) Chat(ctx context.Context, model string, prompt llm.Context
 	}
 
 	//  Response
-	var response Response
-	if err := ollama.DoWithContext(ctx, req, &response, client.OptPath("chat"), client.OptJsonStreamCallback(func(v any) error {
-		if v, ok := v.(*Response); ok && opt.chatcallback != nil {
-			opt.chatcallback(v)
+	var response, delta Response
+	if err := ollama.DoWithContext(ctx, req, &delta, client.OptPath("chat"), client.OptJsonStreamCallback(func(v any) error {
+		if v, ok := v.(*Response); !ok || v == nil {
+			return llm.ErrConflict.Withf("Invalid stream response: %v", v)
+		} else {
+			response.Model = v.Model
+			response.CreatedAt = v.CreatedAt
+			response.Message.Role = v.Message.Role
+			response.Message.Content += v.Message.Content
+			if v.Done {
+				response.Done = v.Done
+				response.Metrics = v.Metrics
+				response.Reason = v.Reason
+			}
+		}
+
+		if opt.chatcallback != nil {
+			opt.chatcallback(&response)
 		}
 		return nil
 	})); err != nil {
 		return nil, err
 	}
 
-	// Append the response message to the context
-	prompt.(*session).seq = append(prompt.(*session).seq, &response.Message)
-	response.Context = prompt.(*session).seq
-
-	// Return success
-	return &response, nil
+	// We return the delta or the response
+	if opt.stream {
+		return &response, nil
+	} else {
+		return &delta, nil
+	}
 }

pkg/ollama/chat_test.go

@@ -18,15 +18,16 @@ func Test_chat_001(t *testing.T) {
 	}
 
 	// Pull the model
-	if err := client.PullModel(context.TODO(), "qwen:0.5b", ollama.WithPullStatus(func(status *ollama.PullStatus) {
+	model, err := client.PullModel(context.TODO(), "qwen:0.5b", ollama.WithPullStatus(func(status *ollama.PullStatus) {
 		t.Log(status)
-	})); err != nil {
+	}))
+	if err != nil {
 		t.FailNow()
 	}
 
 	t.Run("ChatStream", func(t *testing.T) {
 		assert := assert.New(t)
-		response, err := client.Chat(context.TODO(), "qwen:0.5b", client.UserPrompt("why is the sky blue?"), ollama.WithChatStream(func(stream *ollama.Response) {
+		response, err := client.Chat(context.TODO(), model.MustUserPrompt("why is the sky blue?"), ollama.WithStream(func(stream *ollama.Response) {
 			t.Log(stream)
 		}))
 		if !assert.NoError(err) {
@@ -37,7 +38,7 @@ func Test_chat_001(t *testing.T) {
 
 	t.Run("ChatNoStream", func(t *testing.T) {
 		assert := assert.New(t)
-		response, err := client.Chat(context.TODO(), "qwen:0.5b", client.UserPrompt("why is the sky green?"))
+		response, err := client.Chat(context.TODO(), model.MustUserPrompt("why is the sky green?"))
 		if !assert.NoError(err) {
 			t.FailNow()
 		}
@@ -52,16 +53,17 @@ func Test_chat_002(t *testing.T) {
 	}
 
 	// Pull the model
-	if err := client.PullModel(context.TODO(), "llama3.2:1b", ollama.WithPullStatus(func(status *ollama.PullStatus) {
+	model, err := client.PullModel(context.TODO(), "llama3.2:1b", ollama.WithPullStatus(func(status *ollama.PullStatus) {
 		t.Log(status)
-	})); err != nil {
+	}))
+	if err != nil {
 		t.FailNow()
 	}
 
 	t.Run("Tools", func(t *testing.T) {
 		assert := assert.New(t)
-		response, err := client.Chat(context.TODO(), "llama3.2:1b",
-			client.UserPrompt("what is the weather in berlin?"),
+		response, err := client.Chat(context.TODO(),
+			model.MustUserPrompt("what is the weather in berlin?"),
 			ollama.WithTool(ollama.MustTool("get_weather", "Return weather conditions in a location", struct {
 				Location string `help:"Location to get weather for" required:""`
 			}{})),
@@ -79,16 +81,15 @@ func Test_chat_003(t *testing.T) {
 		t.FailNow()
 	}
 
-	// Delete model
-	client.DeleteModel(context.TODO(), "llava")
-
 	// Pull the model
-	if err := client.PullModel(context.TODO(), "llava", ollama.WithPullStatus(func(status *ollama.PullStatus) {
+	model, err := client.PullModel(context.TODO(), "llava", ollama.WithPullStatus(func(status *ollama.PullStatus) {
 		t.Log(status)
-	})); err != nil {
+	}))
+	if err != nil {
 		t.FailNow()
 	}
 
+	// Explain the content of an image
 	t.Run("Image", func(t *testing.T) {
 		assert := assert.New(t)
 
@@ -98,8 +99,8 @@ func Test_chat_003(t *testing.T) {
 		}
 		defer f.Close()
 
-		response, err := client.Chat(context.TODO(), "llava",
-			client.UserPrompt("where was this photo taken?", ollama.WithData(f)),
+		response, err := client.Chat(context.TODO(),
+			model.MustUserPrompt("describe this photo to me", ollama.WithData(f)),
 		)
 		if !assert.NoError(err) {
 			t.FailNow()