Skip to content

[dotnet-code] Consolidate OpenAI tool schema conversion #535

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
michelle-clayton-work wants to merge 2 commits into
base: main
Choose a base branch
from
+11 −30
Open

[dotnet-code] Consolidate OpenAI tool schema conversion #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f512fc
Consolidate OpenAI tool schema conversion
github-actions[bot] Jul 14, 2026
98bb1cb
Guard schemaToMap against nil schema to preserve original behavior
Copilot Jul 17, 2026
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
19 changes: 4 additions & 15 deletions provider/openaiprovider/chat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,21 +308,10 @@ func buildCompletionParams(model string, messages []*message.Message, opts []age
}
case tool.FuncTool:
name, description := tl.Name(), tl.Description()
var funcParams map[string]any
switch schema := tl.Schema().(type) {
case map[string]any:
funcParams = schema
default:
if schema == nil {
break
}
data, err := json.Marshal(schema)
if err == nil {
err = json.Unmarshal(data, &funcParams)
}
if err != nil {
return openai.ChatCompletionNewParams{}, fmt.Errorf("failed to convert function tool schema to JSON format: %w", err)
}
schema := tl.Schema()
funcParams, err := schemaToMap(schema)
if err != nil {
return openai.ChatCompletionNewParams{}, fmt.Errorf("failed to convert function tool schema to JSON format: %w", err)
}
Comment on lines +311 to 315
params.Tools = append(params.Tools, openai.ChatCompletionToolUnionParam{
OfFunction: &openai.ChatCompletionFunctionToolParam{
Expand Down
22 changes: 7 additions & 15 deletions provider/openaiprovider/responses.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,21 +327,10 @@ func responsesBuildCompletionParams(config AgentConfig, messages []*message.Mess
switch tl := tl.(type) {
case tool.FuncTool:
name, description := tl.Name(), tl.Description()
var funcParams map[string]any
switch schema := tl.Schema().(type) {
case map[string]any:
funcParams = schema
default:
if schema == nil {
break
}
data, err := json.Marshal(schema)
if err == nil {
err = json.Unmarshal(data, &funcParams)
}
if err != nil {
return responses.ResponseNewParams{}, fmt.Errorf("failed to convert schema for function tool %q (type %T) to JSON format: %w", name, schema, err)
}
schema := tl.Schema()
funcParams, err := schemaToMap(schema)
if err != nil {
return responses.ResponseNewParams{}, fmt.Errorf("failed to convert schema for function tool %q (type %T) to JSON format: %w", name, schema, err)
}
Comment on lines +330 to 334
params.Tools = append(params.Tools, responses.ToolUnionParam{
OfFunction: &responses.FunctionToolParam{
Expand Down Expand Up @@ -771,6 +760,9 @@ func responsesBuildMessageParam(msg *message.Message, resp responses.ResponseInp
}

func schemaToMap(schema any) (map[string]any, error) {
if schema == nil {
return nil, nil
}
if schemaMap, ok := schema.(map[string]any); ok {
return schemaMap, nil
}
Expand Down
Loading