Add schema selection values and ownership

This commit is contained in:
2026-11-20 15:20:29 +00:00
parent e775a3c116
commit fbe3d427a2
17 changed files with 186 additions and 9 deletions

View File

@@ -330,6 +330,7 @@ func toDomainOutputContract(contract OutputContract) domain.OutputContract {
return domain.OutputContract{ return domain.OutputContract{
Format: domain.OutputFormat(contract.Format), Format: domain.OutputFormat(contract.Format),
ValidationMode: domain.ValidationMode(contract.ValidationMode), ValidationMode: domain.ValidationMode(contract.ValidationMode),
Schema: contract.Schema,
SchemaPath: contract.SchemaPath, SchemaPath: contract.SchemaPath,
RepairAttempts: contract.RepairAttempts, RepairAttempts: contract.RepairAttempts,
} }
@@ -339,6 +340,7 @@ func fromDomainOutputContract(contract domain.OutputContract) OutputContract {
return OutputContract{ return OutputContract{
Format: OutputFormat(contract.Format), Format: OutputFormat(contract.Format),
ValidationMode: ValidationMode(contract.ValidationMode), ValidationMode: ValidationMode(contract.ValidationMode),
Schema: jsonvalue.CloneTrusted(contract.Schema),
SchemaPath: contract.SchemaPath, SchemaPath: contract.SchemaPath,
RepairAttempts: contract.RepairAttempts, RepairAttempts: contract.RepairAttempts,
} }

View File

@@ -139,6 +139,8 @@ not a list to search. Root selection happens before opening the requested file.
## Stage 1 — Add Schema Value Shapes And Ownership ## Stage 1 — Add Schema Value Shapes And Ownership
Status: complete.
Read `types.go`, `prompts.go`, `resource_inspection.go`, `convert.go`, domain Read `types.go`, `prompts.go`, `resource_inspection.go`, `convert.go`, domain
output contracts, and the existing schema-document ownership/decoder helpers. output contracts, and the existing schema-document ownership/decoder helpers.

View File

@@ -103,6 +103,8 @@ type cacheControlConfig struct {
type promptOutputConfig struct { type promptOutputConfig struct {
Format *string `yaml:"format"` Format *string `yaml:"format"`
ValidationMode *string `yaml:"validation_mode"` ValidationMode *string `yaml:"validation_mode"`
Schema any `yaml:"schema"`
SchemaFile *string `yaml:"schema_file"`
SchemaPath *string `yaml:"schema_path"` SchemaPath *string `yaml:"schema_path"`
RepairAttempts int `yaml:"repair_attempts"` RepairAttempts int `yaml:"repair_attempts"`
} }

View File

@@ -11,6 +11,7 @@ import (
"go.maximumdirect.net/configkit" "go.maximumdirect.net/configkit"
"go.maximumdirect.net/promptkit/internal/domain" "go.maximumdirect.net/promptkit/internal/domain"
"go.maximumdirect.net/promptkit/internal/filecatalog" "go.maximumdirect.net/promptkit/internal/filecatalog"
"go.maximumdirect.net/promptkit/internal/jsonvalue"
"go.maximumdirect.net/promptkit/internal/prompt" "go.maximumdirect.net/promptkit/internal/prompt"
"go.maximumdirect.net/promptkit/internal/promptdef" "go.maximumdirect.net/promptkit/internal/promptdef"
) )
@@ -273,6 +274,7 @@ func (state *loaded) lookupPromptEntry(id string) (*promptEntry, error) {
} }
func ownPromptDefinition(definition domain.PromptDefinition) *domain.PromptDefinition { func ownPromptDefinition(definition domain.PromptDefinition) *domain.PromptDefinition {
definition.Validation = ownOutputContract(definition.Validation)
definition.Inputs = append([]domain.PromptInput(nil), definition.Inputs...) definition.Inputs = append([]domain.PromptInput(nil), definition.Inputs...)
definition.Templates = append([]domain.PromptMessageTemplate(nil), definition.Templates...) definition.Templates = append([]domain.PromptMessageTemplate(nil), definition.Templates...)
for index := range definition.Templates { for index := range definition.Templates {
@@ -285,10 +287,17 @@ func ownPromptDefinition(definition domain.PromptDefinition) *domain.PromptDefin
} }
func ownPromptInspection(inspection domain.PromptInspection) *domain.PromptInspection { func ownPromptInspection(inspection domain.PromptInspection) *domain.PromptInspection {
inspection.OutputContract = ownOutputContract(inspection.OutputContract)
inspection.Inputs = append([]domain.PromptInput(nil), inspection.Inputs...) inspection.Inputs = append([]domain.PromptInput(nil), inspection.Inputs...)
return &inspection return &inspection
} }
func ownOutputContract(contract domain.OutputContract) domain.OutputContract {
contract.Schema = jsonvalue.CloneTrusted(contract.Schema)
contract.SchemaFile = stringPointerValue(contract.SchemaFile)
return contract
}
func promptLookupError(err error) error { func promptLookupError(err error) error {
if errors.Is(err, errPromptNotFound) { if errors.Is(err, errPromptNotFound) {
return promptdef.ErrPromptDefinitionNotFound return promptdef.ErrPromptDefinitionNotFound

View File

@@ -60,6 +60,8 @@ type PromptCacheControlResource struct {
type PromptOutputResource struct { type PromptOutputResource struct {
Format domain.OutputFormat Format domain.OutputFormat
ValidationMode domain.ValidationMode ValidationMode domain.ValidationMode
Schema any
SchemaFile *string
SchemaPath *string SchemaPath *string
RepairAttempts *int RepairAttempts *int
} }

View File

@@ -2,6 +2,7 @@ package domain
import ( import (
"context" "context"
"io/fs"
"time" "time"
) )
@@ -156,6 +157,8 @@ type PromptDefinition struct {
Inputs []PromptInput `yaml:"inputs"` Inputs []PromptInput `yaml:"inputs"`
Templates []PromptMessageTemplate `yaml:"templates"` Templates []PromptMessageTemplate `yaml:"templates"`
Validation OutputContract `yaml:"validation"` Validation OutputContract `yaml:"validation"`
SchemaRoot *ResourceBinding `json:"-" yaml:"-"`
SchemaFile *ResourceBinding `json:"-" yaml:"-"`
} }
// PromptInspection is lightweight metadata for prompt requirement selection. // PromptInspection is lightweight metadata for prompt requirement selection.
@@ -253,10 +256,18 @@ type ExecutionTarget struct {
type OutputContract struct { type OutputContract struct {
Format OutputFormat `yaml:"format"` Format OutputFormat `yaml:"format"`
ValidationMode ValidationMode `yaml:"validation_mode"` ValidationMode ValidationMode `yaml:"validation_mode"`
Schema any `yaml:"schema,omitempty" json:"schema,omitempty"`
SchemaFile *string `yaml:"schema_file,omitempty" json:"schema_file,omitempty"`
SchemaPath string `yaml:"schema_path"` SchemaPath string `yaml:"schema_path"`
RepairAttempts int `yaml:"repair_attempts"` RepairAttempts int `yaml:"repair_attempts"`
} }
// ResourceBinding identifies a resource in its originating filesystem.
type ResourceBinding struct {
FS fs.FS
Path string
}
// RenderedPrompt represents the prompt after template application. // RenderedPrompt represents the prompt after template application.
type RenderedPrompt struct { type RenderedPrompt struct {
SessionID string `json:"session_id,omitempty"` SessionID string `json:"session_id,omitempty"`

View File

@@ -22,8 +22,26 @@ func ValidateOutputContract(contract OutputContract) error {
return fmt.Errorf("invalid validation mode: %q", contract.ValidationMode) return fmt.Errorf("invalid validation mode: %q", contract.ValidationMode)
} }
if contract.ValidationMode == ValidationJSONSchema && strings.TrimSpace(contract.SchemaPath) == "" { if contract.ValidationMode == ValidationJSONSchema {
return errors.New("schema_path is required when validation_mode is json_schema") count := 0
if contract.Schema != nil {
count++
}
if contract.SchemaFile != nil {
if strings.TrimSpace(*contract.SchemaFile) == "" {
return errors.New("schema_file must not be blank")
}
count++
}
if contract.SchemaPath != "" {
if strings.TrimSpace(contract.SchemaPath) == "" {
return errors.New("schema_path must not be blank")
}
count++
}
if count != 1 {
return errors.New("exactly one of schema, schema_file, or schema_path is required when validation_mode is json_schema")
}
} }
if contract.RepairAttempts < 0 { if contract.RepairAttempts < 0 {
return errors.New("repair_attempts must be greater than or equal to 0") return errors.New("repair_attempts must be greater than or equal to 0")

View File

@@ -85,3 +85,34 @@ func TestValidateOutputContract(t *testing.T) {
}) })
} }
} }
func TestSchemaSelection(t *testing.T) {
file, blank := "schema.json", " "
for _, tt := range []struct {
name string
schema any
file *string
path string
valid bool
}{
{"missing", nil, nil, "", false},
{"false", false, nil, "", true},
{"true", true, nil, "", true},
{"empty object", map[string]any{}, nil, "", true},
{"file", nil, &file, "", true},
{"blank file", nil, &blank, "", false},
{"conflict", false, &file, "", false},
{"path conflict", map[string]any{}, nil, "schema.json", false},
} {
t.Run(tt.name, func(t *testing.T) {
contract := OutputContract{Format: FormatJSON, ValidationMode: ValidationJSONSchema, Schema: tt.schema, SchemaFile: tt.file, SchemaPath: tt.path}
if err := ValidateOutputContract(contract); (err == nil) != tt.valid {
t.Fatalf("active selection error = %v", err)
}
contract.ValidationMode = ValidationNone
if err := ValidateOutputContract(contract); err != nil {
t.Fatalf("inactive selection: %v", err)
}
})
}
}

View File

@@ -36,6 +36,26 @@ func newOutputContractTestRunner() (*Runner, outputContractTestCollaborators) {
), collaborators ), collaborators
} }
func TestResolveInlineSchemaOwnsRuntimeValue(t *testing.T) {
value := map[string]any{"properties": map[string]any{"name": map[string]any{"type": "string"}}}
override := domain.OutputContract{Format: domain.FormatJSON, ValidationMode: domain.ValidationJSONSchema, Schema: value}
contract, err := resolveOutputContract(context.Background(), &domain.PromptDefinition{}, &override)
if err != nil {
t.Fatal(err)
}
value["properties"].(map[string]any)["name"] = false
if _, ok := contract.Schema.(map[string]any)["properties"].(map[string]any)["name"].(map[string]any); !ok {
t.Fatal("schema shares caller storage")
}
var null map[string]any
override.Schema = null
override.SchemaPath = "schema.json"
contract, err = resolveOutputContract(context.Background(), &domain.PromptDefinition{}, &override)
if err != nil || contract.Schema != nil {
t.Fatalf("typed null selection: %#v, %v", contract.Schema, err)
}
}
func TestRunnerPreparationNormalizesOutputContractConsistently(t *testing.T) { func TestRunnerPreparationNormalizesOutputContractConsistently(t *testing.T) {
tests := []struct { tests := []struct {
name string name string

View File

@@ -351,7 +351,7 @@ func (r *Runner) resolvePreparation(
recorder.UpdateSelection(observation.Selection{PromptID: def.ID}) recorder.UpdateSelection(observation.Selection{PromptID: def.ID})
} }
promptDefinitionHash := promptSelection.hash promptDefinitionHash := promptSelection.hash
effectiveContract, err := resolveOutputContract(def, req.Validation) effectiveContract, err := resolveOutputContract(ctx, def, req.Validation)
if err != nil { if err != nil {
return nil, fmt.Errorf("%w: output contract: %v", ErrInvalidRequest, err) return nil, fmt.Errorf("%w: output contract: %v", ErrInvalidRequest, err)
} }
@@ -649,13 +649,20 @@ func validateAPIKey(apiKeyEnv string, apiKey string, apiKeyRequired bool) error
return nil return nil
} }
func resolveOutputContract(def *domain.PromptDefinition, override *domain.OutputContract) (domain.OutputContract, error) { func resolveOutputContract(ctx context.Context, def *domain.PromptDefinition, override *domain.OutputContract) (domain.OutputContract, error) {
contract := def.Validation contract := def.Validation
if override != nil { if override != nil {
contract = *override contract = *override
if contract.Format == "" { if contract.Format == "" {
contract.Format = domain.FormatText contract.Format = domain.FormatText
} }
if contract.ValidationMode == domain.ValidationJSONSchema && contract.Schema != nil {
value, err := validate.DecodeInlineSchema(ctx, contract.Schema)
if err != nil {
return domain.OutputContract{}, fmt.Errorf("invalid inline schema value: %w", err)
}
contract.Schema = value
}
} }
if err := domain.ValidateOutputContract(contract); err != nil { if err := domain.ValidateOutputContract(contract); err != nil {
return domain.OutputContract{}, err return domain.OutputContract{}, err

View File

@@ -183,6 +183,15 @@ func validateArtifact(ctx context.Context, artifact *domain.Artifact, contract d
} }
} }
// DecodeInlineSchema converts a caller-supplied value to an owned JSON document.
func DecodeInlineSchema(ctx context.Context, value any) (any, error) {
encoded, err := json.Marshal(value)
if err != nil {
return nil, err
}
return decodeJSONValue(ctx, encoded)
}
func decodeJSONValue(ctx context.Context, body []byte) (any, error) { func decodeJSONValue(ctx context.Context, body []byte) (any, error) {
if err := ctx.Err(); err != nil { if err := ctx.Err(); err != nil {
return nil, err return nil, err

View File

@@ -6,6 +6,12 @@ import (
"go.maximumdirect.net/promptkit/internal/domain" "go.maximumdirect.net/promptkit/internal/domain"
) )
// Input describes the selected contract and its optional bound schema file.
type Input struct {
Contract domain.OutputContract
File *domain.ResourceBinding
}
// PreparedValidation validates artifacts against one frozen output contract. // PreparedValidation validates artifacts against one frozen output contract.
// Its cancellation boundary is synchronous: Validate does not detach schema // Its cancellation boundary is synchronous: Validate does not detach schema
// execution, and an observed context error prevents publication of a result. // execution, and an observed context error prevents publication of a result.

View File

@@ -15,6 +15,13 @@ func TestPreparationRejectsInvalidOutputContractWithPublicError(t *testing.T) {
name string name string
contract promptkit.OutputContract contract promptkit.OutputContract
}{ }{
{
name: "inline schema cannot be encoded",
contract: promptkit.OutputContract{
Format: promptkit.FormatJSON, ValidationMode: promptkit.ValidationJSONSchema,
Schema: make(chan int),
},
},
{ {
name: "unsupported format", name: "unsupported format",
contract: promptkit.OutputContract{ contract: promptkit.OutputContract{

View File

@@ -104,3 +104,40 @@ func TestNilTypedPromptSourceSuppliesEmptySequence(t *testing.T) {
t.Fatalf("empty source = %v, %v", prompts, err) t.Fatalf("empty source = %v, %v", prompts, err)
} }
} }
func TestTypedPromptSourceSchemaValues(t *testing.T) {
var absent map[string]any
object := map[string]any{"type": "object"}
file := "schema.json"
source := promptkit.PromptSource("schemas", []promptkit.PromptConfig{
{ID: "false", Output: &promptkit.PromptOutputConfig{Schema: false}},
{ID: "true", Output: &promptkit.PromptOutputConfig{Schema: true}},
{ID: "empty", Output: &promptkit.PromptOutputConfig{Schema: map[string]any{}}},
{ID: "absent", Output: &promptkit.PromptOutputConfig{Schema: absent}},
{ID: "object", Output: &promptkit.PromptOutputConfig{Schema: object, SchemaFile: &file}},
})
object["type"] = "changed"
type document struct {
Prompts []struct {
ID string `yaml:"id"`
Output map[string]any `yaml:"output"`
} `yaml:"prompts"`
}
result, err := configkit.LoadLayered(configkit.Input{Source: source}, configkit.LayeredOptions[document]{})
if err != nil {
t.Fatal(err)
}
values := result.Config.Prompts
if values[0].Output["schema"] != false || values[1].Output["schema"] != true {
t.Fatalf("boolean schemas: %#v", values)
}
if empty, ok := values[2].Output["schema"].(map[string]any); !ok || len(empty) != 0 {
t.Fatalf("empty schema: %#v", values[2])
}
if _, ok := values[3].Output["schema"]; ok {
t.Fatalf("nil schema emitted: %#v", values[3])
}
if captured, ok := values[4].Output["schema"].(map[string]any); !ok || captured["type"] != "object" || values[4].Output["schema_file"] != file {
t.Fatalf("captured schema: %#v", values[4])
}
}

View File

@@ -1,6 +1,10 @@
package promptkit package promptkit
import "go.maximumdirect.net/configkit" import (
"reflect"
"go.maximumdirect.net/configkit"
)
// PromptConfig is a presence-aware source input for one prompt. Extends names // PromptConfig is a presence-aware source input for one prompt. Extends names
// a sibling prompt. Nil optional pointers and slices are omitted; non-nil // a sibling prompt. Nil optional pointers and slices are omitted; non-nil
@@ -35,7 +39,8 @@ type PromptCacheControlConfig struct{ Type, TTL *string }
// PromptOutputConfig supplies optional output contract source fields. // PromptOutputConfig supplies optional output contract source fields.
type PromptOutputConfig struct { type PromptOutputConfig struct {
Format, ValidationMode, SchemaPath *string Format, ValidationMode, SchemaPath, SchemaFile *string
Schema any
RepairAttempts *int RepairAttempts *int
} }
@@ -118,6 +123,12 @@ func PromptSource(label string, prompts []PromptConfig) configkit.Source {
if config.Output.SchemaPath != nil { if config.Output.SchemaPath != nil {
output["schema_path"] = *config.Output.SchemaPath output["schema_path"] = *config.Output.SchemaPath
} }
if value := reflect.ValueOf(config.Output.Schema); value.IsValid() && !((value.Kind() == reflect.Pointer || value.Kind() == reflect.Map || value.Kind() == reflect.Slice || value.Kind() == reflect.Interface) && value.IsNil()) {
output["schema"] = config.Output.Schema
}
if config.Output.SchemaFile != nil {
output["schema_file"] = *config.Output.SchemaFile
}
if config.Output.RepairAttempts != nil { if config.Output.RepairAttempts != nil {
output["repair_attempts"] = *config.Output.RepairAttempts output["repair_attempts"] = *config.Output.RepairAttempts
} }

View File

@@ -80,6 +80,8 @@ type PromptCacheControlInspection struct {
type PromptOutputInspection struct { type PromptOutputInspection struct {
Format OutputFormat `json:"format" yaml:"format"` Format OutputFormat `json:"format" yaml:"format"`
ValidationMode ValidationMode `json:"validation_mode" yaml:"validation_mode"` ValidationMode ValidationMode `json:"validation_mode" yaml:"validation_mode"`
Schema any `json:"schema,omitempty" yaml:"schema,omitempty"`
SchemaFile *string `json:"schema_file,omitempty" yaml:"schema_file,omitempty"`
SchemaPath *string `json:"schema_path,omitempty" yaml:"schema_path,omitempty"` SchemaPath *string `json:"schema_path,omitempty" yaml:"schema_path,omitempty"`
RepairAttempts *int `json:"repair_attempts,omitempty" yaml:"repair_attempts,omitempty"` RepairAttempts *int `json:"repair_attempts,omitempty" yaml:"repair_attempts,omitempty"`
} }

View File

@@ -502,8 +502,9 @@ type OutputContract struct {
// ValidationMode selects the content check. Use one of the declared // ValidationMode selects the content check. Use one of the declared
// ValidationMode constants. // ValidationMode constants.
ValidationMode ValidationMode `json:"validation_mode"` ValidationMode ValidationMode `json:"validation_mode"`
// SchemaPath is required when ValidationMode is ValidationJSONSchema and is // Schema supplies an inline JSON Schema. Nil means no inline selection.
// ignored by other modes. Schema any `json:"schema,omitempty"`
// SchemaPath identifies a schema under the applicable configured root.
SchemaPath string `json:"schema_path"` SchemaPath string `json:"schema_path"`
// RepairAttempts is an additional generation-call budget from zero through // RepairAttempts is an additional generation-call budget from zero through
// three. Zero is single-pass. A positive value is valid only with basic, // three. Zero is single-pass. A positive value is valid only with basic,