Improve D&D validation reliability

This commit is contained in:
2026-08-29 01:24:45 +00:00
parent 4da9360d74
commit 917d150279
55 changed files with 1300 additions and 565 deletions

View File

@@ -15,7 +15,7 @@ import (
const (
Key = "extract/dnd/location-registry/shape"
ReasonCode = "invalid_location_shape"
policy = "dnd.location_registry.validator.shape.v1"
policy = "dnd.location_registry.validator.shape.v2"
)
type Options struct{}
@@ -34,39 +34,58 @@ func (v *Validator) CheckpointFingerprints() []pipeline.CheckpointFingerprint {
}
func (v *Validator) Validate(_ context.Context, req contracts.TypedValidationRequest[dnd.LocationRegistry]) (contracts.ValidationResult, error) {
issues := issuesFor(req.Value)
normalization := req.Stage == string(pipeline.StageNormalize)
issues, corrections := assess(req.Value, normalization)
if len(issues) > 0 {
return rejection(diagnostics.Aggregate("invalid location shape", issues)), nil
prefix := "Correct every rejected location and return the complete replacement registry"
if normalization {
prefix = "Correct the duplicate-group proposals and return the complete replacement proposal response"
}
return rejection(diagnostics.Aggregate("invalid location shape", issues), corrections.Guidance(prefix)), nil
}
return contracts.ValidationResult{Approved: true}, nil
}
func Validate(value dnd.LocationRegistry) error {
issues := issuesFor(value)
issues, _ := assess(value, false)
if len(issues) == 0 {
return nil
}
return fmt.Errorf("%s", diagnostics.Aggregate("invalid location shape", issues))
}
func issuesFor(value dnd.LocationRegistry) []string {
func assess(value dnd.LocationRegistry, normalization bool) ([]string, diagnostics.Corrections) {
var corrections diagnostics.Corrections
nameRule := "Provide one nonblank, transcript-supported proper location name for every registry entry."
refRule := "Provide at least one transcript source range that directly supports every named location."
listRule := "Return a `locations` array; use an empty array when the transcript establishes no named locations."
if normalization {
nameRule = "Revise the duplicate-group proposals so every selected canonical location has a nonblank, transcript-supported proper name."
refRule = "Revise the duplicate-group proposals so every selected canonical location preserves direct transcript evidence."
listRule = "Revise the duplicate-group proposals so normalization retains the complete location candidate registry."
}
if value.Locations == nil {
return []string{"locations must be present"}
corrections.Add("list", listRule, "")
return []string{"locations must be present"}, corrections
}
issues := make([]string, 0)
for index, location := range value.Locations {
prefix := fmt.Sprintf("locations[%d]", index)
record := "Affected location " + diagnostics.Quote(strings.TrimSpace(location.Name)) + " " + diagnostics.SourceRange(location.SourceRefs) + "."
if strings.TrimSpace(location.ID) == "" {
issues = append(issues, prefix+".id must not be empty")
corrections.Add("name", nameRule, record)
}
if strings.TrimSpace(location.Name) == "" {
issues = append(issues, prefix+".name must not be empty")
corrections.Add("name", nameRule, record)
}
if len(location.SourceRefs) == 0 {
issues = append(issues, prefix+".source_refs must not be empty")
corrections.Add("source-refs", refRule, record)
}
}
return issues
return issues, corrections
}
func Spec() pipeline.ValidatorSpec {
@@ -92,6 +111,6 @@ func DecodeOptions(options map[string]any) (Options, error) {
func validateOptions(options map[string]any) error { _, err := DecodeOptions(options); return err }
func rejection(message string) contracts.ValidationResult {
return contracts.ValidationResult{Approved: false, ReasonCode: ReasonCode, Message: message, CorrectionGuidance: "Return a complete location registry containing only properly named locations with valid source references."}
func rejection(message, guidance string) contracts.ValidationResult {
return contracts.ValidationResult{Approved: false, ReasonCode: ReasonCode, Message: message, CorrectionGuidance: guidance}
}