Wait for the WhatsApp catch-up before a turn

[onechat] / compactor.go

diff --git a/compactor.go b/compactor.go
index 48b855b743ae56cf6793e175be5543e8ef4ba1d5..5e73cfac30197ebf28ccb16dd2e30b140b8e3f24 100644 (file)
--- a/compactor.go
+++ b/compactor.go
@@ -8,12 +8,24 @@ import (
        "unicode/utf8"
 )
 
        "unicode/utf8"
 )
 

-// compactionTries is the most calls for one node.
-const compactionTries = 5
+// compactorTries is the most calls for one node.
+const compactorTries = 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.
-var ruler = 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)
+
+// 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
 
 // 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


@@ -23,7 +35,7 @@ var ruler = strings.Repeat("-", nodeBytes)
 // 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
 // never sends the model's earlier reply or reasoning back, so every try has the
 // 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
 // never sends the model's earlier reply or reasoning back, so every try has the

-// same cached prefix and about the same size. After at most compactionTries
+// same cached prefix and 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.
 // 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.


@@ -34,22 +46,10 @@ type Compactor struct {
        tools        []ModelTool
 }
 
        tools        []ModelTool
 }
 

-// 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:        agentTools(),
-       }
-}
-

 // Summarize returns the line of the node of task.
 func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
        view := task.Context + "\n"
 // 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)
+       text, err := compactorTask(task)

        if err != nil {
                return "", err
        }
        if err != nil {
                return "", err
        }


@@ -61,7 +61,7 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
 
        var lines []string
        note := ""
 
        var lines []string
        note := ""

-       for len(lines) < compactionTries {
+       for len(lines) < compactorTries {

                parts := []string{view, text}
                if note != "" {
                        parts = append(parts, note)
                parts := []string{view, text}
                if note != "" {
                        parts = append(parts, note)


@@ -74,7 +74,7 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
                        Instructions: instructions,
                        Tools:        c.tools,
                        Input:        []any{modelUserMessage(parts...)},
                        Instructions: instructions,
                        Tools:        c.tools,
                        Input:        []any{modelUserMessage(parts...)},

-                       Node:         &nodeKey{task.Level, task.Index},
+                       Node:         &NodeKey{task.Level, task.Index},

                })
                if err != nil {
                        break
                })
                if err != nil {
                        break


@@ -91,25 +91,25 @@ func (c *Compactor) Summarize(ctx context.Context, task Task) (string, error) {
                        break
                }
 
                        break
                }
 

-               note = tooLong(line)
+               note = compactorTooLong(line)

        }
 
        if len(lines) == 0 {
                return "", fmt.Errorf("compact node (%d, %d): %w", task.Level, task.Index, err)
        }
 
        }
 
        if len(lines) == 0 {
                return "", fmt.Errorf("compact node (%d, %d): %w", task.Level, task.Index, err)
        }
 

-       return shortest(lines), nil
+       return compactorShortest(lines), nil

 }
 
 }
 

-// compactionTask returns the task of a build, with its input.
-func compactionTask(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 {
                return 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
        if task.Level == 0 && len(task.Input) == 1 {
                return 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

-</input>`, task.Index, nodeBytes, ruler, task.Input[0]), nil
+</input>`, task.Index, nodeBytes, compactorRuler, task.Input[0]), nil

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


@@ -124,24 +124,36 @@ of them from there too.
 <input>
 %s
 %s
 <input>
 %s
 %s

-</input>`, first, half, first+half, half, nodeBytes, ruler, first, nodeEnd(task.Level, task.Index)-1, task.Input[0], task.Input[1]), nil
+</input>`, first, half, first+half, half, nodeBytes, compactorRuler, first, nodeEnd(task.Level, task.Index)-1, task.Input[0], task.Input[1]), nil

        }
 
        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))
 }
 

-// tooLong 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 tooLong(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 {

        return fmt.Sprintf(`Too long: your last line for this <input> was %d bytes,
 over the %d-byte limit. Write the whole line again, cutting just
 enough of the least valuable items to fit before this cut:
        return fmt.Sprintf(`Too long: your last line for this <input> was %d bytes,
 over the %d-byte limit. Write the whole line again, cutting just
 enough of the least valuable items to fit before this cut:

-%s| <- LIMIT`, len(line), nodeBytes, cutLine(line))
+%s| <- LIMIT`, len(line), nodeBytes, compactorCutLine(line))
+}
+
+// compactorShortest returns the first of the compactorShortest lines.
+func compactorShortest(lines []string) string {
+       best := lines[0]
+       for _, line := range lines[1:] {
+               if len(line) < len(best) {
+                       best = line
+               }
+       }
+
+       return best

 }
 
 }
 

-// cutLine returns the first nodeBytes bytes of line, without a part of a
-// character at the end.
-func cutLine(line string) string {
+// compactorCutLine returns the first nodeBytes bytes of line, without a part of
+// a character at the end.
+func compactorCutLine(line string) string {

        if len(line) <= nodeBytes {
                return line
        }
        if len(line) <= nodeBytes {
                return line
        }


@@ -153,15 +165,3 @@ func cutLine(line string) string {
 
        return cut
 }
 
        return cut
 }

-
-// shortest returns the first of the shortest lines.
-func shortest(lines []string) string {
-       best := lines[0]
-       for _, line := range lines[1:] {
-               if len(line) < len(best) {
-                       best = line
-               }
-       }
-
-       return best
-}