Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/model/provider/anthropic/beta_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ func (c *Client) createBetaStream(
return nil, err
}
}
if len(converted) == 0 {
return nil, errors.New("no messages to send after conversion: all messages were filtered out")
}

sys := extractBetaSystemBlocks(messages)

Expand Down
3 changes: 3 additions & 0 deletions pkg/model/provider/anthropic/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,9 @@ func (c *Client) CreateChatCompletionStream(
return nil, err
}
}
if len(converted) == 0 {
return nil, errors.New("no messages to send after conversion: all messages were filtered out")
}
sys := extractSystemBlocks(messages)

params := anthropic.MessageNewParams{
Expand Down
62 changes: 62 additions & 0 deletions pkg/model/provider/anthropic/client_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package anthropic

import (
"context"
"encoding/json"
"net/http"
"net/http/httptest"
Expand All @@ -13,6 +14,8 @@ import (
"github.com/stretchr/testify/require"

"github.com/docker/cagent/pkg/chat"
"github.com/docker/cagent/pkg/config/latest"
"github.com/docker/cagent/pkg/model/provider/base"
"github.com/docker/cagent/pkg/tools"
)

Expand All @@ -21,6 +24,65 @@ func testClient() *Client {
return &Client{}
}

func TestCreateChatCompletionStream_ErrorOnEmptyMessages(t *testing.T) {
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
t.Fatal("request should not have been sent")
w.WriteHeader(http.StatusOK)
}))
defer server.Close()

client := &Client{
Config: base.Config{
ModelConfig: latest.ModelConfig{
Provider: "anthropic",
Model: "claude-sonnet-4-5-20250929",
},
},
clientFn: func(_ context.Context) (anthropic.Client, error) {
return anthropic.NewClient(
option.WithAPIKey("test-key"),
option.WithBaseURL(server.URL),
), nil
},
}

tests := []struct {
name string
messages []chat.Message
}{
{
name: "nil messages",
messages: nil,
},
{
name: "empty messages",
messages: []chat.Message{},
},
{
name: "only system messages",
messages: []chat.Message{
{Role: chat.MessageRoleSystem, Content: "You are helpful."},
},
},
{
name: "only whitespace content",
messages: []chat.Message{
{Role: chat.MessageRoleSystem, Content: "System prompt"},
{Role: chat.MessageRoleUser, Content: " "},
{Role: chat.MessageRoleAssistant, Content: " \t\n "},
},
},
}

for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
_, err := client.CreateChatCompletionStream(t.Context(), tt.messages, nil)
require.Error(t, err)
assert.Contains(t, err.Error(), "no messages to send after conversion")
})
}
}

func TestConvertMessages_SkipEmptySystemText(t *testing.T) {
msgs := []chat.Message{{
Role: chat.MessageRoleSystem,
Expand Down