Temporarily removed anthropic

Author: djthorpe

cmd/llm/chat.go

@@ -18,6 +18,7 @@ import (
 type ChatCmd struct {
 	Model    string `arg:"" help:"Model name"`
 	NoStream bool   `flag:"nostream" help:"Disable streaming"`
+	NoTools  bool   `flag:"nostream" help:"Disable tool calling"`
 	System   string `flag:"system" help:"Set the system prompt"`
 }
 
@@ -39,16 +40,17 @@ func (cmd *ChatCmd) Run(globals *Globals) error {
 		// Set the options
 		opts := []llm.Opt{}
 		if !cmd.NoStream {
-			opts = append(opts, llm.WithStream(func(cc llm.ContextContent) {
-				if text := cc.Text(); text != "" {
-					fmt.Println(text)
+			opts = append(opts, llm.WithStream(func(cc llm.Completion) {
+				if text := cc.Text(0); text != "" {
+					text = strings.ReplaceAll(text, "\n", " ")
+					fmt.Print("\r" + text)
 				}
 			}))
 		}
 		if cmd.System != "" {
 			opts = append(opts, llm.WithSystemPrompt(cmd.System))
 		}
-		if globals.toolkit != nil {
+		if globals.toolkit != nil && !cmd.NoTools {
 			opts = append(opts, llm.WithToolKit(globals.toolkit))
 		}
 
@@ -77,12 +79,12 @@ func (cmd *ChatCmd) Run(globals *Globals) error {
 
 			// Repeat call tools until no more calls are made
 			for {
-				calls := session.ToolCalls()
+				calls := session.ToolCalls(0)
 				if len(calls) == 0 {
 					break
 				}
-				if session.Text() != "" {
-					globals.term.Println(session.Text())
+				if session.Text(0) != "" {
+					globals.term.Println(session.Text(0))
 				} else {
 					var names []string
 					for _, call := range calls {
@@ -98,7 +100,7 @@ func (cmd *ChatCmd) Run(globals *Globals) error {
 			}
 
 			// Print the response
-			globals.term.Println("\n" + session.Text() + "\n")
+			globals.term.Println("\n" + session.Text(0) + "\n")
 		}
 	})
 }

cmd/llm/main.go

@@ -12,8 +12,8 @@ import (
 	client "github.com/mutablelogic/go-client"
 	llm "github.com/mutablelogic/go-llm"
 	agent "github.com/mutablelogic/go-llm/pkg/agent"
-	"github.com/mutablelogic/go-llm/pkg/newsapi"
-	"github.com/mutablelogic/go-llm/pkg/tool"
+	newsapi "github.com/mutablelogic/go-llm/pkg/newsapi"
+	tool "github.com/mutablelogic/go-llm/pkg/tool"
 )
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -107,9 +107,11 @@ func main() {
 	if cli.OllamaEndpoint != "" {
 		opts = append(opts, agent.WithOllama(cli.OllamaEndpoint, clientopts...))
 	}
-	if cli.AnthropicKey != "" {
-		opts = append(opts, agent.WithAnthropic(cli.AnthropicKey, clientopts...))
-	}
+	/*
+		if cli.AnthropicKey != "" {
+			opts = append(opts, agent.WithAnthropic(cli.AnthropicKey, clientopts...))
+		}
+	*/
 	if cli.MistralKey != "" {
 		opts = append(opts, agent.WithMistral(cli.MistralKey, clientopts...))
 	}

pkg/agent/opt.go

@@ -4,7 +4,6 @@ import (
 	// Packages
 	client "github.com/mutablelogic/go-client"
 	llm "github.com/mutablelogic/go-llm"
-	anthropic "github.com/mutablelogic/go-llm/pkg/anthropic"
 	mistral "github.com/mutablelogic/go-llm/pkg/mistral"
 	ollama "github.com/mutablelogic/go-llm/pkg/ollama"
 )
@@ -23,17 +22,18 @@ func WithOllama(endpoint string, opts ...client.ClientOpt) llm.Opt {
 	}
 }
 
-func WithAnthropic(key string, opts ...client.ClientOpt) llm.Opt {
-	return func(o *llm.Opts) error {
-		client, err := anthropic.New(key, opts...)
-		if err != nil {
-			return err
-		} else {
-			return llm.WithAgent(client)(o)
+/*
+	func WithAnthropic(key string, opts ...client.ClientOpt) llm.Opt {
+		return func(o *llm.Opts) error {
+			client, err := anthropic.New(key, opts...)
+			if err != nil {
+				return err
+			} else {
+				return llm.WithAgent(client)(o)
+			}
 		}
 	}
-}
-
+*/
 func WithMistral(key string, opts ...client.ClientOpt) llm.Opt {
 	return func(o *llm.Opts) error {
 		client, err := mistral.New(key, opts...)