X-Git-Url: https://git.giacomolli.uk/onechat/blobdiff_plain/6755f2645bf6bcf8c7cd5b1f3a682a11bf2392f5..153f3f9b4b09d521412eacca30eddeed395c3f41:/compactor_test.go

diff --git a/compactor_test.go b/compactor_test.go
index cd6311a..8b14c81 100644
--- a/compactor_test.go
+++ b/compactor_test.go
@@ -14,7 +14,7 @@ import (
 )
 
 func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
-	server := newFakeResponses(t)
+	server := newModelFake(t)
 	compactor := newTestCompactor(t, server)
 
 	line, err := compactor.Summarize(t.Context(), Task{
@@ -28,7 +28,7 @@ func TestCompactorSendsThePromptToolsAndTask(t *testing.T) {
 	require.Equal(t, 1, server.Calls())
 
 	body := server.Call(0).body
-	require.Equal(t, prompt("Ada"), body["instructions"])
+	require.Equal(t, prompt("Ada", ""), body["instructions"])
 	require.Equal(t, "gpt-test", body["model"])
 	require.Equal(t, map[string]any{"effort": "high"}, body["reasoning"])
 	require.Equal(t, "agent-key", body["prompt_cache_key"])
@@ -67,16 +67,24 @@ func TestCompactorWritesTheMergeTask(t *testing.T) {
 
 func TestCompactorRetriesALongLineWithTheNewestNote(t *testing.T) {
 	long := []string{strings.Repeat("a", 600), strings.Repeat("b", 550), strings.Repeat("c", 400)}
-	server := newFakeResponses(t)
-	server.reply = func(w http.ResponseWriter, call fakeCall) {
-		writeEvents(w, completedEvent([]any{messageItem(long[call.number])}, 100, 0, 5))
+	server := newModelFake(t)
+	server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+		modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem(long[call.number])}, 100, 0, 5))
 	}
 
-	line, err := newTestCompactor(t, server).Summarize(t.Context(), leafTask())
+	compactor := newTestCompactor(t, server)
+	line, err := compactor.Summarize(t.Context(), leafTask())
 	require.NoError(t, err)
 	require.Equal(t, long[2], line)
 	require.Equal(t, 3, server.Calls())
 
+	records := modelReadUsage(t, compactor.client.usage.path)
+	require.Len(t, records, 3)
+	for n, record := range records {
+		require.Equal(t, &[2]int{0, 0}, record.Node)
+		require.Equal(t, len(long[n]), record.TextBytes)
+	}
+
 	first := inputParts(t, server.Call(0))
 	require.Len(t, first, 2)
 	for n, want := range []string{long[0], long[1]} {
@@ -98,9 +106,9 @@ func TestCompactorRetriesALongLineWithTheNewestNote(t *testing.T) {
 
 func TestCompactorKeepsTheShortestOfFiveLines(t *testing.T) {
 	sizes := []int{700, 530, 600, 520, 560, 513}
-	server := newFakeResponses(t)
-	server.reply = func(w http.ResponseWriter, call fakeCall) {
-		writeEvents(w, completedEvent([]any{messageItem(strings.Repeat("z", sizes[call.number]))}, 100, 0, 5))
+	server := newModelFake(t)
+	server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+		modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem(strings.Repeat("z", sizes[call.number]))}, 100, 0, 5))
 	}
 
 	line, err := newTestCompactor(t, server).Summarize(t.Context(), leafTask())
@@ -112,12 +120,12 @@ func TestCompactorKeepsTheShortestOfFiveLines(t *testing.T) {
 func TestCompactorFailsWithoutALine(t *testing.T) {
 	testCases := []struct {
 		name  string
-		reply func(http.ResponseWriter, fakeCall)
+		reply func(http.ResponseWriter, ModelFakeCall)
 		want  string
 	}{
 		{
 			name: "failed call",
-			reply: func(w http.ResponseWriter, call fakeCall) {
+			reply: func(w http.ResponseWriter, call ModelFakeCall) {
 				w.WriteHeader(http.StatusInternalServerError)
 				_, _ = io.WriteString(w, "down")
 			},
@@ -125,8 +133,8 @@ func TestCompactorFailsWithoutALine(t *testing.T) {
 		},
 		{
 			name: "tool call and no text",
-			reply: func(w http.ResponseWriter, call fakeCall) {
-				writeEvents(w, completedEvent([]any{map[string]any{"type": "function_call", "name": "zoom", "arguments": "{}"}}, 100, 0, 5))
+			reply: func(w http.ResponseWriter, call ModelFakeCall) {
+				modelWriteEvents(w, modelCompletedEvent([]any{map[string]any{"type": "function_call", "name": "zoom", "arguments": "{}"}}, 100, 0, 5))
 			},
 			want: "no line",
 		},
@@ -134,7 +142,7 @@ func TestCompactorFailsWithoutALine(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			server := newFakeResponses(t)
+			server := newModelFake(t)
 			server.reply = tc.reply
 
 			_, err := newTestCompactor(t, server).Summarize(t.Context(), leafTask())
@@ -153,14 +161,14 @@ func TestCutLineKeepsWholeCharacters(t *testing.T) {
 }
 
 func TestCompactorBuildsNodesInTheCore(t *testing.T) {
-	server := newFakeResponses(t)
-	server.reply = func(w http.ResponseWriter, call fakeCall) {
+	server := newModelFake(t)
+	server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
 		if call.number == 0 {
 			w.WriteHeader(http.StatusServiceUnavailable)
 			return
 		}
 
-		writeEvents(w, completedEvent([]any{messageItem("summary of the long output")}, 100, 0, 5))
+		modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem("summary of the long output")}, 100, 0, 5))
 	}
 
 	memory, err := openMemory(t.Context(), t.TempDir(), newTestClock().Now, newTestCompactor(t, server))
@@ -185,17 +193,22 @@ func TestCompactorBuildsNodesInTheCore(t *testing.T) {
 	require.Equal(t, 2, server.Calls())
 }
 
-func newTestCompactor(t *testing.T, server *fakeResponses) *Compactor {
+func newTestCompactor(t *testing.T, server *ModelFake) *Compactor {
 	t.Helper()
 
-	client := newClient(server.URL, apiKey(testKey), "agent-key", filepath.Join(t.TempDir(), "usage.jsonl"))
+	client := newModelClient(server.URL, ModelAPIKey(modelTestKey), "agent-key", filepath.Join(t.TempDir(), "usage.jsonl"))
 
-	return newCompactor(client, "Ada", ModelConfig{
+	return newCompactor(client, adaPrompt, 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,
@@ -206,7 +219,7 @@ func leafTask() Task {
 }
 
 // inputParts returns the texts of the one user message of call.
-func inputParts(t *testing.T, call fakeCall) []string {
+func inputParts(t *testing.T, call ModelFakeCall) []string {
 	t.Helper()
 
 	var body struct {