Check operation context on returned errors

[onechat] / model_test.go

diff --git a/model_test.go b/model_test.go
index 84b767eb451ded852d25f6468c026adfb615c587..e9321073ab4e753fa7a37a76e67b49a5733a28ff 100644 (file)
--- a/model_test.go
+++ b/model_test.go
@@ -85,13 +85,26 @@ func TestClientSendsTheSessionHeaderToChatGPT(t *testing.T) {
                        call := server.Call(0)
                        require.Equal(t, tc.want, call.header.Get("session_id"))
                        require.Equal(t, "agent-key", call.body["prompt_cache_key"])
                        call := server.Call(0)
                        require.Equal(t, tc.want, call.header.Get("session_id"))
                        require.Equal(t, "agent-key", call.body["prompt_cache_key"])

+
+                       // A subagent has its own key.
+                       request := modelTestRequest()
+                       request.Agent = "GreenOtter"
+                       _, err = client.Create(t.Context(), request)
+                       require.NoError(t, err)
+
+                       call = server.Call(1)
+                       if tc.want != "" {
+                               require.Equal(t, "agent-key-GreenOtter", call.header.Get("session_id"))
+                       }
+
+                       require.Equal(t, "agent-key-GreenOtter", call.body["prompt_cache_key"])

                })
        }
 }
 
 func TestClientReadsTheStream(t *testing.T) {
        server := newModelFake(t)
                })
        }
 }
 
 func TestClientReadsTheStream(t *testing.T) {
        server := newModelFake(t)

-       server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+       server.reply = func(w http.ResponseWriter, _ ModelFakeCall) {

                modelWriteEvents(w,
                        map[string]any{"type": "response.created", "response": map[string]any{}},
                        map[string]any{"type": "response.output_item.done", "item": map[string]any{"type": "reasoning", "encrypted_content": "opaque"}},
                modelWriteEvents(w,
                        map[string]any{"type": "response.created", "response": map[string]any{}},
                        map[string]any{"type": "response.output_item.done", "item": map[string]any{"type": "reasoning", "encrypted_content": "opaque"}},


@@ -116,7 +129,7 @@ func TestClientReadsTheStream(t *testing.T) {
 
 func TestClientTakesTheOutputOfTheCompletedResponse(t *testing.T) {
        server := newModelFake(t)
 
 func TestClientTakesTheOutputOfTheCompletedResponse(t *testing.T) {
        server := newModelFake(t)

-       server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+       server.reply = func(w http.ResponseWriter, _ ModelFakeCall) {

                modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem("only here")}, 10, 0, 2))
        }
 
                modelWriteEvents(w, modelCompletedEvent([]any{modelMessageItem("only here")}, 10, 0, 2))
        }
 


@@ -145,10 +158,12 @@ func TestClientRecordsEachCall(t *testing.T) {
        client := newTestModelClient(t, server)
        request := modelTestRequest()
        request.Node = &NodeKey{2, 5}
        client := newTestModelClient(t, server)
        request := modelTestRequest()
        request.Node = &NodeKey{2, 5}

+       request.Agent = "GreenOtter"

        _, err := client.Create(t.Context(), request)
        require.NoError(t, err)
        require.NotContains(t, server.Call(0).body, "node")
        require.NotContains(t, string(server.Call(0).raw), "[2,5]")
        _, err := client.Create(t.Context(), request)
        require.NoError(t, err)
        require.NotContains(t, server.Call(0).body, "node")
        require.NotContains(t, string(server.Call(0).raw), "[2,5]")

+       require.NotContains(t, server.Call(0).body, "agent")

 
        _, err = client.Create(t.Context(), modelTestRequest())
        require.ErrorContains(t, err, "HTTP 429")
 
        _, err = client.Create(t.Context(), modelTestRequest())
        require.ErrorContains(t, err, "HTTP 429")


@@ -168,12 +183,14 @@ func TestClientRecordsEachCall(t *testing.T) {
        require.Equal(t, 7, records[0].OutputTokens)
        require.Equal(t, quota, records[0].Quota)
        require.Equal(t, &[2]int{2, 5}, records[0].Node)
        require.Equal(t, 7, records[0].OutputTokens)
        require.Equal(t, quota, records[0].Quota)
        require.Equal(t, &[2]int{2, 5}, records[0].Node)

+       require.Equal(t, "GreenOtter", records[0].Agent)

        require.Equal(t, len("ok"), records[0].TextBytes)
        require.Greater(t, records[0].Seconds, 0.0)
        require.Empty(t, records[0].Error)
        require.NotEmpty(t, records[0].Date)
 
        require.Nil(t, records[1].Node)
        require.Equal(t, len("ok"), records[0].TextBytes)
        require.Greater(t, records[0].Seconds, 0.0)
        require.Empty(t, records[0].Error)
        require.NotEmpty(t, records[0].Date)
 
        require.Nil(t, records[1].Node)

+       require.Empty(t, records[1].Agent)

        require.Zero(t, records[1].TextBytes)
 
        require.Equal(t, http.StatusTooManyRequests, records[1].Status)
        require.Zero(t, records[1].TextBytes)
 
        require.Equal(t, http.StatusTooManyRequests, records[1].Status)


@@ -238,7 +255,7 @@ func TestClientFailsWhenTheResponseFails(t *testing.T) {
        for _, tc := range testCases {
                t.Run(tc.name, func(t *testing.T) {
                        server := newModelFake(t)
        for _, tc := range testCases {
                t.Run(tc.name, func(t *testing.T) {
                        server := newModelFake(t)

-                       server.reply = func(w http.ResponseWriter, call ModelFakeCall) {
+                       server.reply = func(w http.ResponseWriter, _ ModelFakeCall) {

                                modelWriteEvents(w, tc.events...)
                        }
 
                                modelWriteEvents(w, tc.events...)
                        }