fix(workflow): enforce optional result booleans only when required
This commit is contained in:
1 parent
307f2fc9e2
commit
6b71dc8108
2 files changed
+36
-8
No files matched your search
@@ -173,7 +173,11 @@ func agentResultTool(schema map[string]any) (*agentrun.CaptureTool, error) {
|
||||
property, _ := properties[name].(map[string]any)
|
||||
switch property["type"] {
|
||||
case "boolean":
|
||||
tool.BooleanFields = append(tool.BooleanFields, name)
|
||||
// Presence is enforced only for required fields, like strings:
|
||||
// an optional boolean the result omits is valid.
|
||||
if slices.Contains(required, name) {
|
||||
tool.BooleanFields = append(tool.BooleanFields, name)
|
||||
}
|
||||
case "string":
|
||||
if slices.Contains(required, name) {
|
||||
tool.NonEmptyStrings = append(tool.NonEmptyStrings, name)
|
||||
|
||||
@@ -27,6 +27,14 @@ func TestAgentResultToolSchema(t *testing.T) {
|
||||
}{
|
||||
{name: "no schema", schema: nil},
|
||||
{name: "valid schema", schema: valid},
|
||||
{name: "optional boolean", schema: map[string]any{
|
||||
"type": "object",
|
||||
"properties": map[string]any{
|
||||
"needs_change": map[string]any{"type": "boolean"},
|
||||
"summary": map[string]any{"type": "string"},
|
||||
},
|
||||
"required": []any{"summary"},
|
||||
}},
|
||||
{name: "not an object", schema: map[string]any{"type": "string"}, wantErr: "must be a JSON Schema with type: object"},
|
||||
{
|
||||
name: "unresolvable reference",
|
||||
@@ -58,14 +66,30 @@ func TestAgentResultToolSchema(t *testing.T) {
|
||||
if tool == nil {
|
||||
t.Fatal("tool = nil, want a capture tool")
|
||||
}
|
||||
if len(tool.RequiredFields) != 3 {
|
||||
t.Fatalf("RequiredFields = %v, want the schema's three required fields", tool.RequiredFields)
|
||||
// Presence is enforced exactly for the required fields, whether
|
||||
// string or boolean; an optional field of either type is valid
|
||||
// when omitted.
|
||||
required := map[string]bool{}
|
||||
if list, ok := tt.schema["required"].([]any); ok {
|
||||
for _, field := range list {
|
||||
if name, ok := field.(string); ok {
|
||||
required[name] = true
|
||||
}
|
||||
}
|
||||
}
|
||||
if !containsString(tool.NonEmptyStrings, "reasons") && !containsString(tool.NonEmptyStrings, "workflow") {
|
||||
t.Fatalf("NonEmptyStrings = %v, want the required string fields", tool.NonEmptyStrings)
|
||||
}
|
||||
if !containsString(tool.BooleanFields, "needs_change") {
|
||||
t.Fatalf("BooleanFields = %v, want needs_change", tool.BooleanFields)
|
||||
properties, _ := tt.schema["properties"].(map[string]any)
|
||||
for name, raw := range properties {
|
||||
property, _ := raw.(map[string]any)
|
||||
switch property["type"] {
|
||||
case "string":
|
||||
if required[name] != containsString(tool.NonEmptyStrings, name) {
|
||||
t.Fatalf("NonEmptyStrings = %v, want exactly the required strings", tool.NonEmptyStrings)
|
||||
}
|
||||
case "boolean":
|
||||
if required[name] != containsString(tool.BooleanFields, name) {
|
||||
t.Fatalf("BooleanFields = %v, want exactly the required booleans", tool.BooleanFields)
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user