Skip to content

fix: resolve union decoder field type reflection for param.Opt types #528

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −2
Open

fix: resolve union decoder field type reflection for param.Opt types #528

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
9 changes: 9 additions & 0 deletions chatcompletion.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2742,6 +2742,15 @@ func (u ChatCompletionToolChoiceOptionUnionParam) GetType() *string {
return nil
}

func init() {
apijson.RegisterUnion[ChatCompletionToolChoiceOptionUnionParam](
"type",
apijson.Discriminator[ChatCompletionAllowedToolChoiceParam]("allowed_tools"),
apijson.Discriminator[ChatCompletionNamedToolChoiceParam]("function"),
apijson.Discriminator[ChatCompletionNamedToolChoiceCustomParam]("custom"),
)
}

// `none` means the model will not call any tool and instead generates a message.
// `auto` means the model can pick between generating a message or calling one or
// more tools. `required` means the model must call one or more tools.
Expand Down
9 changes: 7 additions & 2 deletions internal/apijson/union.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ package apijson

import (
"errors"
"github.com/openai/openai-go/v3/packages/param"
"reflect"

"github.com/openai/openai-go/v3/packages/param"

"github.com/tidwall/gjson"
)

Expand Down Expand Up @@ -66,7 +67,11 @@ func (d *decoderBuilder) newStructUnionDecoder(t reflect.Type) decoderFunc {
for _, variant := range unionEntry.variants {
// For each union variant, find a matching decoder and save it
for _, decoder := range decoders {
if decoder.field.Type.Elem() == variant.Type {
fieldType := decoder.field.Type
if fieldType.Kind() == reflect.Ptr {
fieldType = fieldType.Elem()
}
if fieldType == variant.Type {
discriminatedDecoders = append(discriminatedDecoders, discriminatedDecoder{
decoder,
variant.DiscriminatorValue,
Expand Down