Updated

Author: djthorpe

cmd/llm/complete.go

@@ -21,7 +21,7 @@ type CompleteCmd struct {
 	File        []string `type:"file" short:"f" help:"Files to attach"`
 	System      string   `flag:"system" help:"Set the system prompt"`
 	NoStream    bool     `flag:"no-stream" help:"Do not stream output"`
-	Format      string   `flag:"format" enum:"text,json" default:"text" help:"Output format. You may also need to specify the output in the system or user prompt."`
+	Format      string   `flag:"format" enum:"text,markdown,json" default:"text" help:"Output format"`
 	Temperature *float64 `flag:"temperature" short:"t"  help:"Temperature for sampling"`
 }
 
@@ -97,14 +97,30 @@ func (cmd *CompleteCmd) Run(globals *Globals) error {
 
 func (cmd *CompleteCmd) opts() []llm.Opt {
 	opts := []llm.Opt{}
+
+	// Set system prompt
+	var system []string
+	if cmd.Format == "markdown" {
+		system = append(system, "Return the completion in markdown format.")
+	} else if cmd.Format == "json" {
+		system = append(system, "Return the completion in JSON format.")
+	}
 	if cmd.System != "" {
-		opts = append(opts, llm.WithSystemPrompt(cmd.System))
+		system = append(system, cmd.System)
+	}
+	if len(system) > 0 {
+		opts = append(opts, llm.WithSystemPrompt(strings.Join(system, "\n")))
 	}
+
+	// Set format
 	if cmd.Format == "json" {
 		opts = append(opts, llm.WithFormat("json"))
 	}
+
+	// Set temperature
 	if cmd.Temperature != nil {
 		opts = append(opts, llm.WithTemperature(*cmd.Temperature))
 	}
+
 	return opts
 }

cmd/llm/models.go

@@ -4,10 +4,15 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
+	"sort"
+	"strings"
 
 	// Packages
+	tablewriter "github.com/djthorpe/go-tablewriter"
 	llm "github.com/mutablelogic/go-llm"
 	agent "github.com/mutablelogic/go-llm/pkg/agent"
+	"github.com/mutablelogic/go-llm/pkg/ollama"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -39,16 +44,28 @@ func (cmd *ListToolsCmd) Run(globals *Globals) error {
 
 func (cmd *ListModelsCmd) Run(globals *Globals) error {
 	return runagent(globals, func(ctx context.Context, client llm.Agent) error {
-		agent, ok := client.(*agent.Agent)
+		agent_, ok := client.(*agent.Agent)
 		if !ok {
 			return fmt.Errorf("No agents found")
 		}
-		models, err := agent.ListModels(ctx, cmd.Agent...)
+		models, err := agent_.ListModels(ctx, cmd.Agent...)
 		if err != nil {
 			return err
 		}
-		fmt.Println(models)
-		return nil
+		result := make(ModelList, 0, len(models))
+		for _, model := range models {
+			result = append(result, Model{
+				Agent:       model.(*agent.Model).Agent,
+				Model:       model.Name(),
+				Description: model.Description(),
+				Aliases:     strings.Join(model.Aliases(), ", "),
+			})
+		}
+		// Sort models by name
+		sort.Sort(result)
+
+		// Write out the models
+		return tablewriter.New(os.Stdout).Write(result, tablewriter.OptOutputText(), tablewriter.OptHeader())
 	})
 }
 
@@ -82,14 +99,12 @@ func (cmd *DownloadModelCmd) Run(globals *Globals) error {
 		}
 		// 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)
-		*/
+		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())
 		}
@@ -116,3 +131,27 @@ func getagent(client llm.Agent, name string) llm.Agent {
 	}
 	return nil
 }
+
+// //////////////////////////////////////////////////////////////////////////////
+// MODEL LIST
+
+type Model struct {
+	Agent       string `json:"agent"  writer:"Agent,width:10"`
+	Model       string `json:"model"  writer:"Model,wrap,width:40"`
+	Description string `json:"description" writer:"Description,wrap,width:60"`
+	Aliases     string `json:"aliases" writer:"Aliases,wrap,width:30"`
+}
+
+type ModelList []Model
+
+func (models ModelList) Len() int {
+	return len(models)
+}
+
+func (models ModelList) Less(a, b int) bool {
+	return strings.Compare(models[a].Model, models[b].Model) < 0
+}
+
+func (models ModelList) Swap(a, b int) {
+	models[a], models[b] = models[b], models[a]
+}

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/MichaelMure/go-term-text v0.3.1
 	github.com/alecthomas/kong v1.7.0
 	github.com/djthorpe/go-errors v1.0.3
+	github.com/djthorpe/go-tablewriter v0.0.7
 	github.com/fatih/color v1.9.0
 	github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1
 	github.com/mutablelogic/go-client v1.0.10

go.sum

