Name timeouts for the operations they limit

[onechat] / compactor_test.go

diff --git a/compactor_test.go b/compactor_test.go
index 8c83594cc896355de34051326a6a47499952d646..baa7f57ed7c6c88db4342403ea8f2093b793c5f5 100644 (file)
--- a/compactor_test.go
+++ b/compactor_test.go
@@ -50,90 +50,6 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
        }, texts)
 }
 
        }, texts)
 }
 

-func TestCompactorSendsEachWholeBlockOfTheViewAsAMessage(t *testing.T) {
-       testCases := []struct {
-               name    string
-               context string
-               want    []string
-       }{
-               {
-                       name:    "empty view goes with the task",
-                       context: "<chat>\n</chat>",
-                       want:    []string{"<chat>\n</chat>\nTASK"},
-               },
-               {
-                       name:    "lines short of a block go with the task",
-                       context: "<chat>\n0+1|a\n1+1|b\n2+1|c\n</chat>",
-                       want:    []string{"<chat>\n0+1|a\n1+1|b\n2+1|c\n</chat>\nTASK"},
-               },
-               {
-                       name:    "one whole block and the task",
-                       context: "<chat>\n0+1|a\n1+1|b\n2+1|c\n3+1|d\n</chat>",
-                       want:    []string{"<chat>\n0+1|a\n1+1|b\n2+1|c\n3+1|d\n", "</chat>\nTASK"},
-               },
-               {
-                       name:    "two whole blocks and the rest with the task",
-                       context: "<chat>\n0+2|a\n2+1|b\n3+1|c\n4+1|d\n5+1|e\n6+1|f\n7+1|g\n8+1|h\n9+1|i\n</chat>",
-                       want: []string{
-                               "<chat>\n0+2|a\n2+1|b\n3+1|c\n4+1|d\n",
-                               "5+1|e\n6+1|f\n7+1|g\n8+1|h\n",
-                               "9+1|i\n</chat>\nTASK",
-                       },
-               },
-       }
-
-       for _, tc := range testCases {
-               t.Run(tc.name, func(t *testing.T) {
-                       server := newModelFake(t)
-                       task := compactorLeafTask()
-                       task.Context = tc.context
-
-                       _, err := newTestCompactor(t, server).Summarize(t.Context(), task)
-                       require.NoError(t, err)
-
-                       text, err := compactorTask(task)
-                       require.NoError(t, err)
-
-                       want := make([]string, len(tc.want))
-                       for n, message := range tc.want {
-                               want[n] = strings.Replace(message, "TASK", text, 1)
-                       }
-
-                       texts := compactorInputTexts(t, server.Call(0))
-                       require.Equal(t, want, texts)
-                       require.Equal(t, tc.context+"\n"+text, strings.Join(texts, ""))
-               })
-       }
-}
-
-func TestCompactorSendsTheSameBlocksForViewsWithTheSameFirstLines(t *testing.T) {
-       shared := "<chat>\n0+4|a\n4+1|b\n5+1|c\n6+1|d\n7+1|e\n8+1|f\n9+1|g\n10+1|h\n"
-       server := newModelFake(t)
-       compactor := newTestCompactor(t, server)
-       _, err := compactor.Summarize(t.Context(), Task{
-               Level:   0,
-               Index:   11,
-               Context: shared + "11+1|i\n</chat>",
-               Input:   []string{"user: eleven"},
-       })
-       require.NoError(t, err)
-
-       _, err = compactor.Summarize(t.Context(), Task{
-               Level:   1,
-               Index:   5,
-               Context: shared + "11+1|j\n12+1|k\n</chat>",
-               Input:   []string{"left line", "right line"},
-       })
-       require.NoError(t, err)
-
-       first := compactorInputTexts(t, server.Call(0))
-       second := compactorInputTexts(t, server.Call(1))
-       require.Len(t, first, 3)
-       require.Len(t, second, 3)
-       require.Equal(t, first[:2], second[:2])
-       require.NotEqual(t, first[2], second[2])
-}
-

 func TestCompactorWritesTheMergeTask(t *testing.T) {
        text, err := compactorTask(Task{
                Level: 2,
 func TestCompactorWritesTheMergeTask(t *testing.T) {
        text, err := compactorTask(Task{
                Level: 2,


@@ -173,18 +89,21 @@ func TestCompactorRetriesALongLineWithTheNewestNote(t *testing.T) {
                require.Equal(t, len(long[n]), record.TextBytes)
        }
 
                require.Equal(t, len(long[n]), record.TextBytes)
        }
 

+       text, err := compactorTask(task)
+       require.NoError(t, err)
+

        first := compactorInputTexts(t, server.Call(0))
        first := compactorInputTexts(t, server.Call(0))

-       require.Len(t, first, 2)
+       require.Equal(t, []string{task.Context + "\n" + text}, first)

 
        for n, want := range []string{long[0], long[1]} {
                call := server.Call(n + 1)
                texts := compactorInputTexts(t, call)
 
        for n, want := range []string{long[0], long[1]} {
                call := server.Call(n + 1)
                texts := compactorInputTexts(t, call)

-               require.Equal(t, first, texts[:2])
-               require.Equal(t, []string{compactorTooLong(want)}, texts[2:])
-               require.Contains(t, texts[2], "was "+strconv.Itoa(len(want))+" bytes,")
-               require.Contains(t, texts[2], "\n"+want[:512]+"| <- LIMIT")
+               require.Equal(t, first, texts[:1])
+               require.Equal(t, []string{compactorTooLong(want)}, texts[1:])
+               require.Contains(t, texts[1], "was "+strconv.Itoa(len(want))+" bytes,")
+               require.Contains(t, texts[1], "\n"+want[:512]+"| <- LIMIT")

 
 

-               note, err := json.Marshal(modelUserMessage(texts[2]))
+               note, err := json.Marshal(modelUserMessage(texts[1]))

                require.NoError(t, err)
                require.LessOrEqual(t, len(call.raw), len(server.Call(0).raw)+len(",")+len(note))
        }
                require.NoError(t, err)
                require.LessOrEqual(t, len(call.raw), len(server.Call(0).raw)+len(",")+len(note))
        }


@@ -289,7 +208,7 @@ func newTestCompactor(t *testing.T, server *ModelFake) *Compactor {
        return newCompactor(client, compactorAdaPrompt, ModelConfig{
                Model:  "gpt-test",
                Effort: "high",
        return newCompactor(client, compactorAdaPrompt, ModelConfig{
                Model:  "gpt-test",
                Effort: "high",

-       })
+       }, promptTools(), &ImageStore{dir: t.TempDir()})

 }
 
 // compactorInputTexts returns the text of each user message of call. Each
 }
 
 // compactorInputTexts returns the text of each user message of call. Each