Updated

Author: djthorpe

cmd/llm/complete.go

@@ -16,11 +16,13 @@ import (
 // TYPES
 
 type CompleteCmd struct {
-	Model    string   `arg:"" help:"Model name"`
-	Prompt   string   `arg:"" optional:"" help:"Prompt"`
-	File     []string `type:"file" help:"Files to attach"`
-	System   string   `flag:"system" help:"Set the system prompt"`
-	NoStream bool     `flag:"no-stream" help:"Do not stream output"`
+	Model       string   `arg:"" help:"Model name"`
+	Prompt      string   `arg:"" optional:"" help:"Prompt"`
+	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."`
+	Temperature *float64 `flag:"temperature" short:"t"  help:"Temperature for sampling"`
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -98,5 +100,11 @@ func (cmd *CompleteCmd) opts() []llm.Opt {
 	if cmd.System != "" {
 		opts = append(opts, llm.WithSystemPrompt(cmd.System))
 	}
+	if cmd.Format == "json" {
+		opts = append(opts, llm.WithFormat("json"))
+	}
+	if cmd.Temperature != nil {
+		opts = append(opts, llm.WithTemperature(*cmd.Temperature))
+	}
 	return opts
 }

cmd/llm/main.go

@@ -23,8 +23,8 @@ import (
 type Globals struct {
 	// Debugging
 	Debug   bool          `name:"debug" help:"Enable debug output"`
-	Verbose bool          `name:"verbose" help:"Enable verbose output"`
-	Timeout time.Duration `name:"timeout" help:"Timeout for the command"`
+	Verbose bool          `name:"verbose" short:"v" help:"Enable verbose output"`
+	Timeout time.Duration `name:"timeout" help:"Agent connection timeout"`
 
 	// Agents
 	Ollama    `embed:"" help:"Ollama configuration"`

opt.go

@@ -3,6 +3,7 @@ package llm
 import (
 	"encoding/json"
 	"io"
+	"strings"
 	"time"
 )
 
@@ -330,6 +331,12 @@ func WithSeed(v uint64) Opt {
 // Set format
 func WithFormat(v any) Opt {
 	return func(o *Opts) error {
+		if v_, ok := v.(string); ok {
+			v_ = strings.TrimSpace(strings.ToLower(v_))
+			if v_ == "json" {
+				v = "json_object"
+			}
+		}
 		o.Set("format", v)
 		return nil
 	}