@@ -11,6 +11,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/djthorpe/go-errors v1.0.3 h1:GZeMPkC1mx2vteXLI/gvxZS0Ee9zxzwD1mcYyKU5jD0=
 github.com/djthorpe/go-errors v1.0.3/go.mod h1:HtfrZnMd6HsX75Mtbv9Qcnn0BqOrrFArvCaj3RMnZhY=
+github.com/djthorpe/go-tablewriter v0.0.7 h1:jnNsJDjjLLCt0OAqB5DzGZN7V3beT1IpNMQ8GcOwZDU=
+github.com/djthorpe/go-tablewriter v0.0.7/go.mod h1:NVBvytpL+6fHfCKn0+3lSi15/G3A1HWf2cLNeHg6YBg=
 github.com/fatih/color v1.9.0 h1:8xPHl4/q1VyqGIPif1F+1V3Y3lSmrq01EabUW3CoW5s=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/go-telegram-bot-api/telegram-bot-api/v5 v5.5.1 h1:wG8n/XJQ07TmjbITcGiUaOtXxdrINDz1b0J1w0SzqDc=

model.go

@@ -11,6 +11,12 @@ type Model interface {
 	// Return the name of the model
 	Name() string
 
+	// Return the description of the model
+	Description() string
+
+	// Return any model aliases
+	Aliases() []string
+
 	// Return am empty session context object for the model, setting
 	// session options
 	Context(...Opt) Context

pkg/agent/agent.go

@@ -18,7 +18,7 @@ type Agent struct {
 	*llm.Opts
 }
 
-type model struct {
+type Model struct {
 	Agent     string `json:"agent"`
 	llm.Model `json:"model"`
 }
@@ -44,7 +44,7 @@ func New(opts ...llm.Opt) (*Agent, error) {
 ///////////////////////////////////////////////////////////////////////////////
 // STRINGIFY
 
-func (m model) String() string {
+func (m Model) String() string {
 	data, err := json.MarshalIndent(m, "", "  ")
 	if err != nil {
 		return err.Error()
@@ -168,13 +168,27 @@ func modelsForAgent(ctx context.Context, agent llm.Agent, names ...string) ([]ll
 		return nil, err
 	}
 
+	match_model := func(model llm.Model, names ...string) bool {
+		if len(names) == 0 {
+			return true
+		}
+		if slices.Contains(names, model.Name()) {
+			return true
+		}
+		for _, alias := range model.Aliases() {
+			if slices.Contains(names, alias) {
+				return true
+			}
+		}
+		return false
+	}
+
 	// Filter models
 	result := make([]llm.Model, 0, len(models))
 	for _, agentmodel := range models {
-		if len(names) > 0 && !slices.Contains(names, agentmodel.Name()) {
-			continue
+		if match_model(agentmodel, names...) {
+			result = append(result, &Model{Agent: agent.Name(), Model: agentmodel})
 		}
-		result = append(result, &model{Agent: agent.Name(), Model: agentmodel})
 	}
 
 	// Return success

pkg/gemini/model.go

@@ -55,6 +55,16 @@ func (m model) Name() string {
 	return m.meta.Name
 }
 
+// Return model aliases
+func (model model) Aliases() []string {
+	return nil
+}
+
+// Return model description
+func (model model) Description() string {
+	return model.meta.Description
+}
+
 // Return the models
 func (gemini *Client) Models(ctx context.Context) ([]llm.Model, error) {
 	// Cache models

pkg/mistral/completion_test.go

@@ -7,9 +7,8 @@ import (
 	"testing"
 
 	// Packages
-
 	llm "github.com/mutablelogic/go-llm"
-	"github.com/mutablelogic/go-llm/pkg/tool"
+	tool "github.com/mutablelogic/go-llm/pkg/tool"
 	assert "github.com/stretchr/testify/assert"
 )
 

pkg/mistral/model.go

@@ -97,6 +97,16 @@ func (model model) Name() string {
 	return model.meta.Name
 }
 
+// Return model aliases
+func (model model) Aliases() []string {
+	return model.meta.Aliases
+}
+
+// Return model description
+func (model model) Description() string {
+	return model.meta.Description
+}
+
 // Return a new empty session
 func (model *model) Context(opts ...llm.Opt) llm.Context {
 	return impl.NewSession(model, &messagefactory{}, opts...)

pkg/ollama/model.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"encoding/json"
 	"net/http"
+	"strings"
 	"time"
 
 	// Packages
@@ -88,6 +89,16 @@ func (m model) Name() string {
 	return m.ModelMeta.Name
 }
 
+// Return model name
+func (model) Aliases() []string {
+	return nil
+}
+
+// Return model description
+func (model model) Description() string {
+	return strings.Join(model.ModelMeta.Details.Families, ", ")
+}
+
 // Agent interface
 func (ollama *Client) Models(ctx context.Context) ([]llm.Model, error) {
 	// We don't explicitly cache models