Log the version when the daemon is ready

[onechat] / turn_test.go

diff --git a/turn_test.go b/turn_test.go
index 5d93e08709f4432ff982f55908b1cb19d388a34b..949c0b8fe93b550c973d480336e5163f96438555 100644 (file)
--- a/turn_test.go
+++ b/turn_test.go
@@ -3,7 +3,6 @@ package main
 import (
        "context"
        "encoding/json"
 import (
        "context"
        "encoding/json"

-       "log"

        "net/http"
        "path/filepath"
        "strings"
        "net/http"
        "path/filepath"
        "strings"


@@ -61,6 +60,7 @@ func TestTurnRunsToolsUntilTheFinalAnswer(t *testing.T) {
        require.Equal(t, []string{"user", "busy", "tool", "echo", "reply", "idle"}, test.events.Kinds())
 
        var turns []string
        require.Equal(t, []string{"user", "busy", "tool", "echo", "reply", "idle"}, test.events.Kinds())
 
        var turns []string

+

        for _, record := range modelReadUsage(t, test.usagePath) {
                turns = append(turns, record.Turn)
        }
        for _, record := range modelReadUsage(t, test.usagePath) {
                turns = append(turns, record.Turn)
        }


@@ -106,11 +106,13 @@ func TestMessageDuringATurnJoinsTheNextRequest(t *testing.T) {
        require.NoError(t, err)
 
        <-arrived
        require.NoError(t, err)
 
        <-arrived

+

        _, err = test.loop.Submit(terminalSource, "second, during the turn")
        require.NoError(t, err)
        close(release)
 
        test.events.WaitFor(t, "idle", 1)
        _, err = test.loop.Submit(terminalSource, "second, during the turn")
        require.NoError(t, err)
        close(release)
 
        test.events.WaitFor(t, "idle", 1)

+

        input := server.Call(1).body["input"].([]any)
        require.Equal(t, map[string]any{
                "role":    "user",
        input := server.Call(1).body["input"].([]any)
        require.Equal(t, map[string]any{
                "role":    "user",


@@ -140,6 +142,7 @@ func TestMessageDuringTheFinalRequestStartsANewTurn(t *testing.T) {
        require.NoError(t, err)
 
        <-arrived
        require.NoError(t, err)
 
        <-arrived

+

        _, err = test.loop.Submit(terminalSource, "second")
        require.NoError(t, err)
        close(release)
        _, err = test.loop.Submit(terminalSource, "second")
        require.NoError(t, err)
        close(release)


@@ -221,7 +224,7 @@ func TestFailedCallEndsTheTurnWithoutARetry(t *testing.T) {
        require.Equal(t, 1, server.Calls())
        require.Contains(t, test.events.Last("error"), "HTTP 503")
        require.Equal(t, 1, strings.Count(test.logs.String(), "\n"))
        require.Equal(t, 1, server.Calls())
        require.Contains(t, test.events.Last("error"), "HTTP 503")
        require.Equal(t, 1, strings.Count(test.logs.String(), "\n"))

-       require.Contains(t, test.logs.String(), "turn failed: ")
+       require.Contains(t, test.logs.String(), "<3>turn failed: ")

        require.Contains(t, test.logs.String(), "HTTP 503")
        require.NotContains(t, test.logs.String(), "hello")
 }
        require.Contains(t, test.logs.String(), "HTTP 503")
        require.NotContains(t, test.logs.String(), "hello")
 }


@@ -237,6 +240,7 @@ func TestViewMessagesOnlyGrowBetweenTurns(t *testing.T) {
 
        first := server.Call(1).body["input"].([]any)
        second := server.Call(2).body["input"].([]any)
 
        first := server.Call(1).body["input"].([]any)
        second := server.Call(2).body["input"].([]any)

+

        require.Len(t, first, 4)
        require.Len(t, second, 5)
        require.Equal(t, first[:2], second[:2])
        require.Len(t, first, 4)
        require.Len(t, second, 5)
        require.Equal(t, first[:2], second[:2])


@@ -264,6 +268,7 @@ func (l *TurnTestLoop) Log(t *testing.T) []string {
        t.Helper()
 
        var lines []string
        t.Helper()
 
        var lines []string

+

        for id := range l.memory.Len() {
                message, err := l.memory.Message(id)
                require.NoError(t, err)
        for id := range l.memory.Len() {
                message, err := l.memory.Message(id)
                require.NoError(t, err)


@@ -360,12 +365,14 @@ func turnInputTexts(t *testing.T, call ModelFakeCall) []string {
        require.NoError(t, json.Unmarshal(call.raw, &body))
 
        var texts []string
        require.NoError(t, json.Unmarshal(call.raw, &body))
 
        var texts []string

+

        for _, item := range body.Input {
                if item.Role != "user" {
                        continue
                }
 
                var text strings.Builder
        for _, item := range body.Input {
                if item.Role != "user" {
                        continue
                }
 
                var text strings.Builder

+

                for _, part := range item.Content {
                        text.WriteString(part.Text)
                }
                for _, part := range item.Content {
                        text.WriteString(part.Text)
                }


@@ -399,8 +406,9 @@ func newTestTurnLoopWith(t *testing.T, server *ModelFake, summarizer Summarizer)
 
        client := newModelClient(server.URL, ModelAPIKey(modelTestKey), agent.CacheKey(), test.usagePath)
        whatsapp, _, _ := whatsappStartTest(t, t.TempDir(), clock)
 
        client := newModelClient(server.URL, ModelAPIKey(modelTestKey), agent.CacheKey(), test.usagePath)
        whatsapp, _, _ := whatsappStartTest(t, t.TempDir(), clock)

-       test.loop, err = newTurnLoop(agent, memory, newTestSubagents(t), whatsapp, newTestSchedules(t, clock.Now), client, clock.Now, log.New(test.logs, "", 0), test.events.Add)
+       test.loop, err = newTurnLoop(agent, memory, newTestSubagents(t), whatsapp, newTestSchedules(t, clock.Now), client, clock.Now, daemonTestLogger(test.logs), test.events.Add)

        require.NoError(t, err)
        require.NoError(t, err)

+

        ctx, cancel := context.WithCancel(t.Context())
        done := make(chan error)
        go func() {
        ctx, cancel := context.WithCancel(t.Context())
        done := make(chan error)
        go func() {