Updated llm

Author: djthorpe

cmd/agent/chat.go

@@ -40,7 +40,7 @@ func (cmd *ChatCmd) Run(globals *Globals) error {
 		opts := []llm.Opt{}
 		if !cmd.NoStream {
 			opts = append(opts, llm.WithStream(func(cc llm.ContextContent) {
-				fmt.Println(cc)
+				fmt.Println("STREAM", cc)
 			}))
 		}
 		if cmd.System != "" {
@@ -73,17 +73,30 @@ func (cmd *ChatCmd) Run(globals *Globals) error {
 				return err
 			}
 
-			fmt.Println(session.Text())
-
-			// If there are tool calls, then do these
-			calls := session.ToolCalls()
-			if results, err := globals.toolkit.Run(ctx, calls...); err != nil {
-				return err
-			} else if err := session.FromTool(ctx, results...); err != nil {
-				return err
-			} else {
-				fmt.Println(session.Text())
+			// Repeat call tools until no more calls are made
+			for {
+				calls := session.ToolCalls()
+				if len(calls) == 0 {
+					break
+				}
+				if session.Text() != "" {
+					fmt.Println("Calling", session.Text())
+				} else {
+					var names []string
+					for _, call := range calls {
+						names = append(names, call.Name())
+					}
+					fmt.Println("Calling", strings.Join(names, ", "))
+				}
+				if results, err := globals.toolkit.Run(ctx, calls...); err != nil {
+					return err
+				} else if err := session.FromTool(ctx, results...); err != nil {
+					return err
+				}
 			}
+
+			// Print the response
+			fmt.Println("SESSION", session.Text())
 		}
 	})
 }

pkg/anthropic/messages.go

@@ -150,7 +150,6 @@ func (anthropic *Client) Messages(ctx context.Context, context llm.Context, opts
 				if err := evt.Json(&r); err != nil {
 					return err
 				} else if int(r.Index) != len(response.MessageMeta.Content)-1 {
-					fmt.Println(response.MessageMeta)
 					return fmt.Errorf("%s: unexpected index %d", r.Type, r.Index)
 				} else if content, err := appendDelta(response.MessageMeta.Content, &r.Content); err != nil {
 					return err

pkg/newsapi/agent.go

@@ -2,6 +2,8 @@ package newsapi
 
 import (
 	"context"
+	"fmt"
+	"slices"
 
 	// Packages
 	llm "github.com/mutablelogic/go-llm"
@@ -11,32 +13,78 @@ import (
 // TYPES
 
 type headlines struct {
-	*Client     `json:"-"`
-	CountryCode string `json:"country_code,omitempty" help:"The two-letter countrycode to return headlines for"`
+	*Client `json:"-"`
+	// CountryCode string `json:"country_code,omitempty" help:"The two-letter countrycode to return headlines for. Leave empty for worldwide headlines."`
+}
+
+type search struct {
+	*Client `json:"-"`
+	Query   string `json:"query" help:"A phrase used to search for news headlines." required:"true"`
+}
+
+type category struct {
+	*Client  `json:"-"`
+	Category string `json:"category" enum:"business, entertainment, health, science, sports, technology" help:"business, entertainment, health, science, sports, technology" required:"true"`
 }
 
 var _ llm.Tool = (*headlines)(nil)
 
+var (
+	categories = []string{"business", "entertainment", "health", "science", "sports", "technology"}
+)
+
 ///////////////////////////////////////////////////////////////////////////////
 // HEADLINES
 
 func (headlines) Name() string {
-	return "current_headlines"
+	return "news_headlines"
 }
 
 func (headlines) Description() string {
-	return "Return the current news headlines, optionally for a specific country"
+	return "Return the current global news headlines"
 }
 
 func (headlines *headlines) Run(ctx context.Context) (any, error) {
-	response, err := headlines.Headlines(OptCategory("general"), OptLimit(5))
-	if err != nil {
-		return nil, err
+	return headlines.Headlines(OptCategory("general"), OptLimit(10))
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// SEARCH
+
+func (search) Name() string {
+	return "news_search"
+}
+
+func (search) Description() string {
+	return "Search the news archive with a search query"
+}
+
+func (search *search) Run(ctx context.Context) (any, error) {
+	if search.Query == "" {
+		return nil, nil
 	}
-	return map[string]any{
-		"type":      "text",
-		"headlines": response,
-	}, nil
+	fmt.Printf("search for %q\n", search.Query)
+	return search.Articles(OptQuery(search.Query), OptLimit(10))
+}
+
+///////////////////////////////////////////////////////////////////////////////
+// CATEGORY
+
+func (category) Name() string {
+	return "news_headlines_category"
+}
+
+func (category) Description() string {
+	return "Return the news headlines for a specific category"
+}
+
+func (category *category) Run(ctx context.Context) (any, error) {
+	if !slices.Contains(categories, category.Category) {
+		fmt.Printf("search for %q\n", category.Category)
+		return category.Articles(OptQuery(category.Category), OptLimit(10))
+	}
+	fmt.Printf("category for %q\n", category.Category)
+	return category.Headlines(OptCategory(category.Category), OptLimit(10))
 }
 
 /*

pkg/newsapi/client.go

@@ -42,7 +42,13 @@ func New(ApiKey string, opts ...client.ClientOpt) (*Client, error) {
 
 func (newsapi *Client) RegisterWithToolKit(toolkit *tool.ToolKit) error {
 	// Register tools
-	if err := toolkit.Register(&headlines{newsapi, ""}); err != nil {
+	if err := toolkit.Register(&headlines{newsapi}); err != nil {
+		return err
+	}
+	if err := toolkit.Register(&search{newsapi, ""}); err != nil {
+		return err
+	}
+	if err := toolkit.Register(&category{newsapi, ""}); err != nil {
 		return err
 	}
 

pkg/ollama/chat.go

@@ -64,15 +64,24 @@ func (ollama *Client) Chat(ctx context.Context, prompt llm.Context, opts ...llm.
 		return nil, err
 	}
 
+	// Append the system prompt at the beginning
+	seq := make([]*MessageMeta, 0, len(prompt.(*session).seq)+1)
+	if system := opt.SystemPrompt(); system != "" {
+		seq = append(seq, &MessageMeta{
+			Role:    "system",
+			Content: opt.SystemPrompt(),
+		})
+	}
+	seq = append(seq, prompt.(*session).seq...)
+
 	// Request
 	req, err := client.NewJSONRequest(reqChat{
 		Model:     prompt.(*session).model.Name(),
-		Messages:  prompt.(*session).seq,
+		Messages:  seq,
 		Tools:     optTools(ollama, opt),
 		Format:    optFormat(opt),
 		Options:   optOptions(opt),
 		Stream:    optStream(ollama, opt),
-		System:    optSystemPrompt(opt),
 		KeepAlive: optKeepAlive(opt),
 	})
 	if err != nil {
@@ -97,8 +106,10 @@ func (ollama *Client) Chat(ctx context.Context, prompt llm.Context, opts ...llm.
 		}
 
 		//Call the chat callback
-		if fn := opt.StreamFn(); fn != nil {
-			fn(&response)
+		if optStream(ollama, opt) {
+			if fn := opt.StreamFn(); fn != nil {
+				fn(&response)
+			}
 		}
 		return nil
 	})); err != nil {

pkg/ollama/session.go

@@ -99,6 +99,8 @@ func (s *session) FromTool(ctx context.Context, results ...llm.ToolResult) error
 	// Append the tool results
 	for _, result := range results {
 		if message, err := toolResult(result); err != nil {
+			return err
+		} else {
 			s.seq = append(s.seq, message)
 		}
 	}