X-Git-Url: http://git.giacomolli.uk/onechat/blobdiff_plain/02cdaff8be27f37f44db8892bb12554f2d702323..9bd91a76e6277f7716e206ddb665dc5fe6f5b583:/compactor_test.go?ds=sidebyside

diff --git a/compactor_test.go b/compactor_test.go
index 8b14c81..a128bc7 100644
--- a/compactor_test.go
+++ b/compactor_test.go
@@ -33,14 +33,14 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
 	require.Equal(t, map[string]any{"effort": "high"}, body["reasoning"])
 	require.Equal(t, "agent-key", body["prompt_cache_key"])
 
-	tools, err := json.Marshal(agentTools())
+	tools, err := json.Marshal(promptTools())
 	require.NoError(t, err)
 
 	sent, err := json.Marshal(body["tools"])
 	require.NoError(t, err)
 	require.JSONEq(t, string(tools), string(sent))
 
-	parts := inputParts(t, server.Call(0))
+	parts := compactorInputParts(t, server.Call(0))
 	require.Equal(t, []string{
 		"<chat>\n0+4|user: earlier\n</chat>\n",
 		"Compaction: compress message 7 into one line of at most 512 bytes\n" +
@@ -51,7 +51,7 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
 }
 
 func TestCompactorWritesTheMergeTask(t *testing.T) {
-	text, err := compactionTask(Task{
+	text, err := compactorTask(Task{
 		Level: 2,
 		Index: 3,
 		Input: []string{"left line", "right line"},
@@ -73,7 +73,7 @@ func TestCompactorRetriesALongLineWithTheNewestNote(t *testing.T) {
 	}
 
 	compactor := newTestCompactor(t, server)
-	line, err := compactor.Summarize(t.Context(), leafTask())
+	line, err := compactor.Summarize(t.Context(), compactorLeafTask())
 	require.NoError(t, err)
 	require.Equal(t, long[2], line)
 	require.Equal(t, 3, server.Calls())
@@ -85,13 +85,13 @@ func TestCompactorRetriesALongLineWithTheNewestNote(t *testing.T) {
 		require.Equal(t, len(long[n]), record.TextBytes)
 	}
 
-	first := inputParts(t, server.Call(0))
+	first := compactorInputParts(t, server.Call(0))
 	require.Len(t, first, 2)
 	for n, want := range []string{long[0], long[1]} {
 		call := server.Call(n + 1)
-		parts := inputParts(t, call)
+		parts := compactorInputParts(t, call)
 		require.Equal(t, first, parts[:2])
-		require.Equal(t, []string{tooLong(want)}, parts[2:])
+		require.Equal(t, []string{compactorTooLong(want)}, parts[2:])
 		require.Contains(t, parts[2], "was "+strconv.Itoa(len(want))+" bytes,")
 		require.Contains(t, parts[2], "\n"+want[:512]+"| <- LIMIT")
 
@@ -111,9 +111,9 @@ func TestCompactorKeepsTheShortestOfFiveLines(t *testing.T) {
 		modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem(strings.Repeat("z", sizes[call.number]))}, 100, 0, 5))
 	}
 
-	line, err := newTestCompactor(t, server).Summarize(t.Context(), leafTask())
+	line, err := newTestCompactor(t, server).Summarize(t.Context(), compactorLeafTask())
 	require.NoError(t, err)
-	require.Equal(t, compactionTries, server.Calls())
+	require.Equal(t, compactorTries, server.Calls())
 	require.Len(t, line, 520)
 }
 
@@ -145,7 +145,7 @@ func TestCompactorFailsWithoutALine(t *testing.T) {
 			server := newModelFake(t)
 			server.reply = tc.reply
 
-			_, err := newTestCompactor(t, server).Summarize(t.Context(), leafTask())
+			_, err := newTestCompactor(t, server).Summarize(t.Context(), compactorLeafTask())
 			require.ErrorContains(t, err, tc.want)
 			require.Equal(t, 1, server.Calls())
 		})
@@ -154,10 +154,10 @@ func TestCompactorFailsWithoutALine(t *testing.T) {
 
 func TestCutLineKeepsWholeCharacters(t *testing.T) {
 	line := strings.Repeat("a", 511) + "é" + "tail"
-	cut := cutLine(line)
+	cut := compactorCutLine(line)
 	require.Equal(t, strings.Repeat("a", 511), cut)
 	require.True(t, utf8.ValidString(cut))
-	require.Equal(t, "short", cutLine("short"))
+	require.Equal(t, "short", compactorCutLine("short"))
 }
 
 func TestCompactorBuildsNodesInTheCore(t *testing.T) {
@@ -181,13 +181,13 @@ func TestCompactorBuildsNodesInTheCore(t *testing.T) {
 	_, err = memory.Append("echo", strings.Repeat("output ", 200))
 	require.NoError(t, err)
 	require.NoError(t, memory.Wait(t.Context()))
-	require.False(t, isBuilt(t, memory.tree, 0, 0))
+	require.False(t, treeIsBuilt(t, memory.tree, 0, 0))
 
 	_, err = memory.Append("user", "next")
 	require.NoError(t, err)
 	require.NoError(t, memory.Wait(t.Context()))
 
-	node := readNode(t, memory.tree, 0, 0)
+	node := treeReadNode(t, memory.tree, 0, 0)
 	require.Equal(t, "summary of the long output", node.Text)
 	require.Equal(t, "<chat>\n0+1|summary of the long output\n1+1|user: next\n</chat>", memory.View())
 	require.Equal(t, 2, server.Calls())
@@ -198,28 +198,14 @@ func newTestCompactor(t *testing.T, server *ModelFake) *Compactor {
 
 	client := newModelClient(server.URL, ModelAPIKey(modelTestKey), "agent-key", filepath.Join(t.TempDir(), "usage.jsonl"))
 
-	return newCompactor(client, adaPrompt, ModelConfig{
+	return newCompactor(client, compactorAdaPrompt, ModelConfig{
 		Model:  "gpt-test",
 		Effort: "high",
 	})
 }
 
-// adaPrompt returns the prompt of the agent Ada, without instructions.
-func adaPrompt() (string, error) {
-	return prompt("Ada", ""), nil
-}
-
-func leafTask() Task {
-	return Task{
-		Level:   0,
-		Index:   0,
-		Context: "<chat>\n</chat>",
-		Input:   []string{"user: " + strings.Repeat("y", 600)},
-	}
-}
-
-// inputParts returns the texts of the one user message of call.
-func inputParts(t *testing.T, call ModelFakeCall) []string {
+// compactorInputParts returns the texts of the one user message of call.
+func compactorInputParts(t *testing.T, call ModelFakeCall) []string {
 	t.Helper()
 
 	var body struct {
@@ -244,3 +230,17 @@ func inputParts(t *testing.T, call ModelFakeCall) []string {
 
 	return texts
 }
+
+func compactorLeafTask() Task {
+	return Task{
+		Level:   0,
+		Index:   0,
+		Context: "<chat>\n</chat>",
+		Input:   []string{"user: " + strings.Repeat("y", 600)},
+	}
+}
+
+// compactorAdaPrompt returns the prompt of the agent Ada, without instructions.
+func compactorAdaPrompt() (string, error) {
+	return prompt("Ada", ""), nil
+}