Name and order the model client code

[onechat] / compactor_test.go

diff --git a/compactor_test.go b/compactor_test.go
index 4573fddbdc90107db0dbfdd1565e9fa0a66bf08e..8b14c81ff4423ed47f18f29d0b02bd3e0dc93aa3 100644 (file)
--- 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{
@@ -67,9 +67,9 @@ 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))
        }
 
        compactor := newTestCompactor(t, server)
@@ -78,7 +78,7 @@ func TestCompactorRetriesALongLineWithTheNewestNote(t *testing.T) {
        require.Equal(t, long[2], line)
        require.Equal(t, 3, server.Calls())
 
-       records := readUsage(t, compactor.client.usage.path)
+       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)
@@ -106,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())
@@ -120,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")
                        },
@@ -133,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",
                },
@@ -142,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())
@@ -161,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))
@@ -193,10 +193,10 @@ 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, adaPrompt, ModelConfig{
                Model:  "gpt-test",
@@ -219,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 {