Order model and chat declarations

[onechat] / compactor.go

diff --git a/compactor.go b/compactor.go
index 0089002a4838b057303e210c62a34b434b486ae0..e1014288abb988a88a9a091e5e4261400438dc44 100644 (file)
--- a/compactor.go
+++ b/compactor.go
@@ -4,7 +4,6 @@ import (
        "context"
        "errors"
        "fmt"
        "context"
        "errors"
        "fmt"

-       "slices"

        "strings"
        "unicode/utf8"
 )
        "strings"
        "unicode/utf8"
 )


@@ -16,18 +15,6 @@ const compactorTries = 5
 // bytes, and a sample line as the ruler gets its content copied.
 var compactorRuler = strings.Repeat("-", nodeBytes)
 
 // bytes, and a sample line as the ruler gets its content copied.
 var compactorRuler = strings.Repeat("-", nodeBytes)
 

-// newCompactor returns the compactor of an agent, which sends its calls through
-// client with model. instructions gives the system prompt of the agent at each
-// build, so a build sends the same prompt as the turns of that time.
-func newCompactor(client *ModelClient, instructions func() (string, error), model ModelConfig) *Compactor {
-       return &Compactor{
-               client:       client,
-               model:        model,
-               instructions: instructions,
-               tools:        promptTools(),
-       }
-}
-

 // Compactor builds the nodes of one agent with a model. A compaction is a call
 // like a turn, with the same system prompt and tools, so it reads them from the
 // prompt cache of the turns. The tools are never called. After them comes one
 // Compactor builds the nodes of one agent with a model. A compaction is a call
 // like a turn, with the same system prompt and tools, so it reads them from the
 // prompt cache of the turns. The tools are never called. After them comes one


@@ -36,17 +23,33 @@ func newCompactor(client *ModelClient, instructions func() (string, error), mode
 //
 // When the line is over nodeBytes, the next try sends the same message, plus
 // one more user message with a note with the size of the newest line and its
 //
 // When the line is over nodeBytes, the next try sends the same message, plus
 // one more user message with a note with the size of the newest line and its

-// cut at the limit. A try never sends the model's earlier reply or reasoning
-// back, so every try begins with the same view and task and has about the same
-// size. After at most compactorTries tries, the shortest line is the node. A
-// few bytes over the limit is fine, because the view measures the real sizes. A
-// call that fails before any line fails the build, and the core tries it again
-// at the next message.
+// cut at the limit. Only the first call of an image leaf sends its pixels. A
+// try never sends the model's earlier reply or reasoning back, so every try
+// begins with the same view and task and has about the same size. After at most
+// compactorTries tries, the shortest line is the node. A few bytes over the
+// limit is fine, because the view measures the real sizes. A call that fails
+// before any line fails the build, and the core tries it again at the next
+// message.

 type Compactor struct {
        client       *ModelClient
        model        ModelConfig
        instructions func() (string, error)
        tools        []ModelTool
 type Compactor struct {
        client       *ModelClient
        model        ModelConfig
        instructions func() (string, error)
        tools        []ModelTool

+       images       *ImageStore
+}
+
+// newCompactor returns the compactor of an agent, which sends its calls through
+// client with model. instructions gives the system prompt of the agent at each
+// build. tools are the tools of that agent, so a build sends the same prompt
+// and tools as its turns.
+func newCompactor(client *ModelClient, instructions func() (string, error), model ModelConfig, tools []ModelTool, images *ImageStore) *Compactor {
+       return &Compactor{
+               client:       client,
+               model:        model,
+               instructions: instructions,
+               tools:        tools,
+               images:       images,
+       }

 }
 
 // Summarize returns the line of the node of task.
 }
 
 // Summarize returns the line of the node of task.


@@ -61,7 +64,13 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
                return "", err
        }
 
                return "", err
        }
 

-       first := []any{modelUserMessage(task.Context + "\n" + text)}
+       source := task.Context + "\n" + text
+       parts, err := imageParts(c.images, source, task.Images)
+       if err != nil {
+               return "", fmt.Errorf("read compaction images: %w", err)
+       }
+
+       first := []any{modelUserParts(parts)}

 
        var lines []string
 
 
        var lines []string
 


@@ -69,7 +78,7 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
        for len(lines) < compactorTries {
                input := first
                if note != "" {
        for len(lines) < compactorTries {
                input := first
                if note != "" {

-                       input = append(slices.Clip(first), modelUserMessage(note))
+                       input = []any{modelUserMessage(source), modelUserMessage(note)}

                }
 
                var response ModelResponse
                }
 
                var response ModelResponse


@@ -110,12 +119,17 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
 // compactorTask returns the task of a build, with its input.
 func compactorTask(task Task) (string, error) {
        if task.Level == 0 && len(task.Input) == 1 {
 // compactorTask returns the task of a build, with its input.
 func compactorTask(task Task) (string, error) {
        if task.Level == 0 && len(task.Input) == 1 {

-               return fmt.Sprintf(`Compaction: compress message %d into one line of at most %d bytes
+               text := fmt.Sprintf(`Compaction: compress message %d into one line of at most %d bytes

 (about 70 words), the length of this ruler:
 %s
 <input>
 %s
 (about 70 words), the length of this ruler:
 %s
 <input>
 %s

-</input>`, task.Index, nodeBytes, compactorRuler, task.Input[0]), nil
+</input>`, task.Index, nodeBytes, compactorRuler, task.Input[0])
+               if len(task.Images) > 0 {
+                       text += "\nKeep each [image FILE] name and describe its kind, visible text, amounts, names, and context."
+               }
+
+               return text, nil

        }
 
        if task.Level > 0 && len(task.Input) == 2 {
        }
 
        if task.Level > 0 && len(task.Input) == 2 {