Updated

Author: djthorpe

README.md

@@ -26,6 +26,8 @@ docker run \
   chat claude-3-5-haiku-20241022
 ```
 
+See below for more information on how to use the command-line tool.
+
 ## Programmatic Usage
 
 See the documentation [here](https://pkg.go.dev/github.com/mutablelogic/go-llm)
@@ -183,6 +185,40 @@ The options are as follows:
 | `antropic.WithCitations()` | No | Yes | No | - | Attachments should be used in citations |
 | `antropic.WithUser(string)` | No | Yes | No | - | Indicate the user name for the request, for debugging |
 
+## The Command Line Tool
+
+You can use the command-line tool to interact with the API. To build the tool, you can use the following command:
+
+```bash
+go install github.com/mutablelogic/go-llm/cmd/llm@latest
+llm --help
+```
+
+The output is something like:
+
+```text
+Usage: llm <command> [flags]
+
+LLM agent command line interface
+
+Flags:
+  -h, --help                      Show context-sensitive help.
+      --debug                     Enable debug output
+      --verbose                   Enable verbose output
+      --ollama-endpoint=STRING    Ollama endpoint ($OLLAMA_URL)
+      --anthropic-key=STRING      Anthropic API Key ($ANTHROPIC_API_KEY)
+      --news-key=STRING           News API Key ($NEWSAPI_KEY)
+
+Commands:
+  agents      Return a list of agents
+  models      Return a list of models
+  tools       Return a list of tools
+  download    Download a model
+  chat        Start a chat session
+
+Run "llm <command> --help" for more information on a command.
+```
+
 ## Contributing & Distribution
 
 *This module is currently in development and subject to change*. Please do file

cmd/agent/chat.go cmd/llm/chat.gocmd/agent/chat.go renamed to cmd/llm/chat.go

@@ -15,12 +15,13 @@ type Completion interface {
 	// If this is a completion, the role is usually 'assistant'
 	Role() string
 
-	// Return the text for the last completion. If multiple completions are not
+	// Return the text for the last completion, with the argument as the
+	// completion index (usually 0). If multiple completions are not
 	// supported, the argument is ignored.
 	Text(int) string
 
 	// Return the current session tool calls given the completion index.
-	// Will return nil if no tool calls were returned
+	// Will return nil if no tool calls were returned.
 	ToolCalls(int) []ToolCall
 }
 

cmd/agent/main.go cmd/llm/main.gocmd/agent/main.go renamed to cmd/llm/main.go

@@ -25,4 +25,4 @@ RUN apt update -y && apt install -y ca-certificates
 LABEL org.opencontainers.image.source=https://${SOURCE}
 
 # Entrypoint when running the server
-ENTRYPOINT [ "/usr/local/bin/agent" ]
+ENTRYPOINT [ "/usr/local/bin/llm" ]

cmd/agent/models.go cmd/llm/models.gocmd/agent/models.go renamed to cmd/llm/models.go

@@ -13,12 +13,12 @@ type Opt func(*Opts) error
 
 // set of options
 type Opts struct {
-	agents      map[string]Agent     // Set of agents
-	toolkit     ToolKit              // Toolkit for tools
-	callback    func(ContextContent) // Streaming callback
-	attachments []*Attachment        // Attachments
-	system      string               // System prompt
-	options     map[string]any       // Additional options
+	agents      map[string]Agent // Set of agents
+	toolkit     ToolKit          // Toolkit for tools
+	callback    func(Completion) // Streaming callback
+	attachments []*Attachment    // Attachments
+	system      string           // System prompt
+	options     map[string]any   // Additional options
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -46,7 +46,7 @@ func (o *Opts) ToolKit() ToolKit {
 }
 
 // Return the stream function
-func (o *Opts) StreamFn() func(ContextContent) {
+func (o *Opts) StreamFn() func(Completion) {
 	return o.callback
 }
 
@@ -150,7 +150,7 @@ func WithToolKit(toolkit ToolKit) Opt {
 }
 
 // Set chat streaming function
-func WithStream(fn func(ContextContent)) Opt {
+func WithStream(fn func(Completion)) Opt {
 	return func(o *Opts) error {
 		o.callback = fn
 		return nil