Skip to content

bug: fix anthropic model provider #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 16, 2024
Merged

bug: fix anthropic model provider #367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 23 additions & 5 deletions pkg/openai/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ func toToolCall(call types.CompletionToolCall) openai.ToolCall {
}
}

func toMessages(request types.CompletionRequest) (result []openai.ChatCompletionMessage, err error) {
func toMessages(request types.CompletionRequest, compat bool) (result []openai.ChatCompletionMessage, err error) {
var (
systemPrompts []string
msgs []types.CompletionMessage
Expand All @@ -237,9 +237,23 @@ func toMessages(request types.CompletionRequest) (result []openai.ChatCompletion
})
}

// Never send only a system message
if len(msgs) == 1 && msgs[0].Role == types.CompletionMessageRoleTypeSystem {
msgs[0].Role = types.CompletionMessageRoleTypeUser
if compat {
// This is terrible hack to deal with APIs that strictly want: (system, user | user) (assistant, user)* assistant?
// Two scenarios where this breaks with GPTScript is just sending system, or sending system, assistant

// Don't send just a system message
if len(msgs) == 1 && msgs[0].Role == types.CompletionMessageRoleTypeSystem {
msgs[0].Role = types.CompletionMessageRoleTypeUser
}

// Don't send system, assistant. If so, insert a user message that just has "."
if len(msgs) > 1 && msgs[0].Role == types.CompletionMessageRoleTypeSystem &&
msgs[1].Role == types.CompletionMessageRoleTypeAssistant {
msgs = slices.Insert(msgs, 1, types.CompletionMessage{
Role: types.CompletionMessageRoleTypeUser,
Content: types.Text("."),
})
}
}

for _, message := range msgs {
Expand Down Expand Up @@ -288,7 +302,7 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
if messageRequest.Model == "" {
messageRequest.Model = c.defaultModel
}
msgs, err := toMessages(messageRequest)
msgs, err := toMessages(messageRequest, !c.setSeed)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -368,6 +382,10 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
}
}

if result.Role == "" {
result.Role = types.CompletionMessageRoleTypeAssistant
}

var usage types.Usage
if !cacheResponse {
usage = result.Usage
Expand Down
2 changes: 1 addition & 1 deletion pkg/types/completion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type CompletionMessageRoleType string

type CompletionMessage struct {
Role CompletionMessageRoleType `json:"role,omitempty"`
Content []ContentPart `json:"content,omitempty" column:"name=Message,jsonpath=.spec.content"`
Content []ContentPart `json:"content,omitempty"`
// ToolCall should be set for only messages of type "tool" and Content[0].Text should be set as the
// result of the call describe by this field
ToolCall *CompletionToolCall `json:"toolCall,omitempty"`
Expand Down