Wait for the send back line in the retry test

[onechat] / compactor.go

diff --git a/compactor.go b/compactor.go
index efb183ff583b272c49430c810cd3ca4d9ee8df3a..0089002a4838b057303e210c62a34b434b486ae0 100644 (file)
--- a/compactor.go
+++ b/compactor.go
@@ -12,9 +12,6 @@ import (
 // compactorTries is the most calls for one node.
 const compactorTries = 5
 
 // compactorTries is the most calls for one node.
 const compactorTries = 5
 

-// compactorBlock is the number of view lines in one block message.
-const compactorBlock = 4
-

 // compactorRuler shows the model the size limit of a line. Models cannot count
 // bytes, and a sample line as the ruler gets its content copied.
 var compactorRuler = strings.Repeat("-", nodeBytes)
 // compactorRuler shows the model the size limit of a line. Models cannot count
 // bytes, and a sample line as the ruler gets its content copied.
 var compactorRuler = strings.Repeat("-", nodeBytes)


@@ -33,18 +30,14 @@ func newCompactor(client *ModelClient, instructions func() (string, error), mode
 
 // 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
 
 // 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 come the
-// compaction view up to the node and the task, as the user messages that
-// compactorTexts gives. Each whole block of compactorBlock view lines is its
-// own message, and the last message holds the rest of the lines and the task.
-// The backend reads a cache entry only at a message end of a request, so a
-// compaction whose view begins with the same lines as an earlier one begins
-// with the same block messages.
+// prompt cache of the turns. The tools are never called. After them comes one
+// user message with the compaction view up to the node, its closing tag, a
+// newline, and the task.

 //
 //

-// When the line is over nodeBytes, the next try sends the same messages, plus
+// 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
 // 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 whole earlier try and has about the same
+// 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
 // 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


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

-       var first []any
-       for _, message := range compactorTexts(task.Context, text) {
-               first = append(first, modelUserMessage(message))
-       }
+       first := []any{modelUserMessage(task.Context + "\n" + text)}

 
        var lines []string
 
        var lines []string

+

        note := ""
        for len(lines) < compactorTries {
                input := first
        note := ""
        for len(lines) < compactorTries {
                input := first


@@ -82,6 +73,7 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
                }
 
                var response ModelResponse
                }
 
                var response ModelResponse

+

                response, err = c.client.Create(ctx, ModelRequest{
                        Model:        c.model.Model,
                        Effort:       c.model.Effort,
                response, err = c.client.Create(ctx, ModelRequest{
                        Model:        c.model.Model,
                        Effort:       c.model.Effort,


@@ -144,26 +136,6 @@ of them from there too.
        return "", fmt.Errorf("node (%d, %d) has %d inputs", task.Level, task.Index, len(task.Input))
 }
 
        return "", fmt.Errorf("node (%d, %d) has %d inputs", task.Level, task.Index, len(task.Input))
 }
 

-// compactorTexts returns the texts of the user messages of a first try for the
-// compaction view and the task text. Each whole block of compactorBlock lines,
-// counted from the first line of the view, is one message. The last message
-// holds the rest of the lines, the closing tag, a newline, and the task. The
-// first message starts with the opening tag. Joined, the texts are the view, a
-// newline, and the task.
-func compactorTexts(view, task string) []string {
-       body := strings.TrimSuffix(strings.TrimPrefix(view, "<chat>\n"), "</chat>")
-       lines := strings.SplitAfter(body, "\n")
-       lines = lines[:len(lines)-1]
-       whole := len(lines) - len(lines)%compactorBlock
-
-       var texts []string
-       for n := 0; n < whole; n += compactorBlock {
-               texts = append(texts, viewMessage(n == 0, lines[n:n+compactorBlock]))
-       }
-
-       return append(texts, viewMessage(whole == 0, lines[whole:])+"</chat>\n"+task)
-}
-

 // compactorTooLong returns the note for a line over nodeBytes: its size and its
 // first nodeBytes bytes, which show the model where the limit cuts it.
 func compactorTooLong(line string) string {
 // compactorTooLong returns the note for a line over nodeBytes: its size and its
 // first nodeBytes bytes, which show the model where the limit cuts it.
 func compactorTooLong(line string) string {