Added generate in the agent

Author: djthorpe

cmd/agent/generate.go

@@ -0,0 +1,46 @@
+package main
+
+import (
+	"context"
+	"fmt"
+
+	// Packages
+	llm "github.com/mutablelogic/go-llm"
+	agent "github.com/mutablelogic/go-llm/pkg/agent"
+)
+
+////////////////////////////////////////////////////////////////////////////////
+// TYPES
+
+type GenerateCmd struct {
+	Model string `arg:"" help:"Model name"`
+	Text  string `arg:"" help:"Text to generate a response for"`
+}
+
+////////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+
+func (cmd *GenerateCmd) Run(globals *Globals) error {
+	return runagent(globals, func(ctx context.Context, client llm.Agent) error {
+		// Get the model
+		// TODO: Model should be cached
+		agent, ok := client.(*agent.Agent)
+		if !ok {
+			return fmt.Errorf("No agents found")
+		}
+		model, err := agent.GetModel(ctx, cmd.Model)
+		if err != nil {
+			return err
+		}
+
+		// Generate the content
+		response, err := agent.Generate(ctx, model, agent.UserPrompt(cmd.Text))
+		if err != nil {
+			return err
+		}
+
+		// Print the response
+		fmt.Println("RESPONSE=", response)
+		return nil
+	})
+}

cmd/agent/main.go

@@ -43,8 +43,9 @@ type CLI struct {
 	Globals
 
 	// Agents, Models and Tools
-	Agents ListAgentsCmd `cmd:"" help:"Return a list of agents"`
-	Models ListModelsCmd `cmd:"" help:"Return a list of models"`
+	Agents   ListAgentsCmd `cmd:"" help:"Return a list of agents"`
+	Models   ListModelsCmd `cmd:"" help:"Return a list of models"`
+	Generate GenerateCmd   `cmd:"" help:"Generate a response"`
 }
 
 ////////////////////////////////////////////////////////////////////////////////

pkg/agent/agent.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"fmt"
 	"slices"
 	"strings"
 
@@ -141,26 +140,13 @@ func (a *Agent) GetModel(ctx context.Context, name string, agents ...string) (ll
 		}
 	}
 
+	// Return not found
+	result = errors.Join(result, llm.ErrNotFound.Withf("model %q", name))
+
 	// Return any errors
 	return nil, result
 }
 
-// Generate a response from a prompt
-func (a *Agent) Generate(ctx context.Context, m llm.Model, context llm.Context, opts ...llm.Opt) (llm.Context, error) {
-	// Obtain the agent
-	var agent llm.Agent
-	if model, ok := m.(*model); !ok || model == nil {
-		return nil, llm.ErrBadParameter.With("model")
-	} else if agent_, exists := a.agents[model.Agent]; !exists {
-		return nil, llm.ErrNotFound.Withf("agent %q", model.Agent)
-	} else {
-		agent = agent_
-	}
-	fmt.Println(agent)
-
-	return nil, llm.ErrNotImplemented
-}
-
 // Embedding vector generation
 func (a *Agent) Embedding(context.Context, llm.Model, string, ...llm.Opt) ([]float64, error) {
 	return nil, llm.ErrNotImplemented

pkg/agent/generate.go

@@ -0,0 +1,29 @@
+package agent
+
+import (
+	"context"
+
+	// Packages
+	llm "github.com/mutablelogic/go-llm"
+)
+
+///////////////////////////////////////////////////////////////////////////////
+// PUBLIC METHODS
+
+// Generate a response from a prompt
+func (a *Agent) Generate(ctx context.Context, m llm.Model, context llm.Context, opts ...llm.Opt) (llm.Context, error) {
+	// Obtain the agent
+	var agent llm.Agent
+	if model, ok := m.(*model); !ok || model == nil {
+		return nil, llm.ErrBadParameter.With("model")
+	} else if agent_, exists := a.agents[model.Agent]; !exists {
+		return nil, llm.ErrNotFound.Withf("agent %q", model.Agent)
+	} else {
+		agent = agent_
+	}
+
+	// TODO: Translate all the opts
+
+	// Call Generate for the agent
+	return agent.Generate(ctx, m, context, opts...)
+}

pkg/anthropic/messages.go

@@ -234,7 +234,12 @@ func (anthropic *Client) Messages(ctx context.Context, model llm.Model, context
 }
 
 // Generate a response from a prompt
-func (*Client) Generate(context.Context, llm.Model, llm.Context, ...llm.Opt) (llm.Context, error) {
+func (anthropic *Client) Generate(ctx context.Context, model llm.Model, context llm.Context, opts ...llm.Opt) (llm.Context, error) {
+	response, err := anthropic.Messages(ctx, model, context, opts...)
+	if err != nil {
+		return nil, err
+	}
+	fmt.Println(response)
 	return nil, llm.ErrNotImplemented
 }