Name and order the tool code

[onechat] / compactor.go

diff --git a/compactor.go b/compactor.go
index 11497b8ddd6aeb919a75cf37c7ae08e8f2c25c59..71d72c1bc651eb8209df813fa6e456d8822d836d 100644 (file)
--- a/compactor.go
+++ b/compactor.go
@@ -4,18 +4,12 @@ import (
        "context"
        "errors"
        "fmt"
        "context"
        "errors"
        "fmt"

-       "slices"

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

-const (
-       // compactionTries is the most calls for one node.
-       compactionTries = 5
-
-       // viewBlock is the number of view lines in one input part.
-       viewBlock = 4
-)
+// compactionTries is the most calls for one node.
+const compactionTries = 5

 
 // ruler shows the model the size limit of a line. Models cannot count bytes,
 // and a sample line as the ruler gets its content copied.
 
 // ruler shows the model the size limit of a line. Models cannot count bytes,
 // and a sample line as the ruler gets its content copied.


@@ -24,10 +18,7 @@ var ruler = strings.Repeat("-", nodeBytes)
 // 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

-// user message with the compaction view up to the node and the task, in the
-// parts that compactionParts gives. Only the last part holds the end of the
-// view, so compactions whose views end at different lines begin with the same
-// parts up to their last shared block.
+// user message with the compaction view up to the node and the task.

 //
 // When the line is over nodeBytes, the next try sends the same view and task,
 // plus a note with the size of the newest line and its cut at the limit. A try
 //
 // When the line is over nodeBytes, the next try sends the same view and task,
 // plus a note with the size of the newest line and its cut at the limit. A try


@@ -37,46 +28,52 @@ var ruler = strings.Repeat("-", nodeBytes)
 // 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 {
 // 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       *Client
+       client       *ModelClient

        model        ModelConfig
        model        ModelConfig

-       instructions string
-       tools        []Tool
+       instructions func() (string, error)
+       tools        []ModelTool

 }
 
 }
 

-// newCompactor returns the compactor of the agent name, which sends its calls
-// through client with model.
-func newCompactor(client *Client, name string, model ModelConfig) *Compactor {
+// 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,
        return &Compactor{
                client:       client,
                model:        model,

-               instructions: prompt(name),
-               tools:        agentTools(),
+               instructions: instructions,
+               tools:        promptTools(),

        }
 }
 
 // Summarize returns the line of the node of task.
 func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
        }
 }
 
 // Summarize returns the line of the node of task.
 func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {

+       view := task.Context + "\n"

        text, err := compactionTask(task)
        if err != nil {
                return "", err
        }
 
        text, err := compactionTask(task)
        if err != nil {
                return "", err
        }
 

-       first := compactionParts(task.Context, text)
+       instructions, err := c.instructions()
+       if err != nil {
+               return "", fmt.Errorf("compact node (%d, %d): %w", task.Level, task.Index, err)
+       }
+

        var lines []string
        note := ""
        for len(lines) < compactionTries {
        var lines []string
        note := ""
        for len(lines) < compactionTries {

-               parts := first
+               parts := []string{view, text}

                if note != "" {
                if note != "" {

-                       parts = append(slices.Clip(first), note)
+                       parts = append(parts, note)

                }
 
                }
 

-               var response Response
-               response, err = c.client.Create(ctx, Request{
+               var response ModelResponse
+               response, err = c.client.Create(ctx, ModelRequest{

                        Model:        c.model.Model,
                        Effort:       c.model.Effort,
                        Model:        c.model.Model,
                        Effort:       c.model.Effort,

-                       Instructions: c.instructions,
+                       Instructions: instructions,

                        Tools:        c.tools,
                        Tools:        c.tools,

-                       Input:        []any{userMessage(parts...)},
+                       Input:        []any{modelUserMessage(parts...)},

                        Node:         &nodeKey{task.Level, task.Index},
                })
                if err != nil {
                        Node:         &nodeKey{task.Level, task.Index},
                })
                if err != nil {


@@ -104,22 +101,6 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
        return shortest(lines), nil
 }
 
        return shortest(lines), nil
 }
 

-// compactionParts returns the input parts of a first try for the compaction
-// view context and the task text: the opening tag, one part for each whole
-// block of viewBlock lines, and then one part with the rest of the lines, the
-// closing tag, a newline, and the task. Joined, the parts are the view, a
-// newline, and the task.
-func compactionParts(context, task string) []string {
-       lines := strings.SplitAfter(strings.TrimPrefix(context, "<chat>\n"), "\n")
-       whole := len(lines) - 1 - (len(lines)-1)%viewBlock
-       parts := []string{"<chat>\n"}
-       for n := 0; n < whole; n += viewBlock {
-               parts = append(parts, strings.Join(lines[n:n+viewBlock], ""))
-       }
-
-       return append(parts, strings.Join(lines[whole:], "")+"\n"+task)
-}
-

 // compactionTask returns the task of a build, with its input.
 func compactionTask(task Task) (string, error) {
        if task.Level == 0 && len(task.Input) == 1 {
 // compactionTask returns the task of a build, with its input.
 func compactionTask(task Task) (string, error) {
        if task.Level == 0 && len(task.Input) == 1 {