Updated LLM

Author: djthorpe

agent.go

@@ -12,9 +12,6 @@ type Agent interface {
 	// Return the models
 	Models(context.Context) ([]Model, error)
 
-	// Generate a response from a prompt
-	Generate(context.Context, Model, Context, ...Opt) (Context, error)
-
 	// Embedding vector generation
 	Embedding(context.Context, Model, string, ...Opt) ([]float64, error)
 }

context.go

@@ -1,19 +1,24 @@
 package llm
 
+import "context"
+
 //////////////////////////////////////////////////////////////////
 // TYPES
 
 // Context is fed to the agent to generate a response
 type Context interface {
-	// Return the role, which can be assistant, user, tool, tool_result, ...
-	Role() string
-
-	// Return the text of the context
-	Text() string
+	// Generate a response from the context
+	Generate(context.Context, Model) (Context, error)
 
 	// Append user prompt (and attachments) to a context
 	AppendUserPrompt(string, ...Opt) error
 
 	// Append the result of calling a tool to a context
 	AppendToolResult(string, ...Opt) error
+
+	// Return the role, which can be assistant, user, tool, tool_result, ...
+	Role() string
+
+	// Return the text of the context
+	Text() string
 }

model.go

@@ -1,10 +1,13 @@
 package llm
 
-// An Model can be used to generate a response
+// An Model can be used to generate a response to a user prompt,
+// which is passed to an agent. The interaction occurs through
+// a session context object.
 type Model interface {
 	// Return the name of the model
 	Name() string
 
-	// Return a context object, and set options
+	// Return am empty session context object for the model,
+	// setting session options
 	Context(...Opt) (Context, error)
 }

opt.go

@@ -3,4 +3,5 @@ package llm
 ///////////////////////////////////////////////////////////////////////////////
 // TYPES
 
+// A generic option type, which can set options on an agent or session
 type Opt func(any) error

pkg/agent/opt.go

@@ -1,9 +1,9 @@
 package agent
 
 import (
-	// Packages
 	"fmt"
 
+	// Packages
 	client "github.com/mutablelogic/go-client"
 	llm "github.com/mutablelogic/go-llm"
 	anthropic "github.com/mutablelogic/go-llm/pkg/anthropic"
@@ -81,10 +81,10 @@ func WithTools(tools ...llm.Tool) llm.Opt {
 func WithStream(v bool) llm.Opt {
 	return func(o any) error {
 		o.(*opt).ollama = append(o.(*opt).ollama, ollama.WithStream(func(r *ollama.Response) {
-			fmt.Println(r)
+			fmt.Println("OLLAMA STREAM", r)
 		}))
 		o.(*opt).anthropic = append(o.(*opt).anthropic, anthropic.WithStream(func(r *anthropic.Response) {
-			fmt.Println(r)
+			fmt.Println("ANTHROPIC STREAM", r)
 		}))
 		return nil
 	}